Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b84350d authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Minor rewriting

parent f1d06a30

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

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ import android.os.RemoteException 
import android.provider.ContactsContract

import android.provider.ContactsContract.CommonDataKinds.GroupMembership

import android.provider.ContactsContract.RawContacts.Data

import androidx.annotation.RequiresApi

import at.bitfire.davdroid.BuildConfig

import at.bitfire.davdroid.log.Logger

import at.bitfire.davdroid.model.UnknownProperties
@@ -212,7 +213,7 @@ class LocalContact: AndroidContact, LocalAddress { 
        batch.enqueue(BatchOperation.CpoBuilder

                .newDelete(dataSyncURI())

                .withSelection(

                        Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + " IN (?,?)",

                        "${Data.RAW_CONTACT_ID}=? AND ${Data.MIMETYPE} IN (?,?)",

                        arrayOf(id.toString(), GroupMembership.CONTENT_ITEM_TYPE, CachedGroupMembership.CONTENT_ITEM_TYPE)

                ))

        groupMemberships.clear()

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

+4 −3
Original line number Diff line number Diff line
@@ -30,12 +30,13 @@ class LocalGroup: AndroidGroup, LocalAddress { 


        const val COLUMN_FLAGS = Groups.SYNC4



        /** marshaled list of member UIDs, as sent by server */

        /** marshalled list of member UIDs, as sent by server */

        const val COLUMN_PENDING_MEMBERS = Groups.SYNC3



        /**

         * Processes all groups with non-null {@link #COLUMN_PENDING_MEMBERS}: the pending memberships

         * are (if possible) applied, keeping cached memberships in sync.

         * Processes all groups with non-null [COLUMN_PENDING_MEMBERS]: the pending memberships

         * are applied (if possible) to keep cached memberships in sync.

         *

         * @param addressBook    address book to take groups from

         */

        fun applyPendingMemberships(addressBook: LocalAddressBook) {