From bf050aa53b3cf5ef7d245e9b3d9d4323ccf81726 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Mon, 7 Sep 2020 18:43:06 +0300
Subject: [PATCH] HttpClient: use the http client builder when using etesync

If we don't use the http client builder we don't get cert4droid hooked
which means we won't correctly support self-signed certificates.
---
 app/src/main/java/com/etesync/syncadapter/HttpClient.kt        | 1 -
 .../etesync/syncadapter/ui/ChangeEncryptionPasswordActivity.kt | 2 +-
 .../com/etesync/syncadapter/ui/etebase/CollectionActivity.kt   | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/etesync/syncadapter/HttpClient.kt b/app/src/main/java/com/etesync/syncadapter/HttpClient.kt
index c663d3f2..c3574f66 100644
--- a/app/src/main/java/com/etesync/syncadapter/HttpClient.kt
+++ b/app/src/main/java/com/etesync/syncadapter/HttpClient.kt
@@ -68,7 +68,6 @@ class HttpClient private constructor(
     ) {
         private var certManager: CustomCertManager? = null
         private var certificateAlias: String? = null
-        private var cache: Cache? = null
 
         private val orig = sharedClient.newBuilder()
 
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/ChangeEncryptionPasswordActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/ChangeEncryptionPasswordActivity.kt
index 5b14cde2..86fa3fc5 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/ChangeEncryptionPasswordActivity.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/ChangeEncryptionPasswordActivity.kt
@@ -69,7 +69,7 @@ open class ChangeEncryptionPasswordActivity : BaseActivity() {
         }
 
         doAsync {
-            val httpClient = HttpClient.sharedClient
+            val httpClient = HttpClient.Builder(this@ChangeEncryptionPasswordActivity).setForeground(true).build().okHttpClient
 
             try {
                 Logger.log.info("Loging in with old password")
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/etebase/CollectionActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/etebase/CollectionActivity.kt
index 04da9dcd..f3dbf5f7 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/etebase/CollectionActivity.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/etebase/CollectionActivity.kt
@@ -90,7 +90,8 @@ class AccountViewModel : ViewModel() {
         doAsync {
             val settings = AccountSettings(context, account)
             val etebaseLocalCache = EtebaseLocalCache.getInstance(context, account.name)
-            val etebase = EtebaseLocalCache.getEtebase(context, HttpClient.sharedClient, settings)
+            val httpClient = HttpClient.Builder(context).setForeground(true).build().okHttpClient
+            val etebase = EtebaseLocalCache.getEtebase(context, httpClient, settings)
             val colMgr = etebase.collectionManager
             uiThread {
                 holder.value = AccountHolder(