From c13002d43c0912e231352a9be034a4b19cdabcf9 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Thu, 29 Nov 2018 11:29:55 +0100 Subject: [PATCH 01/30] Switch to AndroidX --- build.gradle | 10 +++++----- gradle.properties | 1 + .../bitfire/vcard4android/AndroidAddressBookTest.kt | 8 ++++---- .../at/bitfire/vcard4android/AndroidContactTest.kt | 12 ++++++------ .../at/bitfire/vcard4android/AndroidGroupTest.kt | 8 ++++---- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index 4901705..7b0bdf3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { - ext.kotlin_version = '1.2.71' + ext.kotlin_version = '1.3.10' ext.dokka_version = '0.9.17' repositories { @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' + classpath 'com.android.tools.build:gradle:3.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$dokka_version" } @@ -49,7 +49,7 @@ android { } defaultConfig { - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } } @@ -68,8 +68,8 @@ dependencies { exclude group: 'com.fasterxml.jackson.core' } - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test:rules:1.0.2' + androidTestImplementation 'androidx.test:runner:1.1.0' + androidTestImplementation 'androidx.test:rules:1.1.0' testImplementation 'junit:junit:4.12' } diff --git a/gradle.properties b/gradle.properties index 8bd86f6..d9cf55d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true diff --git a/src/androidTest/java/at/bitfire/vcard4android/AndroidAddressBookTest.kt b/src/androidTest/java/at/bitfire/vcard4android/AndroidAddressBookTest.kt index e0ad3af..3b0e28c 100644 --- a/src/androidTest/java/at/bitfire/vcard4android/AndroidAddressBookTest.kt +++ b/src/androidTest/java/at/bitfire/vcard4android/AndroidAddressBookTest.kt @@ -13,8 +13,8 @@ import android.accounts.Account import android.content.ContentProviderClient import android.content.ContentValues import android.provider.ContactsContract -import android.support.test.InstrumentationRegistry -import android.support.test.rule.GrantPermissionRule +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.rule.GrantPermissionRule import at.bitfire.vcard4android.impl.TestAddressBook import org.junit.After import org.junit.Assert.* @@ -33,8 +33,8 @@ class AndroidAddressBookTest { @Before fun connect() { - val context = InstrumentationRegistry.getContext() - provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY) + val context = InstrumentationRegistry.getInstrumentation().context + provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!! assertNotNull(provider) } diff --git a/src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt b/src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt index 824b579..d3d5bdf 100644 --- a/src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt +++ b/src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt @@ -12,11 +12,11 @@ import android.Manifest import android.accounts.Account import android.content.ContentProviderClient import android.provider.ContactsContract -import android.support.test.InstrumentationRegistry -import android.support.test.filters.MediumTest -import android.support.test.filters.SmallTest -import android.support.test.rule.GrantPermissionRule import android.util.Base64 +import androidx.test.filters.MediumTest +import androidx.test.filters.SmallTest +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.rule.GrantPermissionRule import at.bitfire.vcard4android.impl.TestAddressBook import ezvcard.VCardVersion import ezvcard.property.Address @@ -45,8 +45,8 @@ class AndroidContactTest { @Before fun connect() { - val context = InstrumentationRegistry.getContext() - provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY) + val context = InstrumentationRegistry.getInstrumentation().context + provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!! assertNotNull(provider) addressBook = TestAddressBook(testAccount, provider) diff --git a/src/androidTest/java/at/bitfire/vcard4android/AndroidGroupTest.kt b/src/androidTest/java/at/bitfire/vcard4android/AndroidGroupTest.kt index 0417594..e4be456 100644 --- a/src/androidTest/java/at/bitfire/vcard4android/AndroidGroupTest.kt +++ b/src/androidTest/java/at/bitfire/vcard4android/AndroidGroupTest.kt @@ -12,8 +12,8 @@ import android.Manifest import android.accounts.Account import android.content.ContentProviderClient import android.provider.ContactsContract -import android.support.test.InstrumentationRegistry -import android.support.test.rule.GrantPermissionRule +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.rule.GrantPermissionRule import at.bitfire.vcard4android.impl.TestAddressBook import org.junit.After import org.junit.Assert.assertEquals @@ -35,8 +35,8 @@ class AndroidGroupTest { @Before fun connect() { - val context = InstrumentationRegistry.getContext() - provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY) + val context = InstrumentationRegistry.getInstrumentation().context + provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!! assertNotNull(provider) addressBook = TestAddressBook(testAccount, provider) -- GitLab From b63883b21c0680b3b41bc4d067ca2985c58a15c8 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Fri, 30 Nov 2018 13:12:19 +0100 Subject: [PATCH 02/30] Don't do emulator checks (because we can only use shared runners at the moment); minor lint --- .gitlab-ci.yml | 5 +++-- build.gradle | 2 +- .../java/at/bitfire/vcard4android/AndroidAddressBookTest.kt | 3 ++- .../java/at/bitfire/vcard4android/AndroidContactTest.kt | 1 + .../java/at/bitfire/vcard4android/AndroidGroupTest.kt | 1 + src/main/java/at/bitfire/vcard4android/AndroidContact.kt | 4 ++-- src/test/java/at/bitfire/vcard4android/ContactTest.kt | 4 ++-- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 809a32a..7f79ead 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,9 @@ cache: test: script: - - (cd /sdk/emulator; ./emulator @test -no-audio -no-window & wait-for-emulator.sh) - - ./gradlew check connectedCheck +# - (cd /sdk/emulator; ./emulator @test -no-audio -no-window & wait-for-emulator.sh) +# - ./gradlew check connectedCheck + - ./gradlew check artifacts: paths: - build/outputs/lint-results-debug.html diff --git a/build.gradle b/build.gradle index 7b0bdf3..128dff7 100644 --- a/build.gradle +++ b/build.gradle @@ -56,7 +56,7 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'org.apache.commons:commons-text:1.1' + implementation 'org.apache.commons:commons-text:1.6' implementation 'commons-io:commons-io:2.6' // ez-vcard to parse/generate VCards diff --git a/src/androidTest/java/at/bitfire/vcard4android/AndroidAddressBookTest.kt b/src/androidTest/java/at/bitfire/vcard4android/AndroidAddressBookTest.kt index 3b0e28c..c0442a4 100644 --- a/src/androidTest/java/at/bitfire/vcard4android/AndroidAddressBookTest.kt +++ b/src/androidTest/java/at/bitfire/vcard4android/AndroidAddressBookTest.kt @@ -40,7 +40,8 @@ class AndroidAddressBookTest { @After fun disconnect() { - provider.release() + @Suppress("DEPRECATION") + provider.release() } diff --git a/src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt b/src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt index d3d5bdf..b813655 100644 --- a/src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt +++ b/src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt @@ -54,6 +54,7 @@ class AndroidContactTest { @After fun disconnect() { + @Suppress("DEPRECATION") provider.release() } diff --git a/src/androidTest/java/at/bitfire/vcard4android/AndroidGroupTest.kt b/src/androidTest/java/at/bitfire/vcard4android/AndroidGroupTest.kt index e4be456..cff3c82 100644 --- a/src/androidTest/java/at/bitfire/vcard4android/AndroidGroupTest.kt +++ b/src/androidTest/java/at/bitfire/vcard4android/AndroidGroupTest.kt @@ -44,6 +44,7 @@ class AndroidGroupTest { @After fun disconnect() { + @Suppress("DEPRECATION") provider.release() } diff --git a/src/main/java/at/bitfire/vcard4android/AndroidContact.kt b/src/main/java/at/bitfire/vcard4android/AndroidContact.kt index 26b4a2a..e99c24d 100644 --- a/src/main/java/at/bitfire/vcard4android/AndroidContact.kt +++ b/src/main/java/at/bitfire/vcard4android/AndroidContact.kt @@ -32,7 +32,7 @@ import ezvcard.util.PartialDate import org.apache.commons.io.IOUtils import org.apache.commons.lang3.StringUtils import org.apache.commons.lang3.builder.ToStringBuilder -import org.apache.commons.lang3.text.WordUtils +import org.apache.commons.text.WordUtils import java.io.ByteArrayOutputStream import java.io.FileNotFoundException import java.io.IOException @@ -579,7 +579,7 @@ open class AndroidContact( arrayOf(id.toString(), GroupMembership.CONTENT_ITEM_TYPE, CachedGroupMembership.CONTENT_ITEM_TYPE)) )) insertDataRows(batch) - val results = batch.commit() + batch.commit() insertPhoto(contact.photo) diff --git a/src/test/java/at/bitfire/vcard4android/ContactTest.kt b/src/test/java/at/bitfire/vcard4android/ContactTest.kt index a1aeaea..1ba7aa3 100644 --- a/src/test/java/at/bitfire/vcard4android/ContactTest.kt +++ b/src/test/java/at/bitfire/vcard4android/ContactTest.kt @@ -26,7 +26,7 @@ import java.util.* class ContactTest { private fun parseContact(fname: String, charset: Charset = Charsets.UTF_8) = - javaClass.classLoader.getResourceAsStream(fname).use { stream -> + javaClass.classLoader!!.getResourceAsStream(fname).use { stream -> Contact.fromReader(InputStreamReader(stream, charset), null).first() } @@ -336,7 +336,7 @@ class ContactTest { assertEquals("muuuum", rel.text) // PHOTO - javaClass.classLoader.getResourceAsStream("lol.jpg").use { photo -> + javaClass.classLoader!!.getResourceAsStream("lol.jpg").use { photo -> assertArrayEquals(IOUtils.toByteArray(photo), c.photo) } } -- GitLab From 42d5cc3f8b16c628fa13a5a3b0f211e6660fb084 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Tue, 25 Dec 2018 22:46:27 +0100 Subject: [PATCH 03/30] Update ez-vcard --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 128dff7..5509d97 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { - ext.kotlin_version = '1.3.10' + ext.kotlin_version = '1.3.11' ext.dokka_version = '0.9.17' repositories { @@ -60,7 +60,7 @@ dependencies { implementation 'commons-io:commons-io:2.6' // ez-vcard to parse/generate VCards - api('com.googlecode.ez-vcard:ez-vcard:0.10.4') { + api('com.googlecode.ez-vcard:ez-vcard:0.10.5') { // hCard functionality not needed exclude group: 'org.jsoup' exclude group: 'org.freemarker' @@ -68,8 +68,8 @@ dependencies { exclude group: 'com.fasterxml.jackson.core' } - androidTestImplementation 'androidx.test:runner:1.1.0' - androidTestImplementation 'androidx.test:rules:1.1.0' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test:rules:1.1.1' testImplementation 'junit:junit:4.12' } -- GitLab From 9af8952aebdd0abb8408f9e467e160bb4c287c1f Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Sun, 6 Jan 2019 18:13:33 +0100 Subject: [PATCH 04/30] Checkout master --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5801d8e..a547d65 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip -- GitLab From ad0fb12d6cb330f9a9183209025718ce15aac217 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Sun, 6 Jan 2019 18:43:30 +0100 Subject: [PATCH 05/30] Fix CI --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f79ead..7031330 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.com/bitfireat/davdroid:latest +image: registry.gitlab.com/bitfireat/davx5-ose:latest before_script: - export GRADLE_USER_HOME=`pwd`/.gradle; chmod +x gradlew -- GitLab From 069ca6fe8f4486f20bce40c07db1cdf61487cb3c Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Tue, 29 Jan 2019 13:02:47 +0100 Subject: [PATCH 06/30] "vCard" instead of "VCard" --- .../java/at/bitfire/vcard4android/Contact.kt | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/at/bitfire/vcard4android/Contact.kt b/src/main/java/at/bitfire/vcard4android/Contact.kt index 01beba2..d7a15b1 100644 --- a/src/main/java/at/bitfire/vcard4android/Contact.kt +++ b/src/main/java/at/bitfire/vcard4android/Contact.kt @@ -108,12 +108,13 @@ class Contact { /** - * Parses an InputStream that contains a VCard. + * Parses an InputStream that contains a vCard. * - * @param reader reader for the input stream containing the VCard (pay attention to the charset) + * @param reader reader for the input stream containing the vCard (pay attention to the charset) * @param downloader will be used to download external resources like contact photos (may be null) * @return list of filled Event data objects (may have size 0) – doesn't return null * @throws IOException on I/O errors when reading the stream + * @throws ezvcard.io.CannotParseException when the vCard can't be parsed */ fun fromReader(reader: Reader, downloader: Downloader?): List { val vcards = Ezvcard.parse(reader).all() @@ -222,7 +223,7 @@ class Contact { extToRemove.distinct().forEach { vCard.removeExtendedProperty(it.propertyName) } if (c.uid == null) { - Constants.log.warning("Received VCard without UID, generating new one") + Constants.log.warning("Received vCard without UID, generating new one") c.uid = UUID.randomUUID().toString() } @@ -296,7 +297,7 @@ class Contact { try { unknownProperties?.let { vCard = Ezvcard.parse(unknownProperties).first() } } catch (e: Exception) { - Constants.log.fine("Couldn't parse original VCard with retained properties") + Constants.log.fine("Couldn't parse original vCard with retained properties") } // UID @@ -309,7 +310,7 @@ class Contact { if (vCardVersion == VCardVersion.V4_0) { vCard.kind = Kind.group() members.forEach { vCard.members += Member("urn:uuid:$it") } - } else { // "VCard4 as VCard3" (Apple-style) + } else { // "vCard4 as vCard3" (Apple-style) vCard.setExtendedProperty(PROPERTY_ADDRESSBOOKSERVER_KIND, Kind.GROUP) members.forEach { vCard.addExtendedProperty(PROPERTY_ADDRESSBOOKSERVER_MEMBER, "urn:uuid:$it") } } @@ -346,7 +347,7 @@ class Contact { vCard.structuredName = n } else if (vCardVersion == VCardVersion.V3_0) { - // (only) VCard 3 requires N [RFC 2426 3.1.2] + // (only) vCard 3 requires N [RFC 2426 3.1.2] if (group && groupMethod == GroupMethod.GROUP_VCARDS) { val n = StructuredName() n.family = fn @@ -431,13 +432,13 @@ class Contact { if (vCardVersion == VCardVersion.V4_0 || prop.date != null) return prop else prop.partialDate?.let { partial -> - // VCard 3: partial date with month and day, but without year + // vCard 3: partial date with month and day, but without year if (partial.date != null && partial.month != null) { return if (partial.year != null) // partial date is a complete date prop else { - // VCard 3: partial date with month and day, but without year + // vCard 3: partial date with month and day, but without year val fakeCal = GregorianCalendar.getInstance() fakeCal.set(DATE_PARAMETER_OMIT_YEAR_DEFAULT, partial.month - 1, partial.date) val fakeProp = generator(fakeCal.time) @@ -460,20 +461,20 @@ class Contact { // REV vCard.revision = Revision.now() - // validate VCard and log results + // validate vCard and log results val validation = vCard.validate(vCardVersion) if (!validation.isEmpty) { val msgs = LinkedList() for ((key, warnings) in validation) msgs += " * " + key.javaClass.simpleName + " - " + warnings.joinToString(" | ") - Constants.log.log(Level.INFO, "Generating possibly invalid VCard", msgs.joinToString(",")) + Constants.log.log(Level.INFO, "Generating possibly invalid vCard", msgs.joinToString(",")) } // generate VCARD Ezvcard .write(vCard) .version(vCardVersion) - .versionStrict(false) // allow VCard4 properties in VCard3s - .caretEncoding(true) // enable RFC 6868 support + .versionStrict(false) // allow vCard4 properties in vCard3s + .caretEncoding(true) // enable RFC 6868 support .prodId(productID == null) .go(os) } -- GitLab From 8171fd44703945c692ecad10bc08829669b2bee6 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Tue, 29 Jan 2019 19:59:48 +0100 Subject: [PATCH 07/30] Update gradle, Kotlin --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5509d97..5431565 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { - ext.kotlin_version = '1.3.11' + ext.kotlin_version = '1.3.20' ext.dokka_version = '0.9.17' repositories { @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$dokka_version" } -- GitLab From 76f8ecbe078d0000c09141edd5f220a1950d2d46 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Sun, 17 Mar 2019 16:30:37 +0100 Subject: [PATCH 08/30] Add info for AboutLibraries --- src/main/res/values/about_strings.xml | 692 ++++++++++++++++++++++++++ 1 file changed, 692 insertions(+) create mode 100644 src/main/res/values/about_strings.xml diff --git a/src/main/res/values/about_strings.xml b/src/main/res/values/about_strings.xml new file mode 100644 index 0000000..3c50912 --- /dev/null +++ b/src/main/res/values/about_strings.xml @@ -0,0 +1,692 @@ + + + + + Ricki Hirner + https://www.bitfire.at + vcard4android + Allows usage of vCard resources with the Android contacts provider + https://gitlab.com/bitfireAT/vcard4android + gpl_3_0 + true + + + GPLv3 + http://www.gnu.org/licenses/gpl-3.0.html + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers\' and authors\' protection, the GPL clearly explains +that there is no warranty for this free software. For both users\' and +authors\' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users\' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work\'s +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users\' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work\'s +users, your or third parties\' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program\'s source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation\'s users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party\'s predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor\'s "contributor version". + + A contributor\'s "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor\'s essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient\'s use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others\' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy\'s +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w\'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c\' for details. + +The hypothetical commands `show w\' and `show c\' should show the appropriate +parts of the General Public License. Of course, your program\'s commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +.]]> + + -- GitLab From 9cda881cf85aad993db2242cc3e88b5616111d84 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Sat, 23 Mar 2019 22:46:07 +0100 Subject: [PATCH 09/30] Enable Gitlab CI tests --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7031330..39dcfc4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,9 +9,8 @@ cache: test: script: -# - (cd /sdk/emulator; ./emulator @test -no-audio -no-window & wait-for-emulator.sh) -# - ./gradlew check connectedCheck - - ./gradlew check + - (cd /sdk/emulator; ./emulator @test -no-audio -no-window & wait-for-emulator.sh) + - ./gradlew check connectedCheck artifacts: paths: - build/outputs/lint-results-debug.html -- GitLab From c9f44bb8bfeacbee4f04c67c208858e372c5bd3d Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Tue, 26 Mar 2019 12:03:19 +0100 Subject: [PATCH 10/30] Remove gpl_3_0 for AboutLibraries 6.2.3+ --- src/main/res/values/about_strings.xml | 679 -------------------------- 1 file changed, 679 deletions(-) diff --git a/src/main/res/values/about_strings.xml b/src/main/res/values/about_strings.xml index 3c50912..44462ad 100644 --- a/src/main/res/values/about_strings.xml +++ b/src/main/res/values/about_strings.xml @@ -10,683 +10,4 @@ gpl_3_0 true - - GPLv3 - http://www.gnu.org/licenses/gpl-3.0.html - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers\' and authors\' protection, the GPL clearly explains -that there is no warranty for this free software. For both users\' and -authors\' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users\' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work\'s -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users\' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work\'s -users, your or third parties\' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program\'s source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation\'s users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party\'s predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor\'s "contributor version". - - A contributor\'s "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor\'s essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient\'s use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others\' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy\'s -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w\'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c\' for details. - -The hypothetical commands `show w\' and `show c\' should show the appropriate -parts of the General Public License. Of course, your program\'s commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -.]]> - -- GitLab From 4e5acd17221491006014affb33cb5f41b8b84ed9 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Tue, 26 Mar 2019 21:10:37 +0100 Subject: [PATCH 11/30] Support read-only flag for raw contacts/data rows --- .../vcard4android/AndroidAddressBook.kt | 2 + .../bitfire/vcard4android/AndroidContact.kt | 60 +++++++++++++++++-- 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/src/main/java/at/bitfire/vcard4android/AndroidAddressBook.kt b/src/main/java/at/bitfire/vcard4android/AndroidAddressBook.kt index b1df0ba..174bb43 100644 --- a/src/main/java/at/bitfire/vcard4android/AndroidAddressBook.kt +++ b/src/main/java/at/bitfire/vcard4android/AndroidAddressBook.kt @@ -26,6 +26,8 @@ open class AndroidAddressBook( protected val groupFactory: AndroidGroupFactory ) { + open var readOnly: Boolean = false + var settings: ContentValues /** * Retrieves [ContactsContract.Settings] for the current address book. diff --git a/src/main/java/at/bitfire/vcard4android/AndroidContact.kt b/src/main/java/at/bitfire/vcard4android/AndroidContact.kt index e99c24d..d6a7366 100644 --- a/src/main/java/at/bitfire/vcard4android/AndroidContact.kt +++ b/src/main/java/at/bitfire/vcard4android/AndroidContact.kt @@ -26,6 +26,7 @@ import android.provider.ContactsContract.CommonDataKinds.Organization import android.provider.ContactsContract.CommonDataKinds.Photo import android.provider.ContactsContract.CommonDataKinds.StructuredName import android.provider.ContactsContract.RawContacts +import android.provider.ContactsContract.RawContacts.Data import ezvcard.parameter.* import ezvcard.property.* import ezvcard.util.PartialDate @@ -575,7 +576,7 @@ open class AndroidContact( // delete known data rows before adding the new ones; don't delete group memberships! batch.enqueue(BatchOperation.Operation( ContentProviderOperation.newDelete(dataSyncURI()) - .withSelection(RawContacts.Data.RAW_CONTACT_ID + "=? AND " + RawContacts.Data.MIMETYPE + " NOT IN (?,?)", + .withSelection(Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + " NOT IN (?,?)", arrayOf(id.toString(), GroupMembership.CONTENT_ITEM_TYPE, CachedGroupMembership.CONTENT_ITEM_TYPE)) )) insertDataRows(batch) @@ -600,6 +601,9 @@ open class AndroidContact( .withValue(COLUMN_ETAG, eTag) .withValue(COLUMN_UID, contact!!.uid) + if (addressBook.readOnly) + builder.withValue(RawContacts.RAW_CONTACT_IS_READ_ONLY, 1) + Constants.log.log(Level.FINER, "Built RawContact data row", builder.build()) } @@ -648,7 +652,7 @@ open class AndroidContact( op = BatchOperation.Operation(builder) builder.withValue(StructuredName.RAW_CONTACT_ID, id) } - builder .withValue(RawContacts.Data.MIMETYPE, CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) + builder .withValue(Data.MIMETYPE, CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) .withValue(StructuredName.DISPLAY_NAME, contact.displayName) .withValue(StructuredName.PREFIX, contact.prefix) .withValue(StructuredName.GIVEN_NAME, contact.givenName) @@ -658,6 +662,10 @@ open class AndroidContact( .withValue(StructuredName.PHONETIC_GIVEN_NAME, contact.phoneticGivenName) .withValue(StructuredName.PHONETIC_MIDDLE_NAME, contact.phoneticMiddleName) .withValue(StructuredName.PHONETIC_FAMILY_NAME, contact.phoneticFamilyName) + + if (addressBook.readOnly) + builder.withValue(Data.IS_READ_ONLY, 1) + Constants.log.log(Level.FINER, "Built StructuredName data row", builder.build()) batch.enqueue(op) } @@ -750,6 +758,10 @@ open class AndroidContact( .withValue(Phone.LABEL, typeLabel) .withValue(Phone.IS_PRIMARY, if (is_primary) 1 else 0) .withValue(Phone.IS_SUPER_PRIMARY, if (is_primary) 1 else 0) + + if (addressBook.readOnly) + builder.withValue(Data.IS_READ_ONLY, 1) + Constants.log.log(Level.FINER, "Built Phone data row", builder.build()) batch.enqueue(op) } @@ -808,6 +820,10 @@ open class AndroidContact( .withValue(Email.LABEL, typeLabel) .withValue(Email.IS_PRIMARY, if (is_primary) 1 else 0) .withValue(Phone.IS_SUPER_PRIMARY, if (is_primary) 1 else 0) + + if (addressBook.readOnly) + builder.withValue(Data.IS_READ_ONLY, 1) + Constants.log.log(Level.FINER, "Built Email data row", builder.build()) batch.enqueue(op) } @@ -841,6 +857,10 @@ open class AndroidContact( .withValue(Organization.DEPARTMENT, department) .withValue(Organization.TITLE, contact.jobTitle) .withValue(Organization.JOB_DESCRIPTION, contact.jobDescription) + + if (addressBook.readOnly) + builder.withValue(Data.IS_READ_ONLY, 1) + Constants.log.log(Level.FINER, "Built Organization data row", builder.build()) batch.enqueue(op) } @@ -905,6 +925,10 @@ open class AndroidContact( op = BatchOperation.Operation(builder) builder.withValue(Im.RAW_CONTACT_ID, id) } + + if (addressBook.readOnly) + builder.withValue(Data.IS_READ_ONLY, 1) + if (sipAddress) { // save as SIP address builder .withValue(SipAddress.MIMETYPE, SipAddress.CONTENT_ITEM_TYPE) @@ -958,6 +982,10 @@ open class AndroidContact( .withValue(Nickname.NAME, nick.values.first()) .withValue(Nickname.TYPE, typeCode) .withValue(Nickname.LABEL, typeLabel) + + if (addressBook.readOnly) + builder.withValue(Data.IS_READ_ONLY, 1) + Constants.log.log(Level.FINER, "Built Nickname data row", builder.build()) batch.enqueue(op) } @@ -977,6 +1005,10 @@ open class AndroidContact( } builder .withValue(Note.MIMETYPE, Note.CONTENT_ITEM_TYPE) .withValue(Note.NOTE, contact.note) + + if (addressBook.readOnly) + builder.withValue(Data.IS_READ_ONLY, 1) + Constants.log.log(Level.FINER, "Built Note data row", builder.build()) batch.enqueue(op) } @@ -1046,6 +1078,10 @@ open class AndroidContact( .withValue(StructuredPostal.REGION, address.region) .withValue(StructuredPostal.POSTCODE, address.postalCode) .withValue(StructuredPostal.COUNTRY, address.country) + + if (addressBook.readOnly) + builder.withValue(Data.IS_READ_ONLY, 1) + Constants.log.log(Level.FINER, "Built StructuredPostal data row", builder.build()) batch.enqueue(op) } @@ -1087,6 +1123,10 @@ open class AndroidContact( .withValue(Website.URL, url.value) .withValue(Website.TYPE, typeCode) .withValue(Website.LABEL, typeLabel) + + if (addressBook.readOnly) + builder.withValue(Data.IS_READ_ONLY, 1) + Constants.log.log(Level.FINER, "Built Website data row", builder.build()) batch.enqueue(op) } @@ -1117,6 +1157,10 @@ open class AndroidContact( builder .withValue(Event.MIMETYPE, Event.CONTENT_ITEM_TYPE) .withValue(Event.TYPE, type) .withValue(Event.START_DATE, dateStr) + + if (addressBook.readOnly) + builder.withValue(Data.IS_READ_ONLY, 1) + batch.enqueue(op) Constants.log.log(Level.FINER, "Built Event data row", builder.build()) } @@ -1150,6 +1194,10 @@ open class AndroidContact( .withValue(Relation.NAME, related.text) .withValue(Relation.TYPE, typeCode) .withValue(Relation.LABEL, StringUtils.trimToNull(labels.joinToString(", "))) + + if (addressBook.readOnly) + builder.withValue(Data.IS_READ_ONLY, 1) + Constants.log.log(Level.FINER, "Built Relation data row", builder.build()) batch.enqueue(op) } @@ -1217,9 +1265,13 @@ open class AndroidContact( Constants.log.fine("Inserting photo BLOB for raw contact $id") val values = ContentValues(3) - values.put(RawContacts.Data.MIMETYPE, Photo.CONTENT_ITEM_TYPE) + values.put(Data.MIMETYPE, Photo.CONTENT_ITEM_TYPE) values.put(Photo.RAW_CONTACT_ID, id) values.put(Photo.PHOTO, photo) + + if (addressBook.readOnly) + values.put(Data.IS_READ_ONLY, 1) + try { addressBook.provider!!.insert(dataSyncURI(), values) } catch(e: RemoteException) { @@ -1253,4 +1305,4 @@ open class AndroidContact( override fun toString() = ToStringBuilder.reflectionToString(this)!! -} +} \ No newline at end of file -- GitLab From f5498aff6746e0cc089c9c99e430cf483e4fa9d0 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Wed, 17 Apr 2019 22:47:17 +0200 Subject: [PATCH 12/30] Update Kotlin, gradle, gradle plugin --- build.gradle | 14 ++++++++------ gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 5431565..a4b141a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,9 @@ buildscript { - ext.kotlin_version = '1.3.20' - ext.dokka_version = '0.9.17' + ext.versions = [ + kotlin: '1.3.30', + dokka: '0.9.17' + ] repositories { jcenter() @@ -9,9 +11,9 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$dokka_version" + classpath 'com.android.tools.build:gradle:3.4.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" + classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${versions.dokka}" } } @@ -54,7 +56,7 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" implementation 'org.apache.commons:commons-text:1.6' implementation 'commons-io:commons-io:2.6' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a547d65..bf1e464 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Aug 23 16:42:17 CEST 2016 +#Wed Apr 17 22:31:47 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip -- GitLab From 28d43522912849cf6a0ed7ccacba20be0f648b82 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Fri, 19 Apr 2019 12:33:55 +0200 Subject: [PATCH 13/30] Property labels: Use "groupX" group name (instead of "davdroidX") --- src/main/java/at/bitfire/vcard4android/Contact.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/at/bitfire/vcard4android/Contact.kt b/src/main/java/at/bitfire/vcard4android/Contact.kt index d7a15b1..5763504 100644 --- a/src/main/java/at/bitfire/vcard4android/Contact.kt +++ b/src/main/java/at/bitfire/vcard4android/Contact.kt @@ -374,7 +374,7 @@ class Contact { fun addLabel(labeledProperty: LabeledProperty) { labeledProperty.label?.let { - val group = "davdroid${labelIterator.incrementAndGet()}" + val group = "group${labelIterator.incrementAndGet()}" labeledProperty.property.group = group val label = vCard.addExtendedProperty(LabeledProperty.PROPERTY_AB_LABEL, it) -- GitLab From 4d704a6f08e683652b93486e02d92bdd0c78b397 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Fri, 19 Apr 2019 13:13:02 +0200 Subject: [PATCH 14/30] Fix test --- src/test/java/at/bitfire/vcard4android/ContactTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/at/bitfire/vcard4android/ContactTest.kt b/src/test/java/at/bitfire/vcard4android/ContactTest.kt index 1ba7aa3..42bd5c2 100644 --- a/src/test/java/at/bitfire/vcard4android/ContactTest.kt +++ b/src/test/java/at/bitfire/vcard4android/ContactTest.kt @@ -175,8 +175,8 @@ class ContactTest { c.uid = UUID.randomUUID().toString() c.phoneNumbers += LabeledProperty(Telephone("12345"), "My Phone") val vCard = toString(c, GroupMethod.GROUP_VCARDS, VCardVersion.V3_0) - assertTrue(vCard.contains("\ndavdroid1.TEL:12345\r\n")) - assertTrue(vCard.contains("\ndavdroid1.X-ABLabel:My Phone\r\n")) + assertTrue(vCard.contains("\ngroup1.TEL:12345\r\n")) + assertTrue(vCard.contains("\ngroup1.X-ABLabel:My Phone\r\n")) c = regenerate(c, VCardVersion.V4_0) assertEquals("12345", c.phoneNumbers.first.property.text) -- GitLab From f2db5fb19ea92c7ac14c72f466bbf5ba564677e1 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Fri, 17 May 2019 12:03:32 +0200 Subject: [PATCH 15/30] Update gradle plugin, Kotlin --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a4b141a..fdc1e9f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext.versions = [ - kotlin: '1.3.30', + kotlin: '1.3.31', dokka: '0.9.17' ] @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools.build:gradle:3.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${versions.dokka}" } -- GitLab From 0b67629b8d5a2a72476ebb2bdaff6cb930575da0 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Fri, 12 Jul 2019 22:45:17 +0200 Subject: [PATCH 16/30] Update Kotlin, gradle plugin, test libraries --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index fdc1e9f..0c3dec6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext.versions = [ - kotlin: '1.3.31', + kotlin: '1.3.41', dokka: '0.9.17' ] @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:3.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${versions.dokka}" } @@ -70,8 +70,8 @@ dependencies { exclude group: 'com.fasterxml.jackson.core' } - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test:rules:1.1.1' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test:rules:1.2.0' testImplementation 'junit:junit:4.12' } -- GitLab From abcd7cdb717441e8e7d9d2e85053f46817185ce9 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Wed, 17 Jul 2019 17:02:13 +0200 Subject: [PATCH 17/30] Update dependencies --- build.gradle | 14 ++++++++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 0c3dec6..e59fdf5 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.versions = [ kotlin: '1.3.41', - dokka: '0.9.17' + dokka: '0.9.18' ] repositories { @@ -28,12 +28,18 @@ apply plugin: 'org.jetbrains.dokka-android' android { compileSdkVersion 28 - buildToolsVersion '28.0.3' + buildToolsVersion '29.0.1' defaultConfig { minSdkVersion 16 targetSdkVersion 28 } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + buildTypes { release { minifyEnabled false @@ -56,9 +62,9 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}" - implementation 'org.apache.commons:commons-text:1.6' + implementation 'org.apache.commons:commons-text:1.7' implementation 'commons-io:commons-io:2.6' // ez-vcard to parse/generate VCards diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bf1e464..dcc7728 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip -- GitLab From c7dcf57ec4e9fc296cc2ee9b800b29a6fba4c0a7 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Sat, 20 Jul 2019 22:02:37 +0200 Subject: [PATCH 18/30] Update README --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0ce4969..06e89f7 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,15 @@ It's a framework for from/into data classes that are compatible with the Android Contacts Provider, and * accessing the Android Contacts Provider by a unified API. -It has been primarily developed for [DAVdroid](https://www.davdroid.com). +It has been primarily developed for [DAVx⁵](https://www.davx5.com). + +_This software is not affiliated to, nor has it been authorized, sponsored or otherwise approved +by Google LLC. Android is a trademark of Google LLC._ Generated KDoc: https://bitfireAT.gitlab.io/vcard4android/dokka/vcard4android/ +Discussion: https://forums.bitfire.at/category/18/libraries + ## Contact @@ -26,9 +31,6 @@ Florastraße 27 Email: [play@bitfire.at](mailto:play@bitfire.at) (do not use this) -For questions, suggestions etc. please use the DAVdroid forum: -https://www.davdroid.com/forums/ - ## License -- GitLab From 3b1ede2903a575e976cda2e038d1bbc70e7957c0 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Thu, 7 Nov 2019 18:11:30 +0100 Subject: [PATCH 19/30] Update dependencies, lint --- build.gradle | 10 ++--- .../bitfire/vcard4android/AndroidContact.kt | 39 +++++++++---------- .../at/bitfire/vcard4android/AndroidGroup.kt | 2 +- .../java/at/bitfire/vcard4android/Contact.kt | 2 +- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index e59fdf5..7c0a3be 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext.versions = [ - kotlin: '1.3.41', + kotlin: '1.3.50', dokka: '0.9.18' ] @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${versions.dokka}" } @@ -27,12 +27,12 @@ apply plugin: 'kotlin-android' apply plugin: 'org.jetbrains.dokka-android' android { - compileSdkVersion 28 - buildToolsVersion '29.0.1' + compileSdkVersion 29 + buildToolsVersion '29.0.2' defaultConfig { minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 29 } compileOptions { diff --git a/src/main/java/at/bitfire/vcard4android/AndroidContact.kt b/src/main/java/at/bitfire/vcard4android/AndroidContact.kt index d6a7366..f07385b 100644 --- a/src/main/java/at/bitfire/vcard4android/AndroidContact.kt +++ b/src/main/java/at/bitfire/vcard4android/AndroidContact.kt @@ -17,7 +17,6 @@ import android.graphics.BitmapFactory import android.net.Uri import android.os.RemoteException import android.provider.ContactsContract -import android.provider.ContactsContract.CommonDataKinds import android.provider.ContactsContract.CommonDataKinds.* import android.provider.ContactsContract.CommonDataKinds.Email import android.provider.ContactsContract.CommonDataKinds.Nickname @@ -41,6 +40,7 @@ import java.text.ParseException import java.text.SimpleDateFormat import java.util.* import java.util.logging.Level +import kotlin.math.min open class AndroidContact( val addressBook: AndroidAddressBook @@ -115,7 +115,7 @@ open class AndroidContact( try { iter = RawContacts.newEntityIterator(addressBook.provider!!.query( addressBook.syncAdapterURI(ContactsContract.RawContactsEntity.CONTENT_URI), - null, ContactsContract.RawContacts._ID + "=?", arrayOf(id.toString()), null)) + null, RawContacts._ID + "=?", arrayOf(id.toString()), null)) if (iter.hasNext()) { val e = iter.next() @@ -135,8 +135,7 @@ open class AndroidContact( it.remove() } - val mimeType = values.getAsString(ContactsContract.RawContactsEntity.MIMETYPE) - when (mimeType) { + when (val mimeType = values.getAsString(ContactsContract.RawContactsEntity.MIMETYPE)) { StructuredName.CONTENT_ITEM_TYPE -> populateStructuredName(values) Phone.CONTENT_ITEM_TYPE -> @@ -252,13 +251,13 @@ open class AndroidContact( Phone.TYPE_MMS -> number.types += Contact.PHONE_TYPE_MMS Phone.TYPE_CUSTOM -> { - row.getAsString(CommonDataKinds.Phone.LABEL)?.let { + row.getAsString(Phone.LABEL)?.let { labeledNumber.label = it number.types += TelephoneType.get(labelToXName(it)) } } } - if (row.getAsInteger(CommonDataKinds.Phone.IS_PRIMARY) != 0) + if (row.getAsInteger(Phone.IS_PRIMARY) != 0) number.pref = 1 contact!!.phoneNumbers += labeledNumber @@ -454,7 +453,7 @@ open class AndroidContact( } protected open fun populateEvent(row: ContentValues) { - val dateStr = row.getAsString(CommonDataKinds.Event.START_DATE) + val dateStr = row.getAsString(Event.START_DATE) var full: Date? = null var partial: PartialDate? = null val fullFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US) @@ -652,7 +651,7 @@ open class AndroidContact( op = BatchOperation.Operation(builder) builder.withValue(StructuredName.RAW_CONTACT_ID, id) } - builder .withValue(Data.MIMETYPE, CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) + builder .withValue(Data.MIMETYPE, StructuredName.CONTENT_ITEM_TYPE) .withValue(StructuredName.DISPLAY_NAME, contact.displayName) .withValue(StructuredName.PREFIX, contact.prefix) .withValue(StructuredName.GIVEN_NAME, contact.givenName) @@ -682,9 +681,9 @@ open class AndroidContact( } catch(e: IllegalStateException) { Constants.log.log(Level.FINER, "Can't understand phone number PREF", e) } - var is_primary = pref != null + var isPrimary = pref != null if (types.contains(TelephoneType.PREF)) { - is_primary = true + isPrimary = true types -= TelephoneType.PREF } @@ -756,8 +755,8 @@ open class AndroidContact( .withValue(Phone.NUMBER, number.text) .withValue(Phone.TYPE, typeCode) .withValue(Phone.LABEL, typeLabel) - .withValue(Phone.IS_PRIMARY, if (is_primary) 1 else 0) - .withValue(Phone.IS_SUPER_PRIMARY, if (is_primary) 1 else 0) + .withValue(Phone.IS_PRIMARY, if (isPrimary) 1 else 0) + .withValue(Phone.IS_SUPER_PRIMARY, if (isPrimary) 1 else 0) if (addressBook.readOnly) builder.withValue(Data.IS_READ_ONLY, 1) @@ -778,9 +777,9 @@ open class AndroidContact( } catch(e: IllegalStateException) { Constants.log.log(Level.FINER, "Can't understand email PREF", e) } - var is_primary = pref != null + var isPrimary = pref != null if (types.contains(EmailType.PREF)) { - is_primary = true + isPrimary = true types -= EmailType.PREF } @@ -818,8 +817,8 @@ open class AndroidContact( .withValue(Email.ADDRESS, email.value) .withValue(Email.TYPE, typeCode) .withValue(Email.LABEL, typeLabel) - .withValue(Email.IS_PRIMARY, if (is_primary) 1 else 0) - .withValue(Phone.IS_SUPER_PRIMARY, if (is_primary) 1 else 0) + .withValue(Email.IS_PRIMARY, if (isPrimary) 1 else 0) + .withValue(Phone.IS_SUPER_PRIMARY, if (isPrimary) 1 else 0) if (addressBook.readOnly) builder.withValue(Data.IS_READ_ONLY, 1) @@ -1030,9 +1029,9 @@ open class AndroidContact( val lineLocality = arrayOf(address.postalCode, address.locality).filterNot { it.isNullOrEmpty() }.joinToString(" ") val lines = LinkedList() - if (!lineStreet.isEmpty()) + if (lineStreet.isNotEmpty()) lines += lineStreet - if (!lineLocality.isEmpty()) + if (lineLocality.isNotEmpty()) lines += lineLocality if (!address.region.isNullOrEmpty()) lines += address.region @@ -1241,7 +1240,7 @@ open class AndroidContact( if (width > max || height > max) { val scaleWidth = max/width val scaleHeight = max/height - val scale = Math.min(scaleWidth, scaleHeight) + val scale = min(scaleWidth, scaleHeight) val newWidth = (width * scale).toInt() val newHeight = (height * scale).toInt() @@ -1298,7 +1297,7 @@ open class AndroidContact( protected fun rawContactSyncURI(): Uri { val id = requireNotNull(id) - return addressBook.syncAdapterURI(ContentUris.withAppendedId(ContactsContract.RawContacts.CONTENT_URI, id)) + return addressBook.syncAdapterURI(ContentUris.withAppendedId(RawContacts.CONTENT_URI, id)) } protected fun dataSyncURI() = addressBook.syncAdapterURI(ContactsContract.Data.CONTENT_URI) diff --git a/src/main/java/at/bitfire/vcard4android/AndroidGroup.kt b/src/main/java/at/bitfire/vcard4android/AndroidGroup.kt index 42a7d17..eca497e 100644 --- a/src/main/java/at/bitfire/vcard4android/AndroidGroup.kt +++ b/src/main/java/at/bitfire/vcard4android/AndroidGroup.kt @@ -150,7 +150,7 @@ open class AndroidGroup( private fun groupSyncURI(): Uri { val id = requireNotNull(id) - return addressBook.syncAdapterURI(ContentUris.withAppendedId(ContactsContract.Groups.CONTENT_URI, id)) + return addressBook.syncAdapterURI(ContentUris.withAppendedId(Groups.CONTENT_URI, id)) } override fun toString() = ToStringBuilder.reflectionToString(this)!! diff --git a/src/main/java/at/bitfire/vcard4android/Contact.kt b/src/main/java/at/bitfire/vcard4android/Contact.kt index 5763504..2854647 100644 --- a/src/main/java/at/bitfire/vcard4android/Contact.kt +++ b/src/main/java/at/bitfire/vcard4android/Contact.kt @@ -442,7 +442,7 @@ class Contact { val fakeCal = GregorianCalendar.getInstance() fakeCal.set(DATE_PARAMETER_OMIT_YEAR_DEFAULT, partial.month - 1, partial.date) val fakeProp = generator(fakeCal.time) - fakeProp.addParameter(DATE_PARAMETER_OMIT_YEAR, Integer.toString(DATE_PARAMETER_OMIT_YEAR_DEFAULT)) + fakeProp.addParameter(DATE_PARAMETER_OMIT_YEAR, DATE_PARAMETER_OMIT_YEAR_DEFAULT.toString()) fakeProp } } -- GitLab From 7c81c7284816fc226385f006436e2c29881d73eb Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Fri, 8 Nov 2019 00:39:34 +0100 Subject: [PATCH 20/30] Use headless emulator from new repo for testing --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39dcfc4..d0c45d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,5 @@ -image: registry.gitlab.com/bitfireat/davx5-ose:latest +# https://gitlab.com/bitfireAT/docker-android-emulator +image: registry.gitlab.com/bitfireat/docker-android-emulator:latest before_script: - export GRADLE_USER_HOME=`pwd`/.gradle; chmod +x gradlew @@ -9,7 +10,7 @@ cache: test: script: - - (cd /sdk/emulator; ./emulator @test -no-audio -no-window & wait-for-emulator.sh) + - start-emulator.sh - ./gradlew check connectedCheck artifacts: paths: -- GitLab From 93df274d1a4f7b8b431b40e56955f821e84406ac Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Fri, 8 Nov 2019 00:48:05 +0100 Subject: [PATCH 21/30] Fix return type --- src/main/java/at/bitfire/vcard4android/AndroidGroup.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/at/bitfire/vcard4android/AndroidGroup.kt b/src/main/java/at/bitfire/vcard4android/AndroidGroup.kt index eca497e..4f2ae49 100644 --- a/src/main/java/at/bitfire/vcard4android/AndroidGroup.kt +++ b/src/main/java/at/bitfire/vcard4android/AndroidGroup.kt @@ -113,6 +113,7 @@ open class AndroidGroup( * Creates a group with data taken from the constructor. * @return number of affected rows * @throws RemoteException on contact provider errors + * @throws ContactsStorageException when the group can't be added */ fun add(): Uri { val values = contentValues() @@ -121,6 +122,7 @@ open class AndroidGroup( values.put(Groups.SHOULD_SYNC, 1) // read-only: values.put(Groups.GROUP_VISIBLE, 1); val uri = addressBook.provider!!.insert(addressBook.syncAdapterURI(Groups.CONTENT_URI), values) + ?: throw ContactsStorageException("Empty result from content provider when adding group") id = ContentUris.parseId(uri) return uri } -- GitLab From d20ad72533edf27f3b1d3093552c921dda38d344 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Sat, 9 Nov 2019 12:55:07 +0100 Subject: [PATCH 22/30] Require privileged tag for Android tests, but allow documentation to be built by shared runner --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0c45d3..643777d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,4 @@ -# https://gitlab.com/bitfireAT/docker-android-emulator -image: registry.gitlab.com/bitfireat/docker-android-emulator:latest +image: openjdk:8-jdk-slim before_script: - export GRADLE_USER_HOME=`pwd`/.gradle; chmod +x gradlew @@ -9,6 +8,9 @@ cache: - .gradle/ test: + image: registry.gitlab.com/bitfireat/docker-android-emulator:latest + tags: + - privileged script: - start-emulator.sh - ./gradlew check connectedCheck -- GitLab From 426f0a5e9244298e081ba5136a297d80cb8c05a8 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Sat, 9 Nov 2019 19:46:40 +0100 Subject: [PATCH 23/30] Update dokka --- .gitlab-ci.yml | 3 +-- build.gradle | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 643777d..3e1bc60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: openjdk:8-jdk-slim +image: registry.gitlab.com/bitfireat/docker-android-emulator:latest before_script: - export GRADLE_USER_HOME=`pwd`/.gradle; chmod +x gradlew @@ -8,7 +8,6 @@ cache: - .gradle/ test: - image: registry.gitlab.com/bitfireat/docker-android-emulator:latest tags: - privileged script: diff --git a/build.gradle b/build.gradle index 7c0a3be..8273f1d 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.versions = [ kotlin: '1.3.50', - dokka: '0.9.18' + dokka: '0.10.0' ] repositories { @@ -13,7 +13,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.5.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" - classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${versions.dokka}" + classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}" } } @@ -24,7 +24,7 @@ repositories { apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'org.jetbrains.dokka-android' +apply plugin: 'org.jetbrains.dokka' android { compileSdkVersion 29 -- GitLab From 02744ee7f3965d4ebceb5227a3ec511f1e7b3f17 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Mon, 11 Nov 2019 00:09:51 +0100 Subject: [PATCH 24/30] Remove useless applicatioName and incorrect allowBackup --- src/main/AndroidManifest.xml | 3 +-- src/main/res/values/strings.xml | 11 ----------- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 src/main/res/values/strings.xml diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index ba2b18c..05e0237 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -12,7 +12,6 @@ - + diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml deleted file mode 100644 index 1072878..0000000 --- a/src/main/res/values/strings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - VCard4Android - -- GitLab From 5053af1742ba226838f65db4521014384f8a49ac Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Tue, 12 Nov 2019 13:11:08 +0100 Subject: [PATCH 25/30] Dokka: add source and JDK links --- build.gradle | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.gradle b/build.gradle index 8273f1d..ca369e9 100644 --- a/build.gradle +++ b/build.gradle @@ -59,6 +59,14 @@ android { defaultConfig { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + + dokka.configuration { + sourceLink { + url = "https://gitlab.com/bitfireAT/vcard4android/tree/master/" + lineSuffix = "#L" + } + jdkVersion = 7 + } } dependencies { -- GitLab From baee10bb62a57eb286f27199da79388b6cf3c275 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Tue, 26 Nov 2019 00:41:26 +0100 Subject: [PATCH 26/30] Change vCard validation warning text/level --- build.gradle | 2 +- src/main/java/at/bitfire/vcard4android/Contact.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ca369e9..6d5ce6a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext.versions = [ - kotlin: '1.3.50', + kotlin: '1.3.60', dokka: '0.10.0' ] diff --git a/src/main/java/at/bitfire/vcard4android/Contact.kt b/src/main/java/at/bitfire/vcard4android/Contact.kt index 2854647..ff56289 100644 --- a/src/main/java/at/bitfire/vcard4android/Contact.kt +++ b/src/main/java/at/bitfire/vcard4android/Contact.kt @@ -467,7 +467,7 @@ class Contact { val msgs = LinkedList() for ((key, warnings) in validation) msgs += " * " + key.javaClass.simpleName + " - " + warnings.joinToString(" | ") - Constants.log.log(Level.INFO, "Generating possibly invalid vCard", msgs.joinToString(",")) + Constants.log.log(Level.WARNING, "vCard validation warnings", msgs.joinToString(",")) } // generate VCARD -- GitLab From 17b474917377d6e69d5159b8c4787b6263f90dcb Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Wed, 11 Dec 2019 12:46:46 +0100 Subject: [PATCH 27/30] Update gradle plugin, Kotlin --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 6d5ce6a..80591f7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext.versions = [ - kotlin: '1.3.60', + kotlin: '1.3.61', dokka: '0.10.0' ] @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:3.5.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}" } -- GitLab From 39c990b8a3ab4aa9c82035b9013e0a3a39871347 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Sun, 15 Dec 2019 19:32:48 +0100 Subject: [PATCH 28/30] Increase EMAIL TYPE compatibility; library update - EMAIL: drop TYPE=internet and TYPE=x400 because Android only knows Internet email addresses - EMAIL: treat TYPE=other (which is not specified in vCard RFCs) as "other" email address for better compatibility - upgrade Apache Commons text library --- build.gradle | 2 +- .../vcard4android/AndroidContactTest.kt | 45 +++++++++++++++++++ .../bitfire/vcard4android/AndroidContact.kt | 5 ++- .../java/at/bitfire/vcard4android/Contact.kt | 3 ++ 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 80591f7..ce20b12 100644 --- a/build.gradle +++ b/build.gradle @@ -72,7 +72,7 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}" - implementation 'org.apache.commons:commons-text:1.7' + implementation 'org.apache.commons:commons-text:1.8' implementation 'commons-io:commons-io:2.6' // ez-vcard to parse/generate VCards diff --git a/src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt b/src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt index b813655..72c5d09 100644 --- a/src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt +++ b/src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt @@ -19,6 +19,7 @@ import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule import at.bitfire.vcard4android.impl.TestAddressBook import ezvcard.VCardVersion +import ezvcard.parameter.EmailType import ezvcard.property.Address import ezvcard.property.Birthday import ezvcard.property.Email @@ -202,6 +203,50 @@ class AndroidContactTest { } } + @Test + @SmallTest + fun testEmailTypes() { + val vCard = "BEGIN:VCARD\r\n" + + "VERSION:4.0\r\n" + + "FN:Test\r\n" + + "EMAIL;TYPE=internet;TYPE=work:work@example.com\r\n" + + "EMAIL;TYPE=home:home@example.com\r\n" + + "EMAIL;TYPE=internet,pref:other1@example.com\r\n" + + "EMAIL;TYPE=x400,other:other2@example.com\r\n" + + "EMAIL;TYPE=x-mobile:mobile@example.com\r\n" + + "END:VCARD\r\n" + val contacts = Contact.fromReader(StringReader(vCard), null) + + val dbContact = AndroidContact(addressBook, contacts.first(), null, null) + dbContact.add() + + val dbContact2 = addressBook.findContactByID(dbContact.id!!) + try { + val contact2 = dbContact2.contact!! + assertEquals("work@example.com", contact2.emails[0].property.value) + assertArrayEquals(arrayOf(EmailType.WORK), contact2.emails[0].property.types.toTypedArray()) + assertNull(contact2.emails[0].property.pref) + + assertEquals("home@example.com", contact2.emails[1].property.value) + assertArrayEquals(arrayOf(EmailType.HOME), contact2.emails[1].property.types.toTypedArray()) + assertNull(contact2.emails[1].property.pref) + + assertEquals("other1@example.com", contact2.emails[2].property.value) + assertTrue(contact2.emails[2].property.types.isEmpty()) + assertNotEquals(0, contact2.emails[2].property.pref) + + assertEquals("other2@example.com", contact2.emails[3].property.value) + assertTrue(contact2.emails[3].property.types.isEmpty()) + assertNull(contact2.emails[3].property.pref) + + assertEquals("mobile@example.com", contact2.emails[4].property.value) + assertArrayEquals(arrayOf(Contact.EMAIL_TYPE_MOBILE), contact2.emails[4].property.types.toTypedArray()) + assertNull(contact2.emails[4].property.pref) + } finally { + dbContact2.delete() + } + } + @Test fun testLabelToXName() { diff --git a/src/main/java/at/bitfire/vcard4android/AndroidContact.kt b/src/main/java/at/bitfire/vcard4android/AndroidContact.kt index f07385b..9a3673d 100644 --- a/src/main/java/at/bitfire/vcard4android/AndroidContact.kt +++ b/src/main/java/at/bitfire/vcard4android/AndroidContact.kt @@ -768,7 +768,9 @@ open class AndroidContact( protected open fun insertEmail(batch: BatchOperation, labeledEmail: LabeledProperty) { val email = labeledEmail.property + // drop TYPE=internet and TYPE=x400 because Android only knows Internet email addresses val types = email.types + types.removeAll(arrayOf(EmailType.INTERNET, EmailType.X400)) // preferred email address? var pref: Int? = null @@ -794,8 +796,9 @@ open class AndroidContact( EmailType.HOME -> typeCode = Email.TYPE_HOME EmailType.WORK -> typeCode = Email.TYPE_WORK Contact.EMAIL_TYPE_MOBILE -> typeCode = Email.TYPE_MOBILE + Contact.EMAIL_TYPE_OTHER -> typeCode = Email.TYPE_OTHER } - if (typeCode == 0) { + if (typeCode == 0) { // we still didn't find a known type if (email.types.isEmpty()) typeCode = Email.TYPE_OTHER else { diff --git a/src/main/java/at/bitfire/vcard4android/Contact.kt b/src/main/java/at/bitfire/vcard4android/Contact.kt index ff56289..e539d17 100644 --- a/src/main/java/at/bitfire/vcard4android/Contact.kt +++ b/src/main/java/at/bitfire/vcard4android/Contact.kt @@ -91,7 +91,10 @@ class Contact { val PHONE_TYPE_ASSISTANT = TelephoneType.get("X-assistant")!! val PHONE_TYPE_MMS = TelephoneType.get("x-mms")!! + /** Custom email type to denote "mobile" email addresses. */ val EMAIL_TYPE_MOBILE = EmailType.get("x-mobile")!! + /** Sometimes used to denote an "other" email address. Only for compatibility – don't use it yourself! */ + val EMAIL_TYPE_OTHER = EmailType.get("other")!! const val NICKNAME_TYPE_MAIDEN_NAME = "x-maiden-name" const val NICKNAME_TYPE_SHORT_NAME = "x-short-name" -- GitLab From 532ae5807c355c22c621ea93436666c4f042506f Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Tue, 17 Dec 2019 13:32:39 +0100 Subject: [PATCH 29/30] Handle (non-standard) TYPE=other for phone numbers and addresses, too (for better compatibility) --- .../bitfire/vcard4android/AndroidContact.kt | 21 ++++++++++--------- .../java/at/bitfire/vcard4android/Contact.kt | 6 ++++++ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/at/bitfire/vcard4android/AndroidContact.kt b/src/main/java/at/bitfire/vcard4android/AndroidContact.kt index 9a3673d..a8b80b7 100644 --- a/src/main/java/at/bitfire/vcard4android/AndroidContact.kt +++ b/src/main/java/at/bitfire/vcard4android/AndroidContact.kt @@ -732,6 +732,7 @@ open class AndroidContact( types.contains(Contact.PHONE_TYPE_MMS) -> typeCode = Phone.TYPE_MMS + types.contains(Contact.PHONE_TYPE_OTHER) || types.contains(TelephoneType.VOICE) || types.contains(TelephoneType.TEXT) -> {} @@ -769,8 +770,9 @@ open class AndroidContact( val email = labeledEmail.property // drop TYPE=internet and TYPE=x400 because Android only knows Internet email addresses + // drop TYPE=other for compatibility, too (non-standard type which is only used by some clients and not useful as an explicit value) val types = email.types - types.removeAll(arrayOf(EmailType.INTERNET, EmailType.X400)) + types.removeAll(arrayOf(EmailType.INTERNET, EmailType.X400, Contact.EMAIL_TYPE_OTHER)) // preferred email address? var pref: Int? = null @@ -796,7 +798,6 @@ open class AndroidContact( EmailType.HOME -> typeCode = Email.TYPE_HOME EmailType.WORK -> typeCode = Email.TYPE_WORK Contact.EMAIL_TYPE_MOBILE -> typeCode = Email.TYPE_MOBILE - Contact.EMAIL_TYPE_OTHER -> typeCode = Email.TYPE_OTHER } if (typeCode == 0) { // we still didn't find a known type if (email.types.isEmpty()) @@ -872,7 +873,6 @@ open class AndroidContact( var typeCode: Int = Im.TYPE_OTHER var typeLabel: String? = null - if (labeledImpp.label != null) { typeCode = Im.TYPE_CUSTOM typeLabel = labeledImpp.label @@ -1044,20 +1044,21 @@ open class AndroidContact( formattedAddress = lines.joinToString("\n") } + val types = address.types var typeCode = StructuredPostal.TYPE_OTHER var typeLabel: String? = null if (labeledAddress.label != null) { typeCode = StructuredPostal.TYPE_CUSTOM typeLabel = labeledAddress.label } else { - for (type in address.types) - when (type) { - AddressType.HOME -> typeCode = StructuredPostal.TYPE_HOME - AddressType.WORK -> typeCode = StructuredPostal.TYPE_WORK + when { + types.contains(AddressType.HOME) -> typeCode = StructuredPostal.TYPE_HOME + types.contains(AddressType.WORK) -> typeCode = StructuredPostal.TYPE_WORK + types.contains(Contact.ADDRESS_TYPE_OTHER) -> {} + types.isNotEmpty() -> { + typeCode = StructuredPostal.TYPE_CUSTOM + typeLabel = xNameToLabel(address.types.first().value) } - if (typeCode == StructuredPostal.TYPE_OTHER && address.types.isNotEmpty()) { - typeCode = StructuredPostal.TYPE_CUSTOM - typeLabel = xNameToLabel(address.types.first().value) } } diff --git a/src/main/java/at/bitfire/vcard4android/Contact.kt b/src/main/java/at/bitfire/vcard4android/Contact.kt index e539d17..ae2a350 100644 --- a/src/main/java/at/bitfire/vcard4android/Contact.kt +++ b/src/main/java/at/bitfire/vcard4android/Contact.kt @@ -11,6 +11,7 @@ package at.bitfire.vcard4android import ezvcard.Ezvcard import ezvcard.VCard import ezvcard.VCardVersion +import ezvcard.parameter.AddressType import ezvcard.parameter.EmailType import ezvcard.parameter.ImageType import ezvcard.parameter.TelephoneType @@ -90,12 +91,17 @@ class Contact { val PHONE_TYPE_RADIO = TelephoneType.get("x-radio")!! val PHONE_TYPE_ASSISTANT = TelephoneType.get("X-assistant")!! val PHONE_TYPE_MMS = TelephoneType.get("x-mms")!! + /** Sometimes used to denote an "other" phone numbers. Only for compatibility – don't use it yourself! */ + val PHONE_TYPE_OTHER = TelephoneType.get("other")!! /** Custom email type to denote "mobile" email addresses. */ val EMAIL_TYPE_MOBILE = EmailType.get("x-mobile")!! /** Sometimes used to denote an "other" email address. Only for compatibility – don't use it yourself! */ val EMAIL_TYPE_OTHER = EmailType.get("other")!! + /** Sometimes used to denote an "other" postal address. Only for compatibility – don't use it yourself! */ + val ADDRESS_TYPE_OTHER = AddressType.get("other")!! + const val NICKNAME_TYPE_MAIDEN_NAME = "x-maiden-name" const val NICKNAME_TYPE_SHORT_NAME = "x-short-name" const val NICKNAME_TYPE_INITIALS = "x-initials" -- GitLab From bf4ea05d74ca8ee12face85af857718d610590e6 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Sun, 22 Dec 2019 15:04:59 +0100 Subject: [PATCH 30/30] Improve compatibility (for instance with Samsung "Edge panel") - don't delete all raw contact data rows, but only the ones we use to insert ourselves --- .../bitfire/vcard4android/AndroidContact.kt | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/main/java/at/bitfire/vcard4android/AndroidContact.kt b/src/main/java/at/bitfire/vcard4android/AndroidContact.kt index a8b80b7..101e100 100644 --- a/src/main/java/at/bitfire/vcard4android/AndroidContact.kt +++ b/src/main/java/at/bitfire/vcard4android/AndroidContact.kt @@ -572,11 +572,28 @@ open class AndroidContact( buildContact(builder, true) batch.enqueue(BatchOperation.Operation(builder)) - // delete known data rows before adding the new ones; don't delete group memberships! + // Delete known data rows before adding the new ones. + // - We don't delete group memberships. + // - We'll only delete rows we have inserted so that unknown rows like + // vnd.android.cursor.item/important_people (= contact is in Samsung "edge panel") remain untouched. batch.enqueue(BatchOperation.Operation( ContentProviderOperation.newDelete(dataSyncURI()) - .withSelection(Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + " NOT IN (?,?)", - arrayOf(id.toString(), GroupMembership.CONTENT_ITEM_TYPE, CachedGroupMembership.CONTENT_ITEM_TYPE)) + .withSelection(Data.RAW_CONTACT_ID + "=? AND " + + Data.MIMETYPE + " IN (?,?,?,?,?,?,?,?,?,?,?,?,?)", + arrayOf(id.toString(), + StructuredName.CONTENT_ITEM_TYPE, + Phone.CONTENT_ITEM_TYPE, + Email.CONTENT_ITEM_TYPE, + Photo.CONTENT_ITEM_TYPE, + Organization.CONTENT_ITEM_TYPE, + Im.CONTENT_ITEM_TYPE, + Nickname.CONTENT_ITEM_TYPE, + Note.CONTENT_ITEM_TYPE, + StructuredPostal.CONTENT_ITEM_TYPE, + Website.CONTENT_ITEM_TYPE, + Event.CONTENT_ITEM_TYPE, + Relation.CONTENT_ITEM_TYPE, + SipAddress.CONTENT_ITEM_TYPE)) )) insertDataRows(batch) batch.commit() -- GitLab