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

Commit eb49dc29 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Minor cleanup

parent 4da2606a

src/androidTest/java/at/bitfire/vcard4android/AndroidAddressBookTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class AndroidAddressBookTest { 
    val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!



    private val testAccount = Account("AndroidAddressBookTest", "at.bitfire.vcard4android")

    lateinit var provider: ContentProviderClient

    private lateinit var provider: ContentProviderClient



	@Before

	fun connect() {

src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ class AndroidContactTest { 


    private val testAccount = Account("AndroidContactTest", "at.bitfire.vcard4android")

    

    lateinit var provider: ContentProviderClient

    lateinit var addressBook: TestAddressBook

    private lateinit var provider: ContentProviderClient

    private lateinit var addressBook: TestAddressBook



    @Before

    fun connect() {
@@ -127,7 +127,7 @@ class AndroidContactTest { 
        val vcard = Contact()

        vcard.displayName = "Large Transaction (many rows)"

        for (i in 0 until 4000)

            vcard.emails += LabeledProperty<Email>(Email("test$i@example.com"))

            vcard.emails += LabeledProperty(Email("test$i@example.com"))



        val contact = AndroidContact(addressBook, vcard, null, null)

        contact.add()
@@ -160,7 +160,7 @@ class AndroidContactTest { 
        address.label = "My \"Label\"\nLine 2"

        address.streetAddress = "Street \"Address\""

        val contact = Contact()

        contact.addresses += LabeledProperty<Address>(address)

        contact.addresses += LabeledProperty(address)



        /* label-param = "LABEL=" param-value

         * param-values must not contain DQUOTE and should be encoded as defined in RFC 6868

src/androidTest/java/at/bitfire/vcard4android/AndroidGroupTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class AndroidGroupTest { 
    @Rule

    val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!



    private val testAccount = Account("AndroidContactGroupTest", "at.bitfire.vcard4android")!!

    private val testAccount = Account("AndroidContactGroupTest", "at.bitfire.vcard4android")



    private lateinit var provider: ContentProviderClient

    private lateinit var addressBook: TestAddressBook

src/main/java/at/bitfire/vcard4android/AndroidAddressBook.kt

+3 −3
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import java.util.* 
open class AndroidAddressBook<T1: AndroidContact, T2: AndroidGroup>(

        var account: Account,

        val provider: ContentProviderClient?,

        val contactFactory: AndroidContactFactory<T1>,

        val groupFactory: AndroidGroupFactory<T2>

        protected val contactFactory: AndroidContactFactory<T1>,

        protected val groupFactory: AndroidGroupFactory<T2>

) {



    var settings: ContentValues
@@ -57,7 +57,7 @@ open class AndroidAddressBook<T1: AndroidContact, T2: AndroidGroup>( 


    var syncState: ByteArray?

        get() = ContactsContract.SyncState.get(provider, account)

        set(data: ByteArray?) = ContactsContract.SyncState.set(provider, account, data)

        set(data) = ContactsContract.SyncState.set(provider, account, data)





    fun queryContacts(where: String?, whereArgs: Array<String>?): List<T1> {

src/main/java/at/bitfire/vcard4android/AndroidContact.kt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * http://www.gnu.org/licenses/gpl.html

 */



package at.bitfire.vcard4android;

package at.bitfire.vcard4android



import android.content.ContentProviderOperation

import android.content.ContentUris