diff --git a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/WebDavCompatibleHttpClient.kt b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/WebDavCompatibleHttpClient.kt index 514220f3..22d912c2 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/WebDavCompatibleHttpClient.kt +++ b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/WebDavCompatibleHttpClient.kt @@ -1,7 +1,6 @@ package org.cryptomator.data.cloud.webdav.network import android.content.Context -import android.net.ConnectivityManager import com.burgstaller.okhttp.AuthenticationCacheInterceptor import com.burgstaller.okhttp.CachingAuthenticatorDecorator 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()) builder.cache(cache) // .addNetworkInterceptor(provideCacheInterceptor()) // - .addInterceptor(provideOfflineCacheInterceptor(context)) + .addInterceptor(provideOfflineCacheInterceptor()) } val trustManager = if (usingWebDavWithSelfSignedCertificate(webDavCloud)) { @@ -80,17 +79,15 @@ internal class WebDavCompatibleHttpClient(cloud: WebDavCloud, context: Context) return builder.build() } - private fun provideOfflineCacheInterceptor(context: Context): Interceptor { + private fun provideOfflineCacheInterceptor(): Interceptor { return Interceptor { chain: Interceptor.Chain -> var request = chain.request() - if (isNetworkAvailable(context)) { - val cacheControl = CacheControl.Builder() // - .maxAge(0, TimeUnit.DAYS) // - .build() - request = request.newBuilder() // - .cacheControl(cacheControl) // - .build() - } + val cacheControl = CacheControl.Builder() // + .maxAge(0, TimeUnit.DAYS) // + .build() + request = request.newBuilder() // + .cacheControl(cacheControl) // + .build() chain.proceed(request) } } @@ -145,12 +142,6 @@ internal class WebDavCompatibleHttpClient(cloud: WebDavCloud, context: Context) private fun usingWebDavWithSelfSignedCertificate(webDavCloud: WebDavCloud): Boolean { 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 {