Update account user data in LocalAddressBook

bitfireAT · Oct 8, 2024 · 38a6042 · 38a6042
1 parent 4b3b618
commit 38a6042
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 24 deletions.
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/resource/LocalAddressBook.kt b/app/src/main/kotlin/at/bitfire/davdroid/resource/LocalAddressBook.kt
@@ -264,9 +264,11 @@ open class LocalAddressBook @AssistedInject constructor(
  * Updates the address book settings.
  *
  * @param info collection where to take the settings from
- * @param forceReadOnly `true`: set the address book to "force read-only"; `false`: determine read-only flag from [info]
+ * @param forceReadOnly `true`: set the address book to "force read-only";
+ * `false`: determine read-only flag from [info];
+ * `null`: don't change the existing value
  */
- fun update(info: Collection, forceReadOnly: Boolean) {
+ fun update(info: Collection, forceReadOnly: Boolean? = null) {
  logger.log(Level.INFO, "Updating local address book $account with collection $info")
  val accountManager = AccountManager.get(context)
 
@@ -283,27 +285,29 @@ open class LocalAddressBook @AssistedInject constructor(
  accountManager.setAndVerifyUserData(account, USER_DATA_URL, info.url.toString())
 
  // Update force read only
- val nowReadOnly = forceReadOnly || !info.privWriteContent || info.forceReadOnly
- if (nowReadOnly != readOnly) {
- logger.info("Address book now read-only = $nowReadOnly, updating contacts")
-
- // update address book itself
- readOnly = nowReadOnly
-
- // update raw contacts
- val rawContactValues = ContentValues(1)
- rawContactValues.put(RawContacts.RAW_CONTACT_IS_READ_ONLY, if (nowReadOnly) 1 else 0)
- provider!!.update(rawContactsSyncUri(), rawContactValues, null, null)
-
- // update data rows
- val dataValues = ContentValues(1)
- dataValues.put(ContactsContract.Data.IS_READ_ONLY, if (nowReadOnly) 1 else 0)
- provider!!.update(syncAdapterURI(ContactsContract.Data.CONTENT_URI), dataValues, null, null)
-
- // update group rows
- val groupValues = ContentValues(1)
- groupValues.put(Groups.GROUP_IS_READ_ONLY, if (nowReadOnly) 1 else 0)
- provider!!.update(groupsSyncUri(), groupValues, null, null)
+ if (forceReadOnly != null) {
+ val nowReadOnly = forceReadOnly || !info.privWriteContent || info.forceReadOnly
+ if (nowReadOnly != readOnly) {
+ logger.info("Address book now read-only = $nowReadOnly, updating contacts")
+
+ // update address book itself
+ readOnly = nowReadOnly
+
+ // update raw contacts
+ val rawContactValues = ContentValues(1)
+ rawContactValues.put(RawContacts.RAW_CONTACT_IS_READ_ONLY, if (nowReadOnly) 1 else 0)
+ provider!!.update(rawContactsSyncUri(), rawContactValues, null, null)
+
+ // update data rows
+ val dataValues = ContentValues(1)
+ dataValues.put(ContactsContract.Data.IS_READ_ONLY, if (nowReadOnly) 1 else 0)
+ provider!!.update(syncAdapterURI(ContactsContract.Data.CONTENT_URI), dataValues, null, null)
+
+ // update group rows
+ val groupValues = ContentValues(1)
+ groupValues.put(Groups.GROUP_IS_READ_ONLY, if (nowReadOnly) 1 else 0)
+ provider!!.update(groupsSyncUri(), groupValues, null, null)
+ }
  }
 
  // make sure it will still be synchronized when contacts are updated

diff --git a/app/src/main/kotlin/at/bitfire/davdroid/settings/AccountSettingsMigrations.kt b/app/src/main/kotlin/at/bitfire/davdroid/settings/AccountSettingsMigrations.kt
@@ -98,7 +98,7 @@ class AccountSettingsMigrations @AssistedInject constructor(
  val collection = collectionRepository.getByServiceAndUrl(service.id, url)
  ?: continue
  val localAddressBook = localAddressBookFactory.create(oldAddressBookAccount, provider)
- localAddressBook.update(collection, collection.forceReadOnly)
+ localAddressBook.update(collection)
  }
  }
  }