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

Unverified Commit 4f143318 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update dependencies and ical4android

parent 8aefab65

app/build.gradle

+4 −4
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ dependencies { 
    implementation project(':vcard4android')



    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"

    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0"

    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1"

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'



    implementation "com.google.dagger:hilt-android:${versions.hilt}"
@@ -112,9 +112,9 @@ dependencies { 
    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

    implementation 'androidx.core:core-ktx:1.8.0'

    implementation 'androidx.fragment:fragment-ktx:1.4.1'

    implementation 'androidx.fragment:fragment-ktx:1.5.1'

    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'

    implementation 'androidx.paging:paging-runtime-ktx:3.1.1'

    implementation 'androidx.preference:preference-ktx:1.2.0'

    implementation 'androidx.security:security-crypto:1.1.0-alpha03'
@@ -122,7 +122,7 @@ dependencies { 
    implementation 'com.google.android.flexbox:flexbox:3.0.0'

    implementation 'com.google.android.material:material:1.6.1'



    def room_version = '2.4.2'

    def room_version = '2.4.3'

    implementation "androidx.room:room-runtime:$room_version"

    implementation "androidx.room:room-ktx:$room_version"

    implementation "androidx.room:room-paging:$room_version"

app/src/androidTest/java/at/bitfire/davdroid/resource/LocalGroupTest.kt

+6 −6
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ class LocalGroupTest { 
        LocalGroup.applyPendingMemberships(ab)



        // check group membership

        ab.provider.query(

        ab.provider!!.query(

            ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI), arrayOf(GroupMembership.GROUP_ROW_ID, GroupMembership.RAW_CONTACT_ID),

            "${GroupMembership.MIMETYPE}=?", arrayOf(GroupMembership.CONTENT_ITEM_TYPE),

            null
@@ -120,7 +120,7 @@ class LocalGroupTest { 
            assertFalse(cursor.moveToNext())

        }

        // check cached group membership

        ab.provider.query(

        ab.provider!!.query(

            ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI), arrayOf(CachedGroupMembership.GROUP_ID, CachedGroupMembership.RAW_CONTACT_ID),

            "${CachedGroupMembership.MIMETYPE}=?", arrayOf(CachedGroupMembership.CONTENT_ITEM_TYPE),

            null
@@ -154,7 +154,7 @@ class LocalGroupTest { 
        LocalGroup.applyPendingMemberships(ab)



        // check group membership

        ab.provider.query(

        ab.provider!!.query(

            ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI), arrayOf(GroupMembership.GROUP_ROW_ID, GroupMembership.RAW_CONTACT_ID),

            "${GroupMembership.MIMETYPE}=?", arrayOf(GroupMembership.CONTENT_ITEM_TYPE),

            null
@@ -162,7 +162,7 @@ class LocalGroupTest { 
            assertFalse(cursor.moveToNext())

        }

        // check cached group membership

        ab.provider.query(

        ab.provider!!.query(

            ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI), arrayOf(CachedGroupMembership.GROUP_ID, CachedGroupMembership.RAW_CONTACT_ID),

            "${CachedGroupMembership.MIMETYPE}=?", arrayOf(CachedGroupMembership.CONTENT_ITEM_TYPE),

            null
@@ -192,7 +192,7 @@ class LocalGroupTest { 
        group.clearDirty(null, null)



        // check cached group membership

        ab.provider.query(

        ab.provider!!.query(

            ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI), arrayOf(CachedGroupMembership.GROUP_ID, CachedGroupMembership.RAW_CONTACT_ID),

            "${CachedGroupMembership.MIMETYPE}=?", arrayOf(CachedGroupMembership.CONTENT_ITEM_TYPE),

            null
@@ -225,7 +225,7 @@ class LocalGroupTest { 
        group.clearDirty(null, null)



        // cached group membership should be gone

        ab.provider.query(

        ab.provider!!.query(

            ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI), arrayOf(CachedGroupMembership.GROUP_ID, CachedGroupMembership.RAW_CONTACT_ID),

            "${CachedGroupMembership.MIMETYPE}=?", arrayOf(CachedGroupMembership.CONTENT_ITEM_TYPE),

            null

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

+4 −4
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ open class LocalAddressBook( 
        if (includeGroups) {

            values.clear()

            values.put(LocalGroup.COLUMN_FLAGS, flags)

            number += provider.update(groupsSyncUri(), values, "NOT ${Groups.DIRTY}", null)

            number += provider!!.update(groupsSyncUri(), values, "NOT ${Groups.DIRTY}", null)

        }



        return number
@@ -193,7 +193,7 @@ open class LocalAddressBook( 
                "NOT ${RawContacts.DIRTY} AND ${LocalContact.COLUMN_FLAGS}=?", arrayOf(flags.toString()))



        if (includeGroups)

            number += provider.delete(groupsSyncUri(),

            number += provider!!.delete(groupsSyncUri(),

                    "NOT ${Groups.DIRTY} AND ${LocalGroup.COLUMN_FLAGS}=?", arrayOf(flags.toString()))



        return number
@@ -224,7 +224,7 @@ open class LocalAddressBook( 
            // 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)

            provider!!.update(syncAdapterURI(ContactsContract.Data.CONTENT_URI), dataValues, null, null)

        }



        // make sure it will still be synchronized when contacts are updated
@@ -378,7 +378,7 @@ open class LocalAddressBook( 


        val values = ContentValues(1)

        values.put(Groups.TITLE, title)

        val uri = provider.insert(syncAdapterURI(Groups.CONTENT_URI), values) ?: throw RemoteException("Couldn't create contact group")

        val uri = provider!!.insert(syncAdapterURI(Groups.CONTENT_URI), values) ?: throw RemoteException("Couldn't create contact group")

        return ContentUris.parseId(uri)

    }

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ buildscript { 
        appIntro: '6.1.0',

        dav4jvm: '2.1.4',

        hilt: '2.42',

        kotlin: '1.6.21',

        kotlin: '1.7.0',

        okhttp: '4.9.3',

        // latest Apache Commons versions that don't require Java 8 (Android 7)

        commonsCollections: '4.2',

ical4android @ 41171b57

Compare 4f89e82d to 41171b57
Original line number Diff line number Diff line 
Subproject commit 4f89e82dfa6943706cc85dd6ee2ba9e944a59d3b
 
Subproject commit 41171b57fdc5f045b17d09df85853a6cc13ef4fd