AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Remove network check for caching as network is forced in WebDAV

Browse Source
This commit is contained in:
Julian Raufelder 2021-11-04 17:22:26 +01:00
parent b163353c1e
commit 0c31410cec
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/src/main/java/org/cryptomator/data/cloud/webdav/network/WebDavCompatibleHttpClient.kt
View File

@ -1,7 +1,6 @@
package org.cryptomator.data.cloud.webdav.network package org.cryptomator.data.cloud.webdav.network
import android.content.Context import android.content.Context
import android.net.ConnectivityManager
import com.burgstaller.okhttp.AuthenticationCacheInterceptor import com.burgstaller.okhttp.AuthenticationCacheInterceptor
import com.burgstaller.okhttp.CachingAuthenticatorDecorator import com.burgstaller.okhttp.CachingAuthenticatorDecorator
import com.burgstaller.okhttp.DispatchingAuthenticator import com.burgstaller.okhttp.DispatchingAuthenticator
@ -65,7 +64,7 @@ internal class WebDavCompatibleHttpClient(cloud: WebDavCloud, context: Context)
val cache = Cache(LruFileCacheUtil(context).resolve(LruFileCacheUtil.Cache.WEBDAV), lruCacheSize.toLong()) val cache = Cache(LruFileCacheUtil(context).resolve(LruFileCacheUtil.Cache.WEBDAV), lruCacheSize.toLong())
builder.cache(cache) // builder.cache(cache) //
.addNetworkInterceptor(provideCacheInterceptor()) // .addNetworkInterceptor(provideCacheInterceptor()) //
.addInterceptor(provideOfflineCacheInterceptor(context)) .addInterceptor(provideOfflineCacheInterceptor())
} }
val trustManager = if (usingWebDavWithSelfSignedCertificate(webDavCloud)) { val trustManager = if (usingWebDavWithSelfSignedCertificate(webDavCloud)) {
@ -80,17 +79,15 @@ internal class WebDavCompatibleHttpClient(cloud: WebDavCloud, context: Context)
return builder.build() return builder.build()
} }
private fun provideOfflineCacheInterceptor(context: Context): Interceptor { private fun provideOfflineCacheInterceptor(): Interceptor {
return Interceptor { chain: Interceptor.Chain -> return Interceptor { chain: Interceptor.Chain ->
var request = chain.request() var request = chain.request()
if (isNetworkAvailable(context)) {
val cacheControl = CacheControl.Builder() // val cacheControl = CacheControl.Builder() //
.maxAge(0, TimeUnit.DAYS) // .maxAge(0, TimeUnit.DAYS) //
.build() .build()
request = request.newBuilder() // request = request.newBuilder() //
.cacheControl(cacheControl) // .cacheControl(cacheControl) //
.build() .build()
}
chain.proceed(request) chain.proceed(request)
} }
} }
@ -145,12 +142,6 @@ internal class WebDavCompatibleHttpClient(cloud: WebDavCloud, context: Context)
private fun usingWebDavWithSelfSignedCertificate(webDavCloud: WebDavCloud): Boolean { private fun usingWebDavWithSelfSignedCertificate(webDavCloud: WebDavCloud): Boolean {
return webDavCloud.certificate() != null return webDavCloud.certificate() != null
} }
private fun isNetworkAvailable(context: Context): Boolean {
val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
val activeNetworkInfo = connectivityManager.activeNetworkInfo
return activeNetworkInfo != null && activeNetworkInfo.isConnected
}
} }
class UserAgentInterceptor : Interceptor { class UserAgentInterceptor : Interceptor {