diff --git a/app/src/main/java/com/etesync/syncadapter/HttpClient.kt b/app/src/main/java/com/etesync/syncadapter/HttpClient.kt index b37c2d68..273d6c28 100644 --- a/app/src/main/java/com/etesync/syncadapter/HttpClient.kt +++ b/app/src/main/java/com/etesync/syncadapter/HttpClient.kt @@ -72,6 +72,7 @@ class HttpClient private constructor( ) { private var certManager: CustomCertManager? = null private var certificateAlias: String? = null + private var foreground = true private val orig = sharedClient.newBuilder() @@ -138,8 +139,9 @@ class HttpClient private constructor( fun customCertManager(manager: CustomCertManager) { certManager = manager } + fun setForeground(foreground: Boolean): Builder { - certManager?.appInForeground = foreground + this.foreground = foreground return this } @@ -223,6 +225,8 @@ class HttpClient private constructor( orig.sslSocketFactory(CertTlsSocketFactory(keyManager, trustManager), trustManager) orig.hostnameVerifier(hostnameVerifier) + certManager?.appInForeground = foreground + return HttpClient(orig.build(), certManager) } diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.kt index 914e5527..0dabd3c9 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.kt +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.kt @@ -236,7 +236,7 @@ constructor(context: Context, account: Account, settings: AccountSettings, extra return null } - val resourceClient = HttpClient.Builder(context).build().okHttpClient + val resourceClient = HttpClient.Builder(context).setForeground(false).build().okHttpClient try { val response = resourceClient.newCall(Request.Builder() diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.kt index cf946f94..11fc8f38 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.kt +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.kt @@ -111,7 +111,7 @@ abstract class SyncAdapterService : Service() { Logger.log.info("Refreshing " + serviceType + " collections of service #" + serviceType.toString()) val settings = AccountSettings(context, account) - val httpClient = HttpClient.Builder(context, settings).build().okHttpClient + val httpClient = HttpClient.Builder(context, settings).setForeground(false).build().okHttpClient val journalsManager = JournalManager(httpClient, HttpUrl.get(settings.uri!!)!!) diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt index fcfe4582..5fe21ef3 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt @@ -87,7 +87,7 @@ constructor(protected val context: Context, protected val account: Account, prot init { // create HttpClient with given logger - httpClient = HttpClient.Builder(context, settings).build().okHttpClient + httpClient = HttpClient.Builder(context, settings).setForeground(false).build().okHttpClient data = (context.applicationContext as App).data val serviceEntity = JournalModel.Service.fetch(data, accountName, serviceType)