arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-03 03:11:48 +00:00
Code Issues Releases Wiki Activity

Address books accounts: set initial user data twice for older Android versions

Browse Source
This commit is contained in:
Ricki Hirner 2019-06-20 12:26:19 +02:00 committed by Tom Hacohen
parent 8abbbd122f
commit 8422892708
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.kt
View File

@ -45,8 +45,19 @@ class LocalAddressBook(
val accountManager = AccountManager.get(context) val accountManager = AccountManager.get(context)
val account = Account(accountName(mainAccount, info), App.addressBookAccountType) val account = Account(accountName(mainAccount, info), App.addressBookAccountType)
if (!accountManager.addAccountExplicitly(account, null, initialUserData(mainAccount, info.uid!!))) val userData = initialUserData(mainAccount, info.uid!!)
throw ContactsStorageException("Couldn't create address book account") Logger.log.log(Level.INFO, "Creating local address book $account", userData)
if (!accountManager.addAccountExplicitly(account, null, userData))
throw IllegalStateException("Couldn't create address book account")
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
// Android < 7 seems to lose the initial user data sometimes, so set it a second time
// https://forums.bitfire.at/post/11644
userData.keySet().forEach { key ->
accountManager.setUserData(account, key, userData.getString(key))
}
}
val addressBook = LocalAddressBook(context, account, provider) val addressBook = LocalAddressBook(context, account, provider)
ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true) ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true)
@ -119,7 +130,7 @@ class LocalAddressBook(
if (name != null && type != null) if (name != null && type != null)
return Account(name, type) return Account(name, type)
else else
throw IllegalStateException("Address book doesn't exist anymore") throw IllegalStateException("No main account assigned to address book account")
} }
} }
set(newMainAccount) { set(newMainAccount) {