flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-27 01:36:14 +00:00
Code Issues Releases Wiki Activity

update session from APM while running the app

Browse Source
This commit is contained in:
Christian Schabesberger 2021-09-13 15:24:33 +02:00
parent b2f6d7f3b1
commit cfd69987e9
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
owncloudComLibrary/build.gradle
View File

@ -7,6 +7,8 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
api 'com.gitlab.ownclouders:dav4android:oc_support_2.1.5' api 'com.gitlab.ownclouders:dav4android:oc_support_2.1.5'
api 'com.github.AppDevNext.Logcat:LogcatCore:2.2.2' api 'com.github.AppDevNext.Logcat:LogcatCore:2.2.2'
debugImplementation 'com.facebook.stetho:stetho:1.5.1'
debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
// Moshi // Moshi
implementation("com.squareup.moshi:moshi-kotlin:$moshiVersion") { implementation("com.squareup.moshi:moshi-kotlin:$moshiVersion") {

4
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/ConnectionValidator.kt
View File

@ -21,7 +21,7 @@ class ConnectionValidator (
var validationRetryCount = 0 var validationRetryCount = 0
val client = OwnCloudClient(baseClient.baseUri, null, false) val client = OwnCloudClient(baseClient.baseUri, null, false)
if (clearCookiesOnValidation) { if (clearCookiesOnValidation) {
client.clearCookies() client.clearCookies();
} else { } else {
client.cookiesForBaseUri = baseClient.cookiesForBaseUri client.cookiesForBaseUri = baseClient.cookiesForBaseUri
} }
@ -84,7 +84,7 @@ class ConnectionValidator (
} }
private fun triggerAuthRefresh(): OwnCloudCredentials { private fun triggerAuthRefresh(): OwnCloudCredentials {
//TODO: Implement me Timber.d("!!!!!!!!!!!!!!!!!!!!!!!!!!!! need to reauthenticate !!!!!!!!!!!!!!!!!!!!!!!!!!")
return OwnCloudCredentialsFactory.getAnonymousCredentials() return OwnCloudCredentialsFactory.getAnonymousCredentials()
} }

4
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
View File

@ -340,10 +340,6 @@ public class OwnCloudClient extends HttpClient {
HttpUrl.parse(mBaseUri.toString())); HttpUrl.parse(mBaseUri.toString()));
} }
public void clearCookies() {
setCookiesForBaseUri(new ArrayList<>());
}
public OwnCloudVersion getOwnCloudVersion() { public OwnCloudVersion getOwnCloudVersion() {
return mVersion; return mVersion;
} }

11
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/CookieJarImpl.kt
View File

@ -28,7 +28,7 @@ import okhttp3.CookieJar
import okhttp3.HttpUrl import okhttp3.HttpUrl
class CookieJarImpl( class CookieJarImpl(
private val sCookieStore: HashMap<String, List<Cookie>> private val cookieStore: HashMap<String, List<Cookie>>
) : CookieJar { ) : CookieJar {
fun containsCookieWithName(cookies: List<Cookie>, name: String): Boolean { fun containsCookieWithName(cookies: List<Cookie>, name: String): Boolean {
@ -52,12 +52,11 @@ class CookieJarImpl(
override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) { override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
// Avoid duplicated cookies but update // Avoid duplicated cookies but update
val currentCookies: List<Cookie> = sCookieStore[url.host] ?: ArrayList() val currentCookies: List<Cookie> = cookieStore[url.host] ?: ArrayList()
val updatedCookies: List<Cookie> = getUpdatedCookies(currentCookies, cookies) val updatedCookies: List<Cookie> = getUpdatedCookies(currentCookies, cookies)
sCookieStore[url.host] = updatedCookies cookieStore[url.host] = updatedCookies
} }
override fun loadForRequest(url: HttpUrl) = override fun loadForRequest(url: HttpUrl) =
sCookieStore[url.host] ?: ArrayList() cookieStore[url.host] ?: ArrayList()
}
}

5
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java
View File

@ -26,6 +26,7 @@ package com.owncloud.android.lib.common.http;
import android.content.Context; import android.content.Context;
import com.facebook.stetho.okhttp3.StethoInterceptor;
import com.owncloud.android.lib.common.network.AdvancedX509TrustManager; import com.owncloud.android.lib.common.network.AdvancedX509TrustManager;
import com.owncloud.android.lib.common.network.NetworkUtils; import com.owncloud.android.lib.common.network.NetworkUtils;
import okhttp3.Cookie; import okhttp3.Cookie;
@ -139,4 +140,8 @@ public class HttpClient {
public static void setContext(Context context) { public static void setContext(Context context) {
sContext = context; sContext = context;
} }
public void clearCookies() {
sCookieStore.clear();
}
} }