mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-07-23 19:50:18 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Handle InvalidAccountException in SyncAdapterService

Browse source
This commit is contained in:
Ricki Hirner 2023-05-03 11:04:19 +02:00
parent f9d6bb153c
commit 0bed00c05a
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/androidTest/java/at/bitfire/davdroid/settings/AccountSettingsTest.kt
View file

@ -10,7 +10,7 @@ import android.content.ContentResolver
import android.provider.CalendarContract
import android.provider.ContactsContract
import android.util.Log
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
import androidx.annotation.RequiresApi
import androidx.test.platform.app.InstrumentationRegistry
import androidx.work.Configuration
import androidx.work.testing.WorkManagerTestInitHelper
@ -19,7 +19,6 @@ import at.bitfire.davdroid.TestUtils
import at.bitfire.davdroid.db.Credentials
import at.bitfire.davdroid.syncadapter.AccountUtils
import at.bitfire.davdroid.syncadapter.PeriodicSyncWorker
import at.bitfire.davdroid.syncadapter.SyncManagerTest
import at.bitfire.davdroid.ui.NotificationUtils
import at.bitfire.ical4android.TaskProvider
import dagger.hilt.android.testing.HiltAndroidRule
@ -31,7 +30,6 @@ import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import java.util.concurrent.TimeUnit
import javax.inject.Inject
@HiltAndroidTest
@ -40,16 +38,13 @@ class AccountSettingsTest {
@get:Rule
val hiltRule = HiltAndroidRule(this)
@get:Rule
var instantTaskExecutorRule = InstantTaskExecutorRule()
@Inject
lateinit var settingsManager: SettingsManager
private val context = InstrumentationRegistry.getInstrumentation().targetContext
val account = Account(javaClass.canonicalName, SyncManagerTest.context.getString(R.string.account_type))
val account = Account(javaClass.canonicalName, context.getString(R.string.account_type))
val fakeCredentials = Credentials("test", "test")
val authorities = listOf(
@ -84,9 +79,9 @@ class AccountSettingsTest {
}
@After
@RequiresApi(22)
fun removeAccount() {
val futureResult = AccountManager.get(context).removeAccount(account, {}, null)
assertTrue(futureResult.getResult(10, TimeUnit.SECONDS))
AccountManager.get(context).removeAccountExplicitly(account)
}
@ -141,4 +136,5 @@ class AccountSettingsTest {
assertEquals(AccountSettings.SYNC_INTERVAL_MANUALLY, settings.getSyncInterval(authority))
}
}
}

10
app/src/main/java/at/bitfire/davdroid/syncadapter/SyncAdapterServices.kt
View file

@ -13,6 +13,7 @@ import android.content.Context
import android.content.Intent
import android.content.SyncResult
import android.os.Bundle
import at.bitfire.davdroid.InvalidAccountException
import at.bitfire.davdroid.log.Logger
import at.bitfire.davdroid.settings.AccountSettings
import java.util.logging.Level
@ -45,8 +46,15 @@ abstract class SyncAdapterService: Service() {
val upload = extras.containsKey(ContentResolver.SYNC_EXTRAS_UPLOAD)
Logger.log.info("Sync request via sync adapter (upload=$upload)")
val accountSettings = try {
AccountSettings(context, account)
} catch (e: InvalidAccountException) {
Logger.log.log(Level.WARNING, "Account doesn't exist anymore", e)
return
}
// Should we run the sync at all?
if (!SyncWorker.wifiConditionsMet(context, AccountSettings(context, account))) {
if (!SyncWorker.wifiConditionsMet(context, accountSettings)) {
Logger.log.info("Sync conditions not met. Aborting sync adapter")
return
}