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

Unverified Commit 57a77bd5 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Actually update vcard4android (better read-only contacts support)

parent d32b21a4

app/src/androidTest/java/at/bitfire/davdroid/resource/contactrow/GroupMembershipBuilderTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ class GroupMembershipBuilderTest { 
        val contact = Contact().apply {

            categories += "TEST GROUP"

        }

        GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsCategories).build().also { result ->

        GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsCategories, false).build().also { result ->

            assertEquals(1, result.size)

            assertEquals(GroupMembership.CONTENT_ITEM_TYPE, result[0].values[GroupMembership.MIMETYPE])

            assertEquals(addressBookGroupsAsCategories.findOrCreateGroup("TEST GROUP"), result[0].values[GroupMembership.GROUP_ROW_ID])
@@ -66,7 +66,7 @@ class GroupMembershipBuilderTest { 
        val contact = Contact().apply {

            categories += "TEST GROUP"

        }

        GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsVCards).build().also { result ->

        GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsVCards, false).build().also { result ->

            // group membership is constructed during post-processing

            assertEquals(0, result.size)

        }

app/src/androidTest/java/at/bitfire/davdroid/resource/contactrow/UnknownPropertiesBuilderTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ class UnknownPropertiesBuilderTest { 


    @Test

    fun testUnknownProperties_None() {

        UnknownPropertiesBuilder(Uri.EMPTY, null, Contact()).build().also { result ->

        UnknownPropertiesBuilder(Uri.EMPTY, null, Contact(), false).build().also { result ->

            assertEquals(0, result.size)

        }

    }
@@ -22,7 +22,7 @@ class UnknownPropertiesBuilderTest { 
    fun testUnknownProperties_Properties() {

        UnknownPropertiesBuilder(Uri.EMPTY, null, Contact().apply {

            unknownProperties = "X-TEST:12345"

        }).build().also { result ->

        }, false).build().also { result ->

            assertEquals(1, result.size)

            assertEquals(UnknownProperties.CONTENT_ITEM_TYPE, result[0].values[UnknownProperties.MIMETYPE])

            assertEquals("X-TEST:12345", result[0].values[UnknownProperties.UNKNOWN_PROPERTIES])

app/src/main/java/at/bitfire/davdroid/resource/contactrow/GroupMembershipBuilder.kt

+4 −4
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ import at.bitfire.vcard4android.GroupMethod 
import at.bitfire.vcard4android.contactrow.DataRowBuilder

import java.util.*



class GroupMembershipBuilder(dataRowUri: Uri, rawContactId: Long?, contact: Contact, val addressBook: LocalAddressBook)

    : DataRowBuilder(Factory.MIME_TYPE, dataRowUri, rawContactId, contact) {

class GroupMembershipBuilder(dataRowUri: Uri, rawContactId: Long?, contact: Contact, val addressBook: LocalAddressBook, readOnly: Boolean)

    : DataRowBuilder(Factory.MIME_TYPE, dataRowUri, rawContactId, contact, readOnly) {



    override fun build(): List<BatchOperation.CpoBuilder> {

        val result = LinkedList<BatchOperation.CpoBuilder>()
@@ -36,8 +36,8 @@ class GroupMembershipBuilder(dataRowUri: Uri, rawContactId: Long?, contact: Cont 
            const val MIME_TYPE = GroupMembership.CONTENT_ITEM_TYPE

        }

        override fun mimeType() = MIME_TYPE

        override fun newInstance(dataRowUri: Uri, rawContactId: Long?, contact: Contact) =

            GroupMembershipBuilder(dataRowUri, rawContactId, contact, addressBook)

        override fun newInstance(dataRowUri: Uri, rawContactId: Long?, contact: Contact, readOnly: Boolean) =

            GroupMembershipBuilder(dataRowUri, rawContactId, contact, addressBook, readOnly)

    }



}
 
 No newline at end of file

app/src/main/java/at/bitfire/davdroid/resource/contactrow/UnknownPropertiesBuilder.kt

+4 −4
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ import at.bitfire.vcard4android.Contact 
import at.bitfire.vcard4android.contactrow.DataRowBuilder

import java.util.*



class UnknownPropertiesBuilder(dataRowUri: Uri, rawContactId: Long?, contact: Contact)

    : DataRowBuilder(Factory.mimeType(), dataRowUri, rawContactId, contact) {

class UnknownPropertiesBuilder(dataRowUri: Uri, rawContactId: Long?, contact: Contact, readOnly: Boolean)

    : DataRowBuilder(Factory.mimeType(), dataRowUri, rawContactId, contact, readOnly) {



    override fun build(): List<BatchOperation.CpoBuilder> {

        val result = LinkedList<BatchOperation.CpoBuilder>()
@@ -24,8 +24,8 @@ class UnknownPropertiesBuilder(dataRowUri: Uri, rawContactId: Long?, contact: Co 


    object Factory: DataRowBuilder.Factory<UnknownPropertiesBuilder> {

        override fun mimeType() = UnknownProperties.CONTENT_ITEM_TYPE

        override fun newInstance(dataRowUri: Uri, rawContactId: Long?, contact: Contact) =

            UnknownPropertiesBuilder(dataRowUri, rawContactId, contact)

        override fun newInstance(dataRowUri: Uri, rawContactId: Long?, contact: Contact, readOnly: Boolean) =

            UnknownPropertiesBuilder(dataRowUri, rawContactId, contact, readOnly)

    }



}
 
 No newline at end of file

vcard4android @ 7fbec18c

Compare 581eac41 to 7fbec18c
Original line number Diff line number Diff line 
Subproject commit 581eac4117634bf59eba14b69acb8bb1cce95d2a
 
Subproject commit 7fbec18c28cf242225126f36aa858e007b28efac