Don't pass certmanager around

app/src/main/java/org/tasks/auth/SignInViewModel.kt

@@ -73,7 +73,6 @@ class SignInViewModel @Inject constructor(
                             username,
                             tokenString
                     )
-                    .setForeground()
                     .homeSet(username, tokenString)
             val password = encryption.encrypt(tokenString)
             return caldavDao.getAccount(CaldavAccount.TYPE_TASKS, username)

app/src/main/java/org/tasks/caldav/CaldavAccountViewModel.kt

@@ -14,7 +14,6 @@ class CaldavAccountViewModel @Inject constructor(
             withContext(Dispatchers.IO) {
                 provider
                     .forUrl(url, username, password)
-                    .setForeground()
                     .homeSet(username, password)
             }
         }

app/src/main/java/org/tasks/caldav/CaldavClient.kt

@@ -1,6 +1,5 @@
 package org.tasks.caldav
 
-import at.bitfire.cert4android.CustomCertManager
 import at.bitfire.dav4jvm.DavCollection
 import at.bitfire.dav4jvm.DavResource
 import at.bitfire.dav4jvm.DavResource.Companion.MIME_XML
@@ -12,16 +11,8 @@ import at.bitfire.dav4jvm.XmlUtils.NS_CALDAV
 import at.bitfire.dav4jvm.XmlUtils.NS_WEBDAV
 import at.bitfire.dav4jvm.exception.DavException
 import at.bitfire.dav4jvm.exception.HttpException
-import at.bitfire.dav4jvm.property.CalendarColor
-import at.bitfire.dav4jvm.property.CalendarHomeSet
-import at.bitfire.dav4jvm.property.CurrentUserPrincipal
-import at.bitfire.dav4jvm.property.CurrentUserPrivilegeSet
-import at.bitfire.dav4jvm.property.DisplayName
-import at.bitfire.dav4jvm.property.GetCTag
-import at.bitfire.dav4jvm.property.ResourceType
+import at.bitfire.dav4jvm.property.*
 import at.bitfire.dav4jvm.property.ResourceType.Companion.CALENDAR
-import at.bitfire.dav4jvm.property.SupportedCalendarComponentSet
-import at.bitfire.dav4jvm.property.SyncToken
 import com.todoroo.astrid.helper.UUIDHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -57,7 +48,6 @@ import kotlin.coroutines.suspendCoroutine
 
 open class CaldavClient(
         private val provider: CaldavClientProvider,
-        private val customCertManager: CustomCertManager,
         val httpClient: OkHttpClient,
         private val httpUrl: HttpUrl?
 ) {
@@ -229,11 +219,6 @@ open class CaldavClient(
         xml.endTag(NS_APPLE_ICAL, "calendar-color")
     }
 
-    fun setForeground(): CaldavClient {
-        customCertManager.appInForeground = true
-        return this
-    }
-
     suspend fun share(
         account: CaldavAccount,
         href: String,

app/src/main/java/org/tasks/caldav/CaldavClientProvider.kt

@@ -37,9 +37,9 @@ class CaldavClientProvider @Inject constructor(
     ): CaldavClient {
         val auth = getAuthInterceptor(username, password, url)
         val customCertManager = newCertManager()
+        customCertManager.appInForeground = true
         return CaldavClient(
                 this,
-                customCertManager,
                 createHttpClient(auth, customCertManager),
                 url?.toHttpUrlOrNull()
         )
@@ -61,9 +61,9 @@ class CaldavClientProvider @Inject constructor(
         val customCertManager = newCertManager()
         val client = createHttpClient(auth, customCertManager)
         return if (account.isTasksOrg) {
-            TasksClient(this, customCertManager, client, url?.toHttpUrlOrNull())
+            TasksClient(this, client, url?.toHttpUrlOrNull())
         } else {
-            CaldavClient(this, customCertManager, client, url?.toHttpUrlOrNull())
+            CaldavClient(this, client, url?.toHttpUrlOrNull())
         }
     }
 

app/src/main/java/org/tasks/caldav/TasksClient.kt

@@ -1,18 +1,19 @@
 package org.tasks.caldav
 
-import at.bitfire.cert4android.CustomCertManager
 import at.bitfire.dav4jvm.exception.HttpException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import okhttp3.*
+import okhttp3.FormBody
+import okhttp3.HttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.Request
 import org.json.JSONObject
 
 class TasksClient constructor(
         provider: CaldavClientProvider,
-        certManager: CustomCertManager,
         httpClient: OkHttpClient,
         private val httpUrl: HttpUrl?
-) : CaldavClient(provider, certManager, httpClient, httpUrl) {
+) : CaldavClient(provider, httpClient, httpUrl) {
     suspend fun generateNewPassword(description: String?): JSONObject? = withContext(Dispatchers.IO) {
         val url = httpUrl?.resolve(ENDPOINT_PASSWORDS) ?: return@withContext null
         httpClient