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

Commit 9418b4f2 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Temporarily disable jCard because of nextcloud/server#29693, version bump to 4.1-alpha.3

parent 26b48241

app/build.gradle

+2 −2
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ android { 
    defaultConfig {

    defaultConfig {

        applicationId "at.bitfire.davdroid"

        applicationId "at.bitfire.davdroid"





        versionCode 401000001

        versionCode 401000002

        buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"

        buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"





        minSdkVersion 21        // Android 5

        minSdkVersion 21        // Android 5
@@ -55,7 +55,7 @@ android { 
    flavorDimensions "distribution"

    flavorDimensions "distribution"

    productFlavors {

    productFlavors {

        standard {

        standard {

            versionName "4.1-alpha.2-ose"

            versionName "4.1-alpha.3-ose"

        }

        }

    }

    }

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -132,7 +132,9 @@ class ContactsSyncManager( 
                if (relation == Response.HrefRelation.SELF) {

                if (relation == Response.HrefRelation.SELF) {

                    response[SupportedAddressData::class.java]?.let { supported ->

                    response[SupportedAddressData::class.java]?.let { supported ->

                        hasVCard4 = supported.hasVCard4()

                        hasVCard4 = supported.hasVCard4()

                        hasJCard = supported.hasJCard()



                        // temporarily disable jCard because of https://github.com/nextcloud/server/issues/29693

                        // hasJCard = supported.hasJCard()

                    }

                    }

                    response[SupportedReportSet::class.java]?.let { supported ->

                    response[SupportedReportSet::class.java]?.let { supported ->

                        hasCollectionSync = supported.reports.contains(SupportedReportSet.SYNC_COLLECTION)

                        hasCollectionSync = supported.reports.contains(SupportedReportSet.SYNC_COLLECTION)
@@ -141,7 +143,7 @@ class ContactsSyncManager( 
                }

                }

            }

            }





            Logger.log.info("Server supports jCard: $hasJCard")

            // Logger.log.info("Server supports jCard: $hasJCard")

            Logger.log.info("Server supports vCard4: $hasVCard4")

            Logger.log.info("Server supports vCard4: $hasVCard4")

            Logger.log.info("Server supports Collection Sync: $hasCollectionSync")

            Logger.log.info("Server supports Collection Sync: $hasCollectionSync")