Do contact provider settings only at address book creation (fixes changed...

Do contact provider settings only at address book creation (fixes changed contact visibility at sync)

app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt

@@ -9,6 +9,7 @@ package at.bitfire.davdroid.resource
 
 import android.accounts.Account
 import android.accounts.AccountManager
+import android.annotation.TargetApi
 import android.content.*
 import android.os.Build
 import android.os.Bundle
@@ -28,6 +29,12 @@ import java.io.FileNotFoundException
 import java.util.*
 import java.util.logging.Level
 
+/**
+ * A local address book. Requires an own Android account, because Android manages contacts per
+ * account and there is no such thing as "address books". So, DAVdroid creates a "DAVdroid
+ * address book" account for every CardDAV address book. These accounts are bound to a
+ * DAVdroid main account.
+ */
 class LocalAddressBook(
         private val context: Context,
         account: Account,
@@ -53,6 +60,13 @@ class LocalAddressBook(
 
             val addressBook = LocalAddressBook(context, account, provider)
             ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true)
+
+            // set up Contacts Provider Settings
+            val values = ContentValues(2)
+            values.put(ContactsContract.Settings.SHOULD_SYNC, 1)
+            values.put(ContactsContract.Settings.UNGROUPED_VISIBLE, 1)
+            addressBook.updateSettings(values)
+
             return addressBook
         }
 
@@ -109,6 +123,8 @@ class LocalAddressBook(
     @Throws(ContactsStorageException::class)
     fun update(info: CollectionInfo) {
         val newAccountName = accountName(getMainAccount(), info)
+
+        @TargetApi(Build.VERSION_CODES.LOLLIPOP)
         if (account.name != newAccountName && Build.VERSION.SDK_INT >= 21) {
             val accountManager = AccountManager.get(context)
             val future = accountManager.renameAccount(account, newAccountName, {
@@ -308,15 +324,6 @@ class LocalAddressBook(
         }
     }
 
-    @Throws(ContactsStorageException::class)
-    fun removeGroups() {
-        try {
-            provider!!.delete(syncAdapterURI(Groups.CONTENT_URI), null, null)
-        } catch(e: RemoteException) {
-            throw ContactsStorageException("Couldn't remove all groups", e)
-        }
-    }
-
 
     // SETTINGS
 

app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt

@@ -13,7 +13,6 @@ import android.content.*
 import android.os.Build
 import android.os.Bundle
 import android.os.RemoteException
-import android.provider.ContactsContract
 import android.provider.ContactsContract.Groups
 import android.support.v4.app.NotificationCompat
 import at.bitfire.dav4android.DavAddressBook
@@ -41,39 +40,39 @@ import java.util.*
 import java.util.logging.Level
 
 /**
- * <p>Synchronization manager for CardDAV collections; handles contacts and groups.</p>
+ * Synchronization manager for CardDAV collections; handles contacts and groups.
  *
- * <p></p>Group handling differs according to the {@link #groupMethod}. There are two basic methods to
- * handle/manage groups:</p>
- * <ul>
- *     <li>{@code CATEGORIES}: groups memberships are attached to each contact and represented as
+ * Group handling differs according to the {@link #groupMethod}. There are two basic methods to
+ * handle/manage groups:
+ *
+ *     1. CATEGORIES: groups memberships are attached to each contact and represented as
  *     "category". When a group is dirty or has been deleted, all its members have to be set to
  *     dirty, too (because they have to be uploaded without the respective category). This
- *     is done in {@link #prepareDirty()}. Empty groups can be deleted without further processing,
- *     which is done in {@link #postProcess()} because groups may become empty after downloading
- *     updated remote contacts.</li>
- *     <li>Groups as separate VCards: individual and group contacts (with a list of member UIDs) are
+ *     is done in [prepareDirty]. Empty groups can be deleted without further processing,
+ *     which is done in [postProcess] because groups may become empty after downloading
+ *     updated remote contacts.
+ *
+ *     2. Groups as separate VCards: individual and group contacts (with a list of member UIDs) are
  *     distinguished. When a local group is dirty, its members don't need to be set to dirty.
- *     <ol>
- *         <li>However, when a contact is dirty, it has
+ *
+ *         * However, when a contact is dirty, it has
  *         to be checked whether its group memberships have changed. In this case, the respective
  *         groups have to be set to dirty. For instance, if contact A is in group G and H, and then
  *         group membership of G is removed, the contact will be set to dirty because of the changed
- *         {@link android.provider.ContactsContract.CommonDataKinds.GroupMembership}. DAVdroid will
+ *         [android.provider.ContactsContract.CommonDataKinds.GroupMembership]. DAVdroid will
  *         then have to check whether the group memberships have actually changed, and if so,
  *         all affected groups have to be set to dirty. To detect changes in group memberships,
- *         DAVdroid always mirrors all {@link android.provider.ContactsContract.CommonDataKinds.GroupMembership}
- *         data rows in respective {@link at.bitfire.vcard4android.CachedGroupMembership} rows.
+ *         DAVdroid always mirrors all [android.provider.ContactsContract.CommonDataKinds.GroupMembership]
+ *         data rows in respective [at.bitfire.vcard4android.CachedGroupMembership] rows.
  *         If the cached group memberships are not the same as the current group member ships, the
  *         difference set (in our example G, because its in the cached memberships, but not in the
- *         actual ones) is marked as dirty. This is done in {@link #prepareDirty()}.</li>
- *         <li>When downloading remote contacts, groups (+ member information) may be received
+ *         actual ones) is marked as dirty. This is done in [prepareDirty].
+ *
+ *         * When downloading remote contacts, groups (+ member information) may be received
  *         by the actual members. Thus, the member lists have to be cached until all VCards
  *         are received. This is done by caching the member UIDs of each group in
- *         {@link LocalGroup#COLUMN_PENDING_MEMBERS}. In {@link #postProcess()},
- *         these "pending memberships" are assigned to the actual contacs and then cleaned up.</li>
- *     </ol>
- * </ul>
+ *         [LocalGroup.COLUMN_PENDING_MEMBERS]. In [postProcess],
+ *         these "pending memberships" are assigned to the actual contacts and then cleaned up.
  */
 class ContactsSyncManager(
         context: Context,
@@ -118,12 +117,6 @@ class ContactsSyncManager(
             }
         }
 
-        // set up Contacts Provider Settings
-        val values = ContentValues(2)
-        values.put(ContactsContract.Settings.SHOULD_SYNC, 1)
-        values.put(ContactsContract.Settings.UNGROUPED_VISIBLE, 1)
-        localAddressBook.updateSettings(values)
-
         collectionURL = HttpUrl.parse(localAddressBook.getURL()) ?: return false
         davCollection = DavAddressBook(httpClient.okHttpClient, collectionURL)