Merge remote-tracking branch 'origin/1245-push-support-unifiedpush-connector-3x' into 1245-push-support-unifiedpush-connector-3x

# Conflicts:
#	app/src/main/kotlin/at/bitfire/davdroid/push/PushRegistrationManager.kt

Author: rfc2822

app/src/main/kotlin/at/bitfire/davdroid/push/PushRegistrationManager.kt

@@ -237,7 +237,7 @@ class PushRegistrationManager @Inject constructor(
         }
         serializer.endDocument()
 
-        runInterruptible(ioDispatcher) {
+        runInterruptible(ioDispatcher) {    // network traffic
             val xml = writer.toString().toRequestBody(DavResource.MIME_XML)
             DavCollection(httpClient.okHttpClient, collection.url).post(xml) { response ->
                 if (response.isSuccessful) {
@@ -258,7 +258,7 @@ class PushRegistrationManager @Inject constructor(
     }
 
     private suspend fun unsubscribe(httpClient: HttpClient, collection: Collection, url: HttpUrl) {
-        runInterruptible(ioDispatcher) {
+        runInterruptible(ioDispatcher) {    // network traffic
             try {
                 DavResource(httpClient.okHttpClient, url).delete {
                     // deleted

app/src/main/kotlin/at/bitfire/davdroid/repository/AccountRepository.kt

@@ -8,7 +8,6 @@ import android.accounts.Account
 import android.accounts.AccountManager
 import android.accounts.OnAccountsUpdateListener
 import android.content.Context
-import at.bitfire.davdroid.sync.account.InvalidAccountException
 import at.bitfire.davdroid.R
 import at.bitfire.davdroid.db.Credentials
 import at.bitfire.davdroid.db.HomeSet
@@ -23,6 +22,7 @@ import at.bitfire.davdroid.sync.AutomaticSyncManager
 import at.bitfire.davdroid.sync.SyncDataType
 import at.bitfire.davdroid.sync.TasksAppManager
 import at.bitfire.davdroid.sync.account.AccountsCleanupWorker
+import at.bitfire.davdroid.sync.account.InvalidAccountException
 import at.bitfire.davdroid.sync.account.SystemAccountUtils
 import at.bitfire.davdroid.sync.worker.SyncWorkerManager
 import at.bitfire.vcard4android.GroupMethod