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

Commit 1f5db90f authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Merge remote-tracking branch 'origin/bitfireAT/master' 

# Conflicts:
#	build.gradle
parents cf49c97b f695daa1

build.gradle

+10 −10
Original line number Diff line number Diff line 


buildscript {

    ext.kotlin_version = '1.2.50'

    ext.dokka_version = '0.9.16'

    ext.kotlin_version = '1.2.71'

    ext.dokka_version = '0.9.17'



    repositories {

        jcenter()
@@ -9,7 +9,7 @@ buildscript { 
    }



    dependencies {

        classpath 'com.android.tools.build:gradle:3.1.3'

        classpath 'com.android.tools.build:gradle:3.2.0'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$dokka_version"

    }
@@ -25,12 +25,12 @@ apply plugin: 'kotlin-android' 
apply plugin: 'org.jetbrains.dokka-android'



android {

    compileSdkVersion 27

    buildToolsVersion '27.0.3'

    compileSdkVersion 28

    buildToolsVersion '28.0.3'



    defaultConfig {

        minSdkVersion 23

        targetSdkVersion 27

        minSdkVersion 16

        targetSdkVersion 28

    }

    buildTypes {

        release {
@@ -54,10 +54,10 @@ android { 
}



dependencies {

    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"



    api 'org.apache.commons:commons-text:1.1'

    api 'commons-io:commons-io:2.6'

    implementation 'org.apache.commons:commons-text:1.1'

    implementation 'commons-io:commons-io:2.6'



    // ez-vcard to parse/generate VCards

    api('com.googlecode.ez-vcard:ez-vcard:0.10.4') {

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip

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

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ class AndroidContactTest { 
        vcard.displayName = "Large Transaction (one row which is too large)"



        // 1 MB eTag ... have fun

        val data = CharArray(1024*1024, { 'x' })

        val data = CharArray(1024*1024) { 'x' }

        val eTag = String(data)



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

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class BatchOperation( 
) {



    private val queue = LinkedList<Operation>()

    private lateinit var results: Array<ContentProviderResult?>

    private var results = arrayOfNulls<ContentProviderResult?>(0)





    fun nextBackrefIdx() = queue.size

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

+9 −2
Original line number Diff line number Diff line
@@ -226,6 +226,13 @@ class Contact { 
                c.uid = UUID.randomUUID().toString()

            }



            // remove properties which

            // - couldn't be parsed (and thus are treated as extended/unknown properties), and

            // - must occur once max.

            arrayOf("ANNIVERSARY", "BDAY", "KIND", "N", "PRODID", "REV", "UID").forEach {

                vCard.removeExtendedProperty(it)

            }



            // store all remaining properties into unknownProperties

            if (vCard.properties.isNotEmpty() || vCard.extendedProperties.isNotEmpty())

                try {
@@ -441,8 +448,8 @@ class Contact { 
            }

            return null

        }

        anniversary?.let { vCard.anniversary = dateOrPartialDate(it, { time -> Anniversary(time, false) }) }

        birthDay?.let { vCard.birthday = dateOrPartialDate(it, { time -> Birthday(time, false) }) }

        anniversary?.let { vCard.anniversary = dateOrPartialDate(it) { time -> Anniversary(time, false) } }

        birthDay?.let { vCard.birthday = dateOrPartialDate(it) { time -> Birthday(time, false) } }



        // RELATED

        relations.forEach { vCard.addRelated(it) }