Fetch translations from Transifex

* don't catch and ignore exceptions when adding client certificates for authentication
* remove useless KeyStore usage

.gitlab-ci.yml

@@ -1,20 +1,31 @@
-image: registry.gitlab.com/bitfireat/davdroid:latest
+image: registry.gitlab.com/bitfireat/docker-android-emulator:latest
 
 before_script:
   - git submodule update --init --recursive
   - export GRADLE_USER_HOME=`pwd`/.gradle; chmod +x gradlew
-  - emulator64-x86 -avd test -no-audio -no-window & wait-for-emulator.sh
-  - wget -q https://f-droid.org/repo/org.dmfs.tasks_481.apk && adb install org.dmfs.tasks_481.apk
 
 cache:
   paths:
      - .gradle/
 
 test:
+  tags:
+    - privileged
   script:
-    - ./gradlew check mergeAndroidReports
+   - start-emulator.sh
+   - ./gradlew app:check app:connectedCheck
   artifacts:
     paths:
       - app/build/outputs/lint-results-debug.html
       - app/build/reports
       - build/reports
+
+pages:
+  script:
+    - ./gradlew app:dokka
+    - mkdir public && mv app/build/dokka public
+  artifacts:
+    paths:
+      - public
+  only:
+    - master-ose

.gitmodules

@@ -1,12 +1,9 @@
-[submodule "dav4android"]
-	path = dav4android
-	url = ../dav4android.git
 [submodule "ical4android"]
 	path = ical4android
-	url = ../ical4android.git
+	url = https://gitlab.com/bitfireAT/ical4android.git
 [submodule "vcard4android"]
 	path = vcard4android
-	url = ../vcard4android.git
+	url = https://gitlab.com/bitfireAT/vcard4android.git
 [submodule "cert4android"]
 	path = cert4android
-	url = ../cert4android.git
+	url = https://gitlab.com/bitfireAT/cert4android.git

CONTRIBUTING.md

@@ -0,0 +1,47 @@
+
+Contributing to DAVx⁵
+=====================
+
+**Thank you for your interest in contributing to DAVx⁵!**
+
+Because you're reading this, you're probably interested in
+contributing to the DAVx⁵ code. [Other ways to contribute:
+see here.](https://www.davx5.com/donate#c306)
+
+To contribute:
+
+1. It's good idea to have a look at the [DAVx⁵ Roadmap](https://gitlab.com/bitfireAT/davx5-ose/wikis/Roadmap)
+   to see whether the change is already planned. Maybe there's even a link to a
+   corresponding forum thread there.
+1. Determine which project the changes shall go to. There's
+   the DAVx⁵ main project (this repo), and the [related
+   libraries](README.md).
+1. Please post to the [DAVx⁵ development forum](https://www.davx5.com/forums)
+   before doing actual work (unless you do it only for yourself, of course).
+   This will help to coordinate activities and you'll also get hints
+   about where to start and possible pitfalls.
+1. Fork the repository.
+1. Do the changes in your repository.
+1. Submit a pull request to the original project.
+1. Post in the forum again (to make sure the pull request is being notified).
+
+
+Questions, discussion
+=====================
+
+We're happy to see questions, discussions etc. in the
+[DAVx⁵ development forum](https://www.davx5.com/forums)!
+
+
+Licensing
+=========
+
+All code has to be licensed under the GPL.
+
+We (bitfire.at, initial developers) are also asking you to double-license the
+code so that we can also use it for related non-open source projects like
+[Managed DAVx⁵](https://www.davx5.com/organizations/managed-davx5).
+
+Please find more about this in the Contributor's License Agreement (CLA)
+we'll send to you if you want to contribute.
+

README.md

@@ -1,38 +1,37 @@
+![DAVx⁵ logo](app/src/main/res/mipmap-xxxhdpi/ic_launcher.png)
 
-[![build status](https://gitlab.com/bitfireAT/davdroid/badges/master/build.svg)](https://gitlab.com/bitfireAT/davdroid/commits/master)
-
-
-DAVdroid
+DAVx⁵
 ========
 
-Please see the [DAVdroid Web site](https://davdroid.bitfire.at) for
-comprehensive information about DAVdroid.
+Please see the [DAVx⁵ Web site](https://www.davx5.com) for
+comprehensive information about DAVx⁵.
 
-DAVdroid is licensed under the [GPLv3 License](LICENSE).
+DAVx⁵ is licensed under the [GPLv3 License](LICENSE).
 
-News and updates: [@davdroidapp](https://twitter.com/davdroidapp) on Twitter /
-[davdroid-announce](https://davdroid.bitfire.at/download/newsletter/) mailing list
+News and updates: [@davx5app](https://twitter.com/davx5app) on Twitter
 
-Help and discussion: [DAVdroid forums](https://davdroid.bitfire.at/forums)
+Help, discussion, feature requests, bug reports and "issues": [DAVx⁵ forums](https://www.davx5.com/forums)
 
-**If you want to support DAVdroid, please consider [donating to DAVdroid](https://davdroid.bitfire.at/donate/)
-or [purchasing it](https://davdroid.bitfire.at/download/).**
+**If you want to support DAVx⁵, please consider [donating to DAVx⁵](https://www.davx5.com/donate)
+or [purchasing it](https://www.davx5.com/download).**
 
-Parts of DAVdroid have been outsourced into these libraries:
+Generated KDoc: https://bitfireAT.gitlab.io/davx5-ose/dokka/app/
+
+Parts of DAVx⁵ have been outsourced into these libraries:
 
 * [cert4android](https://gitlab.com/bitfireAT/cert4android) – custom certificate management
-* [dav4android](https://gitlab.com/bitfireAT/dav4android) – WebDAV/CalDav/CardDAV framework
+* [dav4jvm](https://gitlab.com/bitfireAT/dav4jvm) – WebDAV/CalDav/CardDAV framework
 * [ical4android](https://gitlab.com/bitfireAT/ical4android) – iCalendar processing and Calendar Provider access
-* [vcard4android](https://gitlab.com/bitfireAT/vcard4android) – VCard processing and Contacts Provider access
+* [vcard4android](https://gitlab.com/bitfireAT/vcard4android) – vCard processing and Contacts Provider access
 
 
 USED THIRD-PARTY LIBRARIES
 ==========================
 
-Those libraries are used by DAVdroid (alphabetically):
+Those libraries are used by DAVx⁵ (alphabetically):
 
+* [Color Picker](https://github.com/jaredrummler/ColorPicker) – [Apache License, Version 2.0](https://github.com/jaredrummler/ColorPicker/LICENSE)
 * [dnsjava](http://www.xbill.org/dnsjava/) – [BSD License](http://www.xbill.org/dnsjava/dnsjava-current/LICENSE)
-* [ez-vcard](https://code.google.com/p/ez-vcard/) – [New BSD License](http://opensource.org/licenses/BSD-3-Clause)
-* [iCal4j](http://ical4j.sourceforge.net/) – [New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE)
-* [okhttp](https://square.github.io/okhttp/) – [Apache License, Version 2.0](https://square.github.io/okhttp/#license)
-* [Project Lombok](http://projectlombok.org/) – [MIT License](http://opensource.org/licenses/mit-license.php)
+* [ez-vcard](https://github.com/mangstadt/ez-vcard) – [New BSD License](http://opensource.org/licenses/BSD-3-Clause)
+* [iCal4j](https://github.com/ical4j/ical4j) – [New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE)
+* [okhttp](https://square.github.io/okhttp) – [Apache License, Version 2.0](https://square.github.io/okhttp/#license)

app/build.gradle

@@ -7,151 +7,164 @@
  */
 
 apply plugin: 'com.android.application'
+apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'org.jetbrains.dokka'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.0'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "at.bitfire.davdroid"
-        resValue "string", "packageID", applicationId
 
-        versionCode 160
+        versionCode 303100002
         buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
 
-        minSdkVersion 16
-        targetSdkVersion 25
+        minSdkVersion 21        // Android 5
+        targetSdkVersion 30     // Android 11
 
-        buildConfigField "boolean", "customCerts", "false"
-        buildConfigField "at.bitfire.vcard4android.GroupMethod", "settingContactGroupMethod", "null"
+        buildConfigField "String", "userAgent", "\"DAVx5\""
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        kapt {
+            arguments {
+                arg("room.schemaLocation", "$projectDir/schemas")
+            }
+        }
     }
 
+    compileOptions {
+        // enable because ical4android requires desugaring
+        coreLibraryDesugaringEnabled true
+
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    buildFeatures.dataBinding = true
+
+    flavorDimensions "distribution"
     productFlavors {
         standard {
-            versionName "1.6.5"
-            buildConfigField "boolean", "customCerts", "true"
-        }
-
-        gplay {
-            versionName "1.6.5-play"
-            buildConfigField "boolean", "customCerts", "true"
-        }
-        icloud {
-            applicationId "at.bitfire.cloudsync"
-            resValue "string", "packageID", applicationId
-
-            versionName "1.6.5-cloud"
-            buildConfigField "at.bitfire.vcard4android.GroupMethod", "settingContactGroupMethod", "at.bitfire.vcard4android.GroupMethod.GROUP_VCARDS"
-        }
-        soldupe {
-            applicationId "com.soldupe.cloudsync"
-            resValue "string", "packageID", applicationId
-            minSdkVersion 21
-
-            versionName "1.6.5-soldupe"
-            buildConfigField "boolean", "customCerts", "true"
-            buildConfigField "at.bitfire.vcard4android.GroupMethod", "settingContactGroupMethod", "at.bitfire.vcard4android.GroupMethod.CATEGORIES"
+            versionName "3.3.10-rc1-ose"
         }
     }
 
     sourceSets {
-        standard.java.srcDirs = [ "src/davdroid/java" ]
-        standard.res.srcDirs = [ "src/davdroid/res" ]
-        gplay.java.srcDirs = [ "src/gplay/java", "src/davdroid/java" ]
-        gplay.res.srcDirs = [ "src/gplay/res", "src/davdroid/res" ]
-    }
-
-    signingConfigs {
-        bitfire {
-            storeFile file("${System.env.HOME}/Entwicklung/GooglePlay/bitfire.jks")
-            storePassword '***REMOVED***'
-            keyAlias 'bitfire'
-            keyPassword '***REMOVED***'
-        }
-        soldupe {
-            storeFile file("${System.env.HOME}/Entwicklung/GooglePlay/soldupe.jks")
-            storePassword 'hei8eePh'
-            keyAlias 'soldupe'
-            keyPassword 'ocaip6oZ'
-        }
+        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
     buildTypes {
         debug {
-            minifyEnabled false
         }
         release {
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-release.pro'
 
-            signingConfig signingConfigs.bitfire
-            productFlavors.soldupe.signingConfig signingConfigs.soldupe
+            shrinkResources true
         }
     }
 
     lintOptions {
-        disable 'GoogleAppIndexingWarning'      // we don't need Google indexing, thanks
-        disable 'GradleDependency'
-        disable 'IconColors'
-        disable 'IconLauncherShape'
-        disable 'IconMissingDensityFolder'
-        disable 'ImpliedQuantity', 'MissingQuantity'
-        disable 'MissingTranslation', 'ExtraTranslation'	// translations from Transifex are not always up to date
-        disable 'Recycle'           // doesn't understand Lombok's @Cleanup
-        disable 'RtlEnabled'
-        disable 'RtlHardcoded'
+        disable 'GoogleAppIndexingWarning'                  // we don't need Google indexing, thanks
+        disable 'ImpliedQuantity', 'MissingQuantity'        // quantities from Transifex may vary
+        disable 'MissingTranslation', 'ExtraTranslation'    // translations from Transifex are not always up to date
+        disable 'RtlEnabled', 'RtlHardcoded'                // RTL not supported yet
         disable 'Typos'
-    }
-    packagingOptions {
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/LICENSE'
+        disable 'NullSafeMutableLiveData'                   // crashes lint since Mar 2021
     }
 
-    defaultConfig {
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    dokka.configuration {
+        sourceLink {
+            url = "https://gitlab.com/bitfireAT/davx5-ose/tree/master-ose/"
+            lineSuffix = "#L"
+        }
+        jdkVersion = 8
+
+        externalDocumentationLink {
+            url = new URL("https://bitfireat.gitlab.io/cert4android/dokka/cert4android/")
+            packageListUrl = new URL("https://bitfireat.gitlab.io/cert4android/dokka/cert4android/package-list")
+        }
+        externalDocumentationLink {
+            url = new URL("https://bitfireat.gitlab.io/dav4jvm/dokka/dav4jvm/")
+            packageListUrl = new URL("https://bitfireat.gitlab.io/dav4jvm/dokka/dav4jvm/package-list")
+        }
+        externalDocumentationLink {
+            url = new URL("https://bitfireat.gitlab.io/ical4android/dokka/ical4android/")
+            packageListUrl = new URL("https://bitfireat.gitlab.io/ical4android/dokka/ical4android/package-list")
+        }
+        externalDocumentationLink {
+            url = new URL("https://bitfireat.gitlab.io/vcard4android/dokka/vcard4android/")
+            packageListUrl = new URL("https://bitfireat.gitlab.io/vcard4android/dokka/vcard4android/package-list")
+        }
+    }
+}
+
+aboutLibraries {
+    additionalLicenses {
+        mpl_2_0
     }
 }
 
 dependencies {
-    compile project(':cert4android')
-    compile project(':dav4android')
-    compile project(':ical4android')
-    compile project(':vcard4android')
+    implementation project(':cert4android')
+    implementation project(':ical4android')
+    implementation project(':vcard4android')
 
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2"
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
-    //noinspection GradleDynamicVersion
-    compile 'com.android.support:appcompat-v7:26.+'
-    //noinspection GradleDynamicVersion
-    compile 'com.android.support:cardview-v7:26.+'
-    //noinspection GradleDynamicVersion
-    compile 'com.android.support:design:26.+'
-    //noinspection GradleDynamicVersion
-    compile 'com.android.support:preference-v14:26.+'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.browser:browser:1.3.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.fragment:fragment-ktx:1.3.2'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
+    implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    implementation 'com.google.android:flexbox:1.1.0'
+    implementation 'com.google.android.material:material:1.3.0'
 
-    compile 'com.github.yukuku:ambilwarna:2.0.1'
+    def room_version = '2.2.6'
+    implementation "androidx.room:room-runtime:$room_version"
+    implementation "androidx.room:room-ktx:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+    androidTestImplementation "androidx.room:room-testing:$room_version"
 
-    compile 'com.squareup.okhttp3:logging-interceptor:3.8.1'
-    compile 'commons-io:commons-io:2.5'
-    compile 'dnsjava:dnsjava:2.1.8'
-    compile 'org.apache.commons:commons-lang3:3.6'
-    compile 'org.apache.commons:commons-collections4:4.1'
-    provided 'org.projectlombok:lombok:1.16.16'
+    implementation 'com.jaredrummler:colorpicker:1.1.0'
+    implementation "com.github.AppIntro:AppIntro:${versions.appIntro}"
+    implementation "com.gitlab.bitfireAT:dav4jvm:${versions.dav4jvm}"
+    implementation "com.mikepenz:aboutlibraries:${versions.aboutLibraries}"
+    implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
+    implementation "com.squareup.okhttp3:okhttp-brotli:${versions.okhttp}"
+    implementation "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}"
+    implementation 'commons-io:commons-io:2.6'
+    //noinspection GradleDependency - dnsjava 3+ needs Java 8/Android 7
+    implementation 'dnsjava:dnsjava:2.1.9'
+    //noinspection GradleDependency
+    implementation "org.apache.commons:commons-collections4:${versions.commonsCollections}"
+    //noinspection GradleDependency
+    implementation "org.apache.commons:commons-lang3:${versions.commonsLang}"
+    //noinspection GradleDependency
+    implementation "org.apache.commons:commons-text:${versions.commonsText}"
 
     // for tests
-    //noinspection GradleDynamicVersion
-    androidTestCompile('com.android.support.test:runner:+') {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-    //noinspection GradleDynamicVersion
-    androidTestCompile('com.android.support.test:rules:+') {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-    androidTestCompile 'junit:junit:4.12'
-    androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'junit:junit:4.13.2'
+    androidTestImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"
 
-    testCompile 'junit:junit:4.12'
-    testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"
 }

app/proguard-rules-release.pro

@@ -0,0 +1,25 @@
+
+# R8 usage for DAVx⁵:
+#    shrinking        yes (only in release builds)
+#    optimization     yes (on by R8 defaults)
+#    obfuscation      no (open-source)
+
+-dontobfuscate
+-printusage build/reports/r8-usage.txt
+
+# ez-vcard: keep all vCard properties/parameters (used via reflection)
+-keep class ezvcard.io.scribe.** { *; }
+-keep class ezvcard.property.** { *; }
+-keep class ezvcard.parameter.** { *; }
+
+# ical4j: keep all iCalendar properties/parameters (used via reflection)
+-keep class net.fortuna.ical4j.** { *; }
+
+# DAVx⁵ + libs
+-keep class at.bitfire.** { *; }       # all DAVx⁵ code is required
+
+# we use enum classes (https://www.guardsquare.com/en/products/proguard/manual/examples#enumerations)
+-keepclassmembers,allowoptimization enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}

app/proguard-rules.txt

@@ -1,39 +0,0 @@
-
-# ProGuard usage for DAVdroid:
-#       shrinking        yes (main reason for using ProGuard)
-#       optimization     yes
-#       obfuscation      no (DAVdroid is open-source)
-#       preverification  no
-
--dontobfuscate
-
--optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
--optimizationpasses 5
--allowaccessmodification
--dontpreverify
-
-# ez-vcard
--dontwarn ezvcard.io.json.**            # JSON serializer (for jCards) not used
--dontwarn freemarker.**                 # freemarker templating library (for creating hCards) not used
--dontwarn org.jsoup.**                  # jsoup library (for hCard parsing) not used
--dontwarn sun.misc.Perf
--keep class ezvcard.property.** { *; }  # keep all VCard properties (created at runtime)
-
-# ical4j: ignore unused dynamic libraries
--dontwarn aQute.**
--dontwarn groovy.**                       # Groovy-based ContentBuilder not used
--dontwarn org.codehaus.groovy.**
--dontwarn net.fortuna.ical4j.model.**     # ignore warnings from Groovy dependency
--dontwarn org.apache.log4j.**             # ignore warnings from log4j dependency
--keep class net.fortuna.ical4j.** { *; }  # keep all model classes (properties/factories, created at runtime)
-
-# okhttp
--dontwarn okio.**
--dontwarn javax.annotation.Nullable
--dontwarn javax.annotation.ParametersAreNonnullByDefault
-
-# dnsjava
--dontwarn sun.net.spi.nameservice.**   # not available on Android
-
-# DAVdroid + libs
--keep class at.bitfire.** { *; }       # all DAVdroid code is required

app/schemas/at.bitfire.davdroid.model.AppDatabase/8.json

@@ -0,0 +1,298 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 8,
+    "identityHash": "b8699ef3cc4c62e8851df4360fb69e00",
+    "entities": [
+      {
+        "tableName": "service",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `accountName` TEXT NOT NULL, `type` TEXT NOT NULL, `principal` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountName",
+            "columnName": "accountName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "principal",
+            "columnName": "principal",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_service_accountName_type",
+            "unique": true,
+            "columnNames": [
+              "accountName",
+              "type"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_service_accountName_type` ON `${TABLE_NAME}` (`accountName`, `type`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "homeset",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `personal` INTEGER NOT NULL, `url` TEXT NOT NULL, `privBind` INTEGER NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "serviceId",
+            "columnName": "serviceId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "personal",
+            "columnName": "personal",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privBind",
+            "columnName": "privBind",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_homeset_serviceId_url",
+            "unique": true,
+            "columnNames": [
+              "serviceId",
+              "url"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_homeset_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "service",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "serviceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "collection",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `homeSetId` INTEGER, `type` TEXT NOT NULL, `url` TEXT NOT NULL, `privWriteContent` INTEGER NOT NULL, `privUnbind` INTEGER NOT NULL, `forceReadOnly` INTEGER NOT NULL, `displayName` TEXT, `description` TEXT, `owner` TEXT, `color` INTEGER, `timezone` TEXT, `supportsVEVENT` INTEGER, `supportsVTODO` INTEGER, `supportsVJOURNAL` INTEGER, `source` TEXT, `sync` INTEGER NOT NULL, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`homeSetId`) REFERENCES `homeset`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "serviceId",
+            "columnName": "serviceId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "homeSetId",
+            "columnName": "homeSetId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privWriteContent",
+            "columnName": "privWriteContent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privUnbind",
+            "columnName": "privUnbind",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "forceReadOnly",
+            "columnName": "forceReadOnly",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "owner",
+            "columnName": "owner",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timezone",
+            "columnName": "timezone",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "supportsVEVENT",
+            "columnName": "supportsVEVENT",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "supportsVTODO",
+            "columnName": "supportsVTODO",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "supportsVJOURNAL",
+            "columnName": "supportsVJOURNAL",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "sync",
+            "columnName": "sync",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_collection_serviceId_type",
+            "unique": false,
+            "columnNames": [
+              "serviceId",
+              "type"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_serviceId_type` ON `${TABLE_NAME}` (`serviceId`, `type`)"
+          },
+          {
+            "name": "index_collection_homeSetId_type",
+            "unique": false,
+            "columnNames": [
+              "homeSetId",
+              "type"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_homeSetId_type` ON `${TABLE_NAME}` (`homeSetId`, `type`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "service",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "serviceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "homeset",
+            "onDelete": "SET NULL",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "homeSetId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'b8699ef3cc4c62e8851df4360fb69e00')"
+    ]
+  }
+}

app/src/.gitignore

@@ -0,0 +1 @@
+espressoTest

app/src/androidTest/AndroidManifest.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="at.bitfire.davdroid"
+          xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          android:installLocation="internalOnly">
+
+    <!-- account management permissions not required for own accounts since API level 22 -->
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" android:maxSdkVersion="22"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" android:maxSdkVersion="22"/>
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" android:maxSdkVersion="22"/>
+
+    <application>
+
+        <service
+            android:name=".syncadapter.NullAuthenticatorService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator"/>
+            </intent-filter>
+
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/test_account_authenticator"/>
+        </service>
+
+    </application>
+
+</manifest>

app/src/androidTest/java/at/bitfire/davdroid/HttpClientTest.kt

@@ -0,0 +1,74 @@
+/*
+ * Copyright © Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid
+
+import okhttp3.Request
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Before
+import org.junit.Test
+
+class HttpClientTest {
+
+    lateinit var server: MockWebServer
+    lateinit var httpClient: HttpClient
+
+    @Before
+    fun setUp() {
+        httpClient = HttpClient.Builder().build()
+
+        server = MockWebServer()
+        server.start(30000)
+    }
+
+    @After
+    fun tearDown() {
+        server.shutdown()
+        httpClient.close()
+    }
+
+
+    @Test
+    fun testCookies() {
+        val url = server.url("/test")
+
+        // set cookie for root path (/) and /test path in first response
+        server.enqueue(MockResponse()
+                .setResponseCode(200)
+                .addHeader("Set-Cookie", "cookie1=1; path=/")
+                .addHeader("Set-Cookie", "cookie2=2")
+                .setBody("Cookie set"))
+        httpClient.okHttpClient.newCall(Request.Builder()
+                .get().url(url)
+                .build()).execute()
+        assertNull(server.takeRequest().getHeader("Cookie"))
+
+        // cookie should be sent with second request
+        // second response lets first cookie expire and overwrites second cookie
+        server.enqueue(MockResponse()
+                .addHeader("Set-Cookie", "cookie1=1a; path=/; Max-Age=0")
+                .addHeader("Set-Cookie", "cookie2=2a")
+                .setResponseCode(200))
+        httpClient.okHttpClient.newCall(Request.Builder()
+                .get().url(url)
+                .build()).execute()
+        assertEquals("cookie2=2; cookie1=1", server.takeRequest().getHeader("Cookie"))
+
+        server.enqueue(MockResponse()
+                .setResponseCode(200))
+        httpClient.okHttpClient.newCall(Request.Builder()
+                .get().url(url)
+                .build()).execute()
+        assertEquals("cookie2=2a", server.takeRequest().getHeader("Cookie"))
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/SSLSocketFactoryCompatTest.java

@@ -1,57 +0,0 @@
-/*
- * Copyright © Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import javax.net.ssl.SSLSocket;
-
-import at.bitfire.cert4android.CustomCertManager;
-import okhttp3.mockwebserver.MockWebServer;
-
-import static android.support.test.InstrumentationRegistry.getTargetContext;
-import static junit.framework.TestCase.assertFalse;
-import static org.apache.commons.lang3.ArrayUtils.contains;
-import static org.junit.Assert.assertTrue;
-
-public class SSLSocketFactoryCompatTest {
-
-    SSLSocketFactoryCompat factory;
-    MockWebServer server = new MockWebServer();
-
-    @Before
-    public void startServer() throws Exception {
-        factory = new SSLSocketFactoryCompat(new CustomCertManager(getTargetContext().getApplicationContext(), true));
-        server.start();
-    }
-
-    @After
-    public void stopServer() throws Exception {
-        server.shutdown();
-    }
-
-
-    @Test
-    public void testUpgradeTLS() throws IOException {
-        Socket s = factory.createSocket(server.getHostName(), server.getPort());
-        assertTrue(s instanceof SSLSocket);
-
-        SSLSocket ssl = (SSLSocket)s;
-        assertFalse(contains(ssl.getEnabledProtocols(), "SSLv3"));
-        assertTrue(contains(ssl.getEnabledProtocols(), "TLSv1"));
-        assertTrue(contains(ssl.getEnabledProtocols(), "TLSv1.1"));
-        assertTrue(contains(ssl.getEnabledProtocols(), "TLSv1.2"));
-    }
-
-}

app/src/androidTest/java/at/bitfire/davdroid/model/AppDatabaseTest.kt

@@ -0,0 +1,37 @@
+package at.bitfire.davdroid.model
+
+import androidx.room.Room
+import androidx.room.testing.MigrationTestHelper
+import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Rule
+import org.junit.Test
+
+class AppDatabaseTest {
+
+    val TEST_DB = "test"
+
+    @Rule
+    @JvmField
+    val helper = MigrationTestHelper(
+            InstrumentationRegistry.getInstrumentation(),
+            AppDatabase::class.java.canonicalName,
+            FrameworkSQLiteOpenHelperFactory()
+    )
+
+
+    @Test
+    fun testAllMigrations() {
+        helper.createDatabase(TEST_DB, 8).close()
+
+        Room.databaseBuilder(
+            InstrumentationRegistry.getInstrumentation().targetContext,
+            AppDatabase::class.java,
+            TEST_DB
+        ).addMigrations(*AppDatabase.migrations).build().apply {
+            openHelper.writableDatabase
+            close()
+        }
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/model/CollectionInfoTest.java

@@ -1,117 +0,0 @@
-/*
- * Copyright © Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid.model;
-
-import android.content.ContentValues;
-
-import org.junit.Test;
-
-import java.io.IOException;
-
-import at.bitfire.dav4android.DavResource;
-import at.bitfire.dav4android.exception.DavException;
-import at.bitfire.dav4android.exception.HttpException;
-import at.bitfire.dav4android.property.ResourceType;
-import at.bitfire.davdroid.HttpClient;
-import at.bitfire.davdroid.model.ServiceDB.Collections;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-public class CollectionInfoTest {
-
-    MockWebServer server = new MockWebServer();
-
-    @Test
-    public void testFromDavResource() throws IOException, HttpException, DavException {
-        // r/w address book
-        server.enqueue(new MockResponse()
-                .setResponseCode(207)
-                .setBody("<multistatus xmlns='DAV:' xmlns:CARD='urn:ietf:params:xml:ns:carddav'>" +
-                        "<response>" +
-                        "   <href>/</href>" +
-                        "   <propstat><prop>" +
-                        "       <resourcetype><collection/><CARD:addressbook/></resourcetype>" +
-                        "       <displayname>My Contacts</displayname>" +
-                        "       <CARD:addressbook-description>My Contacts Description</CARD:addressbook-description>" +
-                        "   </prop></propstat>" +
-                        "</response>" +
-                        "</multistatus>"));
-
-        DavResource dav = new DavResource(HttpClient.create(null), server.url("/"));
-        dav.propfind(0, ResourceType.NAME);
-        CollectionInfo info = new CollectionInfo(dav);
-        assertEquals(CollectionInfo.Type.ADDRESS_BOOK, info.getType());
-        assertFalse(info.getReadOnly());
-        assertEquals("My Contacts", info.getDisplayName());
-        assertEquals("My Contacts Description", info.getDescription());
-
-        // read-only calendar, no display name
-        server.enqueue(new MockResponse()
-                .setResponseCode(207)
-                .setBody("<multistatus xmlns='DAV:' xmlns:CAL='urn:ietf:params:xml:ns:caldav' xmlns:ICAL='http://apple.com/ns/ical/'>" +
-                        "<response>" +
-                        "   <href>/</href>" +
-                        "   <propstat><prop>" +
-                        "       <resourcetype><collection/><CAL:calendar/></resourcetype>" +
-                        "       <current-user-privilege-set><privilege><read/></privilege></current-user-privilege-set>" +
-                        "       <CAL:calendar-description>My Calendar</CAL:calendar-description>" +
-                        "       <CAL:calendar-timezone>tzdata</CAL:calendar-timezone>" +
-                        "       <ICAL:calendar-color>#ff0000</ICAL:calendar-color>" +
-                        "   </prop></propstat>" +
-                        "</response>" +
-                        "</multistatus>"));
-
-        dav = new DavResource(HttpClient.create(null), server.url("/"));
-        dav.propfind(0, ResourceType.NAME);
-        info = new CollectionInfo(dav);
-        assertEquals(CollectionInfo.Type.CALENDAR, info.getType());
-        assertTrue(info.getReadOnly());
-        assertNull(info.getDisplayName());
-        assertEquals("My Calendar", info.getDescription());
-        assertEquals(0xFFFF0000, (int)info.getColor());
-        assertEquals("tzdata", info.getTimeZone());
-        assertTrue(info.getSupportsVEVENT());
-        assertTrue(info.getSupportsVTODO());
-    }
-
-    @Test
-    public void testFromDB() {
-        ContentValues values = new ContentValues();
-        values.put(Collections.ID, 1);
-        values.put(Collections.SERVICE_ID, 1);
-        values.put(Collections.URL, "http://example.com");
-        values.put(Collections.READ_ONLY, 1);
-        values.put(Collections.DISPLAY_NAME, "display name");
-        values.put(Collections.DESCRIPTION, "description");
-        values.put(Collections.COLOR, 0xFFFF0000);
-        values.put(Collections.TIME_ZONE, "tzdata");
-        values.put(Collections.SUPPORTS_VEVENT, 1);
-        values.put(Collections.SUPPORTS_VTODO, 1);
-        values.put(Collections.SYNC, 1);
-
-        CollectionInfo info = new CollectionInfo(values);
-        assertEquals(1, (long)info.getId());
-        assertEquals(1, (long)info.getServiceID());
-        assertEquals("http://example.com", info.getUrl());
-        assertTrue(info.getReadOnly());
-        assertEquals("display name", info.getDisplayName());
-        assertEquals("description", info.getDescription());
-        assertEquals(0xFFFF0000, (int)info.getColor());
-        assertEquals("tzdata", info.getTimeZone());
-        assertTrue(info.getSupportsVEVENT());
-        assertTrue(info.getSupportsVTODO());
-        assertTrue(info.getSelected());
-    }
-
-}

app/src/androidTest/java/at/bitfire/davdroid/model/CollectionTest.kt

@@ -0,0 +1,134 @@
+/*
+ * Copyright © Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.model
+
+import androidx.test.filters.SmallTest
+import at.bitfire.dav4jvm.DavResource
+import at.bitfire.dav4jvm.property.ResourceType
+import at.bitfire.davdroid.HttpClient
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+
+class CollectionTest {
+
+    private lateinit var httpClient: HttpClient
+    private val server = MockWebServer()
+
+    @Before
+    fun setUp() {
+        httpClient = HttpClient.Builder().build()
+    }
+
+    @After
+    fun shutDown() {
+        httpClient.close()
+    }
+
+
+    @Test
+    @SmallTest
+    fun testFromDavResponseAddressBook() {
+        // r/w address book
+        server.enqueue(MockResponse()
+                .setResponseCode(207)
+                .setBody("<multistatus xmlns='DAV:' xmlns:CARD='urn:ietf:params:xml:ns:carddav'>" +
+                        "<response>" +
+                        "   <href>/</href>" +
+                        "   <propstat><prop>" +
+                        "       <resourcetype><collection/><CARD:addressbook/></resourcetype>" +
+                        "       <displayname>My Contacts</displayname>" +
+                        "       <CARD:addressbook-description>My Contacts Description</CARD:addressbook-description>" +
+                        "   </prop></propstat>" +
+                        "</response>" +
+                        "</multistatus>"))
+
+        lateinit var info: Collection
+        DavResource(httpClient.okHttpClient, server.url("/"))
+                .propfind(0, ResourceType.NAME) { response, _ ->
+            info = Collection.fromDavResponse(response) ?: throw IllegalArgumentException()
+        }
+        assertEquals(Collection.TYPE_ADDRESSBOOK, info.type)
+        assertTrue(info.privWriteContent)
+        assertTrue(info.privUnbind)
+        assertNull(info.supportsVEVENT)
+        assertNull(info.supportsVTODO)
+        assertNull(info.supportsVJOURNAL)
+        assertEquals("My Contacts", info.displayName)
+        assertEquals("My Contacts Description", info.description)
+    }
+
+    @Test
+    @SmallTest
+    fun testFromDavResponseCalendar() {
+        // read-only calendar, no display name
+        server.enqueue(MockResponse()
+                .setResponseCode(207)
+                .setBody("<multistatus xmlns='DAV:' xmlns:CAL='urn:ietf:params:xml:ns:caldav' xmlns:ICAL='http://apple.com/ns/ical/'>" +
+                        "<response>" +
+                        "   <href>/</href>" +
+                        "   <propstat><prop>" +
+                        "       <resourcetype><collection/><CAL:calendar/></resourcetype>" +
+                        "       <current-user-privilege-set><privilege><read/></privilege></current-user-privilege-set>" +
+                        "       <CAL:calendar-description>My Calendar</CAL:calendar-description>" +
+                        "       <CAL:calendar-timezone>tzdata</CAL:calendar-timezone>" +
+                        "       <ICAL:calendar-color>#ff0000</ICAL:calendar-color>" +
+                        "   </prop></propstat>" +
+                        "</response>" +
+                        "</multistatus>"))
+
+        lateinit var info: Collection
+        DavResource(httpClient.okHttpClient, server.url("/"))
+                .propfind(0, ResourceType.NAME) { response, _ ->
+                    info = Collection.fromDavResponse(response) ?: throw IllegalArgumentException()
+                }
+        assertEquals(Collection.TYPE_CALENDAR, info.type)
+        assertFalse(info.privWriteContent)
+        assertFalse(info.privUnbind)
+        assertNull(info.displayName)
+        assertEquals("My Calendar", info.description)
+        assertEquals(0xFFFF0000.toInt(), info.color)
+        assertEquals("tzdata", info.timezone)
+        assertTrue(info.supportsVEVENT!!)
+        assertTrue(info.supportsVTODO!!)
+        assertTrue(info.supportsVJOURNAL!!)
+    }
+
+    @Test
+    @SmallTest
+    fun testFromDavResponseWebcal() {
+        // Webcal subscription
+        server.enqueue(MockResponse()
+                .setResponseCode(207)
+                .setBody("<multistatus xmlns='DAV:' xmlns:CS='http://calendarserver.org/ns/'>" +
+                        "<response>" +
+                        "   <href>/webcal1</href>" +
+                        "   <propstat><prop>" +
+                        "       <displayname>Sample Subscription</displayname>" +
+                        "       <resourcetype><collection/><CS:subscribed/></resourcetype>" +
+                        "       <CS:source><href>webcals://example.com/1.ics</href></CS:source>" +
+                        "   </prop></propstat>" +
+                        "</response>" +
+                        "</multistatus>"))
+
+        lateinit var info: Collection
+        DavResource(httpClient.okHttpClient, server.url("/"))
+                .propfind(0, ResourceType.NAME) { response, _ ->
+                    info = Collection.fromDavResponse(response) ?: throw IllegalArgumentException()
+                }
+        assertEquals(Collection.TYPE_WEBCAL, info.type)
+        assertEquals("Sample Subscription", info.displayName)
+        assertEquals("https://example.com/1.ics".toHttpUrl(), info.source)
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/model/DaoToolsTest.kt

@@ -0,0 +1,64 @@
+package at.bitfire.davdroid.model
+
+import androidx.room.Room
+import androidx.test.platform.app.InstrumentationRegistry
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+
+class DaoToolsTest {
+
+    private lateinit var db: AppDatabase
+
+    @Before
+    fun createDb() {
+        val context = InstrumentationRegistry.getInstrumentation().context
+        db = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java).build()
+    }
+
+    @After
+    fun closeDb() {
+        db.close()
+    }
+
+    @Test
+    fun testSyncAll() {
+        val serviceDao = db.serviceDao()
+        val service = Service(id=0, accountName="test", type=Service.TYPE_CALDAV, principal = null)
+        service.id = serviceDao.insertOrReplace(service)
+
+        val homeSetDao = db.homeSetDao()
+        val entry1 = HomeSet(id=1, serviceId=service.id, personal=true, url= "https://example.com/1".toHttpUrl())
+        val entry3 = HomeSet(id=3, serviceId=service.id, personal=true, url= "https://example.com/3".toHttpUrl())
+        val oldItems = listOf(
+                entry1,
+                HomeSet(id=2, serviceId=service.id, personal=true, url= "https://example.com/2".toHttpUrl()),
+                entry3
+        )
+        homeSetDao.insert(oldItems)
+
+        val newItems = mutableMapOf<HttpUrl, HomeSet>()
+        newItems[entry1.url] = entry1
+
+        // no id, because identity is given by the url
+        val updated = HomeSet(id=0, serviceId=service.id, personal=true,
+                url= "https://example.com/2".toHttpUrl(), displayName="Updated Entry")
+        newItems[updated.url] = updated
+
+        val created = HomeSet(id=4, serviceId=service.id, personal=true, url= "https://example.com/4".toHttpUrl())
+        newItems[created.url] = created
+
+        DaoTools(homeSetDao).syncAll(oldItems, newItems, { it.url })
+
+        val afterSync = homeSetDao.getByService(service.id)
+        assertEquals(afterSync.size, 3)
+        assertFalse(afterSync.contains(entry3))
+        assertTrue(afterSync.contains(entry1))
+        assertTrue(afterSync.contains(updated))
+        assertTrue(afterSync.contains(created))
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/settings/AccountSettingsTest.kt

@@ -0,0 +1,72 @@
+package at.bitfire.davdroid.settings
+
+import android.accounts.Account
+import android.accounts.AccountManager
+import android.content.ContentResolver
+import android.os.Build
+import android.provider.CalendarContract
+import android.provider.ContactsContract
+import androidx.test.platform.app.InstrumentationRegistry
+import at.bitfire.davdroid.R
+import at.bitfire.davdroid.model.Credentials
+import at.bitfire.davdroid.syncadapter.AccountUtils
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+import java.util.concurrent.TimeUnit
+
+class AccountSettingsTest {
+
+    val context = InstrumentationRegistry.getInstrumentation().targetContext
+
+    val account = Account("Test Account", context.getString(R.string.account_type))
+    val fakeCredentials = Credentials("test", "test")
+
+
+    @Before
+    fun prepareAccount() {
+        assertTrue(AccountUtils.createAccount(context, account, AccountSettings.initialUserData(fakeCredentials)))
+        ContentResolver.setIsSyncable(account, CalendarContract.AUTHORITY, 1)
+        ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 0)
+    }
+
+    @After
+    fun removeAccount() {
+        val futureResult = AccountManager.get(context).removeAccount(account, {}, null)
+        assertTrue(futureResult.getResult(10, TimeUnit.SECONDS))
+    }
+
+
+    @Test
+    fun testSyncIntervals() {
+        val settings = AccountSettings(context, account)
+        val presetIntervals = context.resources.getStringArray(R.array.settings_sync_interval_seconds)
+                .map { it.toLong() }
+                .filter { it != AccountSettings.SYNC_INTERVAL_MANUALLY }
+        for (interval in presetIntervals) {
+            assertTrue(settings.setSyncInterval(CalendarContract.AUTHORITY, interval))
+            assertEquals(interval, settings.getSyncInterval(CalendarContract.AUTHORITY))
+        }
+    }
+
+    @Test
+    fun testSyncIntervals_IsNotSyncable() {
+        val settings = AccountSettings(context, account)
+        val interval = 15*60L    // 15 min
+        val result = settings.setSyncInterval(ContactsContract.AUTHORITY, interval)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)     // below Android 7, Android returns true for whatever reason
+            assertFalse(result)
+    }
+
+    @Test
+    fun testSyncIntervals_TooShort() {
+        val settings = AccountSettings(context, account)
+        val interval = 60L      // 1 min is not supported by Android
+        val result = settings.setSyncInterval(CalendarContract.AUTHORITY, interval)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)     // below Android 7, Android returns true for whatever reason
+            assertFalse(result)
+    }
+
+
+}

app/src/androidTest/java/at/bitfire/davdroid/settings/SettingsManagerTest.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright © Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.settings
+
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class SettingsManagerTest {
+
+    val settingsManager by lazy { SettingsManager.getInstance(InstrumentationRegistry.getInstrumentation().targetContext) }
+
+    @Test
+    fun testContainsKey() {
+        assertFalse(settingsManager.containsKey("notExisting"))
+
+        // provided by DefaultsProvider
+        assertTrue(settingsManager.containsKey(Settings.OVERRIDE_PROXY))
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt

@@ -0,0 +1,36 @@
+package at.bitfire.davdroid.syncadapter
+
+import android.accounts.Account
+import android.accounts.AccountManager
+import android.os.Bundle
+import androidx.test.platform.app.InstrumentationRegistry
+import at.bitfire.davdroid.R
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import java.util.concurrent.TimeUnit
+
+class AccountUtilsTest {
+
+    val context = InstrumentationRegistry.getInstrumentation().targetContext
+    val account = Account("Test Account", context.getString(R.string.account_type))
+
+    @Test
+    fun testCreateAccount() {
+        val userData = Bundle(2)
+        userData.putString("int", "1")
+        userData.putString("string", "abc/\"-")
+        try {
+            assertTrue(AccountUtils.createAccount(context, account, userData))
+
+            // validate user data
+            val manager = AccountManager.get(context)
+            assertEquals("1", manager.getUserData(account, "int"))
+            assertEquals("abc/\"-", manager.getUserData(account, "string"))
+        } finally {
+            val futureResult = AccountManager.get(context).removeAccount(account, {}, null)
+            assertTrue(futureResult.getResult(10, TimeUnit.SECONDS))
+        }
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/syncadapter/LocalTestCollection.kt

@@ -0,0 +1,38 @@
+package at.bitfire.davdroid.syncadapter
+
+import at.bitfire.davdroid.model.SyncState
+import at.bitfire.davdroid.resource.LocalCollection
+
+class LocalTestCollection: LocalCollection<LocalTestResource> {
+
+    override val tag = "LocalTestCollection"
+    override val title = "Local Test Collection"
+
+    override var lastSyncState: SyncState? = null
+
+    val entries = mutableListOf<LocalTestResource>()
+
+    override fun findDeleted() = entries.filter { it.deleted }
+    override fun findDirty() = entries.filter { it.dirty }
+
+    override fun findByName(name: String) = entries.filter { it.fileName == name }.firstOrNull()
+
+    override fun markNotDirty(flags: Int): Int {
+        var updated = 0
+        for (dirty in findDirty()) {
+            dirty.flags = flags
+            updated++
+        }
+        return updated
+    }
+
+    override fun removeNotDirtyMarked(flags: Int): Int {
+        val numBefore = entries.size
+        entries.removeIf { !it.dirty && it.flags == flags }
+        return numBefore - entries.size
+    }
+
+    override fun forgetETags() {
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/syncadapter/LocalTestResource.kt

@@ -0,0 +1,43 @@
+package at.bitfire.davdroid.syncadapter
+
+import android.net.Uri
+import at.bitfire.davdroid.resource.LocalResource
+
+class LocalTestResource: LocalResource<Any> {
+
+    override val id: Long? = null
+    override var fileName: String? = null
+    override var eTag: String? = null
+    override var scheduleTag: String? = null
+    override var flags: Int = 0
+
+    var deleted = false
+    var dirty = false
+
+    override fun prepareForUpload() = "generated-file.txt"
+
+    override fun clearDirty(fileName: String?, eTag: String?, scheduleTag: String?) {
+        dirty = false
+        if (fileName != null)
+            this.fileName = fileName
+        this.eTag = eTag
+        this.scheduleTag = scheduleTag
+    }
+
+    override fun updateFlags(flags: Int) {
+        this.flags = flags
+    }
+
+    override fun add(): Uri {
+        TODO("Not yet implemented")
+    }
+
+    override fun update(data: Any): Uri {
+        TODO("Not yet implemented")
+    }
+
+    override fun delete(): Int {
+        TODO("Not yet implemented")
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/syncadapter/SyncAdapterServiceTest.kt

@@ -0,0 +1,31 @@
+package at.bitfire.davdroid.syncadapter
+
+import android.os.Bundle
+import androidx.test.filters.SmallTest
+import at.bitfire.davdroid.syncadapter.SyncAdapterService.SyncAdapter
+import org.junit.Assert.assertArrayEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class SyncAdapterServiceTest {
+
+    @Test
+    @SmallTest
+    fun testPriorityCollections() {
+        val extras = Bundle()
+        assertTrue(SyncAdapter.priorityCollections(extras).isEmpty())
+
+        extras.putString(SyncAdapterService.SYNC_EXTRAS_PRIORITY_COLLECTIONS, "")
+        assertTrue(SyncAdapter.priorityCollections(extras).isEmpty())
+
+        extras.putString(SyncAdapterService.SYNC_EXTRAS_PRIORITY_COLLECTIONS, "123")
+        assertArrayEquals(longArrayOf(123), SyncAdapter.priorityCollections(extras).toLongArray())
+
+        extras.putString(SyncAdapterService.SYNC_EXTRAS_PRIORITY_COLLECTIONS, ",x,")
+        assertTrue(SyncAdapter.priorityCollections(extras).isEmpty())
+
+        extras.putString(SyncAdapterService.SYNC_EXTRAS_PRIORITY_COLLECTIONS, "1,2,3")
+        assertArrayEquals(longArrayOf(1,2,3), SyncAdapter.priorityCollections(extras).toLongArray())
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt

@@ -0,0 +1,437 @@
+package at.bitfire.davdroid.syncadapter
+
+import android.accounts.Account
+import android.accounts.AccountManager
+import android.content.SyncResult
+import android.os.Bundle
+import androidx.core.app.NotificationManagerCompat
+import androidx.test.platform.app.InstrumentationRegistry
+import at.bitfire.dav4jvm.PropStat
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.Response.HrefRelation
+import at.bitfire.dav4jvm.property.GetETag
+import at.bitfire.davdroid.R
+import at.bitfire.davdroid.model.Credentials
+import at.bitfire.davdroid.model.SyncState
+import at.bitfire.davdroid.settings.AccountSettings
+import okhttp3.Protocol
+import okhttp3.internal.http.StatusLine
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.*
+import org.junit.Assert.*
+import java.util.concurrent.TimeUnit
+
+class SyncManagerTest {
+
+    companion object {
+
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        val account = Account("SyncManagerTest", context.getString(R.string.account_type))
+
+        @BeforeClass
+        @JvmStatic
+        fun createAccount() {
+            assertTrue(AccountManager.get(context).addAccountExplicitly(account, "test", AccountSettings.initialUserData(Credentials("test", "test"))))
+        }
+
+        @AfterClass
+        @JvmStatic
+        fun removeAccount() {
+            assertTrue(AccountManager.get(context).removeAccount(account, null, null).getResult(10, TimeUnit.SECONDS))
+
+            // clear annoying syncError notifications
+            NotificationManagerCompat.from(context).cancelAll()
+        }
+
+    }
+
+    val server = MockWebServer()
+
+    private fun syncManager(collection: LocalTestCollection) =
+            TestSyncManager(
+                    context,
+                    account,
+                    Bundle(),
+                    "TestAuthority",
+                    SyncResult(),
+                    collection,
+                    server
+            )
+
+    @Before
+    fun startServer() {
+        server.start()
+    }
+
+    @After
+    fun stopServer() {
+        server.close()
+    }
+
+
+    private fun queryCapabilitiesResponse(cTag: String? = null): MockResponse {
+        val body = StringBuilder()
+        body.append("<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n" +
+                "<multistatus xmlns=\"DAV:\" xmlns:CALDAV=\"http://calendarserver.org/ns/\">\n" +
+                "  <response>\n" +
+                "    <href>/</href>\n" +
+                "    <propstat>\n" +
+                "      <prop>\n")
+        if (cTag != null)
+                body.append("<CALDAV:getctag>$cTag</CALDAV:getctag>\n")
+        body.append(
+                "      </prop>\n" +
+                "    </propstat>\n" +
+                "  </response>\n" +
+                "</multistatus>")
+        val response = MockResponse()
+                .setResponseCode(207)
+                .setHeader("Content-Type", "text/xml")
+                .setBody(body.toString())
+        return response
+    }
+
+    @Test
+    fun testPerformSync_FirstSync_Empty() {
+        val collection = LocalTestCollection() /* no last known ctag */
+        server.enqueue(queryCapabilitiesResponse())
+
+        val syncManager = syncManager(collection)
+        syncManager.performSync()
+
+        assertFalse(syncManager.didGenerateUpload)
+        assertTrue(syncManager.didListAllRemote)
+        assertFalse(syncManager.didDownloadRemote)
+        assertFalse(syncManager.syncResult.hasError())
+        assertTrue(collection.entries.isEmpty())
+    }
+
+    @Test
+    fun testPerformSync_UploadNewMember_ETagOnPut() {
+        val collection = LocalTestCollection().apply {
+            lastSyncState = SyncState(SyncState.Type.CTAG, "old-ctag")
+            entries += LocalTestResource().apply {
+                dirty = true
+            }
+        }
+        server.enqueue(queryCapabilitiesResponse("ctag1"))
+
+        // PUT -> 204 No Content
+        server.enqueue(MockResponse()
+                .setResponseCode(204)
+                .setHeader("ETag", "etag-from-put"))
+
+        // modifications sent, so DAVx5 will query CTag again
+        server.enqueue(queryCapabilitiesResponse("ctag2"))
+
+        val syncManager = syncManager(collection).apply {
+            listAllRemoteResult = listOf(
+                    Pair(Response(
+                            server.url("/"),
+                            server.url("/generated-file.txt"),
+                            null,
+                            listOf(PropStat(
+                                    listOf(
+                                            GetETag("\"etag-from-put\"")
+                                    ),
+                                    StatusLine(Protocol.HTTP_1_1, 200, "OK")
+                            )
+                            )), HrefRelation.MEMBER)
+            )
+        }
+        syncManager.performSync()
+
+        assertTrue(syncManager.didGenerateUpload)
+        assertTrue(syncManager.didListAllRemote)
+        assertFalse(syncManager.didDownloadRemote)
+        assertFalse(syncManager.syncResult.hasError())
+        assertEquals(1, collection.entries.size)
+        assertEquals("etag-from-put", collection.entries.first().eTag)
+    }
+
+    @Test
+    fun testPerformSync_UploadModifiedMember_ETagOnPut() {
+        val collection = LocalTestCollection().apply {
+            lastSyncState = SyncState(SyncState.Type.CTAG, "old-ctag")
+            entries += LocalTestResource().apply {
+                fileName = "existing-file.txt"
+                eTag = "old-etag-like-on-server"
+                dirty = true
+            }
+        }
+        server.enqueue(queryCapabilitiesResponse("ctag1"))
+
+        // PUT -> 204 No Content
+        server.enqueue(MockResponse()
+                .setResponseCode(204)
+                .addHeader("ETag", "etag-from-put"))
+
+        // modifications sent, so DAVx5 will query CTag again
+        server.enqueue(queryCapabilitiesResponse("ctag2"))
+
+        val syncManager = syncManager(collection).apply {
+            listAllRemoteResult = listOf(
+                    Pair(Response(
+                            server.url("/"),
+                            server.url("/existing-file.txt"),
+                            null,
+                            listOf(PropStat(
+                                    listOf(
+                                            GetETag("etag-from-put")
+                                    ),
+                                    StatusLine(Protocol.HTTP_1_1, 200, "OK")
+                            )
+                            )), HrefRelation.MEMBER)
+            )
+
+            assertDownloadRemote = mapOf(Pair(server.url("/existing-file.txt"), "etag-from-put"))
+        }
+        syncManager.performSync()
+
+        assertTrue(syncManager.didGenerateUpload)
+        assertTrue(syncManager.didListAllRemote)
+        assertFalse(syncManager.didDownloadRemote)
+        assertFalse(syncManager.syncResult.hasError())
+        assertEquals(1, collection.entries.size)
+        assertEquals("etag-from-put", collection.entries.first().eTag)
+    }
+
+    @Test
+    fun testPerformSync_UploadModifiedMember_NoETagOnPut() {
+        val collection = LocalTestCollection().apply {
+            lastSyncState = SyncState(SyncState.Type.CTAG, "old-ctag")
+            entries += LocalTestResource().apply {
+                fileName = "existing-file.txt"
+                eTag = "old-etag-like-on-server"
+                dirty = true
+            }
+        }
+        server.enqueue(queryCapabilitiesResponse("ctag1"))
+
+        // PUT -> 204 No Content
+        server.enqueue(MockResponse().setResponseCode(204))
+
+        // modifications sent, so DAVx5 will query CTag again
+        server.enqueue(queryCapabilitiesResponse("ctag2"))
+
+        val syncManager = syncManager(collection).apply {
+            listAllRemoteResult = listOf(
+                    Pair(Response(
+                            server.url("/"),
+                            server.url("/existing-file.txt"),
+                            null,
+                            listOf(PropStat(
+                                    listOf(
+                                            GetETag("etag-from-propfind")
+                                    ),
+                                    StatusLine(Protocol.HTTP_1_1, 200, "OK")
+                            )
+                            )), HrefRelation.MEMBER)
+            )
+
+            assertDownloadRemote = mapOf(Pair(server.url("/existing-file.txt"), "etag-from-propfind"))
+        }
+        syncManager.performSync()
+
+        assertTrue(syncManager.didGenerateUpload)
+        assertTrue(syncManager.didListAllRemote)
+        assertTrue(syncManager.didDownloadRemote)
+        assertFalse(syncManager.syncResult.hasError())
+        assertEquals(1, collection.entries.size)
+        assertEquals("etag-from-propfind", collection.entries.first().eTag)
+    }
+
+    @Test
+    fun testPerformSync_UploadModifiedMember_412PreconditionFailed() {
+        val collection = LocalTestCollection().apply {
+            lastSyncState = SyncState(SyncState.Type.CTAG, "old-ctag")
+            entries += LocalTestResource().apply {
+                fileName = "existing-file.txt"
+                eTag = "etag-that-has-been-changed-on-server-in-the-meanwhile"
+                dirty = true
+            }
+        }
+        server.enqueue(queryCapabilitiesResponse("ctag1"))
+
+        // PUT -> 412 Precondition Failed
+        server.enqueue(MockResponse()
+                .setResponseCode(412))
+
+        // modifications sent, so DAVx5 will query CTag again
+        server.enqueue(queryCapabilitiesResponse("ctag1"))
+
+        val syncManager = syncManager(collection).apply {
+            listAllRemoteResult = listOf(
+                    Pair(Response(
+                            server.url("/"),
+                            server.url("/existing-file.txt"),
+                            null,
+                            listOf(PropStat(
+                                    listOf(
+                                            GetETag("changed-etag-from-server")
+                                    ),
+                                    StatusLine(Protocol.HTTP_1_1, 200, "OK")
+                            )
+                            )), HrefRelation.MEMBER)
+            )
+
+            assertDownloadRemote = mapOf(Pair(server.url("/existing-file.txt"), "changed-etag-from-server"))
+        }
+        syncManager.performSync()
+
+        assertTrue(syncManager.didGenerateUpload)
+        assertTrue(syncManager.didListAllRemote)
+        assertTrue(syncManager.didDownloadRemote)
+        assertFalse(syncManager.syncResult.hasError())
+        assertEquals(1, collection.entries.size)
+        assertEquals("changed-etag-from-server", collection.entries.first().eTag)
+    }
+
+    @Test
+    fun testPerformSync_NoopOnMemberWithSameETag() {
+        val collection = LocalTestCollection().apply {
+            lastSyncState = SyncState(SyncState.Type.CTAG, "ctag1")
+            entries += LocalTestResource().apply {
+                fileName = "downloaded-member.txt"
+                eTag = "MemberETag1"
+            }
+        }
+        server.enqueue(queryCapabilitiesResponse("ctag2"))
+
+        val syncManager = syncManager(collection).apply {
+            listAllRemoteResult = listOf(
+                    Pair(Response(
+                            server.url("/"),
+                            server.url("/downloaded-member.txt"),
+                            null,
+                            listOf(PropStat(
+                                    listOf(
+                                            GetETag("\"MemberETag1\"")
+                                    ),
+                                    StatusLine(Protocol.HTTP_1_1, 200, "OK")
+                            )
+                            )), HrefRelation.MEMBER)
+            )
+
+        }
+        syncManager.performSync()
+
+        assertFalse(syncManager.didGenerateUpload)
+        assertTrue(syncManager.didListAllRemote)
+        assertFalse(syncManager.didDownloadRemote)
+        assertFalse(syncManager.syncResult.hasError())
+        assertEquals(1, collection.entries.size)
+        assertEquals("MemberETag1", collection.entries.first().eTag)
+    }
+
+    @Test
+    fun testPerformSync_DownloadNewMember() {
+        val collection = LocalTestCollection().apply {
+            lastSyncState = SyncState(SyncState.Type.CTAG, "old-ctag")
+        }
+        server.enqueue(queryCapabilitiesResponse(cTag = "new-ctag"))
+
+        val syncManager = syncManager(collection).apply {
+            listAllRemoteResult = listOf(
+                    Pair(Response(
+                            server.url("/"),
+                            server.url("/new-member.txt"),
+                            null,
+                            listOf(PropStat(
+                                    listOf(
+                                            GetETag("\"NewMemberETag1\"")
+                                    ),
+                                    StatusLine(Protocol.HTTP_1_1, 200, "OK")
+                            )
+                    )), HrefRelation.MEMBER)
+            )
+
+            assertDownloadRemote = mapOf(Pair(server.url("/new-member.txt"), "NewMemberETag1"))
+        }
+        syncManager.performSync()
+
+        assertFalse(syncManager.didGenerateUpload)
+        assertTrue(syncManager.didListAllRemote)
+        assertTrue(syncManager.didDownloadRemote)
+        assertFalse(syncManager.syncResult.hasError())
+        assertEquals(1, collection.entries.size)
+        assertEquals("NewMemberETag1", collection.entries.first().eTag)
+    }
+
+    @Test
+    fun testPerformSync_DownloadUpdatedMember() {
+        val collection = LocalTestCollection().apply {
+            lastSyncState = SyncState(SyncState.Type.CTAG, "old-ctag")
+            entries += LocalTestResource().apply {
+                fileName = "downloaded-member.txt"
+                eTag = "MemberETag1"
+            }
+        }
+        server.enqueue(queryCapabilitiesResponse(cTag = "new-ctag"))
+
+        val syncManager = syncManager(collection).apply {
+            listAllRemoteResult = listOf(
+                    Pair(Response(
+                            server.url("/"),
+                            server.url("/downloaded-member.txt"),
+                            null,
+                            listOf(PropStat(
+                                    listOf(
+                                            GetETag("\"MemberETag2\"")
+                                    ),
+                                    StatusLine(Protocol.HTTP_1_1, 200, "OK")
+                            )
+                            )), HrefRelation.MEMBER)
+            )
+
+            assertDownloadRemote = mapOf(Pair(server.url("/downloaded-member.txt"), "MemberETag2"))
+        }
+        syncManager.performSync()
+
+        assertFalse(syncManager.didGenerateUpload)
+        assertTrue(syncManager.didListAllRemote)
+        assertTrue(syncManager.didDownloadRemote)
+        assertFalse(syncManager.syncResult.hasError())
+        assertEquals(1, collection.entries.size)
+        assertEquals("MemberETag2", collection.entries.first().eTag)
+    }
+
+    @Test
+    fun testPerformSync_RemoveVanishedMember() {
+        val collection = LocalTestCollection().apply {
+            lastSyncState = SyncState(SyncState.Type.CTAG, "old-ctag")
+            entries += LocalTestResource().apply {
+                fileName = "downloaded-member.txt"
+            }
+        }
+        server.enqueue(queryCapabilitiesResponse(cTag = "new-ctag"))
+
+        val syncManager = syncManager(collection)
+        syncManager.performSync()
+
+        assertFalse(syncManager.didGenerateUpload)
+        assertTrue(syncManager.didListAllRemote)
+        assertFalse(syncManager.didDownloadRemote)
+        assertFalse(syncManager.syncResult.hasError())
+        assertTrue(collection.entries.isEmpty())
+    }
+
+    @Test
+    fun testPerformSync_CTagDidntChange() {
+        val collection = LocalTestCollection().apply {
+            lastSyncState = SyncState(SyncState.Type.CTAG, "ctag1")
+        }
+        server.enqueue(queryCapabilitiesResponse("ctag1"))
+
+        val syncManager = syncManager(collection)
+        syncManager.performSync()
+
+        assertFalse(syncManager.didGenerateUpload)
+        assertFalse(syncManager.didListAllRemote)
+        assertFalse(syncManager.didDownloadRemote)
+        assertFalse(syncManager.syncResult.hasError())
+        assertTrue(collection.entries.isEmpty())
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/syncadapter/TestSyncManager.kt

@@ -0,0 +1,100 @@
+package at.bitfire.davdroid.syncadapter
+
+import android.accounts.Account
+import android.content.Context
+import android.content.SyncResult
+import android.os.Bundle
+import at.bitfire.dav4jvm.DavCollection
+import at.bitfire.dav4jvm.DavResponseCallback
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.property.GetCTag
+import at.bitfire.davdroid.DavUtils
+import at.bitfire.davdroid.model.SyncState
+import at.bitfire.davdroid.resource.LocalResource
+import at.bitfire.davdroid.settings.AccountSettings
+import okhttp3.HttpUrl
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.Assert.assertEquals
+
+class TestSyncManager(
+        context: Context,
+        account: Account,
+        extras: Bundle,
+        authority: String,
+        syncResult: SyncResult,
+        localCollection: LocalTestCollection,
+        val mockWebServer: MockWebServer
+): SyncManager<LocalTestResource, LocalTestCollection, DavCollection>(context, account, AccountSettings(context, account), extras, authority, syncResult, localCollection) {
+
+    override fun prepare(): Boolean {
+        collectionURL = mockWebServer.url("/")
+        davCollection = DavCollection(httpClient.okHttpClient, collectionURL)
+        return true
+    }
+
+    var didQueryCapabilities = false
+    override fun queryCapabilities(): SyncState? {
+        if (didQueryCapabilities)
+            throw IllegalStateException("queryCapabilities() must not be called twice")
+        didQueryCapabilities = true
+
+        var cTag: SyncState? = null
+        davCollection.propfind(0, GetCTag.NAME) { response, rel ->
+            if (rel == Response.HrefRelation.SELF)
+                response[GetCTag::class.java]?.cTag?.let {
+                    cTag = SyncState(SyncState.Type.CTAG, it)
+                }
+        }
+
+        return cTag
+    }
+
+    var didGenerateUpload = false
+    override fun generateUpload(resource: LocalTestResource): RequestBody {
+        didGenerateUpload = true
+        return resource.toString().toRequestBody()
+    }
+
+    override fun syncAlgorithm() = SyncAlgorithm.PROPFIND_REPORT
+
+    var listAllRemoteResult = emptyList<Pair<Response, Response.HrefRelation>>()
+    var didListAllRemote = false
+    override fun listAllRemote(callback: DavResponseCallback) {
+        if (didListAllRemote)
+            throw IllegalStateException("listAllRemote() must not be called twice")
+        didListAllRemote = true
+        for (result in listAllRemoteResult)
+            callback(result.first, result.second)
+    }
+
+    var assertDownloadRemote = emptyMap<HttpUrl, String>()
+    var didDownloadRemote = false
+    override fun downloadRemote(bunch: List<HttpUrl>) {
+        didDownloadRemote = true
+        assertEquals(assertDownloadRemote.keys.toList(), bunch)
+
+        for ((url, eTag) in assertDownloadRemote) {
+            val fileName = DavUtils.lastSegmentOfUrl(url)
+            var localEntry = localCollection.entries.filter { it.fileName == fileName }.firstOrNull()
+            if (localEntry == null) {
+                val newEntry = LocalTestResource().also {
+                    it.fileName = fileName
+                }
+                localCollection.entries += newEntry
+                localEntry = newEntry
+            }
+            localEntry.eTag = eTag
+            localEntry.flags = LocalResource.FLAG_REMOTELY_PRESENT
+        }
+    }
+
+    override fun postProcess() {
+    }
+
+    override fun notifyInvalidResourceTitle(): String {
+        TODO("Not yet implemented")
+    }
+
+}

app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.java

@@ -1,200 +0,0 @@
-/*
- * Copyright © Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid.ui.setup;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.net.URI;
-
-import at.bitfire.dav4android.DavResource;
-import at.bitfire.dav4android.exception.DavException;
-import at.bitfire.dav4android.exception.HttpException;
-import at.bitfire.dav4android.property.AddressbookHomeSet;
-import at.bitfire.dav4android.property.ResourceType;
-import at.bitfire.davdroid.HttpClient;
-import at.bitfire.davdroid.log.Logger;
-import at.bitfire.davdroid.ui.setup.DavResourceFinder.Configuration.ServiceInfo;
-import okhttp3.OkHttpClient;
-import okhttp3.mockwebserver.Dispatcher;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
-
-import static android.support.test.InstrumentationRegistry.getTargetContext;
-import static junit.framework.TestCase.assertFalse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-public class DavResourceFinderTest {
-
-    MockWebServer server = new MockWebServer();
-
-    DavResourceFinder finder;
-    OkHttpClient client;
-    LoginCredentials credentials;
-
-    private static final String
-            PATH_NO_DAV = "/nodav",
-
-            PATH_CALDAV = "/caldav",
-            PATH_CARDDAV = "/carddav",
-            PATH_CALDAV_AND_CARDDAV = "/both-caldav-carddav",
-
-            SUBPATH_PRINCIPAL = "/principal",
-            SUBPATH_ADDRESSBOOK_HOMESET = "/addressbooks",
-            SUBPATH_ADDRESSBOOK = "/addressbooks/private-contacts";
-
-    @Before
-    public void initServerAndClient() throws Exception {
-        server.setDispatcher(new TestDispatcher());
-        server.start();
-
-        credentials = new LoginCredentials(URI.create("/"), "mock", "12345");
-        finder = new DavResourceFinder(getTargetContext(), credentials);
-
-        client = HttpClient.create(null);
-        client = HttpClient.addAuthentication(client, credentials.getUserName(), credentials.getPassword());
-    }
-
-    @After
-    public void stopServer() throws Exception {
-        server.shutdown();
-    }
-
-    @Test
-    public void testRememberIfAddressBookOrHomeset() throws IOException, HttpException, DavException {
-        ServiceInfo info;
-
-        // before dav.propfind(), no info is available
-        DavResource dav = new DavResource(client, server.url(PATH_CARDDAV + SUBPATH_PRINCIPAL));
-        finder.rememberIfAddressBookOrHomeset(dav, info = new ServiceInfo());
-        assertEquals(0, info.getCollections().size());
-        assertEquals(0, info.getHomeSets().size());
-
-        // recognize home set
-        dav.propfind(0, AddressbookHomeSet.NAME);
-        finder.rememberIfAddressBookOrHomeset(dav, info = new ServiceInfo());
-        assertEquals(0, info.getCollections().size());
-        assertEquals(1, info.getHomeSets().size());
-        assertEquals(server.url(PATH_CARDDAV + SUBPATH_ADDRESSBOOK_HOMESET + "/").uri(), info.getHomeSets().iterator().next());
-
-        // recognize address book
-        dav = new DavResource(client, server.url(PATH_CARDDAV + SUBPATH_ADDRESSBOOK));
-        dav.propfind(0, ResourceType.NAME);
-        finder.rememberIfAddressBookOrHomeset(dav, info = new ServiceInfo());
-        assertEquals(1, info.getCollections().size());
-        assertEquals(server.url(PATH_CARDDAV + SUBPATH_ADDRESSBOOK + "/").uri(), info.getCollections().keySet().iterator().next());
-        assertEquals(0, info.getHomeSets().size());
-    }
-
-    @Test
-    public void testProvidesService() throws IOException {
-        assertFalse(finder.providesService(server.url(PATH_NO_DAV), DavResourceFinder.Service.CALDAV));
-        assertFalse(finder.providesService(server.url(PATH_NO_DAV), DavResourceFinder.Service.CARDDAV));
-
-        assertTrue(finder.providesService(server.url(PATH_CALDAV), DavResourceFinder.Service.CALDAV));
-        assertFalse(finder.providesService(server.url(PATH_CALDAV), DavResourceFinder.Service.CARDDAV));
-
-        assertTrue(finder.providesService(server.url(PATH_CARDDAV), DavResourceFinder.Service.CARDDAV));
-        assertFalse(finder.providesService(server.url(PATH_CARDDAV), DavResourceFinder.Service.CALDAV));
-
-        assertTrue(finder.providesService(server.url(PATH_CALDAV_AND_CARDDAV), DavResourceFinder.Service.CALDAV));
-        assertTrue(finder.providesService(server.url(PATH_CALDAV_AND_CARDDAV), DavResourceFinder.Service.CARDDAV));
-    }
-
-    @Test
-    public void testGetCurrentUserPrincipal() throws IOException, HttpException, DavException {
-        assertNull(finder.getCurrentUserPrincipal(server.url(PATH_NO_DAV), DavResourceFinder.Service.CALDAV));
-        assertNull(finder.getCurrentUserPrincipal(server.url(PATH_NO_DAV), DavResourceFinder.Service.CARDDAV));
-
-        assertEquals(
-                server.url(PATH_CALDAV + SUBPATH_PRINCIPAL).uri(),
-                finder.getCurrentUserPrincipal(server.url(PATH_CALDAV), DavResourceFinder.Service.CALDAV)
-        );
-        assertNull(finder.getCurrentUserPrincipal(server.url(PATH_CALDAV), DavResourceFinder.Service.CARDDAV));
-
-        assertEquals(
-                server.url(PATH_CARDDAV + SUBPATH_PRINCIPAL).uri(),
-                finder.getCurrentUserPrincipal(server.url(PATH_CARDDAV), DavResourceFinder.Service.CARDDAV)
-        );
-        assertNull(finder.getCurrentUserPrincipal(server.url(PATH_CARDDAV), DavResourceFinder.Service.CALDAV));
-    }
-
-
-    // mock server
-
-    public class TestDispatcher extends Dispatcher {
-
-        @Override
-        public MockResponse dispatch(RecordedRequest rq) throws InterruptedException {
-            if (!checkAuth(rq)) {
-                MockResponse authenticate = new MockResponse().setResponseCode(401);
-                authenticate.setHeader("WWW-Authenticate", "Basic realm=\"test\"");
-                return authenticate;
-            }
-
-            String path = rq.getPath();
-
-            if ("OPTIONS".equalsIgnoreCase(rq.getMethod())) {
-                String dav = null;
-                if (path.startsWith(PATH_CALDAV))
-                    dav = "calendar-access";
-                else if (path.startsWith(PATH_CARDDAV))
-                    dav = "addressbook";
-                else if (path.startsWith(PATH_CALDAV_AND_CARDDAV))
-                    dav = "calendar-access, addressbook";
-                MockResponse response = new MockResponse().setResponseCode(200);
-                if (dav != null)
-                       response.addHeader("DAV", dav);
-                return response;
-
-            } else if ("PROPFIND".equalsIgnoreCase(rq.getMethod())) {
-                String props = null;
-                switch (path) {
-                    case PATH_CALDAV:
-                    case PATH_CARDDAV:
-                        props = "<current-user-principal><href>" + path + SUBPATH_PRINCIPAL + "</href></current-user-principal>";
-                        break;
-
-                    case PATH_CARDDAV + SUBPATH_PRINCIPAL:
-                        props = "<CARD:addressbook-home-set>" +
-                                "   <href>" + PATH_CARDDAV + SUBPATH_ADDRESSBOOK_HOMESET + "</href>" +
-                                "</CARD:addressbook-home-set>";
-                        break;
-                    case PATH_CARDDAV + SUBPATH_ADDRESSBOOK:
-                        props = "<resourcetype>" +
-                                "   <collection/>" +
-                                "   <CARD:addressbook/>" +
-                                "</resourcetype>";
-                        break;
-                }
-                Logger.log.info("Sending props: " + props);
-                return new MockResponse()
-                        .setResponseCode(207)
-                        .setBody("<multistatus xmlns='DAV:' xmlns:CARD='urn:ietf:params:xml:ns:carddav'>" +
-                                "<response>" +
-                                "   <href>" + rq.getPath() + "</href>" +
-                                "   <propstat><prop>" + props + "</prop></propstat>" +
-                                "</response>" +
-                                "</multistatus>");
-            }
-
-            return new MockResponse().setResponseCode(404);
-        }
-
-        private boolean checkAuth(RecordedRequest rq) {
-            return "Basic bW9jazoxMjM0NQ==".equals(rq.getHeader("Authorization"));
-        }
-    }
-
-}

app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.kt

@@ -0,0 +1,208 @@
+/*
+ * Copyright © Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.ui.setup
+
+import androidx.test.filters.SmallTest
+import androidx.test.platform.app.InstrumentationRegistry
+import at.bitfire.dav4jvm.DavResource
+import at.bitfire.dav4jvm.property.AddressbookHomeSet
+import at.bitfire.dav4jvm.property.ResourceType
+import at.bitfire.davdroid.HttpClient
+import at.bitfire.davdroid.log.Logger
+import at.bitfire.davdroid.model.Credentials
+import at.bitfire.davdroid.ui.setup.DavResourceFinder.Configuration.ServiceInfo
+import okhttp3.mockwebserver.Dispatcher
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import okhttp3.mockwebserver.RecordedRequest
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+import java.net.URI
+
+class DavResourceFinderTest {
+
+    companion object {
+        private const val PATH_NO_DAV = "/nodav"
+        private const val PATH_CALDAV = "/caldav"
+        private const val PATH_CARDDAV = "/carddav"
+        private const val PATH_CALDAV_AND_CARDDAV = "/both-caldav-carddav"
+
+        private const val SUBPATH_PRINCIPAL = "/principal"
+        private const val SUBPATH_ADDRESSBOOK_HOMESET = "/addressbooks"
+        private const val SUBPATH_ADDRESSBOOK = "/addressbooks/private-contacts"
+    }
+
+    val server = MockWebServer()
+
+    lateinit var finder: DavResourceFinder
+    lateinit var client: HttpClient
+    lateinit var loginModel: LoginModel
+
+    @Before
+    fun initServerAndClient() {
+        server.dispatcher = TestDispatcher()
+        server.start()
+
+        loginModel = LoginModel()
+        loginModel.baseURI = URI.create("/")
+        loginModel.credentials = Credentials("mock", "12345")
+
+        finder = DavResourceFinder(InstrumentationRegistry.getInstrumentation().targetContext, loginModel)
+        client = HttpClient.Builder()
+                .addAuthentication(null, loginModel.credentials!!)
+                .build()
+    }
+
+    @After
+    fun stopServer() {
+        server.shutdown()
+    }
+
+
+    @Test
+    @SmallTest
+    fun testRememberIfAddressBookOrHomeset() {
+        // recognize home set
+        var info = ServiceInfo()
+        DavResource(client.okHttpClient, server.url(PATH_CARDDAV + SUBPATH_PRINCIPAL))
+                .propfind(0, AddressbookHomeSet.NAME) { response, _ ->
+            finder.scanCardDavResponse(response, info)
+        }
+        assertEquals(0, info.collections.size)
+        assertEquals(1, info.homeSets.size)
+        assertEquals(server.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK_HOMESET/"), info.homeSets.first())
+
+        // recognize address book
+        info = ServiceInfo()
+        DavResource(client.okHttpClient, server.url(PATH_CARDDAV + SUBPATH_ADDRESSBOOK))
+                .propfind(0, ResourceType.NAME) { response, _ ->
+            finder.scanCardDavResponse(response, info)
+        }
+        assertEquals(1, info.collections.size)
+        assertEquals(server.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"), info.collections.keys.first())
+        assertEquals(0, info.homeSets.size)
+    }
+
+    @Test
+    fun testProvidesService() {
+        assertFalse(finder.providesService(server.url(PATH_NO_DAV), DavResourceFinder.Service.CALDAV))
+        assertFalse(finder.providesService(server.url(PATH_NO_DAV), DavResourceFinder.Service.CARDDAV))
+
+        assertTrue(finder.providesService(server.url(PATH_CALDAV), DavResourceFinder.Service.CALDAV))
+        assertFalse(finder.providesService(server.url(PATH_CALDAV), DavResourceFinder.Service.CARDDAV))
+
+        assertTrue(finder.providesService(server.url(PATH_CARDDAV), DavResourceFinder.Service.CARDDAV))
+        assertFalse(finder.providesService(server.url(PATH_CARDDAV), DavResourceFinder.Service.CALDAV))
+
+        assertTrue(finder.providesService(server.url(PATH_CALDAV_AND_CARDDAV), DavResourceFinder.Service.CALDAV))
+        assertTrue(finder.providesService(server.url(PATH_CALDAV_AND_CARDDAV), DavResourceFinder.Service.CARDDAV))
+    }
+
+    @Test
+    fun testGetCurrentUserPrincipal() {
+        assertNull(finder.getCurrentUserPrincipal(server.url(PATH_NO_DAV), DavResourceFinder.Service.CALDAV))
+        assertNull(finder.getCurrentUserPrincipal(server.url(PATH_NO_DAV), DavResourceFinder.Service.CARDDAV))
+
+        assertEquals(
+                server.url(PATH_CALDAV + SUBPATH_PRINCIPAL),
+                finder.getCurrentUserPrincipal(server.url(PATH_CALDAV), DavResourceFinder.Service.CALDAV)
+        )
+        assertNull(finder.getCurrentUserPrincipal(server.url(PATH_CALDAV), DavResourceFinder.Service.CARDDAV))
+
+        assertEquals(
+                server.url(PATH_CARDDAV + SUBPATH_PRINCIPAL),
+                finder.getCurrentUserPrincipal(server.url(PATH_CARDDAV), DavResourceFinder.Service.CARDDAV)
+        )
+        assertNull(finder.getCurrentUserPrincipal(server.url(PATH_CARDDAV), DavResourceFinder.Service.CALDAV))
+    }
+
+    @Test
+    fun testQueryEmailAddress() {
+        var info = ServiceInfo()
+        assertArrayEquals(
+                arrayOf("email1@example.com", "email2@example.com"),
+                finder.queryEmailAddress(server.url(PATH_CALDAV + SUBPATH_PRINCIPAL)).toTypedArray()
+        )
+        assertTrue(finder.queryEmailAddress(server.url(PATH_CARDDAV + SUBPATH_PRINCIPAL)).isEmpty())
+    }
+
+
+    // mock server
+
+    class TestDispatcher: Dispatcher() {
+
+        override fun dispatch(request: RecordedRequest): MockResponse {
+            if (!checkAuth(request)) {
+                val authenticate = MockResponse().setResponseCode(401)
+                authenticate.setHeader("WWW-Authenticate", "Basic realm=\"test\"")
+                return authenticate
+            }
+
+            val path = request.path!!
+
+            if (request.method.equals("OPTIONS", true)) {
+                val dav = when {
+                    path.startsWith(PATH_CALDAV) -> "calendar-access"
+                    path.startsWith(PATH_CARDDAV) -> "addressbook"
+                    path.startsWith(PATH_CALDAV_AND_CARDDAV) -> "calendar-access, addressbook"
+                    else -> null
+                }
+                val response = MockResponse().setResponseCode(200)
+                if (dav != null)
+                    response.addHeader("DAV", dav)
+                return response
+            } else if (request.method.equals("PROPFIND", true)) {
+                val props: String?
+                when (path) {
+                    PATH_CALDAV,
+                    PATH_CARDDAV ->
+                        props = "<current-user-principal><href>$path$SUBPATH_PRINCIPAL</href></current-user-principal>"
+
+                    PATH_CARDDAV + SUBPATH_PRINCIPAL ->
+                        props = "<CARD:addressbook-home-set>" +
+                                "   <href>$PATH_CARDDAV$SUBPATH_ADDRESSBOOK_HOMESET</href>" +
+                                "</CARD:addressbook-home-set>"
+
+                    PATH_CARDDAV + SUBPATH_ADDRESSBOOK ->
+                        props = "<resourcetype>" +
+                                "   <collection/>" +
+                                "   <CARD:addressbook/>" +
+                                "</resourcetype>"
+
+                    PATH_CALDAV + SUBPATH_PRINCIPAL ->
+                        props = "<CAL:calendar-user-address-set>" +
+                                "  <href>urn:unknown-entry</href>" +
+                                "  <href>mailto:email1@example.com</href>" +
+                                "  <href>mailto:email2@example.com</href>" +
+                                "</CAL:calendar-user-address-set>"
+
+                    else -> props = null
+                }
+                Logger.log.info("Sending props: $props")
+                return MockResponse()
+                        .setResponseCode(207)
+                        .setBody("<multistatus xmlns='DAV:' xmlns:CARD='urn:ietf:params:xml:ns:carddav' xmlns:CAL='urn:ietf:params:xml:ns:caldav'>" +
+                                "<response>" +
+                                "   <href>${request.path}</href>" +
+                                "   <propstat><prop>$props</prop></propstat>" +
+                                "</response>" +
+                                "</multistatus>")
+            }
+
+            return MockResponse().setResponseCode(404)
+        }
+
+        private fun checkAuth(rq: RecordedRequest) =
+            rq.getHeader("Authorization") == "Basic bW9jazoxMjM0NQ=="
+
+    }
+
+}

app/src/androidTest/res/xml/test_account_authenticator.xml

@@ -0,0 +1,3 @@
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="at.bitfire.davdroid.SyncManagerTest"
+    android:label="Test Account" />

app/src/davdroid/java/at/bitfire/davdroid/ui/DefaultAccountsDrawerHandler.kt

@@ -1,47 +0,0 @@
-/*
- * Copyright © Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid.ui
-
-import android.app.Activity
-import android.content.Intent
-import android.net.Uri
-import android.view.MenuItem
-import at.bitfire.davdroid.App
-import at.bitfire.davdroid.BuildConfig
-import at.bitfire.davdroid.R
-
-class DefaultAccountsDrawerHandler: IAccountsDrawerHandler {
-
-    override fun onNavigationItemSelected(activity: Activity, item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.nav_about ->
-                activity.startActivity(Intent(activity, AboutActivity::class.java))
-            R.id.nav_app_settings ->
-                activity.startActivity(Intent(activity, AppSettingsActivity::class.java))
-            R.id.nav_twitter ->
-                activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://twitter.com/davdroidapp")))
-            R.id.nav_website ->
-                activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.homepage_url))))
-            R.id.nav_faq ->
-                activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.navigation_drawer_faq_url))))
-            R.id.nav_forums ->
-                activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.homepage_url))
-                        .buildUpon().appendEncodedPath("forums/").build()))
-            R.id.nav_donate ->
-                if (BuildConfig.FLAVOR != App.FLAVOR_GOOGLE_PLAY)
-                    activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.homepage_url))
-                            .buildUpon().appendEncodedPath("donate/").build()))
-            else ->
-                return false
-        }
-
-        return true
-    }
-
-}

app/src/davdroid/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt

@@ -1,165 +0,0 @@
-/*
- * Copyright © Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid.ui.setup
-
-import android.app.Fragment
-import android.net.Uri
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.CompoundButton
-import at.bitfire.dav4android.Constants
-import at.bitfire.davdroid.R
-import kotlinx.android.synthetic.standard.login_credentials_fragment.view.*
-import java.net.IDN
-import java.net.URI
-import java.net.URISyntaxException
-import java.util.logging.Level
-
-class DefaultLoginCredentialsFragment: Fragment(), CompoundButton.OnCheckedChangeListener {
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val v = inflater.inflate(R.layout.login_credentials_fragment, container, false)
-
-        if (savedInstanceState == null) {
-            // first call
-            activity?.intent?.let {
-                // we've got initial login data
-                val url = it.getStringExtra(LoginActivity.EXTRA_URL)
-                val username = it.getStringExtra(LoginActivity.EXTRA_USERNAME)
-                val password = it.getStringExtra(LoginActivity.EXTRA_PASSWORD)
-
-                if (url != null) {
-                    v.login_type_url.isChecked = true
-                    v.base_url.setText(url)
-                    v.user_name.setText(username)
-                    v.url_password.setText(password)
-                } else {
-                    v.login_type_email.isChecked = true
-                    v.email_address.setText(username)
-                    v.email_password.setText(password)
-                }
-            }
-        }
-
-        v.login.setOnClickListener({ _ ->
-            validateLoginData()?.let { credentials ->
-                DetectConfigurationFragment.newInstance(credentials).show(fragmentManager, null)
-            }
-        })
-
-        // initialize to Login by email
-        onCheckedChanged(v)
-
-        v.login_type_email.setOnCheckedChangeListener(this)
-        v.login_type_url.setOnCheckedChangeListener(this)
-
-        return v
-    }
-
-    override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
-        onCheckedChanged(view)
-    }
-
-    private fun onCheckedChanged(v: View) {
-        val loginByEmail = !v.login_type_url.isChecked
-        v.login_type_email_details.visibility = if (loginByEmail) View.VISIBLE else View.GONE
-        v.login_type_url_details.visibility = if (loginByEmail) View.GONE else View.VISIBLE
-        (if (loginByEmail) v.email_address else v.base_url).requestFocus()
-    }
-
-    private fun validateLoginData(): LoginCredentials? {
-        if (view.login_type_email.isChecked) {
-            var uri: URI? = null
-            var valid = true
-
-            val email = view.email_address.text.toString()
-            if (!email.matches(Regex(".+@.+"))) {
-                view.email_address.error = getString(R.string.login_email_address_error)
-                valid = false
-            } else
-                try {
-                    uri = URI("mailto", email, null)
-                } catch(e: URISyntaxException) {
-                    view.email_address.error = e.localizedMessage
-                    valid = false
-                }
-
-            val password = view.email_password.getText().toString()
-            if (password.isEmpty()) {
-                view.email_password.setError(getString(R.string.login_password_required))
-                valid = false
-            }
-
-            return if (valid && uri != null)
-                LoginCredentials(uri, email, password)
-            else
-                null
-
-        } else if (view.login_type_url.isChecked) {
-            var uri: URI? = null
-            var valid = true
-
-            val baseUrl = Uri.parse(view.base_url.text.toString())
-            val scheme = baseUrl.scheme
-            if (scheme.equals("http", true) || scheme.equals("https", true)) {
-                var host = baseUrl.host
-                if (host.isNullOrBlank()) {
-                    view.base_url.error = getString(R.string.login_url_host_name_required)
-                    valid = false
-                } else
-                    try {
-                        host = IDN.toASCII(host)
-                    } catch(e: IllegalArgumentException) {
-                        Constants.log.log(Level.WARNING, "Host name not conforming to RFC 3490", e)
-                    }
-
-                val path = baseUrl.encodedPath
-                val port = baseUrl.port
-                try {
-                    uri = URI(baseUrl.scheme, null, host, port, path, null, null)
-                } catch(e: URISyntaxException) {
-                    view.base_url.error = e.localizedMessage
-                    valid = false
-                }
-            } else {
-                view.base_url.error = getString(R.string.login_url_must_be_http_or_https)
-                valid = false
-            }
-
-            val userName = view.user_name.text.toString()
-            if (userName.isBlank()) {
-                view.user_name.error = getString(R.string.login_user_name_required)
-                valid = false
-            }
-
-            val password = view.url_password.getText().toString()
-            if (password.isEmpty()) {
-                view.url_password.setError(getString(R.string.login_password_required))
-                valid = false
-            }
-
-            return if (valid && uri != null)
-                LoginCredentials(uri, userName, password)
-            else
-                null
-        }
-
-        return null
-    }
-
-
-    class Factory: ILoginCredentialsFragment {
-
-        override fun getFragment() = DefaultLoginCredentialsFragment()
-
-    }
-
-}

app/src/davdroid/res/layout/login_credentials_fragment.xml

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
-  ~ All rights reserved. This program and the accompanying materials
-  ~ are made available under the terms of the GNU Public License v3.0
-  ~ which accompanies this distribution, and is available at
-  ~ http://www.gnu.org/licenses/gpl.html
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <!-- We don't want the keyboard up when the user arrives in this initial screen -->
-    <View android:layout_height="0dp"
-          android:layout_width="0dp"
-          android:focusable="true"
-          android:focusableInTouchMode="true"
-          android:contentDescription="@null"
-          android:importantForAccessibility="no" tools:ignore="UnusedAttribute">
-        <requestFocus/>
-    </View>
-
-    <ScrollView android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:layout_margin="@dimen/activity_margin">
-
-        <RadioGroup
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:animateLayoutChanges="true">
-
-            <RadioButton
-                android:id="@+id/login_type_email"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/login_type_email"
-                android:paddingLeft="14dp" tools:ignore="RtlSymmetry"
-                style="@style/login_type_headline"/>
-
-            <LinearLayout
-                android:id="@+id/login_type_email_details"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <EditText
-                    android:id="@+id/email_address"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/login_email_address"
-                    android:inputType="textEmailAddress"/>
-                <at.bitfire.davdroid.ui.widget.EditPassword
-                    android:id="@+id/email_password"
-                    android:hint="@string/login_password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
-            </LinearLayout>
-
-            <RadioButton
-                android:id="@+id/login_type_url"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/login_type_url"
-                android:layout_marginTop="16dp"
-                android:paddingLeft="14dp" tools:ignore="RtlSymmetry"
-                style="@style/login_type_headline"/>
-
-            <LinearLayout
-                android:id="@+id/login_type_url_details"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <EditText
-                    android:id="@+id/base_url"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/login_base_url"
-                    android:inputType="textUri"/>
-                <EditText
-                    android:id="@+id/user_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/login_user_name"
-                    android:inputType="textEmailAddress"/>
-                <at.bitfire.davdroid.ui.widget.EditPassword
-                    android:id="@+id/url_password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/login_password"/>
-
-            </LinearLayout>
-
-        </RadioGroup>
-    </ScrollView>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/stepper_nav_bar">
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            style="@style/stepper_nav_button"/>
-
-        <Button
-            android:id="@+id/login"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:text="@string/login_login"
-            style="@style/stepper_nav_button"/>
-
-    </LinearLayout>
-</LinearLayout>

app/src/davdroid/res/values-ca/strings.xml

@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--common strings-->
-  <string name="app_name">DAVdroid</string>
-  <string name="help">Ajuda</string>
-  <!--startup dialogs-->
-  <!--AboutActivity-->
-  <!--global settings-->
-  <!--AccountsActivity-->
-  <!--DavService-->
-  <!--AppSettingsActivity-->
-  <!--AccountActivity-->
-  <!--PermissionsActivity-->
-  <!--AddAccountActivity-->
-  <string name="login_type_email">Entra amb una adreça de correu electrònic</string>
-  <string name="login_type_url">Entra amb una URL i un nom d\'usuari</string>
-  <!--AccountSettingsActivity-->
-  <!--collection management-->
-  <!--ExceptionInfoFragment-->
-  <!--sync errors and DebugInfoActivity-->
-  <!--cert4android-->
-</resources>

app/src/davdroid/res/values-cs/strings.xml

@@ -1,242 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--common strings-->
-  <string name="app_name">DAVdroid</string>
-  <string name="help">Pomoc</string>
-  <string name="manage_accounts">Spravovat účty</string>
-  <string name="please_wait">Chvíli strpení ...</string>
-  <string name="send">Odeslat</string>
-  <!--startup dialogs-->
-  <string name="startup_battery_optimization">Optimalizace využití baterie</string>
-  <string name="startup_battery_optimization_message">Android může po několika dnech vypnout/prodloužit interval synchronizování DAVdroid. Chcete-li tomuto zabránit, vypněte optimalizaci baterie.</string>
-  <string name="startup_battery_optimization_disable">Vypnout pro DAVdroid</string>
-  <string name="startup_dont_show_again">Již nezobrazovat</string>
-  <string name="startup_development_version_give_feedback">Dát zpětnou vazbu</string>
-  <string name="startup_donate">Open Source informace</string>
-  <string name="startup_donate_message">Jsme velice rádi že používáte DAVdroid, software s otevřeným zdrojovým kódem (GPLv3). Vývoj této aplikace je náročný a trval již několik tisíc hodin, velice nás potěší přispějete-li na jeho vývoj.</string>
-  <string name="startup_donate_now">Zobrazit stránku pro obdarování</string>
-  <string name="startup_donate_later">Možná později</string>
-  <string name="startup_google_play_accounts_removed">Informace o chybě DRM Obchodu Play</string>
-  <string name="startup_google_play_accounts_removed_message">Za určitých podmínek může dojít po restartu nebo aktualizaci aplikace DAVdroid k vymazání účtů kvůli chybě DRM Obchodu Play. Pokud jste postiženi touto chybou (ale pouze v tomto případě), nainstalujte prosím z Obchodu Play aplikaci \"DAVdroid JB Workaround\".</string>
-  <string name="startup_google_play_accounts_removed_more_info">Více informací</string>
-  <string name="startup_opentasks_not_installed">OpenTasks není nainstalován</string>
-  <string name="startup_opentasks_not_installed_message">Aplikace OpenTasks není dostupná, proto nebude DAVdroid moci synchronizovat seznam úkolů.</string>
-  <string name="startup_opentasks_reinstall_davdroid">Po instalaci OpenTasks musíte PŘEINSTALOVAT DAVdroid a přidat znovu své účty (Android chyba).</string>
-  <string name="startup_opentasks_not_installed_install">Nainstalovat OpenTasks</string>
-  <!--AboutActivity-->
-  <string name="about_license_terms">Licenční podmínky</string>
-  <string name="about_license_info_no_warranty">Tento program je distribuován BEZ JAKÉKOLIV ZÁRUKY. Je to volně dostupný software a lze jej za určitých podmínek dále distribuovat.</string>
-  <!--global settings-->
-  <string name="logging_davdroid_file_logging">DAVdroid logování do souboru</string>
-  <string name="logging_to_external_storage">Logování do externího úložiště: %s</string>
-  <string name="logging_to_external_storage_warning">Smazat logy jak nejdříve možno!</string>
-  <string name="logging_couldnt_create_file">Nelze vytvořit externí soubor logu: %s</string>
-  <string name="logging_no_external_storage">Externí úložiště nenalezeno</string>
-  <!--AccountsActivity-->
-  <string name="navigation_drawer_open">Otevřít panel navigace</string>
-  <string name="navigation_drawer_close">Zavřít panel navigace</string>
-  <string name="navigation_drawer_subtitle">CalDAV/CardDAV adapter synchronizace</string>
-  <string name="navigation_drawer_about">O aplikaci / Licence</string>
-  <string name="navigation_drawer_settings">Nastavení</string>
-  <string name="navigation_drawer_news_updates">Novinky &amp; aktualizace</string>
-  <string name="navigation_drawer_external_links">Externí odkazy</string>
-  <string name="navigation_drawer_website">Webová stránka</string>
-  <string name="navigation_drawer_faq">FAQ</string>
-  <string name="navigation_drawer_donate">Obdarovat</string>
-  <string name="account_list_empty">Vítejte v aplikaci DAVdroid!\n\nNyní můžete přidat CalDAV/CardDAV účet.</string>
-  <!--DavService-->
-  <string name="dav_service_refresh_failed">Vyhledání služby selhalo</string>
-  <string name="dav_service_refresh_couldnt_refresh">Nelze obnovit seznam sbírky</string>
-  <!--AppSettingsActivity-->
-  <string name="app_settings">Nastavení</string>
-  <string name="app_settings_user_interface">Uživatelské prostředí</string>
-  <string name="app_settings_reset_hints">Resetovat nápovědu</string>
-  <string name="app_settings_reset_hints_summary">Znovu povolí vypnuté texty nápovědy</string>
-  <string name="app_settings_reset_hints_success">Budou zobrazovány všechny texty nápovědy</string>
-  <string name="app_settings_connection">Připojení</string>
-  <string name="app_settings_override_proxy">Přepsat proxy nastavení</string>
-  <string name="app_settings_override_proxy_on">Použít vlastní proxy nastavení</string>
-  <string name="app_settings_override_proxy_off">Použít výchozí systémová proxy nastavení</string>
-  <string name="app_settings_override_proxy_host">HTTP proxy hostname</string>
-  <string name="app_settings_override_proxy_port">HTTP proxy port</string>
-  <string name="app_settings_security">Zabezpečení</string>
-  <string name="app_settings_distrust_system_certs">Nedůvěřovat systémovým certifikátům</string>
-  <string name="app_settings_distrust_system_certs_on">Systémovým a uživatelem přidaným CA nebude důvěřováno</string>
-  <string name="app_settings_distrust_system_certs_off">Systémovým a uživatelem přidaným CA bude důvěřováno (doporučeno)</string>
-  <string name="app_settings_reset_certificates">Resetovat (ne)důvěryhodné certifikáty</string>
-  <string name="app_settings_reset_certificates_summary">Resetovat důvěryhodnost všech vlastních certifikátů</string>
-  <string name="app_settings_reset_certificates_success">Všechny vlastní certifikáty byly resetovány</string>
-  <string name="app_settings_debug">Ladění</string>
-  <string name="app_settings_log_to_external_storage">Logovat do externího souboru</string>
-  <string name="app_settings_log_to_external_storage_on">Logování do externího úložiště (pokud dostupné)</string>
-  <string name="app_settings_log_to_external_storage_off">Logování do externího souboru je vypnuto</string>
-  <string name="app_settings_show_debug_info">Zobrazit ladící informace</string>
-  <string name="app_settings_show_debug_info_details">Zobrazit/sdílet software a detaily konfigurace</string>
-  <!--AccountActivity-->
-  <string name="account_synchronize_now">Synchronizovat nyní</string>
-  <string name="account_synchronizing_now">Probíhá synchronizace</string>
-  <string name="account_settings">Nastavení účtu</string>
-  <string name="account_rename">Přejmenovat účet</string>
-  <string name="account_rename_new_name">Neuložená místní data mohou být vynechána. Po přejmenování je vyžadována nová synchronizace. Nové jméno účtu:</string>
-  <string name="account_rename_rename">Přejmenovat</string>
-  <string name="account_delete">Smazat účet</string>
-  <string name="account_delete_confirmation_title">Opravdu smazat účet?</string>
-  <string name="account_delete_confirmation_text">Všechny místní kopie adresáře, kalendářů a úkolů budou smazány.</string>
-  <string name="account_refresh_address_book_list">Obnovit seznam adresářů</string>
-  <string name="account_create_new_address_book">Vytvořit nový adresář</string>
-  <string name="account_refresh_calendar_list">Obnovit seznam kalendářů</string>
-  <string name="account_create_new_calendar">Vytvořit nový kalendář</string>
-  <!--PermissionsActivity-->
-  <string name="permissions_title">DAVdroid oprávnění</string>
-  <string name="permissions_calendar">Oprávnění pro kalendáře</string>
-  <string name="permissions_calendar_details">Pro synchronizaci CalDAV událostí s místním kalendářem potřebuje DAVdroid oprávnění přistupovat ke kalendářům.</string>
-  <string name="permissions_calendar_request">Vyžádat oprávnění kalendáře</string>
-  <string name="permissions_contacts">Oprávnění pro kontakty</string>
-  <string name="permissions_contacts_details">Pro synchronizaci CardDAV adresářů s místními kontakty potřebuje DAVdroid oprávnění přistupovat ke kontaktům.</string>
-  <string name="permissions_contacts_request">Vyžádat oprávnění kontaktů</string>
-  <string name="permissions_opentasks">Oprávnění pro OpenTasks</string>
-  <string name="permissions_opentasks_details">Pro synchronizaci CalDAV událostí s místním seznamem úkolů potřebuje DAVdroid oprávnění přistupovat k OpenTasks.</string>
-  <string name="permissions_opentasks_request">Vyžádat oprávnění OpenTasks</string>
-  <!--AddAccountActivity-->
-  <string name="login_title">Přidat účet</string>
-  <string name="login_type_email">Přihlášení s emailovou adresou</string>
-  <string name="login_email_address">Emailová adresa</string>
-  <string name="login_email_address_error">Vyžadován platný email</string>
-  <string name="login_password">Heslo</string>
-  <string name="login_password_required">Vyžadováno heslo</string>
-  <string name="login_type_url">Přihlášení s URL a uživatelským jménem</string>
-  <string name="login_url_must_be_http_or_https">URL musí začínat na http(s)://</string>
-  <string name="login_url_host_name_required">Vyžadováno hostname</string>
-  <string name="login_user_name">Uživatelské jméno</string>
-  <string name="login_user_name_required">Vyžadováno uživatelské jméno</string>
-  <string name="login_base_url">Základní URL</string>
-  <string name="login_login">Login</string>
-  <string name="login_back">Zpět</string>
-  <string name="login_create_account">Vytvořit účet</string>
-  <string name="login_account_name">Jméno účtu</string>
-  <string name="login_account_name_info">Pro jméno účtu použijte svou emailovou adresu, protože Android bude brát jméno účtu jako údaj pro ORGANIZÁTORA vytvořených událostí. Nelze mít dva účty stejného jména.</string>
-  <string name="login_account_contact_group_method">Metoda seskupování kontaktů:</string>
-  <string name="login_account_name_required">Vyžadováno jméno účtu</string>
-  <string name="login_account_not_created">Účet nelze vytvořit</string>
-  <string name="login_configuration_detection">Vyhledání konfigurace</string>
-  <string name="login_querying_server">Chvíli strpení, probíhá dotazování serveru...</string>
-  <string name="login_no_caldav_carddav">Nelze nalézt službu CalDAV nebo CardDAV.</string>
-  <string name="login_view_logs">Prohlížet logy</string>
-  <!--AccountSettingsActivity-->
-  <string name="settings_title">Nastavení: %s</string>
-  <string name="settings_authentication">Ověření</string>
-  <string name="settings_username">Uživatelské jméno</string>
-  <string name="settings_enter_username">Zadat uživatelské jméno</string>
-  <string name="settings_password">Heslo</string>
-  <string name="settings_password_summary">Aktualizovat heslo dle svého serveru.</string>
-  <string name="settings_enter_password">Vložit své heslo:</string>
-  <string name="settings_sync">Synchronizace</string>
-  <string name="settings_sync_interval_contacts">Interval synchronizace kontaktů</string>
-  <string name="settings_sync_summary_manually">Pouze manuálně</string>
-  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Každých %d minut a ihned při lokálních změnách</string>
-  <string name="settings_sync_interval_calendars">Interval synchronizace kalendáře</string>
-  <string name="settings_sync_interval_tasks">Interval synchronizace úkolů</string>
-  <string-array name="settings_sync_interval_seconds">
-    <item>-1</item>
-    <item>300</item>
-    <item>600</item>
-    <item>900</item>
-    <item>3600</item>
-    <item>7200</item>
-    <item>14400</item>
-    <item>86400</item>
-  </string-array>
-  <string-array name="settings_sync_interval_names">
-    <item>Pouze manuálně</item>
-    <item>Každých 5 minut</item>
-    <item>Každých 10 minut</item>
-    <item>Každých 15 minut</item>
-    <item>Každou hodinu</item>
-    <item>Každé 2 hodiny</item>
-    <item>Každé 4 hodiny</item>
-    <item>Jednou za den</item>
-  </string-array>
-  <string name="settings_sync_wifi_only">Synchronizovat pouze přes WiFi</string>
-  <string name="settings_sync_wifi_only_on">Synchronizace omezena na WiFi připojení</string>
-  <string name="settings_sync_wifi_only_off">Druh připojení není brán v potaz</string>
-  <string name="settings_sync_wifi_only_ssid">Omezení WiFi SSID</string>
-  <string name="settings_sync_wifi_only_ssid_on">Synchronizace pouze přes %s</string>
-  <string name="settings_sync_wifi_only_ssid_off">Použít všechna WiFi připojení</string>
-  <string name="settings_sync_wifi_only_ssid_message">Zadejte jméno WiFi sítě (SSID) pro omezení synchronizace na tutu síť, nebo ponechte prázdné pro použití všech WiFi připojení.</string>
-  <string name="settings_carddav">CardDAV</string>
-  <string name="settings_contact_group_method">Metoda seskupování kontaktů</string>
-  <string-array name="settings_contact_group_method_values">
-    <item>GROUP_VCARDS</item>
-    <item>CATEGORIES</item>
-  </string-array>
-  <string-array name="settings_contact_group_method_entries">
-    <item>Skupiny jsou oddělené soubory VCard</item>
-    <item>Skupiny jsou kategorie na kontakt</item>
-  </string-array>
-  <string name="settings_caldav">CalDAV</string>
-  <string name="settings_sync_time_range_past">Časový limit pro staré události</string>
-  <string name="settings_sync_time_range_past_none">Synchronizovat všechny události</string>
-  <plurals name="settings_sync_time_range_past_days">
-    <item quantity="one">Ignorovat události starší než 1 den</item>
-    <item quantity="few">Ignorovat události starší než %d dny</item>
-    <item quantity="other">Ignorovat události starší než %d dnů</item>
-  </plurals>
-  <string name="settings_sync_time_range_past_message">Události z minulosti starší než vyznačený počet dnů budou ignorovány (lze zadat 0). Ponechte prázdné pro synchronizaci všech událostí.</string>
-  <string name="settings_manage_calendar_colors">Spravovat barvy kalendářů</string>
-  <string name="settings_manage_calendar_colors_on">Barvy kalendářů spravuje DAVdroid</string>
-  <string name="settings_manage_calendar_colors_off">Barvy kalendářů nespravuje DAVdroid</string>
-  <!--collection management-->
-  <string name="create_addressbook">Vytvořit adresář</string>
-  <string name="create_addressbook_display_name_hint">Můj adresář</string>
-  <string name="create_calendar">Vytvořit CalDAV sbírku</string>
-  <string name="create_calendar_display_name_hint">Můj kalendář</string>
-  <string name="create_calendar_time_zone">Časová zóna:</string>
-  <string name="create_calendar_type">Typ sbírky:</string>
-  <string name="create_calendar_type_only_events">Kalendář (pouze události)</string>
-  <string name="create_calendar_type_only_tasks">Seznam úkolů (pouze úkoly)</string>
-  <string name="create_calendar_type_events_and_tasks">Kombinovaná (události a úkoly)</string>
-  <string name="create_collection_color">Nastavit barvu sbírky</string>
-  <string name="create_collection_creating">Vytváření sbírky</string>
-  <string name="create_collection_display_name">Zobrazit jméno (nadpis) této sbírky:</string>
-  <string name="create_collection_display_name_required">Nadpis je vyžadován</string>
-  <string name="create_collection_description">Popis (volitelný):</string>
-  <string name="create_collection_home_set">Domácí sbírka:</string>
-  <string name="create_collection_create">Vytvořit</string>
-  <string name="delete_collection">Smazat sbírku</string>
-  <string name="delete_collection_confirm_title">Jste si jisti?</string>
-  <string name="delete_collection_confirm_warning">Tato sbírka (%s) a všechna její data budou odstraněna ze serveru.</string>
-  <string name="delete_collection_deleting_collection">Mazání sbírky</string>
-  <!--ExceptionInfoFragment-->
-  <string name="exception">Došlo k chybě.</string>
-  <string name="exception_httpexception">Došlo k HTTP chybě.</string>
-  <string name="exception_ioexception">Došlo k I/O chybě.</string>
-  <string name="exception_show_details">Zobrazit detaily</string>
-  <!--sync errors and DebugInfoActivity-->
-  <string name="debug_info_title">Ladící informace</string>
-  <string name="sync_error_permissions">DAVdroid oprávnění</string>
-  <string name="sync_error_permissions_text">Vyžadována dodatečná oprávnění</string>
-  <string name="sync_error_calendar">Synchronizace kalendáře selhala (%s)</string>
-  <string name="sync_error_contacts">Synchronizace adresáře selhala (%s)</string>
-  <string name="sync_error_tasks">Synchronizace úkolu selhala (%s)</string>
-  <string name="sync_error">Chyba při %s</string>
-  <string name="sync_error_http_dav">Chyba serveru při %s</string>
-  <string name="sync_error_local_storage">Chyba databáze při %s</string>
-  <string-array name="sync_error_phases">
-    <item>příprava synchronizace</item>
-    <item>dotazování možností</item>
-    <item>zpracovávání místně smazaných záznamů</item>
-    <item>příprava vytvořených/upravených záznamů</item>
-    <item>nahrávání vytvořených/upravených záznamů</item>
-    <item>kontrola stavu synchronizace</item>
-    <item>výpis místních záznamů</item>
-    <item>výpis vzdálených záznamů</item>
-    <item>porovnání místních/vzdálených záznamů</item>
-    <item>stahování vzdálených záznamů</item>
-    <item>uzavírání procesu</item>
-    <item>ukládání stavu synchronizace</item>
-  </string-array>
-  <string name="sync_error_unauthorized">Chybné uživatelské jméno/heslo</string>
-  <!--cert4android-->
-  <string name="certificate_notification_connection_security">DAVdroid: Zabezpečení připojení</string>
-  <string name="trust_certificate_unknown_certificate_found">DAVdroid nalezl neznámý certifikát. Chcete mu důvěřovat?</string>
-</resources>

app/src/davdroid/res/values-da/strings.xml

@@ -1,245 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--common strings-->
-  <string name="app_name">DAVdroid</string>
-  <string name="account_title_address_book">DAVdroid Addressebog</string>
-  <string name="address_books_authority_title">Adressebøger</string>
-  <string name="help">Hjælp</string>
-  <string name="manage_accounts">Administrer konti</string>
-  <string name="please_wait">Vent venligst ...</string>
-  <string name="send">Send</string>
-  <!--startup dialogs-->
-  <string name="startup_battery_optimization">Batterioptimering</string>
-  <string name="startup_battery_optimization_message">Android kan deaktivere/reducere DAVDroid synkronisering efter et par dage. For at undgå dette, slå batterioptimering fra.</string>
-  <string name="startup_battery_optimization_disable">Deaktiver DAVdroid</string>
-  <string name="startup_dont_show_again">Vis ikke igen</string>
-  <string name="startup_development_version_give_feedback">Giv feedback</string>
-  <string name="startup_donate">Open-Source Information</string>
-  <string name="startup_donate_message">Det glæder os, at du bruger DAVdroid, som er open source-software (GPLv3). Det er hårdt arbejde at udvikle DAVdroid og taget tusindvis af arbejdstimer, så overvej at donere til projektet.</string>
-  <string name="startup_donate_now">Vis donationsside</string>
-  <string name="startup_donate_later">Måske senere</string>
-  <string name="startup_google_play_accounts_removed">Play Store DRM-fejl: Information</string>
-  <string name="startup_google_play_accounts_removed_message">Under visse tekniske omstændigheder kan DRM fra Play Store bevirke, at alle DAVdroid-konti er væk efter en genstart eller opgradering af DAVdroid. Hvis du er udsat for dette problem (og ellers ikke), opfordres du til at installere DAVDroid JB Workaround\" fra Play Store.</string>
-  <string name="startup_google_play_accounts_removed_more_info">Yderligere oplysninger</string>
-  <string name="startup_opentasks_not_installed">OpenTasks ikke installeret</string>
-  <string name="startup_opentasks_not_installed_message">OpenTasks er ikke til rådighedm så DAVdroid vil ikke kunne synkronisere opgavelister.</string>
-  <string name="startup_opentasks_reinstall_davdroid">Efter at have installeret OpenTasks, vil du være nødt til at GENINSTALLERE DAVdroid og dine konti igen (en fejl i Android).</string>
-  <string name="startup_opentasks_not_installed_install">Installer OpenTasks</string>
-  <!--AboutActivity-->
-  <string name="about_license_terms">Licensforhold</string>
-  <string name="about_license_info_no_warranty">Dette program leveres ABSOLUT UDEN GARANTI. Det er fri software, og du er velkommen til at videredistribuere det under visse betingelse.</string>
-  <!--global settings-->
-  <string name="logging_davdroid_file_logging">DAVdroid fil-logning</string>
-  <string name="logging_to_external_storage">Logger til eksternt datalager: %s</string>
-  <string name="logging_to_external_storage_warning">Slet logfiler hurtigst muligt!</string>
-  <string name="logging_couldnt_create_file">Kunne ikke oprette ekstern logfil: %s</string>
-  <string name="logging_no_external_storage">Eksternt lager ikke funder</string>
-  <!--AccountsActivity-->
-  <string name="navigation_drawer_open">Åbn navigationsvindue</string>
-  <string name="navigation_drawer_close">Luk navigationsvindue</string>
-  <string name="navigation_drawer_subtitle">CalDAV/CardDAV Sync-adapter</string>
-  <string name="navigation_drawer_about">Om / Licens</string>
-  <string name="navigation_drawer_settings">Indstillinger</string>
-  <string name="navigation_drawer_news_updates">Nyheder &amp; opdateringer</string>
-  <string name="navigation_drawer_external_links">Eksterne links</string>
-  <string name="navigation_drawer_website">Hjemmeside</string>
-  <string name="navigation_drawer_faq">FAQ</string>
-  <string name="navigation_drawer_donate">Donation</string>
-  <string name="account_list_empty">Velkommen til DAVdroid!\n\nDu kan nu tilføje en CaDAV/CardDAV-konto.</string>
-  <string name="accounts_global_sync_disabled">Automatisk synkronisering på tværs af systemet er deaktiveret</string>
-  <string name="accounts_global_sync_enable">Aktiver</string>
-  <!--DavService-->
-  <string name="dav_service_refresh_failed">Registrering af tjeneste kunne ikke foretages</string>
-  <string name="dav_service_refresh_couldnt_refresh">Kunne opdatere liste over sæt</string>
-  <!--AppSettingsActivity-->
-  <string name="app_settings">Indstillinger</string>
-  <string name="app_settings_user_interface">Brugerflade</string>
-  <string name="app_settings_reset_hints">Nulstil vejledende popups</string>
-  <string name="app_settings_reset_hints_summary">Genaktiverer hjælp, som er blevet lukket tidligere</string>
-  <string name="app_settings_reset_hints_success">Al vejledning vil blive vist igen</string>
-  <string name="app_settings_connection">Forbindelse</string>
-  <string name="app_settings_override_proxy">Tilsidesæt proxyindstillinger</string>
-  <string name="app_settings_override_proxy_on">Brug brugerdefinerede proxyindstillinger</string>
-  <string name="app_settings_override_proxy_off">Brug systemstandard proxyindstillinger</string>
-  <string name="app_settings_override_proxy_host">HTTP proxy værtsnavn</string>
-  <string name="app_settings_override_proxy_port">HTTP proxy port</string>
-  <string name="app_settings_security">Sikkerhed</string>
-  <string name="app_settings_distrust_system_certs">Stol ikke på systemcertifikater</string>
-  <string name="app_settings_distrust_system_certs_on">System og brugertilføjede CA\'er vil ikke blive betroet</string>
-  <string name="app_settings_distrust_system_certs_off">System og brugertilføjede CA\'er vil blive betroet (anbefalet)</string>
-  <string name="app_settings_reset_certificates">Nulstil (ikke-)betroede certifikater</string>
-  <string name="app_settings_reset_certificates_summary">Nulstiller tilliden til brugerdefinerede certifikater</string>
-  <string name="app_settings_reset_certificates_success">Alle brugerdefinerede certifikater er blevet rydet</string>
-  <string name="app_settings_debug">Debugging</string>
-  <string name="app_settings_log_to_external_storage">Log til ekstern fil</string>
-  <string name="app_settings_log_to_external_storage_on">Logger til eksternt lager (hvis muligt)</string>
-  <string name="app_settings_log_to_external_storage_off">Ekstern logning deaktiveret</string>
-  <string name="app_settings_show_debug_info">Vis debug-info</string>
-  <string name="app_settings_show_debug_info_details">Vis/del software og opsætningsoplysninger</string>
-  <!--AccountActivity-->
-  <string name="account_synchronize_now">Synkroniser nu</string>
-  <string name="account_synchronizing_now">Synkroniserer nu</string>
-  <string name="account_settings">Opsætning af konti</string>
-  <string name="account_rename">Omdøb konto</string>
-  <string name="account_rename_new_name">Lokaldata der ikke er gemt kan gå tabt. Eftersynkronisering er krævet efter omdøbning. Nyt kontonavn: </string>
-  <string name="account_rename_rename">Omdøb</string>
-  <string name="account_delete">Slet konto</string>
-  <string name="account_delete_confirmation_title">Ønsker du at slette konto?</string>
-  <string name="account_delete_confirmation_text">Alle lokale kopier af addessebøger, kalendere og opgavelister vil blive slettet.</string>
-  <string name="account_refresh_address_book_list">Opdater adressebogslister</string>
-  <string name="account_create_new_address_book">Opret ny adressebog</string>
-  <string name="account_refresh_calendar_list">Opdater kalenderliste</string>
-  <string name="account_create_new_calendar">Opret ny kalender</string>
-  <!--PermissionsActivity-->
-  <string name="permissions_title">DAVdroid adgangsrettigheder</string>
-  <string name="permissions_calendar">Kalenderadgange</string>
-  <string name="permissions_calendar_details">For at synkronisere CalDAV-begivenheder med dine lokale kalendere, skal DAVdroid have adgang til dine kalendere.</string>
-  <string name="permissions_calendar_request">Anmod om kalenderadgang</string>
-  <string name="permissions_contacts">Kontakter: Adgangsrettigheder</string>
-  <string name="permissions_contacts_details">DAVdroid er nødt til at have adgang til dine kontakter, hvis CardDAV-adressebøger skal kunne synkronisere med dine kontakter.</string>
-  <string name="permissions_contacts_request">Anmod om adgang til kontakter</string>
-  <string name="permissions_opentasks">OpenTasks: Adgangsrettigheder</string>
-  <string name="permissions_opentasks_details">DAVdroid er nødt til at have adgang til OpenTasks, hvis CalDAV-opgaver skal kunne synkronisere med dine lokale opgavelister.</string>
-  <string name="permissions_opentasks_request">Anmod om adgang til OpenTasks</string>
-  <!--AddAccountActivity-->
-  <string name="login_title">Tilføj konto</string>
-  <string name="login_type_email">Log ind med emailadresse</string>
-  <string name="login_email_address">Emailadresse</string>
-  <string name="login_email_address_error">Gyldig emailadresse påkrævet</string>
-  <string name="login_password">Adgangskode</string>
-  <string name="login_password_required">Adgangskode påkrævet</string>
-  <string name="login_type_url">Log ind med URL og brugernavn</string>
-  <string name="login_url_must_be_http_or_https">URL skal begynde med http(s)://</string>
-  <string name="login_url_host_name_required">Værtsnavn påkrævet</string>
-  <string name="login_user_name">Brugernavn</string>
-  <string name="login_user_name_required">Brugernavn påkrævet</string>
-  <string name="login_base_url">Basis-URL</string>
-  <string name="login_login">Login</string>
-  <string name="login_back">Tilbage</string>
-  <string name="login_create_account">Opret konto</string>
-  <string name="login_account_name">Kontonavn</string>
-  <string name="login_account_name_info">Brug emailadressen som kontonavn, for Android vil bruge kontonavnet til ORGANIZER-feltet for aktiviteter, som du opretter. Du kan ikke have to konti med samme navn.</string>
-  <string name="login_account_contact_group_method">Gruppering af kontakter:</string>
-  <string name="login_account_name_required">Kontonavn påkrævet</string>
-  <string name="login_account_not_created">Konto kunne ikke oprettes</string>
-  <string name="login_configuration_detection">Check konfiguration</string>
-  <string name="login_querying_server">Vent, forespørger hos serveren...</string>
-  <string name="login_no_caldav_carddav">Kunne ikke finde CalDAV- eller CardDAV-tjeneste.</string>
-  <string name="login_view_logs">Vis logs.</string>
-  <!--AccountSettingsActivity-->
-  <string name="settings_title">Indstillinger: %s</string>
-  <string name="settings_authentication">Adgangsgodkendelse</string>
-  <string name="settings_username">Brugernavn</string>
-  <string name="settings_enter_username">Indtast brugernavn:</string>
-  <string name="settings_password">Adgangskode</string>
-  <string name="settings_password_summary">Opdater adgangskoden, så den svarer til din server.</string>
-  <string name="settings_enter_password">Indtast adgangskode:</string>
-  <string name="settings_sync">Synkronisering</string>
-  <string name="settings_sync_interval_contacts">Synkroniseringsinterval for kontakter</string>
-  <string name="settings_sync_summary_manually">Kun manuelt</string>
-  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Hver %d minutter + øjeblikkeligt ved lokale ændringer</string>
-  <string name="settings_sync_interval_calendars">Synkroniseringsinterval for kalender</string>
-  <string name="settings_sync_interval_tasks">Synkroniseringsinterval for opgaver</string>
-  <string-array name="settings_sync_interval_seconds">
-    <item>-1</item>
-    <item>300</item>
-    <item>600</item>
-    <item>900</item>
-    <item>3600</item>
-    <item>7200</item>
-    <item>14400</item>
-    <item>86400</item>
-  </string-array>
-  <string-array name="settings_sync_interval_names">
-    <item>Kun manuelt</item>
-    <item>Hver 5. minut</item>
-    <item>Hver 10. minut</item>
-    <item>Hver 15. minut</item>
-    <item>En gang i timen</item>
-    <item>En gang hver 2. time</item>
-    <item>En gang hver 4. time</item>
-    <item>En gang om dagen</item>
-  </string-array>
-  <string name="settings_sync_wifi_only">Synkroniser kun over WiFi</string>
-  <string name="settings_sync_wifi_only_on">Synkronisering er begrænset til WiFi-forbindelser</string>
-  <string name="settings_sync_wifi_only_off">Forbindelsestypen har ingen betydning</string>
-  <string name="settings_sync_wifi_only_ssid">Begræsning til WiFi-SSID</string>
-  <string name="settings_sync_wifi_only_ssid_on">Vil kun blive synkroniseret over %s</string>
-  <string name="settings_sync_wifi_only_ssid_off">Alle WiFi-forbindelse vil kunne bruges</string>
-  <string name="settings_sync_wifi_only_ssid_message">Indtast navnet på et WiFi-netværk (SSID) for at begrænse synkronisering til dette netværk, eller efterlad feltet blank for at acceptere alle WiFi-forbindelser.</string>
-  <string name="settings_carddav">CardDAV</string>
-  <string name="settings_contact_group_method">Gruppering af kontakter</string>
-  <string-array name="settings_contact_group_method_values">
-    <item>GROUP_VCARDS</item>
-    <item>CATEGORIES</item>
-  </string-array>
-  <string-array name="settings_contact_group_method_entries">
-    <item>Grupper er særskilte VCards</item>
-    <item>Grupper er kategorier pr. kontakt</item>
-  </string-array>
-  <string name="settings_caldav">CalDAV</string>
-  <string name="settings_sync_time_range_past">Tidsafgrænsning for tidligere begivenheder</string>
-  <string name="settings_sync_time_range_past_none">Alle begivenheder vil blive synkroniseret</string>
-  <plurals name="settings_sync_time_range_past_days">
-    <item quantity="one">Begivenheder ældre end en dag vil blive ignoreret</item>
-    <item quantity="other">Begivenheder, der er mere end %d dage gamle, vil blive ignoreret</item>
-  </plurals>
-  <string name="settings_sync_time_range_past_message">Begivenheder, som er mere end dette antal dage gamle vil blive ignoreret (kan også være 0). Hvis feltet ikke er udfyldt, vil alle begivenheder blive synkroniseret.</string>
-  <string name="settings_manage_calendar_colors">Administrer farver for kalender</string>
-  <string name="settings_manage_calendar_colors_on">Kalenderfarver administreres af DAVdroid</string>
-  <string name="settings_manage_calendar_colors_off">Kalenderfarver sættes ikke fra DAVdroid</string>
-  <!--collection management-->
-  <string name="create_addressbook">Opret adressebog</string>
-  <string name="create_addressbook_display_name_hint">Min adressebog</string>
-  <string name="create_calendar">Opret CalDAV-sæt</string>
-  <string name="create_calendar_display_name_hint">Min kalender</string>
-  <string name="create_calendar_time_zone">Tidszone:</string>
-  <string name="create_calendar_type">Type af sæt:</string>
-  <string name="create_calendar_type_only_events">Kalender (kun begivenheder)</string>
-  <string name="create_calendar_type_only_tasks">Opgaveliste (kun opgaver)</string>
-  <string name="create_calendar_type_events_and_tasks">Kombineret (begivenheder og opgaver)</string>
-  <string name="create_collection_color">Sæt en farve på sættet</string>
-  <string name="create_collection_creating">Opretter sæt</string>
-  <string name="create_collection_display_name">Navn (titel) på dette sæt:</string>
-  <string name="create_collection_display_name_required">En titel er påkrævet</string>
-  <string name="create_collection_description">Beskrivelse (valgfri):</string>
-  <string name="create_collection_home_set">Home set:</string>
-  <string name="create_collection_create">Opret</string>
-  <string name="delete_collection">Slet sæt</string>
-  <string name="delete_collection_confirm_title">Er du sikker?</string>
-  <string name="delete_collection_confirm_warning">DAV-sættet (%s) og dets data vil blive fjernet fra serveren.</string>
-  <string name="delete_collection_deleting_collection">Sletter CalDAV-sæt</string>
-  <!--ExceptionInfoFragment-->
-  <string name="exception">Der er opstået en fejl.</string>
-  <string name="exception_httpexception">Der er opstået en HTTP-fejl.</string>
-  <string name="exception_ioexception">Der er opstået en I/O-fejl.</string>
-  <string name="exception_show_details">Vis detaljer</string>
-  <!--sync errors and DebugInfoActivity-->
-  <string name="debug_info_title">Debug-info</string>
-  <string name="sync_error_permissions">DAVdroid-rettigheder</string>
-  <string name="sync_error_permissions_text">Yderligere adgang påkrævet</string>
-  <string name="sync_error_calendar">Synkronisering af kalenderen lykkedes ikke (%s)</string>
-  <string name="sync_error_contacts">Synkronisering af adressebogen lykkedes ikke (%s)</string>
-  <string name="sync_error_tasks">Synkronisering af opgaver lykkedes ikke (%s)</string>
-  <string name="sync_error">Fejl under %s</string>
-  <string name="sync_error_http_dav">Serverfejl under %s</string>
-  <string name="sync_error_local_storage">Databasefejl under %s</string>
-  <string-array name="sync_error_phases">
-    <item>forbereder synkronisering</item>
-    <item>checker understøttelse</item>
-    <item>behandler poster, der er slettet lokalt</item>
-    <item>behandler poster, der er blevet oprettet/redigeret</item>
-    <item>uploader poster, der er blevet oprettet/redigeret</item>
-    <item>checker synkroniseringsstatus</item>
-    <item>laver liste af lokale poster</item>
-    <item>laver lister af poster på server</item>
-    <item>sammenligner poster lokalt og på server</item>
-    <item>downloader poster på server</item>
-    <item>efterbehandler</item>
-    <item>gemmer synkroniseringsstatus</item>
-  </string-array>
-  <string name="sync_error_unauthorized">Fejl i brugernavn/adgangskode</string>
-  <!--cert4android-->
-  <string name="certificate_notification_connection_security">DAVdroid: Forbindelsessikkerhed</string>
-  <string name="trust_certificate_unknown_certificate_found">DAVdroid er stødt på et ukendt certifikat. Vil du stole på det? </string>
-</resources>

app/src/davdroid/res/values-es/strings.xml

@@ -1,241 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--common strings-->
-  <string name="app_name">DAVdroid</string>
-  <string name="help">Ayuda</string>
-  <string name="manage_accounts">Administrar cuentas</string>
-  <string name="please_wait">Por favor, espere...</string>
-  <string name="send">Enviar</string>
-  <!--startup dialogs-->
-  <string name="startup_battery_optimization">Optimización de batería</string>
-  <string name="startup_battery_optimization_message">Android puede desactivar/reducir la sincronización de DAVdroid después de unos días. Para prevenir esto, desactiva la optimización.</string>
-  <string name="startup_battery_optimization_disable">Apagar para DAVdroid</string>
-  <string name="startup_dont_show_again">No mostrar de nuevo</string>
-  <string name="startup_development_version_give_feedback">Dar retroalimentación</string>
-  <string name="startup_donate">Información de código abierto</string>
-  <string name="startup_donate_message">Nos alegra que uses DAVdroid, que es software de código abierto (GPLv3). Debido al duro trabajo que supone el desarrollo de DAVdroid y los cientos de horas de trabajo, por favor, considera hacer una donación.</string>
-  <string name="startup_donate_now">Mostrar página de donación</string>
-  <string name="startup_donate_later">Quizás luego</string>
-  <string name="startup_google_play_accounts_removed">Información de error de DRM de Play Store</string>
-  <string name="startup_google_play_accounts_removed_message">Bajo ciertas condiciones, el DRM de Play Store puede causar que todas las cuentas de DAVdroid se desconfiguren tras un reinicio o una actualización de DAVdroid. Si esto le afecta (y sólo en ese caso), por favor, instale \"DAVdroid JB Workaround\" desde Play Store.</string>
-  <string name="startup_google_play_accounts_removed_more_info">Más información</string>
-  <string name="startup_opentasks_not_installed">OpenTasks no está instalado</string>
-  <string name="startup_opentasks_not_installed_message">La aplicación OpenTasks no está disponible. DAVdroid no podrá sincronizar listas de tareas.</string>
-  <string name="startup_opentasks_reinstall_davdroid">Tras instalar OpenTasks, tendrás que re-instalar DAVdroid y añadir tus cuentas de nuevo (por un error de Android).</string>
-  <string name="startup_opentasks_not_installed_install">Instalar OpenTasks</string>
-  <!--AboutActivity-->
-  <string name="about_license_terms">Términos de la licencia</string>
-  <string name="about_license_info_no_warranty">Este programa viene sin NINGÚN TIPO DE GARANTÍA. Es software libre, y cualquier contribución es bienvenida y redistribuida bajo ciertas condiciones.</string>
-  <!--global settings-->
-  <string name="logging_davdroid_file_logging">Archivo de registro de DAVdroid</string>
-  <string name="logging_to_external_storage">Registrar en almacenamiento externo: %s</string>
-  <string name="logging_to_external_storage_warning">¡Eliminar todos los registros tan pronto como sea posible!</string>
-  <string name="logging_couldnt_create_file">No se puede crear el archivo de registro externo: %s</string>
-  <string name="logging_no_external_storage">Almacenamiento externo no encontrado</string>
-  <!--AccountsActivity-->
-  <string name="navigation_drawer_open">Abrir panel de navegación</string>
-  <string name="navigation_drawer_close">Cerrar panel de navegación</string>
-  <string name="navigation_drawer_subtitle">Adaptador de sincronización CalDAV/CardDAV</string>
-  <string name="navigation_drawer_about">Acerca de / Licencia</string>
-  <string name="navigation_drawer_settings">Ajustes</string>
-  <string name="navigation_drawer_news_updates">Noticias y actualizaciones</string>
-  <string name="navigation_drawer_external_links">Enlaces externos</string>
-  <string name="navigation_drawer_website">Sitio web</string>
-  <string name="navigation_drawer_faq">Preguntas frequentes</string>
-  <string name="navigation_drawer_donate">Donar</string>
-  <string name="account_list_empty">Bienvenido a DAVdroid!\n\nAhora puedes añadir una cuenta CalDAV/CardDAV.</string>
-  <!--DavService-->
-  <string name="dav_service_refresh_failed">Falló la detección del servicio</string>
-  <string name="dav_service_refresh_couldnt_refresh">No se pudo refrescar lista de colección</string>
-  <!--AppSettingsActivity-->
-  <string name="app_settings">Ajustes</string>
-  <string name="app_settings_user_interface">Interfaz de usuario</string>
-  <string name="app_settings_reset_hints">Restablecer advertencias</string>
-  <string name="app_settings_reset_hints_summary">Habilita las advertencias que han sido rechazadas con anterioridad</string>
-  <string name="app_settings_reset_hints_success">Todas las advertencias se mostrarán nuevamente</string>
-  <string name="app_settings_connection">Conexión</string>
-  <string name="app_settings_override_proxy">Anular ajustes del proxy</string>
-  <string name="app_settings_override_proxy_on">Usar ajustes personalizados del proxy</string>
-  <string name="app_settings_override_proxy_off">Usar ajustes del proxy predefinidos por el sistema</string>
-  <string name="app_settings_override_proxy_host">Nombre del host del proxy HTTP</string>
-  <string name="app_settings_override_proxy_port">Puerto del proxy HTTP</string>
-  <string name="app_settings_security">Seguridad</string>
-  <string name="app_settings_distrust_system_certs">Invalidar los certificados del sistema</string>
-  <string name="app_settings_distrust_system_certs_on">Los CA del sistema y los añadidos por el usuario no serán válidos</string>
-  <string name="app_settings_distrust_system_certs_off">Los CA del sistema y los añadidos por el usuario serán usados y de confianza (recomendado)</string>
-  <string name="app_settings_reset_certificates">Reiniciar certificados (in)validados</string>
-  <string name="app_settings_reset_certificates_summary">Reinicia la validez de todos los certificados particulares</string>
-  <string name="app_settings_reset_certificates_success">Todos los certificados particulares han sido limpiados</string>
-  <string name="app_settings_debug">Depuración</string>
-  <string name="app_settings_log_to_external_storage">Registrar en fichero externo</string>
-  <string name="app_settings_log_to_external_storage_on">Registro en almacenamiento externo (si está disponible)</string>
-  <string name="app_settings_log_to_external_storage_off">El archivo de registro externo está deshabilitado</string>
-  <string name="app_settings_show_debug_info">Mostrar la información de depuración</string>
-  <string name="app_settings_show_debug_info_details">Ver/compartir detalles de software y configuración</string>
-  <!--AccountActivity-->
-  <string name="account_synchronize_now">Sincronizar ahora</string>
-  <string name="account_synchronizing_now">Sincronizando...</string>
-  <string name="account_settings">Ajustes de cuenta</string>
-  <string name="account_rename">Renombrar cuenta</string>
-  <string name="account_rename_new_name">Información local no guardada puede ser desechada. Se requiere resincronizar después de renombrar. Nuevo nombre de cuenta:</string>
-  <string name="account_rename_rename">Renombrar</string>
-  <string name="account_delete">Eliminar cuenta</string>
-  <string name="account_delete_confirmation_title">¿Seguro que deseas eliminar la cuenta?</string>
-  <string name="account_delete_confirmation_text">Todas las copias locales de tus contactos, calendarios y tareas serán eliminadas.</string>
-  <string name="account_refresh_address_book_list">Refrescar contactos</string>
-  <string name="account_create_new_address_book">Crear nueva lista de contactos</string>
-  <string name="account_refresh_calendar_list">Refrescar calendario</string>
-  <string name="account_create_new_calendar">Crear nuevo calendario</string>
-  <!--PermissionsActivity-->
-  <string name="permissions_title">Permisos de DAVdroid</string>
-  <string name="permissions_calendar">Permisos de calendario</string>
-  <string name="permissions_calendar_details">Para sincronizar eventos CalDAV con tus calendarios locales, DAVdroid necesita acceder a los mismos.</string>
-  <string name="permissions_calendar_request">Solicitar permisos sobre calendario</string>
-  <string name="permissions_contacts">Permisos de contactos</string>
-  <string name="permissions_contacts_details">Para sincronizar libretas de contactos CadDAV con tus contactos locales, DAVdroid necesita acceder a los mismos.</string>
-  <string name="permissions_contacts_request">Solicitar permisos sobre contactos</string>
-  <string name="permissions_opentasks">Permisos de OpenTasks</string>
-  <string name="permissions_opentasks_details">Para sincronizar listas de tareas CalDAV con tus listas de tareas locales, DAVdroid necesita acceder a OpenTasks.</string>
-  <string name="permissions_opentasks_request">Solicitar permisos sobre OpenTasks</string>
-  <!--AddAccountActivity-->
-  <string name="login_title">Añadir cuenta</string>
-  <string name="login_type_email">Acceder con cuenta de correo</string>
-  <string name="login_email_address">Dirección de correo</string>
-  <string name="login_email_address_error">Se requiere una dirección de correo válida</string>
-  <string name="login_password">Contraseña</string>
-  <string name="login_password_required">Contraseña requerida</string>
-  <string name="login_type_url">Acceder con URL y nombre de usuario</string>
-  <string name="login_url_must_be_http_or_https">La URL debe comenzar con http(s)://</string>
-  <string name="login_url_host_name_required">Nombre de servidor requerido</string>
-  <string name="login_user_name">Nombre de usuario</string>
-  <string name="login_user_name_required">Nombre de usuario requerido</string>
-  <string name="login_base_url">URL base</string>
-  <string name="login_login">Registrar</string>
-  <string name="login_back">Volver</string>
-  <string name="login_create_account">Crear cuenta</string>
-  <string name="login_account_name">Nombre de cuenta</string>
-  <string name="login_account_name_info">Usa tu dirección de correo como nombre de cuenta puesto que Android usará el nombre de la cuenta como campo de \"organizador\" en los eventos que cree. No puedes tener dos cuentas con el mismo nombre.</string>
-  <string name="login_account_contact_group_method">Método de contacto de grupo:</string>
-  <string name="login_account_name_required">Nombre de cuenta requerido</string>
-  <string name="login_account_not_created">La cuenta no pudo ser creada</string>
-  <string name="login_configuration_detection">Detectar configuración</string>
-  <string name="login_querying_server">Por favor espera, consultando al servidor...</string>
-  <string name="login_no_caldav_carddav">No se pudo encontrar el servicio CalDAV o CardDAV.</string>
-  <string name="login_view_logs">Ver registros</string>
-  <!--AccountSettingsActivity-->
-  <string name="settings_title">Ajustes: %s</string>
-  <string name="settings_authentication">Autenticación</string>
-  <string name="settings_username">Nombre de usuario</string>
-  <string name="settings_enter_username">Introduce tu nombre de usuario:</string>
-  <string name="settings_password">Contraseña</string>
-  <string name="settings_password_summary">Actualiza la contraseña de acuerdo a tu servidor.</string>
-  <string name="settings_enter_password">Introduce tu contraseña:</string>
-  <string name="settings_sync">Sincronización</string>
-  <string name="settings_sync_interval_contacts">Intervalo de sincronización de contactos</string>
-  <string name="settings_sync_summary_manually">Solo manualmente</string>
-  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Cada %d minutos + inmediatamente con cambios locales</string>
-  <string name="settings_sync_interval_calendars">Intervalo de sincronización de calendarios</string>
-  <string name="settings_sync_interval_tasks">Intervalo de sincronizacion de Tasks</string>
-  <string-array name="settings_sync_interval_seconds">
-    <item>-1</item>
-    <item>300</item>
-    <item>600</item>
-    <item>900</item>
-    <item>3600</item>
-    <item>7200</item>
-    <item>14400</item>
-    <item>86400</item>
-  </string-array>
-  <string-array name="settings_sync_interval_names">
-    <item>Solo manualmente</item>
-    <item>Cada 5 minutos</item>
-    <item>Cada 10 minutos</item>
-    <item>Cada 15 minutos</item>
-    <item>Cada hora</item>
-    <item>Cada 2 horas</item>
-    <item>Cada 4 horas</item>
-    <item>Una vez al día</item>
-  </string-array>
-  <string name="settings_sync_wifi_only">Sincronizar sólo sobre WiFi</string>
-  <string name="settings_sync_wifi_only_on">La sincronización está restringida a conexiones WiFi</string>
-  <string name="settings_sync_wifi_only_off">Tipo de conexión no tenido en cuenta</string>
-  <string name="settings_sync_wifi_only_ssid">Restricción WiFi SSID</string>
-  <string name="settings_sync_wifi_only_ssid_on">Sólo se sincronizará sobre %s</string>
-  <string name="settings_sync_wifi_only_ssid_off">Todas las conexiones WiFi pueden ser usadas</string>
-  <string name="settings_sync_wifi_only_ssid_message">Introduce el nombre de una red WiFi (SSID) para restringir la sincronización a esta red, o deja el campo en blanco para usar todas las conexiones WiFi.</string>
-  <string name="settings_carddav">CardDAV</string>
-  <string name="settings_contact_group_method">Método de contacto de grupo</string>
-  <string-array name="settings_contact_group_method_values">
-    <item>GROUP_VCARDS</item>
-    <item>CATEGORIES</item>
-  </string-array>
-  <string-array name="settings_contact_group_method_entries">
-    <item>Los groups tienen VCards separadas</item>
-    <item>Los groups tienen una categoría por contacto</item>
-  </string-array>
-  <string name="settings_caldav">CalDAV</string>
-  <string name="settings_sync_time_range_past">Límite de tiempo de eventos pasados</string>
-  <string name="settings_sync_time_range_past_none">Todos los eventos serán sincronizados</string>
-  <plurals name="settings_sync_time_range_past_days">
-    <item quantity="one">Los eventos anteriores a un día serán ignorados</item>
-    <item quantity="other">Los eventos anteriores a %d días serán ignorados</item>
-  </plurals>
-  <string name="settings_sync_time_range_past_message">Los eventos anteriores a este número de días serán ignorados (puede ser 0). Deja en blanco el campo para sincronizar todos los eventos.</string>
-  <string name="settings_manage_calendar_colors">Colores de calendario</string>
-  <string name="settings_manage_calendar_colors_on">Los colores de los calendarios son administrados por DAVdroid</string>
-  <string name="settings_manage_calendar_colors_off">Los colores de los calendarios no son establecidos por DAVdroid</string>
-  <!--collection management-->
-  <string name="create_addressbook">Crear nueva lista de contactos</string>
-  <string name="create_addressbook_display_name_hint">Agendas</string>
-  <string name="create_calendar">Crear colección CalDAV</string>
-  <string name="create_calendar_display_name_hint">Mi calendario</string>
-  <string name="create_calendar_time_zone">Zona horaria:</string>
-  <string name="create_calendar_type">Tipo de colección:</string>
-  <string name="create_calendar_type_only_events">Calendario (sólo eventos)</string>
-  <string name="create_calendar_type_only_tasks">Lista de tareas (sólo tareas)</string>
-  <string name="create_calendar_type_events_and_tasks">Combinado (eventos y tareas)</string>
-  <string name="create_collection_color">Establecer un color</string>
-  <string name="create_collection_creating">Crear colección</string>
-  <string name="create_collection_display_name">Nombre mostrado (título):</string>
-  <string name="create_collection_display_name_required">Título requerido</string>
-  <string name="create_collection_description">Descripción (opcional):</string>
-  <string name="create_collection_home_set">Establecer localización:</string>
-  <string name="create_collection_create">Crear</string>
-  <string name="delete_collection">Eliminar colección</string>
-  <string name="delete_collection_confirm_title">¿Estás seguro/a?</string>
-  <string name="delete_collection_confirm_warning">Esta colección (%s) y toda su información será eliminada del servidor.</string>
-  <string name="delete_collection_deleting_collection">Eliminando colección</string>
-  <!--ExceptionInfoFragment-->
-  <string name="exception">Ocurrió un error.</string>
-  <string name="exception_httpexception">Ha ocurrido un error HTTP.</string>
-  <string name="exception_ioexception">Ha ocurrido un error I/O.</string>
-  <string name="exception_show_details">Mostrar detalles</string>
-  <!--sync errors and DebugInfoActivity-->
-  <string name="debug_info_title">Información de depuración</string>
-  <string name="sync_error_permissions">Permisos de DAVdroid</string>
-  <string name="sync_error_permissions_text">Permisos adicionales requeridos</string>
-  <string name="sync_error_calendar">La sincronización de calendario falló (%s)</string>
-  <string name="sync_error_contacts">La sincronización de agenda falló (%s)</string>
-  <string name="sync_error_tasks">La sincronización de tareas falló (%s)</string>
-  <string name="sync_error">Error al %s</string>
-  <string name="sync_error_http_dav">Error de servidor al %s</string>
-  <string name="sync_error_local_storage">Error de base de datos al %s</string>
-  <string-array name="sync_error_phases">
-    <item>preparando sincronización</item>
-    <item>buscando capacidades</item>
-    <item>procesando entradas borradas localmente</item>
-    <item>preparando entradas creadas/modificadas</item>
-    <item>cargando entradas creadas/modificadas</item>
-    <item>comprobando estado de sincronización</item>
-    <item>enumerando entradas locales</item>
-    <item>enumerando entradas remotas</item>
-    <item>comparando entradas locales/remotas</item>
-    <item>descargando entradas remotas</item>
-    <item>post-procesando</item>
-    <item>guardando estado de sincronización</item>
-  </string-array>
-  <string name="sync_error_unauthorized">Nombre de usuario/contraseña erróneo</string>
-  <!--cert4android-->
-  <string name="certificate_notification_connection_security">DAVdroid: Seguridad de conexión</string>
-  <string name="trust_certificate_unknown_certificate_found">DAVdroid ha encontrado un certificado desconocido. ¿Quieres que sea válido?</string>
-</resources>

app/src/davdroid/res/values-fr/strings.xml

@@ -1,246 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--common strings-->
-  <string name="app_name">DAVdroid</string>
-  <string name="account_title_address_book">Carnet d\'adresses DAVdroid</string>
-  <string name="address_books_authority_title">Carnets d\'adresses</string>
-  <string name="help">Aide</string>
-  <string name="manage_accounts">Gestion des comptes</string>
-  <string name="please_wait">SVP attendez ...</string>
-  <string name="send">Envoyer</string>
-  <!--startup dialogs-->
-  <string name="startup_battery_optimization">Optimisation de la batterie</string>
-  <string name="startup_battery_optimization_message">Android peut désactiver/réduire la synchronisation de DAVdroid après quelques jours. Pour éviter cela, désactivez l\'optimisation de la batterie.</string>
-  <string name="startup_battery_optimization_disable">Désactiver pour DAVdroid</string>
-  <string name="startup_dont_show_again">Ne plus afficher</string>
-  <string name="startup_development_version_give_feedback">Faire un commentaire</string>
-  <string name="startup_donate">Open-Source Information</string>
-  <string name="startup_donate_message">Nous sommes heureux que vous utilisez DAVdroid, qui est un logiciel open-source (GPLv3). Parce que développer DAVdroid est un travail difficile et nous a pris de nombreuses heures, s\'il vous plaît envisager de faire un don.</string>
-  <string name="startup_donate_now">Faire un don</string>
-  <string name="startup_donate_later">Plus tard</string>
-  <string name="startup_google_play_accounts_removed">Erreur information Play Store DRM</string>
-  <string name="startup_google_play_accounts_removed_message">Dans certaines conditions, Play Store DRM peut provoquer la disparition de tous les comptes DAVdroid après un redémarrage ou après la mise à niveau de DAVdroid. Si vous êtes concerné par ce problème (et seulement alors), s\'il vous plaît installer \"DAVdroid JB Solution\" du Play Store.</string>
-  <string name="startup_google_play_accounts_removed_more_info">Plus d\'informations</string>
-  <string name="startup_opentasks_not_installed">OpenTasks n\'est pas installé</string>
-  <string name="startup_opentasks_not_installed_message">L\'application OpenTasks n\'est pas disponible, donc DAVdroid ne pourra pas synchroniser des listes de tâches.</string>
-  <string name="startup_opentasks_reinstall_davdroid">Après l\'installation OpenTasks, vous devez RE-INSTALLER DAVdroid et ajoutez vos comptes à nouveau (bug Android).</string>
-  <string name="startup_opentasks_not_installed_install">Installer OpenTasks</string>
-  <!--AboutActivity-->
-  <string name="about_license_terms">Conditions d\'utilisation</string>
-  <string name="about_license_info_no_warranty">Ce programme est fourni sans AUCUNE GARANTIE. C\'est un logiciel libre, et vous êtes en droit de le redistribuer sous certaines conditions.</string>
-  <!--global settings-->
-  <string name="logging_davdroid_file_logging">DAVdroid fichier de journalisation</string>
-  <string name="logging_to_external_storage">Se connecter au stockage externe: %s</string>
-  <string name="logging_to_external_storage_warning">Supprimer les journaux dès que possible!</string>
-  <string name="logging_couldnt_create_file">Impossible de créer le fichier journal externe: %s</string>
-  <string name="logging_no_external_storage">Stockage externe introuvable</string>
-  <!--AccountsActivity-->
-  <string name="navigation_drawer_open">Ouvrir le tiroir de navigation</string>
-  <string name="navigation_drawer_close">Fermer le tiroir de navigation</string>
-  <string name="navigation_drawer_subtitle">Adaptateur de synchronisation CalDAV/CardDAV</string>
-  <string name="navigation_drawer_about">A propos / Licence</string>
-  <string name="navigation_drawer_settings">Paramètres</string>
-  <string name="navigation_drawer_news_updates">Actualité &amp; mise à jour</string>
-  <string name="navigation_drawer_external_links">Liens externes</string>
-  <string name="navigation_drawer_website">Site Web</string>
-  <string name="navigation_drawer_faq">FAQ</string>
-  <string name="navigation_drawer_donate">Faire un don</string>
-  <string name="account_list_empty">Bienvenue sur DAVdroid!\n\nVous pouvez maintenant ajouter un compte CalDAV/CardDAV.</string>
-  <string name="accounts_global_sync_disabled">La synchronisation automatique globale est désactivée</string>
-  <string name="accounts_global_sync_enable">Activer</string>
-  <!--DavService-->
-  <string name="dav_service_refresh_failed">La détection du service a échoué</string>
-  <string name="dav_service_refresh_couldnt_refresh">Impossible d\'actualiser la liste de collection</string>
-  <!--AppSettingsActivity-->
-  <string name="app_settings">Paramètres</string>
-  <string name="app_settings_user_interface">Interface utilisateur</string>
-  <string name="app_settings_reset_hints">Réinitialiser les astuces</string>
-  <string name="app_settings_reset_hints_summary">Réactiver les astuces qui ont été vues précédemment</string>
-  <string name="app_settings_reset_hints_success">Toutes les astuces seront affichés à nouveau</string>
-  <string name="app_settings_connection">Connexion</string>
-  <string name="app_settings_override_proxy">Ignorer les paramètres proxy</string>
-  <string name="app_settings_override_proxy_on">Utiliser des paramètres proxy personnalisés</string>
-  <string name="app_settings_override_proxy_off">Utiliser les paramètres proxy du système</string>
-  <string name="app_settings_override_proxy_host">Nom de l\'hôte du proxy HTTP</string>
-  <string name="app_settings_override_proxy_port">Port du proxy HTTP</string>
-  <string name="app_settings_security">Sécurité</string>
-  <string name="app_settings_distrust_system_certs">Révoquer les certificats du système</string>
-  <string name="app_settings_distrust_system_certs_on">Les certificats du système et ceux ajoutés par l\'utilisateur ne seront pas  dignes de confiance</string>
-  <string name="app_settings_distrust_system_certs_off">Les certificats du système et ceux ajoutés par l\'utilisateur seront dignes de confiance (recommandé)</string>
-  <string name="app_settings_reset_certificates">Réinitialiser les certificats de (non)confiance</string>
-  <string name="app_settings_reset_certificates_summary">Réinitialiser la confiance de tous les certificats personnalisés</string>
-  <string name="app_settings_reset_certificates_success">Tous les certificats personnalisés ont été effacés</string>
-  <string name="app_settings_debug">Débogage</string>
-  <string name="app_settings_log_to_external_storage">Journaliser dans un fichier externe</string>
-  <string name="app_settings_log_to_external_storage_on">Journaliser sur le stockage externe (si disponible)</string>
-  <string name="app_settings_log_to_external_storage_off">Le fichier externe n\'est pas disponible.</string>
-  <string name="app_settings_show_debug_info">Afficher les infos de débogage</string>
-  <string name="app_settings_show_debug_info_details">Voir/partager l\'application et les détails de configuration</string>
-  <!--AccountActivity-->
-  <string name="account_synchronize_now">Synchroniser maintenant</string>
-  <string name="account_synchronizing_now">Synchronisation en cours</string>
-  <string name="account_settings">Paramètres du compte</string>
-  <string name="account_rename">Renommer le compte</string>
-  <string name="account_rename_new_name">Les données locales non enregistrées pourraient être perdues. Une re-synchronisation est nécessaire après avoir renommé le compte. Nouveau nom du compte : </string>
-  <string name="account_rename_rename">Renommer</string>
-  <string name="account_delete">Supprimer le compte</string>
-  <string name="account_delete_confirmation_title">Voulez-vous vraiment supprimer le compte?</string>
-  <string name="account_delete_confirmation_text">Toutes les copies locales des carnets d\'adresses, des calendriers et des listes de tâches seront supprimées.</string>
-  <string name="account_refresh_address_book_list">Actualiser le carnet d\'adresses</string>
-  <string name="account_create_new_address_book">Créer un nouveau carnet d\'adresses</string>
-  <string name="account_refresh_calendar_list">Actualiser le calendrier</string>
-  <string name="account_create_new_calendar">Créer un nouveau calendrier</string>
-  <!--PermissionsActivity-->
-  <string name="permissions_title">Autorisations DAVdroid</string>
-  <string name="permissions_calendar">Autorisations calendrier</string>
-  <string name="permissions_calendar_details">Pour synchroniser les événements CalDAV avec vos calendriers locaux, DAVdroid a besoin d\'accéder à vos calendriers.</string>
-  <string name="permissions_calendar_request">Demande d\'autorisations d\'accéder au calendrier</string>
-  <string name="permissions_contacts">Autorisations contacts</string>
-  <string name="permissions_contacts_details">Pour synchroniser les carnets d\'adresses de CardDAV avec votre carnet d\'adresses local, DAVdroid a besoin d\'accéder à vos contacts.</string>
-  <string name="permissions_contacts_request">Demande d\'autorisations d\'accéder aux contacts</string>
-  <string name="permissions_opentasks">Autorisations OpenTasks</string>
-  <string name="permissions_opentasks_details">Pour synchroniser les tâches de CalDAV avec vos listes de tâches locales, DAVdroid a besoin d\'accéder à OpenTasks.</string>
-  <string name="permissions_opentasks_request">Demande d\'autorisations d\'accéder à OpenTasks</string>
-  <!--AddAccountActivity-->
-  <string name="login_help_url">https://davdroid.bitfire.at/configuration/?pk_campaign=davdroid-app</string>
-  <string name="login_title">Ajouter un compte</string>
-  <string name="login_type_email">Connexion avec une adresse email</string>
-  <string name="login_email_address">Adresse mail</string>
-  <string name="login_email_address_error">Une adresse e-mail valide est requise</string>
-  <string name="login_password">Mot de passe</string>
-  <string name="login_password_required">Mot de passe requis</string>
-  <string name="login_type_url">Connexion avec une URL et un nom d\'utilisateur</string>
-  <string name="login_url_must_be_http_or_https">L\'URL doit commencer par http(s)://</string>
-  <string name="login_url_host_name_required">Nom d\'hôte requis</string>
-  <string name="login_user_name">Nom d\'utilisateur</string>
-  <string name="login_user_name_required">Nom d\'utilisateur requis</string>
-  <string name="login_base_url">URL de base</string>
-  <string name="login_login">Se connecter</string>
-  <string name="login_back">Retour</string>
-  <string name="login_create_account">Créer un compte</string>
-  <string name="login_account_name">Nom du compte</string>
-  <string name="login_account_name_info">Utilisez votre adresse e-mail comme nom de compte car Android utilisera ce nom en tant que champ ORGANISATEUR pour les événements que vous créerez. Vous ne pouvez pas avoir deux comptes avec le même nom.</string>
-  <string name="login_account_contact_group_method">Méthode pour les contacts de type groupe :</string>
-  <string name="login_account_name_required">Nom du compte requis</string>
-  <string name="login_account_not_created">Le compte n\'a pas pu être créé</string>
-  <string name="login_configuration_detection">Détection de la configuration</string>
-  <string name="login_querying_server">S\'il vous plaît patienter, nous interrogeons le serveur ...</string>
-  <string name="login_no_caldav_carddav">Aucun service CalDAV ou CardDAV trouvé.</string>
-  <string name="login_view_logs">Voir infos de débogage</string>
-  <!--AccountSettingsActivity-->
-  <string name="settings_title">Paramètres: %s</string>
-  <string name="settings_authentication">Authentification</string>
-  <string name="settings_username">Nom d\'utilisateur</string>
-  <string name="settings_enter_username">Saisissez votre nom d\'utilisateur :</string>
-  <string name="settings_password">Mot de passe</string>
-  <string name="settings_password_summary">Mettre à jour le mot de passe </string>
-  <string name="settings_enter_password">Saisissez votre mot de passe :</string>
-  <string name="settings_sync">Synchronisation</string>
-  <string name="settings_sync_interval_contacts">Intervalle de synchronisation des carnets d\'adresses</string>
-  <string name="settings_sync_summary_manually">Manuellement</string>
-  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Toutes les %d minutes et immédiatement après un changement local</string>
-  <string name="settings_sync_interval_calendars">Intervalle de synchronisation des agendas</string>
-  <string name="settings_sync_interval_tasks">Intervalle de synchronisation des tâches</string>
-  <string-array name="settings_sync_interval_seconds">
-    <item>-1</item>
-    <item>300</item>
-    <item>600</item>
-    <item>900</item>
-    <item>3600</item>
-    <item>7200</item>
-    <item>14400</item>
-    <item>86400</item>
-  </string-array>
-  <string-array name="settings_sync_interval_names">
-    <item>Manuellement</item>
-    <item>Toutes les 5 minutes</item>
-    <item>Toutes les 10 minutes</item>
-    <item>Toutes les 15 minutes</item>
-    <item>Toutes les heures</item>
-    <item>Toutes les 2 heures</item>
-    <item>Toutes les 4 heures</item>
-    <item>Une fois par jour</item>
-  </string-array>
-  <string name="settings_sync_wifi_only">Synchronisation en Wifi seulement</string>
-  <string name="settings_sync_wifi_only_on">La synchronisation est limitée aux connexions WiFi</string>
-  <string name="settings_sync_wifi_only_off">Le type de connexion n\'est pas pris en charge</string>
-  <string name="settings_sync_wifi_only_ssid">Restriction WiFi SSID</string>
-  <string name="settings_sync_wifi_only_ssid_on">Sera seulement synchroniser avec %s</string>
-  <string name="settings_sync_wifi_only_ssid_off">Toutes les connexions WiFi peuvent être utilisées</string>
-  <string name="settings_sync_wifi_only_ssid_message">Entrez le nom d\'un réseau WiFi (SSID) pour restreindre la synchronisation à ce réseau, ou laisser vide pour autoriser toutes les connexions WiFi.</string>
-  <string name="settings_carddav">CardDAV</string>
-  <string name="settings_contact_group_method">Méthode pour les contacts de type groupe</string>
-  <string-array name="settings_contact_group_method_values">
-    <item>GROUP_VCARDS</item>
-    <item>CATEGORIES</item>
-  </string-array>
-  <string-array name="settings_contact_group_method_entries">
-    <item>Les groupes sont des VCards indépendantes</item>
-    <item>Les groupes sont des catégories pour chacun des contacts</item>
-  </string-array>
-  <string name="settings_caldav">CalDAV</string>
-  <string name="settings_sync_time_range_past">Limite des événements passés</string>
-  <string name="settings_sync_time_range_past_none">Tous les événements seront synchronisés</string>
-  <plurals name="settings_sync_time_range_past_days">
-    <item quantity="one">Les événements de plus d’un jour passé seront ignorés</item>
-    <item quantity="other">Les événements de plus de %d jours passés seront ignorés</item>
-  </plurals>
-  <string name="settings_sync_time_range_past_message">Les événements antérieurs à ce nombre de jours seront ignorés (peut être 0). Laissez vide pour synchroniser tous les événements.</string>
-  <string name="settings_manage_calendar_colors">Choisir couleur du calendrier</string>
-  <string name="settings_manage_calendar_colors_on">Les couleurs de calendrier sont gérées par DAVdroid</string>
-  <string name="settings_manage_calendar_colors_off">Les couleurs de calendrier ne sont pas gérées par DAVdroid</string>
-  <!--collection management-->
-  <string name="create_addressbook">Créer un carnet d\'adresses</string>
-  <string name="create_addressbook_display_name_hint">Mon carnet d\'adresses</string>
-  <string name="create_calendar">Créer une collection CalDAV</string>
-  <string name="create_calendar_display_name_hint">Mon calendrier</string>
-  <string name="create_calendar_time_zone">Fuseau horaire:</string>
-  <string name="create_calendar_type">Type de collection:</string>
-  <string name="create_calendar_type_only_events">Calendrier (événements seulement)</string>
-  <string name="create_calendar_type_only_tasks">Liste de tâches (tâches seulement)</string>
-  <string name="create_calendar_type_events_and_tasks">Fusionner (événements et tâches)</string>
-  <string name="create_collection_color">Choisir une couleur pour la collection</string>
-  <string name="create_collection_creating">Création collection</string>
-  <string name="create_collection_display_name">Le nom affiché (titre) pour cette collection:</string>
-  <string name="create_collection_display_name_required">Titre requis</string>
-  <string name="create_collection_description">Description (facultatif)</string>
-  <string name="create_collection_home_set">Accueil:</string>
-  <string name="create_collection_create">Créer</string>
-  <string name="delete_collection">Supprimer la collection</string>
-  <string name="delete_collection_confirm_title">Êtes-vous sur?</string>
-  <string name="delete_collection_confirm_warning">Cette collection (%s) et toutes ses données seront supprimées du serveur.</string>
-  <string name="delete_collection_deleting_collection">Suppression de la collection</string>
-  <!--ExceptionInfoFragment-->
-  <string name="exception">Une erreur est survenue.</string>
-  <string name="exception_httpexception">Une erreur HTTP est survenue.</string>
-  <string name="exception_ioexception">Une erreur I/O est survenue.</string>
-  <string name="exception_show_details">Voir détails</string>
-  <!--sync errors and DebugInfoActivity-->
-  <string name="debug_info_title">Infos de débogage</string>
-  <string name="sync_error_permissions">Autorisations DAVdroid</string>
-  <string name="sync_error_permissions_text">Autorisations supplémentaires demandées</string>
-  <string name="sync_error_calendar">Échec de la synchronisation du calendrier (%s)</string>
-  <string name="sync_error_contacts">Échec de la synchronisation du carnet d\'adresse (%s)</string>
-  <string name="sync_error_tasks">Échec de la synchronisation (%s)</string>
-  <string name="sync_error">Erreur durant %s</string>
-  <string name="sync_error_http_dav">Erreur de serveur durant %s</string>
-  <string name="sync_error_local_storage">Erreur de base de donnée durant %s</string>
-  <string-array name="sync_error_phases">
-    <item>prépare la synchronisation</item>
-    <item>demande les autorisations</item>
-    <item>procède à la suppression des entrées locales</item>
-    <item>prépare les entrées créées/modifiées</item>
-    <item>envoi les entrées créées/modifiées</item>
-    <item>vérifie l\'état de la synchronisation</item>
-    <item>liste les entrées locales</item>
-    <item>liste les entrées distantes</item>
-    <item>compare les entrées locales/distantes</item>
-    <item>télécharge les entrées distantes</item>
-    <item>post-traitement</item>
-    <item>enregistre l\'état de la synchronisation</item>
-  </string-array>
-  <string name="sync_error_unauthorized">Nom d\'utilisateur ou mot de passe erroné</string>
-  <!--cert4android-->
-  <string name="certificate_notification_connection_security">DAVdroid : Sécurité de la connexion</string>
-  <string name="trust_certificate_unknown_certificate_found">DAVdroid a rencontré un certificat inconnu. Voulez-vous lui faire confiance?</string>
-</resources>

app/src/davdroid/res/values-hu/strings.xml

@@ -1,245 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--common strings-->
-  <string name="app_name">DAVdroid</string>
-  <string name="account_title_address_book">DAVdroid címjegyzék</string>
-  <string name="address_books_authority_title">Címjegyzékek</string>
-  <string name="help">Súgó</string>
-  <string name="manage_accounts">Fiókok kezelése</string>
-  <string name="please_wait">Kérjük, várjon ...</string>
-  <string name="send">Küldés</string>
-  <!--startup dialogs-->
-  <string name="startup_battery_optimization">Akkumulátoroptimalizálás </string>
-  <string name="startup_battery_optimization_message">Az operációs rendszer a DAVdroid szinkronizálást pár nap után leállíthatja vagy visszafoghatja.  Ennek elkerülésére kapcsolja ki az akkumulátoroptimalizálást.</string>
-  <string name="startup_battery_optimization_disable">Kikapcsolás a DAVdroid kapcsán</string>
-  <string name="startup_dont_show_again">Ne jelenjen meg többet</string>
-  <string name="startup_development_version_give_feedback">Visszajelzés küldése</string>
-  <string name="startup_donate">A forrás nyíltságával kapcsolatos információk</string>
-  <string name="startup_donate_message">Örülünk, hogy használja a DAVdroidot.  A DAVdroid nyílt forráskódú (GPLv3) szoftver, de a fejlesztése kemény munkát jelent, már eddig több ezer munkaórát emésztett fel, ezért kérjük, fontolja meg, hogy támogassa munkánkat.</string>
-  <string name="startup_donate_now">Támogatás küldése</string>
-  <string name="startup_donate_later">Talán később</string>
-  <string name="startup_google_play_accounts_removed">Play Áruház DRM hibával kapcsolatos információ</string>
-  <string name="startup_google_play_accounts_removed_message">Bizonyos körülmények között  a Play Áruház DRM okozhatja azt, hogy az eszköz újraindítását vagy a DAVdroid frissítését követően a DAVdroid fiókok eltűnnek.  Amennyiben (és csak amennyiben) érinti Önt ez a probléma, telepítse a \"DAVdroid JB Workaround\" alkalmazást Play Áruházból.</string>
-  <string name="startup_google_play_accounts_removed_more_info">További információk</string>
-  <string name="startup_opentasks_not_installed">Az OpenTasks nincs telepítve</string>
-  <string name="startup_opentasks_not_installed_message">Az OpenTasks alkalmazás nincs telepítve, így a DAVdroid nem lesz képes szinkronizálni feladatlistákat.</string>
-  <string name="startup_opentasks_reinstall_davdroid">Az OpenTasks telepítését követően újra kell telepíteni a DAVdroit alkalmazást és újra fel kell venni a fiókokat (Android hiba).</string>
-  <string name="startup_opentasks_not_installed_install">Az OpenTasks telepítése</string>
-  <!--AboutActivity-->
-  <string name="about_license_terms">Licencfeltételek</string>
-  <string name="about_license_info_no_warranty">Ehhez a program SEMMIFÉLE GARANCIA NEM JÁR.   Ez a program szabad szoftver, ami a bizonyos feltételek mellett szabadon terjeszthető.</string>
-  <!--global settings-->
-  <string name="logging_davdroid_file_logging">DAVdroid fájlalapú naplózás</string>
-  <string name="logging_to_external_storage">Naplózás külső tárhelyre: %s</string>
-  <string name="logging_to_external_storage_warning">Törölje a naplófájlt, amint lehetséges!</string>
-  <string name="logging_couldnt_create_file">Külső naplófájl létrehozása sikertelen: %s</string>
-  <string name="logging_no_external_storage">A külső tárhely nem érhető el</string>
-  <!--AccountsActivity-->
-  <string name="navigation_drawer_open">Navigációs fiók megnyitása</string>
-  <string name="navigation_drawer_close">Navigációs fiók lezárása</string>
-  <string name="navigation_drawer_subtitle">CalDAV/CardDAV szinkronizációs adapter</string>
-  <string name="navigation_drawer_about">Névjegy / Licenc</string>
-  <string name="navigation_drawer_settings">Beállítások</string>
-  <string name="navigation_drawer_news_updates">Hírek és frissítések</string>
-  <string name="navigation_drawer_external_links">Weblapok</string>
-  <string name="navigation_drawer_website">Honlap</string>
-  <string name="navigation_drawer_faq">GYIK</string>
-  <string name="navigation_drawer_donate">Támogatás</string>
-  <string name="account_list_empty">Üdvözöljük a DAVdroid felhasználók között!\n\nMost már felvehet CalDAV/CardDav fiókokat.</string>
-  <string name="accounts_global_sync_disabled">A rendszerszintű automatikus szinkronizálás ki van kapcsolva</string>
-  <string name="accounts_global_sync_enable">Bekapcsolás</string>
-  <!--DavService-->
-  <string name="dav_service_refresh_failed">Szolgáltatások felderítése nem sikerült</string>
-  <string name="dav_service_refresh_couldnt_refresh">Gyűjteménylista frissítése nem sikerült</string>
-  <!--AppSettingsActivity-->
-  <string name="app_settings">Beállítások</string>
-  <string name="app_settings_user_interface">Felhasználói felület</string>
-  <string name="app_settings_reset_hints">Tippek visszaállítása</string>
-  <string name="app_settings_reset_hints_summary">Újra jelenjen meg az összes tipp</string>
-  <string name="app_settings_reset_hints_success">Az összes tipp újra meg fog jelenni</string>
-  <string name="app_settings_connection">Kapcsolat</string>
-  <string name="app_settings_override_proxy">Proxybeállítások felülírása</string>
-  <string name="app_settings_override_proxy_on">Egyedi proxybeállítások</string>
-  <string name="app_settings_override_proxy_off">Az alapértelmezett proxybeállítás használata</string>
-  <string name="app_settings_override_proxy_host">HTTP proxyállomás neve</string>
-  <string name="app_settings_override_proxy_port">HTTP proxy port</string>
-  <string name="app_settings_security">Biztonság</string>
-  <string name="app_settings_distrust_system_certs">A rendszertanúsítványok elfogadása</string>
-  <string name="app_settings_distrust_system_certs_on">A rendszer által kezelt, előre vagy felhasználó által telepített tanúsítványok figyelmen kívül lesznek hagyva</string>
-  <string name="app_settings_distrust_system_certs_off">A rendszer által kezelt, előre vagy felhasználó által telepített tanúsítványok megbízhatóak (javasolt)</string>
-  <string name="app_settings_reset_certificates">A tanúsítványok megbízhatóságának törlésére</string>
-  <string name="app_settings_reset_certificates_summary">A tanúsítványok megbízhatóságával kapcsolatos beállítások törlésére</string>
-  <string name="app_settings_reset_certificates_success">A tanúsítványok megbízhatóságával kapcsolatos beállítások törölve</string>
-  <string name="app_settings_debug">Hibakeresés</string>
-  <string name="app_settings_log_to_external_storage">Naplózás fájlba</string>
-  <string name="app_settings_log_to_external_storage_on">Naplózás külső tárhelyre (ha elérhető)</string>
-  <string name="app_settings_log_to_external_storage_off">Fájlalapú naplózás kikapcsolva</string>
-  <string name="app_settings_show_debug_info">Hibakeresési információ megtekintése</string>
-  <string name="app_settings_show_debug_info_details">Szoftver- és konfigurációs részletek megtekintése/megosztása</string>
-  <!--AccountActivity-->
-  <string name="account_synchronize_now">Szinkronizálás most</string>
-  <string name="account_synchronizing_now">Szinkronizálás</string>
-  <string name="account_settings">Fiókbeállítások</string>
-  <string name="account_rename">Fiók átnevezése</string>
-  <string name="account_rename_new_name">Az elmentetlen helyben tárolt adatok elvesznek.  Az átnevezés után szinkronizálásra lesz szükség.  Új fióknév:</string>
-  <string name="account_rename_rename">Átnevez</string>
-  <string name="account_delete">Fiók törlése</string>
-  <string name="account_delete_confirmation_title">Valóban törölni akarja a fiókot?</string>
-  <string name="account_delete_confirmation_text">Az összes címjegyzék, naptár és feladatlista helyi példányai törölve lesznek.</string>
-  <string name="account_refresh_address_book_list">Címjegyzék-lista frissítése</string>
-  <string name="account_create_new_address_book">Új címjegyzék létrehozása</string>
-  <string name="account_refresh_calendar_list">Naptárlista frissítése</string>
-  <string name="account_create_new_calendar">Új naptár létrehozása</string>
-  <!--PermissionsActivity-->
-  <string name="permissions_title">DAVdroid engedélyek </string>
-  <string name="permissions_calendar">Naptárengedély</string>
-  <string name="permissions_calendar_details">A CalDAV naptárak és a helyi naptárak szinkronizálásához a DAVdroid naptárhozzáférést igényel.</string>
-  <string name="permissions_calendar_request">Naptárhozzáférés igénylése</string>
-  <string name="permissions_contacts">Névjegyengedélyek</string>
-  <string name="permissions_contacts_details">A CardDAV címlisták és a helyi címlisták szinkronizálásához a névjegyhozzáférést igényel.</string>
-  <string name="permissions_contacts_request">Névjegyengedélyek igénylése</string>
-  <string name="permissions_opentasks">OpenTasks engedélyek</string>
-  <string name="permissions_opentasks_details">A CalDAV feladatlisták és a helyi feladatlisták szinkronizálásához a DAVdroid OpenTasks hozzáférést igényel.</string>
-  <string name="permissions_opentasks_request">OpenTasks engedélyek igénylése</string>
-  <!--AddAccountActivity-->
-  <string name="login_title">Fiók hozzáadása</string>
-  <string name="login_type_email">Bejelentkezés email cím segítségével</string>
-  <string name="login_email_address">Email cím:</string>
-  <string name="login_email_address_error">Érvényes email cím megadása feltétlenül szükséges</string>
-  <string name="login_password">Jelszó</string>
-  <string name="login_password_required">A jelszó megadása szükséges</string>
-  <string name="login_type_url">Bejelentkezés URL és felhasználónév segítségével</string>
-  <string name="login_url_must_be_http_or_https">Az URL elején szerepeljen http(s)://</string>
-  <string name="login_url_host_name_required">A szervernév megadása feltétlenül szükséges</string>
-  <string name="login_user_name">Felhasználónév</string>
-  <string name="login_user_name_required">A felhasználónév megadása feltétlenül szükséges</string>
-  <string name="login_base_url">URL-törzs</string>
-  <string name="login_login">Bejelentkezés</string>
-  <string name="login_back">Vissza</string>
-  <string name="login_create_account">Fiók létrehozása</string>
-  <string name="login_account_name">A fiók neve</string>
-  <string name="login_account_name_info">Használja az email címet fióknévként, mert később a létrehozandó események szervezőjeként (ORGANIZER mező) az Android ezt fogja használni. Két fiókot nem lehet azonos néven létrehozni.</string>
-  <string name="login_account_contact_group_method">A csoportok kezelésének módja:</string>
-  <string name="login_account_name_required">A fióknév megadása feltétlenül szükséges</string>
-  <string name="login_account_not_created">A fiók létrehozása nem sikerült</string>
-  <string name="login_configuration_detection">A konfiguráció felderítése</string>
-  <string name="login_querying_server">Kérjük, várjon, a szerver lekérdezése...</string>
-  <string name="login_no_caldav_carddav">Nem található CalDAV vagy CardDAV szolgáltatás.</string>
-  <string name="login_view_logs">Naplóbejegyzések megtekintése</string>
-  <!--AccountSettingsActivity-->
-  <string name="settings_title">Beállítások: %s</string>
-  <string name="settings_authentication">Authentikáció</string>
-  <string name="settings_username">Felhasználónév</string>
-  <string name="settings_enter_username">Adja meg a felhasználónevet:</string>
-  <string name="settings_password">Jelszó</string>
-  <string name="settings_password_summary">Adja meg a szerveren érvényes új jelszót.</string>
-  <string name="settings_enter_password">Adja meg a jelszót:</string>
-  <string name="settings_sync">Szinkronizálás</string>
-  <string name="settings_sync_interval_contacts">Névjegyszinkronizálás sűrűsége</string>
-  <string name="settings_sync_summary_manually">Manuális</string>
-  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Minden %d percben + az eszközön történt módosítás után</string>
-  <string name="settings_sync_interval_calendars">Naptárszinkronizálás sűrűsége</string>
-  <string name="settings_sync_interval_tasks">Feladatlisták szinkronizálásának sűrűsége</string>
-  <string-array name="settings_sync_interval_seconds">
-    <item>-1</item>
-    <item>300</item>
-    <item>600</item>
-    <item>900</item>
-    <item>3600</item>
-    <item>7200</item>
-    <item>14400</item>
-    <item>86400</item>
-  </string-array>
-  <string-array name="settings_sync_interval_names">
-    <item>Manuális</item>
-    <item>5 percenként</item>
-    <item>10 percenként</item>
-    <item>15 percenként</item>
-    <item>Óránként</item>
-    <item>2 óránként</item>
-    <item>4 óránként</item>
-    <item>Naponta</item>
-  </string-array>
-  <string name="settings_sync_wifi_only">Szinkronizálás csak WIFI-n</string>
-  <string name="settings_sync_wifi_only_on">Csak WIFI kapcsolat keresztül történjen szinkronizálás</string>
-  <string name="settings_sync_wifi_only_off">Szinkronizálás a kapcsolat típusától függetlenül</string>
-  <string name="settings_sync_wifi_only_ssid">WIFI SSID szűkítés</string>
-  <string name="settings_sync_wifi_only_ssid_on">Szinkronizálás csak a(z) %s hálózatra kapcsolódva</string>
-  <string name="settings_sync_wifi_only_ssid_off">Szinkronizálás bármely WIFI hálózaton</string>
-  <string name="settings_sync_wifi_only_ssid_message">Adja meg a WIFI hálózat nevét (SSID) a szinkronizálás egy hálózatra való korlátozához, vagy hagyja üresen, ha nem akar ilyen szűkítést.</string>
-  <string name="settings_carddav">CardDAV</string>
-  <string name="settings_contact_group_method">A csoportok kezelésének módja</string>
-  <string-array name="settings_contact_group_method_values">
-    <item>GROUP_VCARDS</item>
-    <item>CATEGORIES</item>
-  </string-array>
-  <string-array name="settings_contact_group_method_entries">
-    <item>Minden csoport egy különálló VCard</item>
-    <item>A csoportok a kapcsolatonkéni kategóriák</item>
-  </string-array>
-  <string name="settings_caldav">CalDAV</string>
-  <string name="settings_sync_time_range_past">Múltbéli események időkorlátja</string>
-  <string name="settings_sync_time_range_past_none">Minden esemény szinkronizálása</string>
-  <plurals name="settings_sync_time_range_past_days">
-    <item quantity="one">Az egy napnál régebbi események figyelmen kívül hagyása</item>
-    <item quantity="other">A %d napnál régebbi események figyelmen kívül hagyása</item>
-  </plurals>
-  <string name="settings_sync_time_range_past_message">Az ennyi napnál (lehet 0) régebbi események figyelmen kívül lesznek hagyva.  Hagyja üresen, ha minden múltbéli eseményt szinkronizálni akar.</string>
-  <string name="settings_manage_calendar_colors">Naptárszínek kezelése</string>
-  <string name="settings_manage_calendar_colors_on">A naptárszíneket a DAVdroid kezeli</string>
-  <string name="settings_manage_calendar_colors_off">A naptárszíneket nem a DAVdroid kezeli</string>
-  <!--collection management-->
-  <string name="create_addressbook">Címjegyzék létrehozása</string>
-  <string name="create_addressbook_display_name_hint">Új címjegyzék</string>
-  <string name="create_calendar">CalDAV gyűjtemény létrehozása</string>
-  <string name="create_calendar_display_name_hint">Új naptár</string>
-  <string name="create_calendar_time_zone">Időzóna:</string>
-  <string name="create_calendar_type">Gyűjtemény típusa:</string>
-  <string name="create_calendar_type_only_events">Naptár (csak események)</string>
-  <string name="create_calendar_type_only_tasks">Feladatlista (csak feladatok)</string>
-  <string name="create_calendar_type_events_and_tasks">Kombinált (események és feladatok)</string>
-  <string name="create_collection_color">A gyűjtemény színének kiválasztása</string>
-  <string name="create_collection_creating">Gyűjtemény létrehozása</string>
-  <string name="create_collection_display_name">A gyűjtemény megnevezése (címe)</string>
-  <string name="create_collection_display_name_required">A cím megadása feltétlenül szükséges</string>
-  <string name="create_collection_description">Leírás (opcionális):</string>
-  <string name="create_collection_home_set">Gyűjtemények tárolója:</string>
-  <string name="create_collection_create">Létrehozás</string>
-  <string name="delete_collection">Gyűjtemény törlése</string>
-  <string name="delete_collection_confirm_title">Biztos?</string>
-  <string name="delete_collection_confirm_warning">A gyűjtemény (%s) és a hozzá tartozó adatok törölve lesznek a szerverről.</string>
-  <string name="delete_collection_deleting_collection">Gyűjtemény törlése</string>
-  <!--ExceptionInfoFragment-->
-  <string name="exception">Hiba történt.</string>
-  <string name="exception_httpexception">HTTP hiba történt.</string>
-  <string name="exception_ioexception">I/O hiba történt.</string>
-  <string name="exception_show_details">Részletek megjelenítése</string>
-  <!--sync errors and DebugInfoActivity-->
-  <string name="debug_info_title">Hibakeresési információ</string>
-  <string name="sync_error_permissions">DAVdroid engedélyek </string>
-  <string name="sync_error_permissions_text">További engedélyek szükségesek</string>
-  <string name="sync_error_calendar">A naptár szinkronizálása nem sikerült (%s)</string>
-  <string name="sync_error_contacts">A címjegyzék szinkronizálása nem sikerült (%s)</string>
-  <string name="sync_error_tasks">A feladatok szinkronizálása nem sikerült (%s)</string>
-  <string name="sync_error">Hiba az alábbi művelet közben: %s</string>
-  <string name="sync_error_http_dav">Szerver oldali hiba az alábbi művelet közben: %s</string>
-  <string name="sync_error_local_storage">Adatbázishiba az alábbi művelet közben: %s</string>
-  <string-array name="sync_error_phases">
-    <item>szinkronizáció előkészítése </item>
-    <item>szerver képességeinek lekérdezése</item>
-    <item>a helyben törölt bejegyzések feldolgozása</item>
-    <item>az új vagy módosított bejegyzések gyűjtése </item>
-    <item>az új vagy módosított bejegyzések feltöltése</item>
-    <item>szinkronizációs állapot ellenőrzése</item>
-    <item>helyi bejegyzések listázása</item>
-    <item>távoli bejegyzések listázása</item>
-    <item>helyi és távoli bejegyzések összehasonlítása</item>
-    <item>távoli bejegyzések letöltése</item>
-    <item>utófeldolgozás</item>
-    <item>szinkronizációs állapot mentése</item>
-  </string-array>
-  <string name="sync_error_unauthorized">A felhasználónév vagy jelszó hibás</string>
-  <!--cert4android-->
-  <string name="certificate_notification_connection_security">DAVdroid: kapcsolatbiztonság</string>
-  <string name="trust_certificate_unknown_certificate_found">Egy eddig ismeretlen tanúsítvány érkezett.  Megbízhatónak kívánja elfogadni?</string>
-</resources>

app/src/davdroid/res/values-it/strings.xml

@@ -1,245 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--common strings-->
-  <string name="app_name">DAVdroid</string>
-  <string name="account_title_address_book">Rubrica degli indirizzi DAVdroid</string>
-  <string name="address_books_authority_title">Rubriche degli indirizzi</string>
-  <string name="help">Aiuto</string>
-  <string name="manage_accounts">Gestione account</string>
-  <string name="please_wait">Attendere prego …</string>
-  <string name="send">Invia</string>
-  <!--startup dialogs-->
-  <string name="startup_battery_optimization">Ottimizazione della batteria</string>
-  <string name="startup_battery_optimization_message">Android può ridurre o disabilitare la sincronizzazione di DAVdroid dopo alcuni giorni. Per prevenire questo comportamento disabilita l\'ottimizzazione della batteria</string>
-  <string name="startup_battery_optimization_disable">Disabilita per DAVdroid</string>
-  <string name="startup_dont_show_again">Non mostrare più</string>
-  <string name="startup_development_version_give_feedback">Invia un rapporto</string>
-  <string name="startup_donate">Informazioni sull\'Open-Source</string>
-  <string name="startup_donate_message">Siamo soddisfatti del tuo uso di DAVdroid, programma Open-Source (GPLv3). Poiché lo sviluppo è un\'iniziativa complessa che comporta molte ore di lavoro ti invitiamo a fare una donazione.</string>
-  <string name="startup_donate_now">Mostra pagina donazioni</string>
-  <string name="startup_donate_later">Più tardi</string>
-  <string name="startup_google_play_accounts_removed">Informazioni sul bug del DRM di Play Store</string>
-  <string name="startup_google_play_accounts_removed_message">In alcune condizioni il DRM di Play Store può causare la perdita di tutti gli account DAVdroid dopo un riavvio o dopo un aggiornamento di DAVdroid. Se verificate questo problema installate successivamente \"DAVdroid JB Workaround\" da Play Store.</string>
-  <string name="startup_google_play_accounts_removed_more_info">Maggiori informazioni</string>
-  <string name="startup_opentasks_not_installed">OpenTasks non installata</string>
-  <string name="startup_opentasks_not_installed_message">L\'applicazione OpenTasks non è installata: di conseguenza DAVdroid non potrà sincronizzare l\'elenco delle attività.</string>
-  <string name="startup_opentasks_reinstall_davdroid">Dopo l\'installazione di OpenTasks è necessario INSTALLARE NUOVAMENTE DAVdroid e aggiungere ancora gli account (per un bug di Android).</string>
-  <string name="startup_opentasks_not_installed_install">Installa OpenTasks</string>
-  <!--AboutActivity-->
-  <string name="about_license_terms">Termini di licenza</string>
-  <string name="about_license_info_no_warranty">Il programma è distribuito SENZA ALCUNA GARANZIA. È software libero e può essere redistribuito sotto alcune condizioni.</string>
-  <!--global settings-->
-  <string name="logging_davdroid_file_logging">Invio del log di DAVdroid su file</string>
-  <string name="logging_to_external_storage">Log su dispositivo esterno: %s</string>
-  <string name="logging_to_external_storage_warning">Cancellare prima possibile i file di log!</string>
-  <string name="logging_couldnt_create_file">Non riesco a creare il file di log esterno: %s</string>
-  <string name="logging_no_external_storage">Dispositivo esterno non disponibile</string>
-  <!--AccountsActivity-->
-  <string name="navigation_drawer_open">Apri barra di navigazione</string>
-  <string name="navigation_drawer_close">Chiudi barra di navigazione</string>
-  <string name="navigation_drawer_subtitle">CalDAV/CardDAV adattatore di sincronizzazione</string>
-  <string name="navigation_drawer_about">Informazioni / Licenza</string>
-  <string name="navigation_drawer_settings">Impostazioni</string>
-  <string name="navigation_drawer_news_updates">Notizie &amp; aggiornamenti</string>
-  <string name="navigation_drawer_external_links">Link esterni</string>
-  <string name="navigation_drawer_website">Sito web</string>
-  <string name="navigation_drawer_faq">Domande Frequenti</string>
-  <string name="navigation_drawer_donate">Donazione</string>
-  <string name="account_list_empty">Benvenuto a DAVdroid!\n\nÈ ora possibile aggiungere account CalDAV/CardDAV.</string>
-  <string name="accounts_global_sync_disabled">La sincronizzazione automatica dell\'intero sistema è disabilitata</string>
-  <string name="accounts_global_sync_enable">Attiva</string>
-  <!--DavService-->
-  <string name="dav_service_refresh_failed">Fallita l\'individuazione dei servizi</string>
-  <string name="dav_service_refresh_couldnt_refresh">Impossibile aggiornare la lista delle raccolte</string>
-  <!--AppSettingsActivity-->
-  <string name="app_settings">Impostazioni</string>
-  <string name="app_settings_user_interface">Interfaccia utente</string>
-  <string name="app_settings_reset_hints">Reimposta i suggerimenti</string>
-  <string name="app_settings_reset_hints_summary">Riabilita i suggerimenti precedentemente disabilitati</string>
-  <string name="app_settings_reset_hints_success">I suggerimenti verranno mostrati</string>
-  <string name="app_settings_connection">Connessione</string>
-  <string name="app_settings_override_proxy">Non rispettare la impostazioni del proxy</string>
-  <string name="app_settings_override_proxy_on">Impostazioni personalizzate del proxy</string>
-  <string name="app_settings_override_proxy_off">Usa le impostazioni di sistema del proxy</string>
-  <string name="app_settings_override_proxy_host">Nome host del proxy HTTP</string>
-  <string name="app_settings_override_proxy_port">Porta del proxy HTTP</string>
-  <string name="app_settings_security">Sicurezza</string>
-  <string name="app_settings_distrust_system_certs">Non ti fidare dei certificati di sistema</string>
-  <string name="app_settings_distrust_system_certs_on">Le CA di sistema e quelle aggiunte dall\'utente non sono affidabili</string>
-  <string name="app_settings_distrust_system_certs_off">Le CA di sistema e quelle aggiunte dall\'utente sono affidabili (raccomandato)</string>
-  <string name="app_settings_reset_certificates">Reimposta la fiducia in tutti i certificati</string>
-  <string name="app_settings_reset_certificates_summary">Reimposta la fiducia nei certificati aggiunti</string>
-  <string name="app_settings_reset_certificates_success">Sono stati cancellati tutti i certificati aggiunti</string>
-  <string name="app_settings_debug">Debug</string>
-  <string name="app_settings_log_to_external_storage">Log su file esterno</string>
-  <string name="app_settings_log_to_external_storage_on">Log su dispositivo esterno (se disponibile)</string>
-  <string name="app_settings_log_to_external_storage_off">Log su file esterno disabilitato</string>
-  <string name="app_settings_show_debug_info">Mostra informazioni di debug</string>
-  <string name="app_settings_show_debug_info_details">Mostra e condividi i dettagli del programma e della configurazione</string>
-  <!--AccountActivity-->
-  <string name="account_synchronize_now">Sincronizza adesso</string>
-  <string name="account_synchronizing_now">Sincronizzazione in corso</string>
-  <string name="account_settings">Impostazioni account</string>
-  <string name="account_rename">Rinomina account</string>
-  <string name="account_rename_new_name">I dati locali non salvati potrebbero essere rimossi. È necessario effettuare la risincronizzazione dopo la rinomina. Nuovo nome dell\'account:</string>
-  <string name="account_rename_rename">Rinomina</string>
-  <string name="account_delete">Elimina account</string>
-  <string name="account_delete_confirmation_title">Cancellare l\'account?</string>
-  <string name="account_delete_confirmation_text">Tutte le copie locali delle rubriche, dei calendari e degli elenchi attività verranno eliminate.</string>
-  <string name="account_refresh_address_book_list">Aggiorna elenco degli indirizzari</string>
-  <string name="account_create_new_address_book">Crea un nuovo indirizzario</string>
-  <string name="account_refresh_calendar_list">Aggiorna lista calendari</string>
-  <string name="account_create_new_calendar">Crea nuovo calendario</string>
-  <!--PermissionsActivity-->
-  <string name="permissions_title">Permessi DAVdroid</string>
-  <string name="permissions_calendar">Permessi calendario</string>
-  <string name="permissions_calendar_details">Per sincronizzare gli eventi CalDAV con i calendari locali DAVdroid deve avere l\'accesso ai tuoi calendari.</string>
-  <string name="permissions_calendar_request">Richiesta autorizzazione al calendario</string>
-  <string name="permissions_contacts">Permessi Contatti</string>
-  <string name="permissions_contacts_details">Per sincronizzare l\'indirizzario CardDAV con i contatti locali DAVdroid deve avere l\'accesso ai tuoi contatti.</string>
-  <string name="permissions_contacts_request">Richiesta autorizzazione ai contatti</string>
-  <string name="permissions_opentasks">Permessi OpenTasks</string>
-  <string name="permissions_opentasks_details">Per sincronizzazione l\'elenco attività di CalDAV con l\'elenco locale DAVdroid deve avere l\'accesso  ad OpenTasks.</string>
-  <string name="permissions_opentasks_request">Richiesta autorizzazione ad OpenTasks</string>
-  <!--AddAccountActivity-->
-  <string name="login_title">Aggiungi account</string>
-  <string name="login_type_email">Accedi con indirizzo email</string>
-  <string name="login_email_address">Indirizzo email</string>
-  <string name="login_email_address_error">È necessario un indirizzo email valido</string>
-  <string name="login_password">Password</string>
-  <string name="login_password_required">Password richiesta</string>
-  <string name="login_type_url">Accedi con URL e nome utente</string>
-  <string name="login_url_must_be_http_or_https">L\'URL deve iniziare con http(s)://</string>
-  <string name="login_url_host_name_required">Nome host richiesto</string>
-  <string name="login_user_name">Nome utente</string>
-  <string name="login_user_name_required">Nome utente richiesto</string>
-  <string name="login_base_url">Base URL</string>
-  <string name="login_login">Login</string>
-  <string name="login_back">Indietro</string>
-  <string name="login_create_account">Crea account</string>
-  <string name="login_account_name">Nome account</string>
-  <string name="login_account_name_info">Inserisci il tuo indirizzo email come nome dell\'account in quanto Android userà il nome dell\'account nel campo ORGANIZER degli eventi creati. Non è possibile avere due account con nome uguale.</string>
-  <string name="login_account_contact_group_method">Metodo del contact group:</string>
-  <string name="login_account_name_required">Richiesto il nome dell\'account</string>
-  <string name="login_account_not_created">L\'account non può essere creato</string>
-  <string name="login_configuration_detection">Rilevazione configurazione</string>
-  <string name="login_querying_server">Attendere, invio richiesta al server...</string>
-  <string name="login_no_caldav_carddav">Impossibile trovare servizi CalDAV o CardDAV.</string>
-  <string name="login_view_logs">Vedi i log</string>
-  <!--AccountSettingsActivity-->
-  <string name="settings_title">Impostazioni: %s</string>
-  <string name="settings_authentication">Autenticazione</string>
-  <string name="settings_username">Nome utente</string>
-  <string name="settings_enter_username">Inserisci nome utente:</string>
-  <string name="settings_password">Password</string>
-  <string name="settings_password_summary">Aggiorna la password come sul tuo server.</string>
-  <string name="settings_enter_password">Inserisci la tua password:</string>
-  <string name="settings_sync">Sincronizzazione</string>
-  <string name="settings_sync_interval_contacts">Intervallo sincr. Contatti</string>
-  <string name="settings_sync_summary_manually">Solo manualmente</string>
-  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Ogni %d minuti e a seguito di ogni cambiamento locale</string>
-  <string name="settings_sync_interval_calendars">Intervallo sincr. calendari</string>
-  <string name="settings_sync_interval_tasks">Intervallo sincr. attività</string>
-  <string-array name="settings_sync_interval_seconds">
-    <item>-1</item>
-    <item>300</item>
-    <item>600</item>
-    <item>900</item>
-    <item>3600</item>
-    <item>7200</item>
-    <item>14400</item>
-    <item>86400</item>
-  </string-array>
-  <string-array name="settings_sync_interval_names">
-    <item>Solo manualmente</item>
-    <item>Ogni 5 minuti</item>
-    <item>Ogni 10 minuti</item>
-    <item>Ogni 15 minuti</item>
-    <item>Ogni ora</item>
-    <item>Ogni 2 ore</item>
-    <item>Ogni 4 ore</item>
-    <item>Una volta al giorno</item>
-  </string-array>
-  <string name="settings_sync_wifi_only">Sincr. solo tramite WiFi</string>
-  <string name="settings_sync_wifi_only_on">La sincronizzazione è limitata alle connessioni WiFi</string>
-  <string name="settings_sync_wifi_only_off">Il tipo di connessione non è preso in considerazione</string>
-  <string name="settings_sync_wifi_only_ssid">Restrizione sul SSID del WiFi</string>
-  <string name="settings_sync_wifi_only_ssid_on">La sincronizzazione avverrà solo con %s</string>
-  <string name="settings_sync_wifi_only_ssid_off">Verranno usate tutte le connessioni WiFi</string>
-  <string name="settings_sync_wifi_only_ssid_message">Inserisci il nome di una rete WiFi (SSID) per limitare la sincronizzazione solo con questa rete o lasciare in bianco per usare tutte le connessioni WiFi.</string>
-  <string name="settings_carddav">CardDAV</string>
-  <string name="settings_contact_group_method">Organizzazione dei gruppi di contatto</string>
-  <string-array name="settings_contact_group_method_values">
-    <item>GROUP_VCARDS</item>
-    <item>CATEGORIES</item>
-  </string-array>
-  <string-array name="settings_contact_group_method_entries">
-    <item>I gruppi sono VCards separate</item>
-    <item>I gruppi sono categorie per ogni contatto</item>
-  </string-array>
-  <string name="settings_caldav">CalDAV</string>
-  <string name="settings_sync_time_range_past">Limite di tempo per gli eventi trascorsi</string>
-  <string name="settings_sync_time_range_past_none">Verranno sincronizzati tutti gli eventi</string>
-  <plurals name="settings_sync_time_range_past_days">
-    <item quantity="one">Eventi più vecchi di un giorno saranno ignorati</item>
-    <item quantity="other">Eventi più vecchi di %d giorni saranno ignorati</item>
-  </plurals>
-  <string name="settings_sync_time_range_past_message">Eventi più vecchi di questo numero di giorni verranno ignorati(può anche essere 0). Lasciare in bianco per sincronizzare tutti gli eventi.</string>
-  <string name="settings_manage_calendar_colors">Cambia il colore del calendario</string>
-  <string name="settings_manage_calendar_colors_on">I colori dei calendari sono gestiti da DAVdroid</string>
-  <string name="settings_manage_calendar_colors_off">I colori dei calendari non sono gestiti da DAVdroid</string>
-  <!--collection management-->
-  <string name="create_addressbook">Crea indirizzario</string>
-  <string name="create_addressbook_display_name_hint">Il mio indirizzario</string>
-  <string name="create_calendar">Crea raccolta CalDAV</string>
-  <string name="create_calendar_display_name_hint">Mio calendario</string>
-  <string name="create_calendar_time_zone">Fuso orario:</string>
-  <string name="create_calendar_type">Tipo di raccolta:</string>
-  <string name="create_calendar_type_only_events">Calendario (solo eventi)</string>
-  <string name="create_calendar_type_only_tasks">Elenco attività (solo attività)</string>
-  <string name="create_calendar_type_events_and_tasks">Combinato (eventi e attività)</string>
-  <string name="create_collection_color">Imposta colore della raccolta</string>
-  <string name="create_collection_creating">Crea una raccolta</string>
-  <string name="create_collection_display_name">Mostra il nome (titolo) di questa raccolta:</string>
-  <string name="create_collection_display_name_required">Il titolo è richiesto</string>
-  <string name="create_collection_description">Descrizione (opzionale):</string>
-  <string name="create_collection_home_set">Imposta la home:</string>
-  <string name="create_collection_create">Crea</string>
-  <string name="delete_collection">Elimina raccolta</string>
-  <string name="delete_collection_confirm_title">Sei sicuro?</string>
-  <string name="delete_collection_confirm_warning">Questa raccolta (%s) e tutti i suoi dati saranno rimossi dal server.</string>
-  <string name="delete_collection_deleting_collection">Cancellazione della raccolta</string>
-  <!--ExceptionInfoFragment-->
-  <string name="exception">Si è verificato un errore.</string>
-  <string name="exception_httpexception">Si è verificato un errore HTTP.</string>
-  <string name="exception_ioexception">Si è verificato un errore di I/O.</string>
-  <string name="exception_show_details">Mostra dettagli</string>
-  <!--sync errors and DebugInfoActivity-->
-  <string name="debug_info_title">Informazioni di debug</string>
-  <string name="sync_error_permissions">Autorizzazioni DAVdroid</string>
-  <string name="sync_error_permissions_text">Autorizzazioni addizionali richieste</string>
-  <string name="sync_error_calendar">Sincronizzazione del calendario fallita (%s)</string>
-  <string name="sync_error_contacts">Sincronizzazione dell\'indirizzario fallita (%s)</string>
-  <string name="sync_error_tasks">Sincronizzazione delle attività fallita (%s)</string>
-  <string name="sync_error">Errore nel %s</string>
-  <string name="sync_error_http_dav">Errore del server nel %s</string>
-  <string name="sync_error_local_storage">Errore del database nel %s</string>
-  <string-array name="sync_error_phases">
-    <item>inizio sincronizzazione</item>
-    <item>controllo caratteristiche del server</item>
-    <item>elaborazione voci cancellate in locale</item>
-    <item>elaborazione voci create o modificate</item>
-    <item>invio voci create o modificate</item>
-    <item>controllo stato della sincronizzazione</item>
-    <item>elenco voci locali</item>
-    <item>elenco voci remote</item>
-    <item>confronto voci locali e remote</item>
-    <item>download voci remote</item>
-    <item>post-processing</item>
-    <item>salvataggio stato della sincronizzazione</item>
-  </string-array>
-  <string name="sync_error_unauthorized">Nome utente o password errati</string>
-  <!--cert4android-->
-  <string name="certificate_notification_connection_security">DAVdroid: sicurezza della connessione</string>
-  <string name="trust_certificate_unknown_certificate_found">DAVdroid ha trovato un certificato sconosciuto. Ritenerlo affidabile?</string>
-</resources>

app/src/davdroid/res/values-nl/strings.xml

@@ -1,251 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--common strings-->
-  <string name="app_name">DAVdroid</string>
-  <string name="account_title_address_book">DAVdroid Adresboek</string>
-  <string name="address_books_authority_title">Adresboeken</string>
-  <string name="help">Help</string>
-  <string name="manage_accounts">Beheer accounts</string>
-  <string name="please_wait">Een moment geduld...</string>
-  <string name="send">Verzenden</string>
-  <string name="homepage_url">https://davdroid.bitfire.at/?pk_campaign=davdroid-app</string>
-  <!--startup dialogs-->
-  <string name="startup_battery_optimization">Batterij optimalisatie</string>
-  <string name="startup_battery_optimization_message">Android kan mogelijk de DAVdroid synchronisatie stoppen na een paar dagen. Om dit te voorkomen zet u de batterij optimalisatie uit.</string>
-  <string name="startup_battery_optimization_disable">DAVdroid afsluiten</string>
-  <string name="startup_dont_show_again">Niet opnieuw weergeven</string>
-  <string name="startup_development_version">Voorvertoning van uitgave</string>
-  <string name="startup_development_version_message">Dit is ontwikkelversie %s. Onderdelen werken niet zoals verwacht. Je terugkoppeling is welkom.</string>
-  <string name="startup_development_version_give_feedback">Feedback geven</string>
-  <string name="startup_development_version_feedback_url">https://davdroid.bitfire.at/forums/?pk_campaign=davdroid-app</string>
-  <string name="startup_donate">Open-Source informatie</string>
-  <string name="startup_donate_message">We zijn blij dat je DAVdroid gebruikt, wat open-source software (GPLv3) is. Omdat de ontwikkeling van DAVdroid hard werk is en duizenden uren in beslag neemt. overweeg alstublieft een donatie.</string>
-  <string name="startup_donate_now">Toon donatie pagina</string>
-  <string name="startup_donate_later">Misschien later</string>
-  <string name="startup_google_play_accounts_removed">Play Store DRM fout-informatie</string>
-  <string name="startup_google_play_accounts_removed_message">Onder bepaalde omstandigheden, kan Play Store DRM ervoor zorgen dat accounts kwijt zijn na een herstart of na een DAVdroid update. Als dit probleem zich bij je voordoet (en alleen dan), Installeer dan \"DAVdroid JB Workaround\" vanuit de Play Store</string>
-  <string name="startup_google_play_accounts_removed_more_info">Meer informatie</string>
-  <string name="startup_opentasks_not_installed">OpenTasks niet geinstalleerd</string>
-  <string name="startup_opentasks_not_installed_message">De OpenTasks app is niet beschikbaar, Hierdoor is het voor DAVdroid niet mogelijk om uw taken te synchroniseren.</string>
-  <string name="startup_opentasks_reinstall_davdroid">Na installatie van OpenTasks dient u DAVdroid opnieuw te installeren en de accounts toe te voegen (Android bug).</string>
-  <string name="startup_opentasks_not_installed_install">OpenTasks installeren</string>
-  <!--AboutActivity-->
-  <string name="about_license_terms">Licentie voorwaarden</string>
-  <string name="about_license_info_no_warranty">Dit programma kom met ABSOLUUT GEEN GARANTIE. Het is gratis software, en je bent welkom dit te herdistribueren onder bepaalde voorwaarden.</string>
-  <!--global settings-->
-  <string name="logging_davdroid_file_logging">DAVDroid bestand loggen</string>
-  <string name="logging_to_external_storage">Loggen naar externe opslag: %s</string>
-  <string name="logging_to_external_storage_warning">Verwijder logs zo snel mogelijk</string>
-  <string name="logging_couldnt_create_file">Kon extern log bestand niet verwijderen: %s</string>
-  <string name="logging_no_external_storage">Externe opslag niet gevonden</string>
-  <!--AccountsActivity-->
-  <string name="navigation_drawer_open">Open navigatie drawer</string>
-  <string name="navigation_drawer_close">Sluit navigatie drawer</string>
-  <string name="navigation_drawer_subtitle">CalDAV/CardDav Sync adapter</string>
-  <string name="navigation_drawer_about">Over / Licentie</string>
-  <string name="navigation_drawer_settings">Instellingen</string>
-  <string name="navigation_drawer_news_updates">Nieuws &amp; updates</string>
-  <string name="navigation_drawer_external_links">Externe links</string>
-  <string name="navigation_drawer_website">Website</string>
-  <string name="navigation_drawer_faq">FAQ</string>
-  <string name="navigation_drawer_faq_url">https://davdroid.bitfire.at/faq/?pk_campaign=davdroid-app</string>
-  <string name="navigation_drawer_donate">Doneren</string>
-  <string name="account_list_empty">Welkom bij DAVdroid!\n\nJe kunt nu een CalDAV/CardDAv account toevoegen.</string>
-  <string name="accounts_global_sync_disabled">Systeembrede automatische synchronisatie is uitgeschakeld</string>
-  <string name="accounts_global_sync_enable">Inschakelen</string>
-  <!--DavService-->
-  <string name="dav_service_refresh_failed">Service herkenning is mislukt</string>
-  <string name="dav_service_refresh_couldnt_refresh">Kon de collectie lijst niet vernieuwen</string>
-  <!--AppSettingsActivity-->
-  <string name="app_settings">Instellingen</string>
-  <string name="app_settings_user_interface">Gebruikers interface</string>
-  <string name="app_settings_reset_hints">Hints resetten </string>
-  <string name="app_settings_reset_hints_summary">Hints die al gezien zijn opnieuw weergeven</string>
-  <string name="app_settings_reset_hints_success">Alle hints worden opnieuw weergegeven</string>
-  <string name="app_settings_connection">Verbinding</string>
-  <string name="app_settings_override_proxy">Proxy instellingen overschrijven</string>
-  <string name="app_settings_override_proxy_on">Eigen proxy instellingen gebruiken</string>
-  <string name="app_settings_override_proxy_off">Systeem proxy instellingen gebruiken</string>
-  <string name="app_settings_override_proxy_host">HTTP proxy beheerder naam</string>
-  <string name="app_settings_override_proxy_port">HTTP proxy poort</string>
-  <string name="app_settings_security">Beveiliging</string>
-  <string name="app_settings_distrust_system_certs">Systeem certificaten niet vertrouwen</string>
-  <string name="app_settings_distrust_system_certs_on">Systeem en CAs van toegevoegde gebruiker wordt niet vertrouwd</string>
-  <string name="app_settings_distrust_system_certs_off">Systeem en CAs van toegevoegde gebruiker wordt vertrouwd (aanbevolen)</string>
-  <string name="app_settings_reset_certificates">Resetten (niet) vertrouwde certificaten</string>
-  <string name="app_settings_reset_certificates_summary">Resetten alle bewerkte certificaten</string>
-  <string name="app_settings_reset_certificates_success">Alle bewerkte certificaten zijn vrijgemaakt</string>
-  <string name="app_settings_debug">Debuggen</string>
-  <string name="app_settings_log_to_external_storage">Log naar extern bestand</string>
-  <string name="app_settings_log_to_external_storage_on">Loggen naar externe opslag (wanneer beschikbaar)</string>
-  <string name="app_settings_log_to_external_storage_off">Extern bestands loggen uitgeschakeld</string>
-  <string name="app_settings_show_debug_info">Debug info tonen</string>
-  <string name="app_settings_show_debug_info_details">Bekijk/deel software configuratie details</string>
-  <!--AccountActivity-->
-  <string name="account_synchronize_now">Synchroniseer nu</string>
-  <string name="account_synchronizing_now">Aan het synchronizeren...</string>
-  <string name="account_settings">Account instellingen</string>
-  <string name="account_rename">Account hernoemen</string>
-  <string name="account_rename_new_name">Niet opgeslagen lokale informatie mag verloren gaan. Synchronisatie is noodzakelijk na hernoemen. Nieuw account naam:</string>
-  <string name="account_rename_rename">Hernoemen</string>
-  <string name="account_delete">Account verwijderen</string>
-  <string name="account_delete_confirmation_title">Account echt verwijderen?</string>
-  <string name="account_delete_confirmation_text">Alle lokale kopieën van adresboeken, agenda\'s en taken worden verwijderd.</string>
-  <string name="account_refresh_address_book_list">Adresboeken vernieuwen</string>
-  <string name="account_create_new_address_book">Maak een nieuw adresboek</string>
-  <string name="account_refresh_calendar_list">Agenda\'s vernieuwen</string>
-  <string name="account_create_new_calendar">Maak een nieuwe agenda</string>
-  <!--PermissionsActivity-->
-  <string name="permissions_title">DAVdroid rechten</string>
-  <string name="permissions_calendar">Agenda rechten</string>
-  <string name="permissions_calendar_details">Om CalDAV afspraken te synchroniseren met u agenda dient DAVdroid toegang te verkrijgen. </string>
-  <string name="permissions_calendar_request">Agenda rechten verkrijgen</string>
-  <string name="permissions_contacts">Contact rechten</string>
-  <string name="permissions_contacts_details">Om CalDAV afspraken te synchroniseren met u contacten dient DAVdroid toegang te verkrijgen. </string>
-  <string name="permissions_contacts_request">Contacten rechten verkrijgen</string>
-  <string name="permissions_opentasks">OpenTasks rechten</string>
-  <string name="permissions_opentasks_details">Om CalDAV taken te synchroniseren met uw local takenlijst dient DAVdroid toegang te hebben tot OpenTasks</string>
-  <string name="permissions_opentasks_request">OpenTasks rechten verkrijgen</string>
-  <!--AddAccountActivity-->
-  <string name="login_help_url">https://davdroid.bitfire.at/configuration/?pk_campaign=davdroid-app</string>
-  <string name="login_title">Account toevoegen</string>
-  <string name="login_type_email">Inloggen met e-mailadres</string>
-  <string name="login_email_address">Email adres</string>
-  <string name="login_email_address_error">Geldig email adres vereist</string>
-  <string name="login_password">Wachtwoord</string>
-  <string name="login_password_required">Wachtwoord vereist</string>
-  <string name="login_type_url">Inloggen met URL en gebruikersnaam</string>
-  <string name="login_url_must_be_http_or_https">URL moet met http(s):// beginnen</string>
-  <string name="login_url_host_name_required">Hostnaam vereist</string>
-  <string name="login_user_name">Gebruikersnaam</string>
-  <string name="login_user_name_required">Gebruikersnaam vereist</string>
-  <string name="login_base_url">Basis URL</string>
-  <string name="login_login">Login</string>
-  <string name="login_back">Terug</string>
-  <string name="login_create_account">Maak een account</string>
-  <string name="login_account_name">Accountnaam</string>
-  <string name="login_account_name_info">Gebruik je email adres als account naam want Android zal je account naam gebruiken als ORGANIZER veld voor gemaakte afspraken. Je kunt geen 2 accounts met dezelfde naam hebben,</string>
-  <string name="login_account_contact_group_method">Contact groep methode:</string>
-  <string name="login_account_name_required">Accountnaam vereist</string>
-  <string name="login_account_not_created">Account kon niet gemaakt worden.</string>
-  <string name="login_configuration_detection">Configuratie detectie</string>
-  <string name="login_querying_server">Even geduld, verzoek naar server...</string>
-  <string name="login_no_caldav_carddav">Kon geen CalDAV of CardDAV service vinden.</string>
-  <string name="login_view_logs">Bekijk logs</string>
-  <!--AccountSettingsActivity-->
-  <string name="settings_title">Instellingen: %s</string>
-  <string name="settings_authentication">Authenticatie</string>
-  <string name="settings_username">Gebruikersnaam</string>
-  <string name="settings_enter_username">Gebruikersnaam invoeren:</string>
-  <string name="settings_password">Wachtwoord</string>
-  <string name="settings_password_summary">Gebruik het zelfde wachtwoord als op de server.</string>
-  <string name="settings_enter_password">Wachtwoord invoeren:</string>
-  <string name="settings_sync">Synchronisatie</string>
-  <string name="settings_sync_interval_contacts">Contacten verversen</string>
-  <string name="settings_sync_summary_manually">Alleen handmatig</string>
-  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Elke %d minuten + meteen na wijziging</string>
-  <string name="settings_sync_interval_calendars">Agenda\'s verversen</string>
-  <string name="settings_sync_interval_tasks">Taak sync. tussentijd</string>
-  <string-array name="settings_sync_interval_seconds">
-    <item>-1</item>
-    <item>300</item>
-    <item>600</item>
-    <item>900</item>
-    <item>3600</item>
-    <item>7200</item>
-    <item>14400</item>
-    <item>86400</item>
-  </string-array>
-  <string-array name="settings_sync_interval_names">
-    <item>Alleen handmatig</item>
-    <item>Elke 5 minuten</item>
-    <item>Elke 10 minuten</item>
-    <item>Elke 15 minuten</item>
-    <item>Elk uur</item>
-    <item>Elke 2 uur</item>
-    <item>Elke 4 uur</item>
-    <item>Dagelijks</item>
-  </string-array>
-  <string name="settings_sync_wifi_only">Sync alleen tijdens WiFi</string>
-  <string name="settings_sync_wifi_only_on">Synchronisatie is voorbehouden tijdens WiFi verbindingen</string>
-  <string name="settings_sync_wifi_only_off">Verbinding type is niet overwogen</string>
-  <string name="settings_sync_wifi_only_ssid">WiFi SSID beperking</string>
-  <string name="settings_sync_wifi_only_ssid_on">Zal alleen synchroniseren over %s</string>
-  <string name="settings_sync_wifi_only_ssid_off">Alle WiFI verbindingen mogen worden gebruikt</string>
-  <string name="settings_sync_wifi_only_ssid_message">Type de naam van het WiFi netwerk (SSID) om synchronisatie tot dit netwerk te beperken. Leeg laten voor sync over alle netwerken.</string>
-  <string name="settings_carddav">CardDAV</string>
-  <string name="settings_contact_group_method">Contact groep methode</string>
-  <string-array name="settings_contact_group_method_values">
-    <item>GROUP_VCARDS</item>
-    <item>CATEGORIES</item>
-  </string-array>
-  <string-array name="settings_contact_group_method_entries">
-    <item>Groepen zijn apparte VCards</item>
-    <item>Groepen zijn per-contact categories</item>
-  </string-array>
-  <string name="settings_caldav">CalDAV</string>
-  <string name="settings_sync_time_range_past">Tijdslimiet verleden afspraken</string>
-  <string name="settings_sync_time_range_past_none">Alle afspraken worden gesynchronizeerd</string>
-  <plurals name="settings_sync_time_range_past_days">
-    <item quantity="one">Afspraken ouder dan een dag worden genegeerd</item>
-    <item quantity="other">Afspraken ouder dan %d dagen worden genegeerd</item>
-  </plurals>
-  <string name="settings_sync_time_range_past_message">Afspraken ouder dan dit aantal dagen worden genegeerd (mag 0 zijn). Laat leeg om alle afspraken te synchronizeren.</string>
-  <string name="settings_manage_calendar_colors">Agenda kleuren beheren</string>
-  <string name="settings_manage_calendar_colors_on">Agenda kleuren worden door DAVdroid beheerd.</string>
-  <string name="settings_manage_calendar_colors_off">Agenda kleuren worden niet door DAVdroid ingesteld</string>
-  <!--collection management-->
-  <string name="create_addressbook">Maak adresboek</string>
-  <string name="create_addressbook_display_name_hint">Mijn adresboek</string>
-  <string name="create_calendar">Maak CalDAV collectie</string>
-  <string name="create_calendar_display_name_hint">Mijn agenda</string>
-  <string name="create_calendar_time_zone">Tijdzone:</string>
-  <string name="create_calendar_type">Collectie type:</string>
-  <string name="create_calendar_type_only_events">Agenda (alleen afspraken)</string>
-  <string name="create_calendar_type_only_tasks">Takenlijst (alleen taken)</string>
-  <string name="create_calendar_type_events_and_tasks">Gecombineerd (afspraken en taken)</string>
-  <string name="create_collection_color">Stel een collectie kleur in</string>
-  <string name="create_collection_creating">Collectie aan het maken</string>
-  <string name="create_collection_display_name">Weergave naam (titel) van deze collectie:</string>
-  <string name="create_collection_display_name_required">Titel is vereist</string>
-  <string name="create_collection_description">Beschrijving (optioneel):</string>
-  <string name="create_collection_home_set">Begin map:</string>
-  <string name="create_collection_create">Maak</string>
-  <string name="delete_collection">Verwijder collectie</string>
-  <string name="delete_collection_confirm_title">Weet je het zeker?</string>
-  <string name="delete_collection_confirm_warning">Deze collectie (%s) en alle data zal verwijderd worden van de server.</string>
-  <string name="delete_collection_deleting_collection">Collectie aan het verwijderen</string>
-  <!--ExceptionInfoFragment-->
-  <string name="exception">Er is een fout opgetreden.</string>
-  <string name="exception_httpexception">Er is een HTTP fout opgetreden.</string>
-  <string name="exception_ioexception">Er is een I/O fout opgetreden.</string>
-  <string name="exception_show_details">Toon details</string>
-  <!--sync errors and DebugInfoActivity-->
-  <string name="debug_info_title">Debug informatie</string>
-  <string name="sync_error_permissions">DAVdroid rechten</string>
-  <string name="sync_error_permissions_text">Aanvullende rechten vereist</string>
-  <string name="sync_error_calendar">Agenda synchronisatie is mislukt (%s)</string>
-  <string name="sync_error_contacts">Adresboek synchronisatie is mislukt (%s)</string>
-  <string name="sync_error_tasks">Taak synchronisatie is mislukt (%s)</string>
-  <string name="sync_error">Fout tijdens %s</string>
-  <string name="sync_error_http_dav">Serverfout tijdens %s</string>
-  <string name="sync_error_local_storage">Database fout tijdens %s</string>
-  <string-array name="sync_error_phases">
-    <item>synchronisatie voorbereiden</item>
-    <item>querying mogelijkheden</item>
-    <item>verwerken van lokaal verwijderde data</item>
-    <item>voorberteiding maken/wijzigen data</item>
-    <item>uploaden maken/bewerken data</item>
-    <item>controleren syngronisatie voortgang</item>
-    <item>lijst lokale data</item>
-    <item>lijst remote data</item>
-    <item>vergelijken lokale/remote data</item>
-    <item>downloaden remote data</item>
-    <item>nabewerking</item>
-    <item>opslaan sync voortgang</item>
-  </string-array>
-  <string name="sync_error_unauthorized">Gebruikersnaam/wachtwoord onjuist</string>
-  <!--cert4android-->
-  <string name="certificate_notification_connection_security">DAVdroid: Verbinding beveiliging</string>
-  <string name="trust_certificate_unknown_certificate_found">Davdroid is benaderd door een onbekend certificaat. Vertrouwd u dit?</string>
-</resources>

app/src/davdroid/res/values-pl/strings.xml

@@ -1,245 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--common strings-->
-  <string name="app_name">DAVdroid</string>
-  <string name="account_title_address_book">Książka adresowa DAVdroid</string>
-  <string name="address_books_authority_title">Książka adresowa</string>
-  <string name="help">Pomoc</string>
-  <string name="manage_accounts">Zadządzaj kontami</string>
-  <string name="please_wait">Proszę czekać</string>
-  <string name="send">Wyślij</string>
-  <!--startup dialogs-->
-  <string name="startup_battery_optimization">Optymalizacja baterii</string>
-  <string name="startup_battery_optimization_message">Android może wyłączyć/zmniejszyć synchronizacje DAVdroid po kilku dniach. Aby temu zapobiec należy wyłączyć optymalizację baterii.</string>
-  <string name="startup_battery_optimization_disable">Wyłącz dla DAVdroid</string>
-  <string name="startup_dont_show_again">Nie pokazuj ponownie</string>
-  <string name="startup_development_version">Poprzednie wydanie</string>
-  <string name="startup_development_version_message">To jest wersja rozwojowa 1%s. Nie wszystko może działać zgodnie z oczekiwaniami. Twoja opinia jest mile widziana.</string>
-  <string name="startup_development_version_give_feedback">Przekaż opinię</string>
-  <string name="startup_donate">Informacje Open-Source</string>
-  <string name="startup_donate_message">Jesteśmy szczęśliwi, że używasz DAVdroid, który jest oprogramowaniem open-source (GPLv3). Ponieważ rozwijanie DAVdroid jest ciężką pracą i zajęło nam tysiące godzin pracy, prosimy o rozważenie darowizny.</string>
-  <string name="startup_donate_now">Pokaż stronę darowizny</string>
-  <string name="startup_donate_later">Może później</string>
-  <string name="startup_google_play_accounts_removed">Informacje o błędzie DRM Sklepu Play</string>
-  <string name="startup_google_play_accounts_removed_message">Pod pewnymi warunkami, DRM Sklepu Play może powodować, że wszystkie konta DAVdroid mogą zostać usunięte po uruchomieniu lub po uaktualnieniu DAVdroid. Jeśli jesteś dotknięty tym problemem (i tylko wtedy) należy zainstalować \"DAVdroid JB Obejście\" ze Sklepu Play.</string>
-  <string name="startup_google_play_accounts_removed_more_info">Więcej informacji</string>
-  <string name="startup_opentasks_not_installed">OpenTasks nie jest zainstalowany</string>
-  <string name="startup_opentasks_not_installed_message">Aplikacja Open Tasks nie jest dostępna, więc DAVdroid nie będzie mógł synchronizować listy zadań. </string>
-  <string name="startup_opentasks_reinstall_davdroid">Po zainstalowaniu OpenTasks konieczne jest PRZEINSTALOWANIE DAVdroid i ponowne dodanie twoich kont (błąd Androida).</string>
-  <string name="startup_opentasks_not_installed_install">Zainstaluj OpenTasks</string>
-  <!--AboutActivity-->
-  <string name="about_license_terms">Warunki licencji</string>
-  <string name="about_license_info_no_warranty">Ten program jest ABSOLUTNIE BEZ GWARANCJI. To jest wolne oprogramowanie i mile widziane jest dalsze rozpowszechnianie go pod pewnymi warunkami.</string>
-  <!--global settings-->
-  <string name="logging_davdroid_file_logging">Plik logów DAVdroid</string>
-  <string name="logging_to_external_storage">Logowanie do zewnątrznej pamięci: %s</string>
-  <string name="logging_to_external_storage_warning">Usuń logi tak szybko jak to możliwe!</string>
-  <string name="logging_couldnt_create_file">Nie można stworzyć zewnętrznego pliku logów: %s</string>
-  <string name="logging_no_external_storage">Zewnętrzna pamięci nie została naleziona</string>
-  <!--AccountsActivity-->
-  <string name="navigation_drawer_open">Otwórz menu nawigacji</string>
-  <string name="navigation_drawer_close">Zamknij menu nawigacji</string>
-  <string name="navigation_drawer_subtitle">Adapter synchronizacji CalDAV/CardDAV</string>
-  <string name="navigation_drawer_about">O DAVdroid / Licencja</string>
-  <string name="navigation_drawer_settings">Ustawienia</string>
-  <string name="navigation_drawer_news_updates">Nowości &amp; aktualizacje</string>
-  <string name="navigation_drawer_external_links">Zewnętrzne odnośniki</string>
-  <string name="navigation_drawer_website">Strona WWW</string>
-  <string name="navigation_drawer_faq">FQA</string>
-  <string name="navigation_drawer_donate">Dotacja</string>
-  <string name="account_list_empty">Witamy w DAVdroid!\n\nMożesz teraz dodać konto CalDAV/CardDAV.</string>
-  <string name="accounts_global_sync_disabled">Automatyczna synchronizacja dla całego systemu jest wyłączona</string>
-  <string name="accounts_global_sync_enable">Włącz</string>
-  <!--DavService-->
-  <string name="dav_service_refresh_failed">Wykrycie serwisu nie powiodło się</string>
-  <string name="dav_service_refresh_couldnt_refresh">Nie można odświeżyć listy kolekcji</string>
-  <!--AppSettingsActivity-->
-  <string name="app_settings">Ustawienia</string>
-  <string name="app_settings_user_interface">Interfejs użytkownika</string>
-  <string name="app_settings_reset_hints">Zresetuj podpowiedzi</string>
-  <string name="app_settings_reset_hints_summary">Ponownie włącz wskazówki, które zostały usunięte wcześniej</string>
-  <string name="app_settings_reset_hints_success">Wszystkie wskazówki pojawią się ponownie</string>
-  <string name="app_settings_connection">Łączność</string>
-  <string name="app_settings_override_proxy">Nadpisz ustawienia proxy</string>
-  <string name="app_settings_override_proxy_on">Użyj niestandardowych ustawień proxy </string>
-  <string name="app_settings_override_proxy_off">Użyj systemowych ustawień proxy</string>
-  <string name="app_settings_override_proxy_host">Nazwa hosta HTTP proxy</string>
-  <string name="app_settings_override_proxy_port">Port HTTP proxy</string>
-  <string name="app_settings_security">Bezpieczeństwo</string>
-  <string name="app_settings_distrust_system_certs">Usuń certyfikaty systemowe</string>
-  <string name="app_settings_distrust_system_certs_on">CA systemowe i użytkownika nie zostaną dodane</string>
-  <string name="app_settings_distrust_system_certs_off">CA systemowe i użytkownika zostaną dodane (zalecane)</string>
-  <string name="app_settings_reset_certificates">Zresetuj (nie)zaufane certyfikaty</string>
-  <string name="app_settings_reset_certificates_summary">Zresetuj wszystkie niestandardowe certyfikaty.</string>
-  <string name="app_settings_reset_certificates_success">Wszystkie niestandardowe certyfikaty zostały wyczyszczone</string>
-  <string name="app_settings_debug">Debugowanie</string>
-  <string name="app_settings_log_to_external_storage">Loguj to zewnętrznego pliku</string>
-  <string name="app_settings_log_to_external_storage_on">Logowanie do zewnętrznej pamięci (jeśli jest dostępna)</string>
-  <string name="app_settings_log_to_external_storage_off">Logowanie do zewnętrznego pliku jest niedostępne</string>
-  <string name="app_settings_show_debug_info">Pokaż informacje do debug\'owania</string>
-  <string name="app_settings_show_debug_info_details">Przeglądaj/udostępnij oprogramowanie i szczegóły konfiguracji </string>
-  <!--AccountActivity-->
-  <string name="account_synchronize_now">Synchronizuj teraz</string>
-  <string name="account_synchronizing_now">Synchronizcja w toku</string>
-  <string name="account_settings">Ustawienia konta</string>
-  <string name="account_rename">Zmień nazwę konta</string>
-  <string name="account_rename_new_name">Niezapisane dane lokalne mogą zostać usunięte. Ponowna synchronizacja jest wymagana po zmianie nazwy. Nowa nazwa konta:</string>
-  <string name="account_rename_rename">Zmień nazwę</string>
-  <string name="account_delete">Usuń konto</string>
-  <string name="account_delete_confirmation_title">Naprawdę chcesz usunąć konto?</string>
-  <string name="account_delete_confirmation_text">Wszystkie lokalne kopie książek adresowych, kalendarzy i list zadań zostaną usunięte.</string>
-  <string name="account_refresh_address_book_list">Odśwież list książek adresowych</string>
-  <string name="account_create_new_address_book">Stwórz nową książkę adresową</string>
-  <string name="account_refresh_calendar_list">Odśwież liste kalendarzy</string>
-  <string name="account_create_new_calendar">Stwórz nowy kalendarz</string>
-  <!--PermissionsActivity-->
-  <string name="permissions_title">Uprawnienia DAVdroid</string>
-  <string name="permissions_calendar">Uprawnienia kalendarza</string>
-  <string name="permissions_calendar_details">Aby synchronizować wydarzenia CalDav z lokalnymi kalendarzami, DAVdroid potrzebuje dostępu do twoich kalendarzy.</string>
-  <string name="permissions_calendar_request">Zezwól na uprawnienia kalendarza</string>
-  <string name="permissions_contacts">Uprawnienia kontaktów</string>
-  <string name="permissions_contacts_details">Aby synchronizować książki adresowe CardDAV z lokalnymi kontaktami, DAVdroid potrzebuje dostępu do twoich kontaktów.</string>
-  <string name="permissions_contacts_request">Zezwól na uprawnienia kontaktów</string>
-  <string name="permissions_opentasks">Uprawnienia OpenTasks</string>
-  <string name="permissions_opentasks_details">Aby synchronizować zadania CalDav z lokalnymi listami zadań, DAVdroid potrzebuje dostępu do OpenTasks.</string>
-  <string name="permissions_opentasks_request">Zezwól na uprawnienia OpenTasks</string>
-  <!--AddAccountActivity-->
-  <string name="login_title">Dodaj konto</string>
-  <string name="login_type_email">Logowanie za pomocą adresu e-mail</string>
-  <string name="login_email_address">Adres e-mail</string>
-  <string name="login_email_address_error">Wymanagny poprawny adres e-mail</string>
-  <string name="login_password">Hasło</string>
-  <string name="login_password_required">Wymagane hasło</string>
-  <string name="login_type_url">Logowanie za pomocą adresu URL i nazwy użytkownika</string>
-  <string name="login_url_must_be_http_or_https">URL musi zaczynać się z http(s)://</string>
-  <string name="login_url_host_name_required">Wymagana nazwa hosta</string>
-  <string name="login_user_name">Nazwa użytkownika</string>
-  <string name="login_user_name_required">Wymagana nazwa użtkonika</string>
-  <string name="login_base_url">Podstawowy URL</string>
-  <string name="login_login">Zaloguj</string>
-  <string name="login_back">Wróć</string>
-  <string name="login_create_account">Stwórz konto</string>
-  <string name="login_account_name">Nazwa konta</string>
-  <string name="login_account_name_info">Użyj swojego adresu e-mail jako nazwy konta, ponieważ Android będzie używał nazwy konta jako pola ORGANIZATOR dla wydarzeń, które stworzysz. Nie możesz posiadać dwóch kont o takiej samej nazwie.</string>
-  <string name="login_account_contact_group_method">Metoda grupowania kontaktów:</string>
-  <string name="login_account_name_required">Wymagana nazwa konta</string>
-  <string name="login_account_not_created">Konto nie mogło zostać stworzone</string>
-  <string name="login_configuration_detection">Wykrywanie konfiguracji</string>
-  <string name="login_querying_server">Proszę czekać, odpytywanie serwera...</string>
-  <string name="login_no_caldav_carddav">Nie można znaleźć usługi CalDAV lub CardDAV.</string>
-  <string name="login_view_logs">Pokaż logi</string>
-  <!--AccountSettingsActivity-->
-  <string name="settings_title">Ustawienia: %s</string>
-  <string name="settings_authentication">Uwierzytelnianie</string>
-  <string name="settings_username">Nazwa użytkownika</string>
-  <string name="settings_enter_username">Wpisz nazwe użytkownika:</string>
-  <string name="settings_password">Hasło</string>
-  <string name="settings_password_summary">Zaktualizuj hasło zgodnie z serwerem.</string>
-  <string name="settings_enter_password">Wpisz hasło:</string>
-  <string name="settings_sync">Synchronizacja</string>
-  <string name="settings_sync_interval_contacts">Okres synchronizacji kontktów</string>
-  <string name="settings_sync_summary_manually">Tylko ręcznie</string>
-  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Co %d minut oraz natychmiast przy zmianach lokalnych</string>
-  <string name="settings_sync_interval_calendars">Okres synchronizacji kalendarzy</string>
-  <string name="settings_sync_interval_tasks">Okres synchronizacji list zadań</string>
-  <string-array name="settings_sync_interval_seconds">
-    <item>-1</item>
-    <item>300</item>
-    <item>600</item>
-    <item>900</item>
-    <item>3600</item>
-    <item>7200</item>
-    <item>14400</item>
-    <item>86400</item>
-  </string-array>
-  <string-array name="settings_sync_interval_names">
-    <item>Tylko ręcznie</item>
-    <item>Co 5 minut</item>
-    <item>Co 10 minut</item>
-    <item>Co 15 minut</item>
-    <item>Co godzinę</item>
-    <item>Co 2 godziny</item>
-    <item>Co 4 godziny</item>
-    <item>Raz dziennie</item>
-  </string-array>
-  <string name="settings_sync_wifi_only">Synchronizuj tylko przez WiFi</string>
-  <string name="settings_sync_wifi_only_on">Synchronizacja jest ograniczony do połączeń WiFi</string>
-  <string name="settings_sync_wifi_only_off">Rodzaj połączenia nie jest brany pod uwagę</string>
-  <string name="settings_sync_wifi_only_ssid">Organicznie WiFi SSID</string>
-  <string name="settings_sync_wifi_only_ssid_on">Będzie synchronizować tylko przez %s.</string>
-  <string name="settings_sync_wifi_only_ssid_off">Wszystkie połączenia WiFi mogą zostać wykorzystane</string>
-  <string name="settings_sync_wifi_only_ssid_message">Wprowadź nazwę sieci WiFi (SSID), aby ograniczyć synchronizację do tej sieci lub pozostaw puste dla wszystkich połączeń WiFi.</string>
-  <string name="settings_carddav">CardDAV</string>
-  <string name="settings_contact_group_method">Metoda grupowania kontaktów</string>
-  <string-array name="settings_contact_group_method_values">
-    <item>GROUP_VCARDS</item>
-    <item>CATEGORIES</item>
-  </string-array>
-  <string name="settings_caldav">CalDAV</string>
-  <string name="settings_sync_time_range_past">Limit czasowy przeszłych wydarzeń</string>
-  <string name="settings_sync_time_range_past_none">Wszystkie wydarzenia zostaną synchronizowane</string>
-  <plurals name="settings_sync_time_range_past_days">
-    <item quantity="one">Wydarzenia starsze niż jeden dzień zostaną zignorowane.</item>
-    <item quantity="few">Wydarzenia starsze niż %d dni zostaną zignorowane.</item>
-    <item quantity="many">Wydarzenia starsze niż %d dni zostaną zignorowane.</item>
-    <item quantity="other">Wydarzenia starsze niż %d dni zostaną zignorowane.</item>
-  </plurals>
-  <string name="settings_sync_time_range_past_message">Wydarzenia, które są starsze niż podana liczba dni zostaną zignorowane (może być 0). Zostaw puste, aby synchronizować wszystkie wydarzenia.</string>
-  <string name="settings_manage_calendar_colors">Zarządzaj kolorami kalendarza</string>
-  <string name="settings_manage_calendar_colors_on">Kolory kalendarza są zarządzane przez DAVdroid</string>
-  <string name="settings_manage_calendar_colors_off">Kolory kalendarze nie są ustawiane przez DAVdroid</string>
-  <!--collection management-->
-  <string name="create_addressbook">Stwórz książkę adresową</string>
-  <string name="create_addressbook_display_name_hint">Moja książka adresowa</string>
-  <string name="create_calendar">Stwórz kolekcje CalDAV</string>
-  <string name="create_calendar_display_name_hint">Mój kalendarz</string>
-  <string name="create_calendar_time_zone">Strefa czasowa:</string>
-  <string name="create_calendar_type">Typ kolekcji:</string>
-  <string name="create_calendar_type_only_events">Kalendarz (tylko wydarzenia)</string>
-  <string name="create_calendar_type_only_tasks">Lista zadań (tylko zadań)</string>
-  <string name="create_calendar_type_events_and_tasks">Połączone (wydarzenia i zadania)</string>
-  <string name="create_collection_color">Ustaw kolor kolekcji</string>
-  <string name="create_collection_creating">Tworzenie kolekcji</string>
-  <string name="create_collection_display_name">Nazwa wyświetlana (tytuł) kolekcji:</string>
-  <string name="create_collection_display_name_required">Tytuł jest wymagany</string>
-  <string name="create_collection_description">Opis (opcjoalnie)</string>
-  <string name="create_collection_home_set">Ustaw początek:</string>
-  <string name="create_collection_create">Stwórz</string>
-  <string name="delete_collection">Usuń kolekcje</string>
-  <string name="delete_collection_confirm_title">Jesteś pewien?</string>
-  <string name="delete_collection_confirm_warning">Kolekcja (%s) i jej wszystkie dane zostaną usunięte z serwera.</string>
-  <string name="delete_collection_deleting_collection">Usuwanie kolekcji</string>
-  <!--ExceptionInfoFragment-->
-  <string name="exception">Wystąpił błąd.</string>
-  <string name="exception_httpexception">Wystąpił błąd HTTP.</string>
-  <string name="exception_ioexception">Wystąpił błąd I/O.</string>
-  <string name="exception_show_details">Pokaż szczegóły</string>
-  <!--sync errors and DebugInfoActivity-->
-  <string name="debug_info_title">Informacje debugowe</string>
-  <string name="sync_error_permissions">Uprawnienia DAVdroid</string>
-  <string name="sync_error_permissions_text">Wymagane dodatkowe uprawnienia</string>
-  <string name="sync_error_calendar">Synchronizacja kalendarza nie powiodała się (%s)</string>
-  <string name="sync_error_contacts">Synchronizacja książki adresowej nie powiodała się (%s)</string>
-  <string name="sync_error_tasks">Synchronizacja zadań nie powiodała się (%s)</string>
-  <string name="sync_error">Błąd podczas %s</string>
-  <string name="sync_error_http_dav">Błąd servera podczas %s</string>
-  <string name="sync_error_local_storage">Bład bazy danych podczas %s</string>
-  <string-array name="sync_error_phases">
-    <item>przygotowanie synchronizacji</item>
-    <item>odpytywanie możliwości</item>
-    <item>przetwarzanie lokalnie usuniętych wpisów</item>
-    <item>przygotowanie stworzonych/zmodyfikowanych wpisów</item>
-    <item>wysyłanie stworzonych/zmodyfikowanych wpisów</item>
-    <item>sprawdzanie stanu synchronizacji</item>
-    <item>listowanie lokalnych wpisów</item>
-    <item>listowanie zdalnych wpisów</item>
-    <item>porównywanie lokalnych/zdalnych wpisów</item>
-    <item>pobieranie zdalnych wpisów</item>
-    <item>przetwarzanie końcowe</item>
-    <item>zapisywanie stanu synchronizacji</item>
-  </string-array>
-  <string name="sync_error_unauthorized">Błędna nazwa użytkownika lub hasło</string>
-  <!--cert4android-->
-  <string name="certificate_notification_connection_security">DAVdroid: Bezpieczeństwo połączenia</string>
-  <string name="trust_certificate_unknown_certificate_found">DAVdroid napotkał nieznany certyfikat. Czy chcesz go dodać?</string>
-</resources>

app/src/davdroid/res/values-pt-rBR/strings.xml

@@ -1,247 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--common strings-->
-  <string name="app_name">DAVdroid</string>
-  <string name="account_title_address_book">Livro de endereços DAVdroid</string>
-  <string name="address_books_authority_title">Livros de endereços</string>
-  <string name="help">Ajuda</string>
-  <string name="manage_accounts">Gerenciar contas</string>
-  <string name="please_wait">Por favor, aguarde...</string>
-  <string name="send">Enviar</string>
-  <!--startup dialogs-->
-  <string name="startup_battery_optimization">Otimização da bateria</string>
-  <string name="startup_battery_optimization_message">O Android pode desativar/reduzir a sincronização do DAVdroid depois de alguns dias. Para evitar isso, desligue a otimização da bateria.</string>
-  <string name="startup_battery_optimization_disable">Desligar para o DAVdroid</string>
-  <string name="startup_dont_show_again">Não mostrar novamente</string>
-  <string name="startup_development_version">Preview Release</string>
-  <string name="startup_development_version_message">Esta é uma versão de desenvolvimento do %s. Alguma coisa pode não funcionar como esperado. Suas sugestões e comentários são bem-vindos.</string>
-  <string name="startup_development_version_give_feedback">Enviar sugestões</string>
-  <string name="startup_donate">Informação sobre Código Aberto</string>
-  <string name="startup_donate_message">Estamos felizes que você usa o DAVdroid, um software de código aberto (GPLv3). O desenvolvimento do DAVdroid é trabalhoso e consome muitas horas de trabalho. Por esse motivo, considere fazer uma doação.</string>
-  <string name="startup_donate_now">Mostrar a página de doações</string>
-  <string name="startup_donate_later">Talvez depois</string>
-  <string name="startup_google_play_accounts_removed">Informação sobre o erro de DRM da Play Store</string>
-  <string name="startup_google_play_accounts_removed_message">Sob certas condições, o DRM da Play Store pode fazer com que todas as contas DAVdroid sejam perdidas depois de uma reinicialização ou atualização do DAVdroid. Se você for afetado por esse problema, instale o \"DAVdroid JB Workaround\" a partir da Play Store.</string>
-  <string name="startup_google_play_accounts_removed_more_info">Mais informações</string>
-  <string name="startup_opentasks_not_installed">O OpenTasks não está instalado</string>
-  <string name="startup_opentasks_not_installed_message">O aplicativo OpenTasks não está disponível, não sendo possível sincronizar as listas de tarefas pelo DAVdroid.</string>
-  <string name="startup_opentasks_reinstall_davdroid">Depois da instalação do OpenTasks, torna-se necessário REINSTALAR o DAVdroid e adicionar suas contas novamente (erro do Android).</string>
-  <string name="startup_opentasks_not_installed_install">Instalar o OpenTasks</string>
-  <!--AboutActivity-->
-  <string name="about_license_terms">Termos da Licença</string>
-  <string name="about_license_info_no_warranty">Este programa é distribuído SEM NENHUMA GARANTIA. Ele é software livre e pode ser redistribuído sob algumas condições.</string>
-  <!--global settings-->
-  <string name="logging_davdroid_file_logging">Registro do arquivo do DAVdroid</string>
-  <string name="logging_to_external_storage">Registrando no arquivo externo: %s</string>
-  <string name="logging_to_external_storage_warning">Excluir os registros assim que possível!</string>
-  <string name="logging_couldnt_create_file">Não foi possível criar o arquivo de registro externo: %s</string>
-  <string name="logging_no_external_storage">Armazenamento externo não encontrado</string>
-  <!--AccountsActivity-->
-  <string name="navigation_drawer_open">Abrir a gaveta de navegação</string>
-  <string name="navigation_drawer_close">Fechar gaveta de navegação</string>
-  <string name="navigation_drawer_subtitle">Sincronização de CalDAV/CardDAV</string>
-  <string name="navigation_drawer_about">Sobre / Licença</string>
-  <string name="navigation_drawer_settings">Configurações</string>
-  <string name="navigation_drawer_news_updates">Novidades e atualizações</string>
-  <string name="navigation_drawer_external_links">Links externos</string>
-  <string name="navigation_drawer_website">Site na Web</string>
-  <string name="navigation_drawer_faq">Perguntas fequentes</string>
-  <string name="navigation_drawer_donate">Doações</string>
-  <string name="account_list_empty">Bem-vindo ao DAVdroid!\n\nVocê pode adicionar uma conta CalDAV/CardDAV agora.</string>
-  <string name="accounts_global_sync_disabled">A sincronização automática pelo sistema está desativada</string>
-  <string name="accounts_global_sync_enable">Ativar</string>
-  <!--DavService-->
-  <string name="dav_service_refresh_failed">Falha na detecção do serviço</string>
-  <string name="dav_service_refresh_couldnt_refresh">Não foi possível atualizar a lista da coleção</string>
-  <!--AppSettingsActivity-->
-  <string name="app_settings">Configurações</string>
-  <string name="app_settings_user_interface">Interface de usuário</string>
-  <string name="app_settings_reset_hints">Restaurar sugestões</string>
-  <string name="app_settings_reset_hints_summary">Restaura as sugestões que foram descartadas anteriormente</string>
-  <string name="app_settings_reset_hints_success">Todas as sugestões serão exibidas novamente</string>
-  <string name="app_settings_connection">Conexão</string>
-  <string name="app_settings_override_proxy">Substituir as configurações de proxy</string>
-  <string name="app_settings_override_proxy_on">Usar configurações de proxy personalizadas</string>
-  <string name="app_settings_override_proxy_off">Usar configurações de proxy padrão do sistema</string>
-  <string name="app_settings_override_proxy_host">Nome do servidor proxy HTTP</string>
-  <string name="app_settings_override_proxy_port">Porta do proxy HTTP</string>
-  <string name="app_settings_security">Segurança</string>
-  <string name="app_settings_distrust_system_certs">Desconfiar dos certificados de sistema</string>
-  <string name="app_settings_distrust_system_certs_on">ACs adicionadas pelo usuário e pelo sistema não serão confiáveis</string>
-  <string name="app_settings_distrust_system_certs_off">ACs adicionadas pelo usuário e pelo sistema serão confiáveis (recomendado)</string>
-  <string name="app_settings_reset_certificates">Restaurar certificados não-confiáveis</string>
-  <string name="app_settings_reset_certificates_summary">Restaura a confiança de todos os certificados personalizados</string>
-  <string name="app_settings_reset_certificates_success">Todos os certificados personalizados foram restaurados</string>
-  <string name="app_settings_debug">Depuração</string>
-  <string name="app_settings_log_to_external_storage">Registrar em arquivo externo</string>
-  <string name="app_settings_log_to_external_storage_on">Registrando no armazenamento externo (se disponível)</string>
-  <string name="app_settings_log_to_external_storage_off">O registro em arquivo externo está desativado</string>
-  <string name="app_settings_show_debug_info">Mostrar informações de depuração</string>
-  <string name="app_settings_show_debug_info_details">Exibe/compartilha o software e os detalhes da configuração</string>
-  <!--AccountActivity-->
-  <string name="account_synchronize_now">Sincronizar agora</string>
-  <string name="account_synchronizing_now">Sincronizando</string>
-  <string name="account_settings">Configurações da conta</string>
-  <string name="account_rename">Renomear conta</string>
-  <string name="account_rename_new_name">Dados locais que não foram salvos podem ser descartados. É necessário efetuar uma nova sincronização após renomear. Novo nome da conta:</string>
-  <string name="account_rename_rename">Renomear</string>
-  <string name="account_delete">Excluir conta</string>
-  <string name="account_delete_confirmation_title">Deseja excluir a conta?</string>
-  <string name="account_delete_confirmation_text">Todas as cópias locais dos livros de endereços, calendários e listas de tarefas serão excluídas.</string>
-  <string name="account_refresh_address_book_list">Atualizar lista de livros de endereços</string>
-  <string name="account_create_new_address_book">Criar novo livro de endereços</string>
-  <string name="account_refresh_calendar_list">Atualizar lista de calendários</string>
-  <string name="account_create_new_calendar">Criar novo calendário</string>
-  <!--PermissionsActivity-->
-  <string name="permissions_title">Permissões do DAVdroid</string>
-  <string name="permissions_calendar">Permissões do calendário</string>
-  <string name="permissions_calendar_details">Para sincronizar os eventos CalDAV com seus calendários locais, o DAVdroid precisa acessar seus calendários.</string>
-  <string name="permissions_calendar_request">Solicitar permissão do calendário</string>
-  <string name="permissions_contacts">Permissões dos contados</string>
-  <string name="permissions_contacts_details">Para sincronizar livros de endereços CardDAV com seus contatos locais, o DAVdroid precisa acessar seus contatos.</string>
-  <string name="permissions_contacts_request">Solicitar permissão dos contatos</string>
-  <string name="permissions_opentasks">Permissões do OpenTasks</string>
-  <string name="permissions_opentasks_details">Para sincronizar tarefas CalDAV com suas listas de tarefas locais, o DAVdroid precisa acessar o OpenTasks.</string>
-  <string name="permissions_opentasks_request">Solicitar permissão do OpenTasks</string>
-  <!--AddAccountActivity-->
-  <string name="login_title">Adicionar conta</string>
-  <string name="login_type_email">Autenticação com endereço de e-mail</string>
-  <string name="login_email_address">Endereço de e-mail</string>
-  <string name="login_email_address_error">É necessário um e-mail válido</string>
-  <string name="login_password">Senha</string>
-  <string name="login_password_required">É necessário uma senha</string>
-  <string name="login_type_url">Autenticação com usuário e URL</string>
-  <string name="login_url_must_be_http_or_https">A URL deve começar com http(s)://</string>
-  <string name="login_url_host_name_required">É necessário um nome de máquina</string>
-  <string name="login_user_name">Usuário</string>
-  <string name="login_user_name_required">É necessário um nome de usuário</string>
-  <string name="login_base_url">URL base</string>
-  <string name="login_login">Autenticar</string>
-  <string name="login_back">Voltar</string>
-  <string name="login_create_account">Criar conta</string>
-  <string name="login_account_name">Nome da conta</string>
-  <string name="login_account_name_info">Use seu endereço de e-mail como nome da conta porque o Android irá usar esse nome como campo AGENDA nos eventos que você criar. Não é possível ter duas contas com o mesmo nome.</string>
-  <string name="login_account_contact_group_method">Método do grupo Contato:</string>
-  <string name="login_account_name_required">É necessário um nome de conta</string>
-  <string name="login_account_not_created">A conta não pôde ser criada</string>
-  <string name="login_configuration_detection">Detecção de configuração</string>
-  <string name="login_querying_server">Aguarde, procurando servidor...</string>
-  <string name="login_no_caldav_carddav">Não foi possível encontrar o serviço CalDAV ou CardDAV.</string>
-  <string name="login_view_logs">Exibir registros</string>
-  <!--AccountSettingsActivity-->
-  <string name="settings_title">Configurações: %s</string>
-  <string name="settings_authentication">Autenticação</string>
-  <string name="settings_username">Nome do usuário</string>
-  <string name="settings_enter_username">Digite o nome do usuário:</string>
-  <string name="settings_password">Senha</string>
-  <string name="settings_password_summary">Atualize a senha de acordo com seu servidor</string>
-  <string name="settings_enter_password">Digite sua senha:</string>
-  <string name="settings_sync">Sincronização</string>
-  <string name="settings_sync_interval_contacts">Intervalo sinc. de contatos</string>
-  <string name="settings_sync_summary_manually">Apenas manualmente</string>
-  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">A cada %d minutos + imediatamente nas alterações locais</string>
-  <string name="settings_sync_interval_calendars">Intervalo sinc. de calendários</string>
-  <string name="settings_sync_interval_tasks">Intervalo sinc. de tarefas</string>
-  <string-array name="settings_sync_interval_seconds">
-    <item>-1</item>
-    <item>300</item>
-    <item>600</item>
-    <item>900</item>
-    <item>3600</item>
-    <item>7200</item>
-    <item>14400</item>
-    <item>86400</item>
-  </string-array>
-  <string-array name="settings_sync_interval_names">
-    <item>Apenas manualmente</item>
-    <item>A cada 5 minutos</item>
-    <item>A cada 10 minutos</item>
-    <item>A cada 15 minutos</item>
-    <item>A cada hora</item>
-    <item>A cada 2 horas</item>
-    <item>A cada 4 horas</item>
-    <item>Uma vez por dia</item>
-  </string-array>
-  <string name="settings_sync_wifi_only">Sincronizar apenas por Wi-Fi</string>
-  <string name="settings_sync_wifi_only_on">Sincronização restrita a conexões Wi-Fi</string>
-  <string name="settings_sync_wifi_only_off">O tipo de conexão não é considerado</string>
-  <string name="settings_sync_wifi_only_ssid">Restrição de SSID Wi-Fi</string>
-  <string name="settings_sync_wifi_only_ssid_on">Sincronizará apenas com %s</string>
-  <string name="settings_sync_wifi_only_ssid_off">Qualquer conexão Wi-Fi pode ser utilizada</string>
-  <string name="settings_sync_wifi_only_ssid_message">Informe o nome da rede Wi-Fi (SSID) que será usada para sincronização ou deixe em branco para usar qualquer conexão Wi-Fi.</string>
-  <string name="settings_carddav">CardDAV</string>
-  <string name="settings_contact_group_method">Método do grupo Contato</string>
-  <string-array name="settings_contact_group_method_values">
-    <item>GROUP_VCARDS</item>
-    <item>CATEGORIES</item>
-  </string-array>
-  <string-array name="settings_contact_group_method_entries">
-    <item>Grupos são VCards separados</item>
-    <item>Grupos são categorias por contato</item>
-  </string-array>
-  <string name="settings_caldav">CalDAV</string>
-  <string name="settings_sync_time_range_past">Limite de tempo para eventos passados</string>
-  <string name="settings_sync_time_range_past_none">Todos os eventos serão sincronizados</string>
-  <plurals name="settings_sync_time_range_past_days">
-    <item quantity="one">Os eventos que ocorreram a mais de um dia serão ignorados</item>
-    <item quantity="other">Eventos que ocorreram a mais de %d dias serão ignorados</item>
-  </plurals>
-  <string name="settings_sync_time_range_past_message">Os eventos que ocorreram antes desse número de dias serão ignorados (pode ser 0). Deixe em branco para sincronizar todos os eventos.</string>
-  <string name="settings_manage_calendar_colors">Gerenciar cores dos calendários</string>
-  <string name="settings_manage_calendar_colors_on">Cores dos calendários definidas pelo DAVdroid</string>
-  <string name="settings_manage_calendar_colors_off">Cores dos calendários não definidas pelo DAVdroid</string>
-  <!--collection management-->
-  <string name="create_addressbook">Criar livro de endereços</string>
-  <string name="create_addressbook_display_name_hint">Meu livro de endereços</string>
-  <string name="create_calendar">Criar coleção CalDAV</string>
-  <string name="create_calendar_display_name_hint">Meu calendário</string>
-  <string name="create_calendar_time_zone">Fuso horário:</string>
-  <string name="create_calendar_type">Tipo de coleção:</string>
-  <string name="create_calendar_type_only_events">Calendário (apenas eventos)</string>
-  <string name="create_calendar_type_only_tasks">Lista de tarefas (apenas tarefas)</string>
-  <string name="create_calendar_type_events_and_tasks">Combinado (eventos e tarefas)</string>
-  <string name="create_collection_color">Definir a cor da coleção</string>
-  <string name="create_collection_creating">Criando a coleção</string>
-  <string name="create_collection_display_name">Mostrar o nome (título) desta coleção:</string>
-  <string name="create_collection_display_name_required">É necessário um título</string>
-  <string name="create_collection_description">Descrição (opcional):</string>
-  <string name="create_collection_home_set">Indique o endereço:</string>
-  <string name="create_collection_create">Criar</string>
-  <string name="delete_collection">Excluir coleção</string>
-  <string name="delete_collection_confirm_title">Tem certeza?</string>
-  <string name="delete_collection_confirm_warning">Esta coleção (%s) e todos os seus dados serão removidos do servidor.</string>
-  <string name="delete_collection_deleting_collection">Excluindo coleção</string>
-  <!--ExceptionInfoFragment-->
-  <string name="exception">Ocorreu um erro.</string>
-  <string name="exception_httpexception">Ocorreu um erro de HTTP.</string>
-  <string name="exception_ioexception">Ocorreu um erro de leitura/gravação.</string>
-  <string name="exception_show_details">Mostrar detalhes</string>
-  <!--sync errors and DebugInfoActivity-->
-  <string name="debug_info_title">Informações de depuração</string>
-  <string name="sync_error_permissions">Permissões do DAVdroid</string>
-  <string name="sync_error_permissions_text">É necessário permissões adicionais</string>
-  <string name="sync_error_calendar">Falha na sincronização do calendário (%s)</string>
-  <string name="sync_error_contacts">Falha na sincronização do livro de endereços (%s)</string>
-  <string name="sync_error_tasks">Falha na sincronização das tarefas (%s)</string>
-  <string name="sync_error">Erro ao %s</string>
-  <string name="sync_error_http_dav">Erro do servidor ao %s</string>
-  <string name="sync_error_local_storage">Erro do banco de dados ao %s</string>
-  <string-array name="sync_error_phases">
-    <item>preparando sincronização</item>
-    <item>procurando habilidades</item>
-    <item>processando os itens excluídos localmente</item>
-    <item>preparando os itens criados/modificados</item>
-    <item>enviando os itens criados/modificados</item>
-    <item>verificando o estado da sincronização</item>
-    <item>listando os itens locais</item>
-    <item>listando os itens remotos</item>
-    <item>comparando os itens locais/remotos</item>
-    <item>baixando os itens remotos</item>
-    <item>pós-processamento</item>
-    <item>salvando o estado da sincronização</item>
-  </string-array>
-  <string name="sync_error_unauthorized">Usuário/senha incorreto</string>
-  <!--cert4android-->
-  <string name="certificate_notification_connection_security">DAVdroid: Segurança da conexão</string>
-  <string name="trust_certificate_unknown_certificate_found">O DAVdroid encontrou um certificado desconhecido. Deseja torná-lo confiável?</string>
-</resources>

app/src/davdroid/res/values-pt/strings.xml

@@ -1,53 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--common strings-->
-  <string name="app_name">DAVDroid</string>
-  <string name="help">Ajuda</string>
-  <!--startup dialogs-->
-  <!--AboutActivity-->
-  <!--global settings-->
-  <!--AccountsActivity-->
-  <!--DavService-->
-  <!--AppSettingsActivity-->
-  <!--AccountActivity-->
-  <!--PermissionsActivity-->
-  <!--AddAccountActivity-->
-  <string name="login_type_email">Login com seu enderço de email</string>
-  <string name="login_type_url">Login com URL e nome do usuário</string>
-  <!--AccountSettingsActivity-->
-  <string name="settings_authentication">Autenticação</string>
-  <string name="settings_username">Nome de usuário</string>
-  <string name="settings_enter_username">Informe o nome de usuário:</string>
-  <string name="settings_password">Senha</string>
-  <string name="settings_password_summary">Atualize sua denha de acordo com a do seu servidor.</string>
-  <string name="settings_enter_password">Informe sua senha:</string>
-  <string name="settings_sync">Sincronização</string>
-  <string name="settings_sync_interval_contacts">Intervalo de sincronização dos contatos</string>
-  <string name="settings_sync_summary_manually">Manualmente apenas</string>
-  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">A cada %d minutos + imediatamente em alterações locais</string>
-  <string name="settings_sync_interval_calendars">Intervalo de sincronização do calendário</string>
-  <string-array name="settings_sync_interval_seconds">
-    <item>-1</item>
-    <item>300</item>
-    <item>600</item>
-    <item>900</item>
-    <item>3600</item>
-    <item>7200</item>
-    <item>14400</item>
-    <item>86400</item>
-  </string-array>
-  <string-array name="settings_sync_interval_names">
-    <item>Apenas manualmente</item>
-    <item>A cada 5 minutos</item>
-    <item>A cada 10 minutos</item>
-    <item>A cada 15 minutos</item>
-    <item>A cada hora</item>
-    <item>A cada 2 horas</item>
-    <item>A cada 4 horas</item>
-    <item>Diáriamente</item>
-  </string-array>
-  <!--collection management-->
-  <!--ExceptionInfoFragment-->
-  <!--sync errors and DebugInfoActivity-->
-  <!--cert4android-->
-</resources>

app/src/davdroid/res/values-ru/strings.xml

@@ -1,239 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--common strings-->
-  <string name="app_name">DAVdroid</string>
-  <string name="help">Помощь</string>
-  <string name="manage_accounts">Управление аккаунтами</string>
-  <string name="please_wait">Пожалуйста подождите...</string>
-  <string name="send">Отправить</string>
-  <!--startup dialogs-->
-  <string name="startup_battery_optimization">Оптимизация батареи</string>
-  <string name="startup_battery_optimization_message">Андроид может отключить/уменьшить синхронизацию DAVdroid через несколько дней. Чтобы этого не произошло, выключите оптимизацию батареи.</string>
-  <string name="startup_battery_optimization_disable">Отключить для DAVdroid</string>
-  <string name="startup_dont_show_again">Больше не показывать</string>
-  <string name="startup_development_version_give_feedback">Оставить отзыв</string>
-  <string name="startup_donate">Open-Source информация</string>
-  <string name="startup_donate_message">Мы рады, что вы используете DAVdroid, который является программным обеспечением с открытым исходным кодом (GPLv3). Разработка DAVdroid является сложной задачей, потребовавшей от нас тысяч рабочих часов. Пожалуйста, рассмотрите возможность поддержать проект.</string>
-  <string name="startup_donate_now">Поддержать проект</string>
-  <string name="startup_donate_later">Возможно, позже</string>
-  <string name="startup_google_play_accounts_removed">Информация об ошибке в Play Store DRM</string>
-  <string name="startup_google_play_accounts_removed_message">При определённых условиях Play Store DRM может стать причиной потери всех DAVdroid аккаунтов после перезагрузки устройства или после обновления DAVdroid. Если Вы столкнулись с этой проблемой (и только в этом случае), установите \"DAVdroid JB Workaround\" из Play Store.</string>
-  <string name="startup_google_play_accounts_removed_more_info">Дополнительно</string>
-  <string name="startup_opentasks_not_installed">OpenTasks не установлен</string>
-  <string name="startup_opentasks_not_installed_message">OpenTasks недоступен, DAVdroid не сможет синхронизировать список задач</string>
-  <string name="startup_opentasks_reinstall_davdroid">После установки OpenTasks необходимо ПЕРЕУСТАНОВИТЬ DAVdroid и добавить Ваши аккаунты ещё раз (ошибка Android).</string>
-  <string name="startup_opentasks_not_installed_install">Установить OpenTasks</string>
-  <!--AboutActivity-->
-  <string name="about_license_terms">Лицензионное соглашение</string>
-  <string name="about_license_info_no_warranty">Эта программа поставляется АБСОЛЮТНО БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ. Это свободная программа, и вы приглашаетесь повторно распространять ее при определенных условиях.</string>
-  <!--global settings-->
-  <string name="logging_davdroid_file_logging">Файл логов DAVdroid</string>
-  <string name="logging_to_external_storage">Сохранение логов во внешнем хранилище: %s</string>
-  <string name="logging_to_external_storage_warning">Удалять логи насколько возможно быстро!</string>
-  <string name="logging_couldnt_create_file">Не удалось создать внешний лог файл: %s</string>
-  <string name="logging_no_external_storage">Внешнее хранилище не найдено</string>
-  <!--AccountsActivity-->
-  <string name="navigation_drawer_open">Открыть панель навигации</string>
-  <string name="navigation_drawer_close">Закрыть панель навигации</string>
-  <string name="navigation_drawer_subtitle">Адаптер синхронизации CalDAV/CardDAV</string>
-  <string name="navigation_drawer_about">О программе / Лицензия</string>
-  <string name="navigation_drawer_settings">Настройки</string>
-  <string name="navigation_drawer_news_updates">Новости и обновления</string>
-  <string name="navigation_drawer_external_links">Внешние ссылки</string>
-  <string name="navigation_drawer_website">Веб сайт</string>
-  <string name="navigation_drawer_faq">ЧАВО</string>
-  <string name="navigation_drawer_donate">Пожертвовать</string>
-  <string name="account_list_empty">Вас приветствует DAVdroid\n\nМожете добавить CalDAV/CardDAV аккаунт сейчас.</string>
-  <!--DavService-->
-  <string name="dav_service_refresh_failed">Не удалось обнаружить сервисы</string>
-  <string name="dav_service_refresh_couldnt_refresh">Невозможно обновить список коллекций</string>
-  <!--AppSettingsActivity-->
-  <string name="app_settings">Настройки</string>
-  <string name="app_settings_user_interface">Интерфейс пользователя</string>
-  <string name="app_settings_reset_hints">Включить подсказки</string>
-  <string name="app_settings_reset_hints_summary">Включить подсказки, которые были отключены ранее</string>
-  <string name="app_settings_reset_hints_success">Все подсказки будут показаны снова</string>
-  <string name="app_settings_connection">Соединение</string>
-  <string name="app_settings_override_proxy">Переопределить настройки прокси-сервера</string>
-  <string name="app_settings_override_proxy_on">Использовать пользовательские настройки прокси-сервера</string>
-  <string name="app_settings_override_proxy_off">Использовать системные настройки прокси-сервера</string>
-  <string name="app_settings_override_proxy_host">Имя хоста HTTP прокси-сервера</string>
-  <string name="app_settings_override_proxy_port">Порт HTTP прокси-сервера</string>
-  <string name="app_settings_security">Безопасность</string>
-  <string name="app_settings_distrust_system_certs">Не доверять системным сертификатам</string>
-  <string name="app_settings_distrust_system_certs_on">Не доверять системным и добавленным пользователем CA</string>
-  <string name="app_settings_distrust_system_certs_off">Доверять системным и добавленным пользователем CA (рекомендуется)</string>
-  <string name="app_settings_reset_certificates">Сброс (не)доверенных сертификатов</string>
-  <string name="app_settings_reset_certificates_summary">Отменить доверие ко всем пользовательским сертификатам</string>
-  <string name="app_settings_reset_certificates_success">Все пользовательские сертификаты были очищены</string>
-  <string name="app_settings_debug">Отладка</string>
-  <string name="app_settings_log_to_external_storage">Сохранять лог во внешний файл</string>
-  <string name="app_settings_log_to_external_storage_on">Сохранение логов во внешнем хранилище (если доступно)</string>
-  <string name="app_settings_log_to_external_storage_off">Сохранение логов во внешний файл отключено</string>
-  <string name="app_settings_show_debug_info">Отладочная информация</string>
-  <string name="app_settings_show_debug_info_details">Просмотреть/поделиться программой и настройками</string>
-  <!--AccountActivity-->
-  <string name="account_synchronize_now">Синхронизировать</string>
-  <string name="account_synchronizing_now">Синхронизация</string>
-  <string name="account_settings">Настройки аккаунта</string>
-  <string name="account_rename">Переименовать аккаунт</string>
-  <string name="account_rename_new_name">Несохранённые локальные данные могут быть потеряны. Требуется выполнить синхронизацию после переименования. Новое имя аккаунта:</string>
-  <string name="account_rename_rename">Переименовать</string>
-  <string name="account_delete">Удалить аккаунт</string>
-  <string name="account_delete_confirmation_title">Вы действительно хотите удалить аккаунт?</string>
-  <string name="account_delete_confirmation_text">Все локальные копии контактов, календарей и задач будут удалены.</string>
-  <string name="account_refresh_address_book_list">Обновить список адресных книг</string>
-  <string name="account_create_new_address_book">Создать новую адресную книгу</string>
-  <string name="account_refresh_calendar_list">Обновить календарь</string>
-  <string name="account_create_new_calendar">Создать новый календарь</string>
-  <!--PermissionsActivity-->
-  <string name="permissions_title">Разрешения DAVdroid</string>
-  <string name="permissions_calendar">Разрешения для календаря</string>
-  <string name="permissions_calendar_details">Для синхронизации CalDAV событий с Вашими локальными календарями DAVdroid должен иметь доступ к Вашим календарям.</string>
-  <string name="permissions_calendar_request">Запрос разрешений для календаря</string>
-  <string name="permissions_contacts">Разрешения для контактов</string>
-  <string name="permissions_contacts_details">Для синхронизации CardDAV адресных книг с Вашими локальными контактами DAVdroid должен иметь доступ к Вашим контактам.</string>
-  <string name="permissions_contacts_request">Запрос разрешений для контактов</string>
-  <string name="permissions_opentasks">Разрешения OpenTasks</string>
-  <string name="permissions_opentasks_details">Для синхронизации CalDAV задач с Вашими локальными списками задач DAVdroid должен иметь доступ к OpenTasks.</string>
-  <string name="permissions_opentasks_request">Запрос разрешений для OpenTasks</string>
-  <!--AddAccountActivity-->
-  <string name="login_title">Добавить аккаунт</string>
-  <string name="login_type_email">Вход по адресу электронной почты</string>
-  <string name="login_email_address">Адрес электронной почты</string>
-  <string name="login_email_address_error">Требуется действующий адрес электронной почты</string>
-  <string name="login_password">Пароль</string>
-  <string name="login_password_required">Требуется пароль</string>
-  <string name="login_type_url">Вход через URL и имя пользователя</string>
-  <string name="login_url_must_be_http_or_https">URL должен начинаться с http(s)://</string>
-  <string name="login_url_host_name_required">Требуется имя хоста</string>
-  <string name="login_user_name">Имя</string>
-  <string name="login_user_name_required">Требуется имя</string>
-  <string name="login_base_url">Базовый URL</string>
-  <string name="login_login">Логин</string>
-  <string name="login_back">Назад</string>
-  <string name="login_create_account">Создать аккаунт</string>
-  <string name="login_account_name">Имя аккаунта</string>
-  <string name="login_account_name_info">Используйте Ваш адрес адрес электронной почты в качестве имени аккаунта, так как Android будет использовать имя аккаунта в поле ORGANIZER для событий, которые Вы создаёте. Вы не можете иметь два аккаунта с одинаковыми именами.</string>
-  <string name="login_account_contact_group_method">Метод группировки контактов:</string>
-  <string name="login_account_name_required">Требуется имя аккаунта</string>
-  <string name="login_account_not_created">Аккаунт не может быть создан</string>
-  <string name="login_configuration_detection">Обнаружение конфигурации</string>
-  <string name="login_querying_server">Пожалуйста, подождите, выполняется запрос к серверу...</string>
-  <string name="login_no_caldav_carddav">Не найдены CalDAV или CardDAV сервисы.</string>
-  <string name="login_view_logs">Просмотр логов</string>
-  <!--AccountSettingsActivity-->
-  <string name="settings_title">Настройки: %s</string>
-  <string name="settings_authentication">Аутентификация</string>
-  <string name="settings_username">Имя</string>
-  <string name="settings_enter_username">Введите имя пользователя:</string>
-  <string name="settings_password">Пароль</string>
-  <string name="settings_password_summary">Обновить пароль в соответствии с вашим сервером.</string>
-  <string name="settings_enter_password">Введите свой пароль:</string>
-  <string name="settings_sync">Синхронизация</string>
-  <string name="settings_sync_interval_contacts">Интервал синхронизации контактов</string>
-  <string name="settings_sync_summary_manually">Вручную</string>
-  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Каждые %d минут и немедленно при локальных изменениях</string>
-  <string name="settings_sync_interval_calendars">Интервал синхронизации календарей</string>
-  <string name="settings_sync_interval_tasks">Интервал синхронизации задач</string>
-  <string-array name="settings_sync_interval_seconds">
-    <item>-1</item>
-    <item>300</item>
-    <item>600</item>
-    <item>900</item>
-    <item>3600</item>
-    <item>7200</item>
-    <item>14400</item>
-    <item>86400</item>
-  </string-array>
-  <string-array name="settings_sync_interval_names">
-    <item>Вручную</item>
-    <item>Каждые 5 минут</item>
-    <item>Каждые 10 минут</item>
-    <item>Каждые 15 минут</item>
-    <item>Каждый час</item>
-    <item>Каждые 2 часа</item>
-    <item>Каждые 4 часа</item>
-    <item>Раз в сутки</item>
-  </string-array>
-  <string name="settings_sync_wifi_only">Синхронизировать только через WiFi</string>
-  <string name="settings_sync_wifi_only_on">Разрешить синхронизацию только через WiFi</string>
-  <string name="settings_sync_wifi_only_off">Не учитывать тип соединения</string>
-  <string name="settings_sync_wifi_only_ssid">Разрешённые WiFi SSID</string>
-  <string name="settings_sync_wifi_only_ssid_on">Синхронизировать только через %s</string>
-  <string name="settings_sync_wifi_only_ssid_off">Могут использоваться все WiFi подключения</string>
-  <string name="settings_sync_wifi_only_ssid_message">Укажите имя WiFi сети (SSID), чтобы разрешить синхронизацию только через эту сеть. Или оставьте пустым для синхронизации через любые WiFi соединения.</string>
-  <string name="settings_carddav">CardDAV</string>
-  <string name="settings_contact_group_method">Метод группировки контактов</string>
-  <string-array name="settings_contact_group_method_entries">
-    <item>Группы как отдельные vCards</item>
-    <item>Группы как категории внутри контакта</item>
-  </string-array>
-  <string name="settings_caldav">CalDAV</string>
-  <string name="settings_sync_time_range_past">Интервал синхронизации</string>
-  <string name="settings_sync_time_range_past_none">Все события будут синхронизированы</string>
-  <plurals name="settings_sync_time_range_past_days">
-    <item quantity="one">События старше одного дня будут игнорироваться</item>
-    <item quantity="few">События старше %d дней будут игнорироваться</item>
-    <item quantity="many">События старше %d дней будут игнорироваться</item>
-    <item quantity="other">События старше %d дней будут игнорироваться</item>
-  </plurals>
-  <string name="settings_sync_time_range_past_message">События старше указанного количества дней будут игнорироваться (может быть 0). Оставьте пустым для синхронизации всех событий.</string>
-  <string name="settings_manage_calendar_colors">Управление цветами календаря</string>
-  <string name="settings_manage_calendar_colors_on">Цвета календаря управляются DAVdroid</string>
-  <string name="settings_manage_calendar_colors_off">Цвета календаря не управляются DAVdroid</string>
-  <!--collection management-->
-  <string name="create_addressbook">Создать адресную книгу</string>
-  <string name="create_addressbook_display_name_hint">Моя Адресная книга</string>
-  <string name="create_calendar">Создать CalDAV коллекцию</string>
-  <string name="create_calendar_display_name_hint">Мой Календарь</string>
-  <string name="create_calendar_time_zone">Часовой пояс:</string>
-  <string name="create_calendar_type">Тип коллекции:</string>
-  <string name="create_calendar_type_only_events">Календарь (только события)</string>
-  <string name="create_calendar_type_only_tasks">Список задач (только задачи)</string>
-  <string name="create_calendar_type_events_and_tasks">Совмещённый (события и задачи)</string>
-  <string name="create_collection_color">Установить цвет коллекции</string>
-  <string name="create_collection_creating">Создание коллекции</string>
-  <string name="create_collection_display_name">Отображаемое имя (название) этой коллекции:</string>
-  <string name="create_collection_display_name_required">Требуется название</string>
-  <string name="create_collection_description">Описание (необязательно):</string>
-  <string name="create_collection_home_set">Главная папка:</string>
-  <string name="create_collection_create">Создать</string>
-  <string name="delete_collection">Удалить коллекцию</string>
-  <string name="delete_collection_confirm_title">Вы уверены?</string>
-  <string name="delete_collection_confirm_warning">Коллекция (%s) и все её данные будут удалены с сервера.</string>
-  <string name="delete_collection_deleting_collection">Удаление коллекции</string>
-  <!--ExceptionInfoFragment-->
-  <string name="exception">Произошла ошибка.</string>
-  <string name="exception_httpexception">Произошла ошибка HTTP</string>
-  <string name="exception_ioexception">Произошла ошибка ввода/вывода.</string>
-  <string name="exception_show_details">Подробнее</string>
-  <!--sync errors and DebugInfoActivity-->
-  <string name="debug_info_title">Отладочная информация</string>
-  <string name="sync_error_permissions">Разрешения DAVdroid</string>
-  <string name="sync_error_permissions_text">Требуются дополнительные разрешения</string>
-  <string name="sync_error_calendar">Ошибка при синхронизации Календаря (%s)</string>
-  <string name="sync_error_contacts">Ошибка при синхронизации Контактов (%s)</string>
-  <string name="sync_error_tasks">Ошибка при синхронизации Задачи (%s)</string>
-  <string name="sync_error">Ошибка %s</string>
-  <string name="sync_error_http_dav">Ошибка сервера %s</string>
-  <string name="sync_error_local_storage">Ошибка базы данных %s</string>
-  <string-array name="sync_error_phases">
-    <item>подготовка синхронизации</item>
-    <item>запрос поддерживаемых возможностей</item>
-    <item>обработка локально удалённых записей</item>
-    <item>подготовка созданных/изменённых записей</item>
-    <item>загрузка созданных/изменённых записей</item>
-    <item>проверка статуса синхронизации</item>
-    <item>просмотр локальных записей</item>
-    <item>просмотр серверных записей</item>
-    <item>сравнение локальных/серверных записей</item>
-    <item>загрузка серверных записей</item>
-    <item>пост-обработка</item>
-    <item>сохранение статуса синхронизации</item>
-  </string-array>
-  <string name="sync_error_unauthorized">Имя пользователя/пароль неверные</string>
-  <!--cert4android-->
-  <string name="certificate_notification_connection_security">DAVdroid: Безопасность подключения</string>
-  <string name="trust_certificate_unknown_certificate_found">DAVdroid обнаружил неизвестный сертификат. Вы хотите доверять ему?</string>
-</resources>

app/src/davdroid/res/values-v21/styles.xml

@@ -1,18 +0,0 @@
-<!--
-  ~ Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
-  ~ All rights reserved. This program and the accompanying materials
-  ~ are made available under the terms of the GNU Public License v3.0
-  ~ which accompanies this distribution, and is available at
-  ~ http://www.gnu.org/licenses/gpl.html
-  -->
-
-<resources>
-
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
-
-</resources>

app/src/davdroid/res/values-zh-rCN/strings.xml

@@ -1,247 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--common strings-->
-  <string name="app_name">DAVdroid</string>
-  <string name="account_title_address_book">DAVdroid 通讯录</string>
-  <string name="address_books_authority_title">通讯录</string>
-  <string name="help">帮助</string>
-  <string name="manage_accounts">管理账户</string>
-  <string name="please_wait">请稍等...</string>
-  <string name="send">发送</string>
-  <string name="homepage_url">https://davdroid.bitfire.at/?pk_campaign=davdroid-app</string>
-  <!--startup dialogs-->
-  <string name="startup_battery_optimization">电池优化</string>
-  <string name="startup_battery_optimization_message">系统可能会在几天后减少或停用 DAVdroid 同步。为了避免这一情况，请禁用对 DAVdroid 的电池优化。</string>
-  <string name="startup_battery_optimization_disable">禁用电池优化</string>
-  <string name="startup_dont_show_again">不再显示</string>
-  <string name="startup_development_version_give_feedback">反馈</string>
-  <string name="startup_donate">开源信息</string>
-  <string name="startup_donate_message">欢迎使用 DAVdroid，这是一款开源软件 (GPLv3)。开发 DAVdroid 的工作花费了数千小时，请您考虑捐助我们。</string>
-  <string name="startup_donate_now">显示捐助页面</string>
-  <string name="startup_donate_later">稍后提示</string>
-  <string name="startup_google_play_accounts_removed">Play 商店 DRM 问题提醒</string>
-  <string name="startup_google_play_accounts_removed_message">在某些情况下，Play 商店的 DRM 可能会导致所有 DAVdroid 账户在设备重启或升级 DAVdroid 后消失。如果你遇到了该问题，请从 Play 商店安装“DAVdroid JB Workaround”，否则请不要安装修复程序。</string>
-  <string name="startup_google_play_accounts_removed_more_info">更多信息</string>
-  <string name="startup_opentasks_not_installed">OpenTasks 未安装</string>
-  <string name="startup_opentasks_not_installed_message">未安装 OpenTasks 应用，故 DAVdroid 无法同步任务列表。</string>
-  <string name="startup_opentasks_reinstall_davdroid">安装 OpenTasks 后，由于 Android 的限制，请重新安装 DAVdroid 并重新创建账户。</string>
-  <string name="startup_opentasks_not_installed_install">安装 OpenTasks</string>
-  <!--AboutActivity-->
-  <string name="about_license_terms">许可协议</string>
-  <string name="about_license_info_no_warranty">本程序不附带任何担保。这是一款自由软件，你可以有条件地传播它。</string>
-  <!--global settings-->
-  <string name="logging_davdroid_file_logging">DAVdroid 文件日志</string>
-  <string name="logging_to_external_storage">记录日志到外部存储 %s</string>
-  <string name="logging_to_external_storage_warning">请尽快删除日志！</string>
-  <string name="logging_couldnt_create_file">无法创建外部日志文件 %s</string>
-  <string name="logging_no_external_storage">找不到外部存储</string>
-  <!--AccountsActivity-->
-  <string name="navigation_drawer_open">打开导航抽屉</string>
-  <string name="navigation_drawer_close">关闭导航抽屉</string>
-  <string name="navigation_drawer_subtitle">CalDAV/CardDAV 同步器</string>
-  <string name="navigation_drawer_about">关于 / 许可</string>
-  <string name="navigation_drawer_settings">设置</string>
-  <string name="navigation_drawer_news_updates">最新消息</string>
-  <string name="navigation_drawer_external_links">外部链接</string>
-  <string name="navigation_drawer_website">应用网站</string>
-  <string name="navigation_drawer_faq">常见问题</string>
-  <string name="navigation_drawer_faq_url">https://davdroid.bitfire.at/faq/?pk_campaign=davdroid-app</string>
-  <string name="navigation_drawer_donate">捐助</string>
-  <string name="account_list_empty">欢迎使用 DAVdroid！\n\n现在你可以增加 CalDAV/CardDAV 账户。</string>
-  <string name="accounts_global_sync_disabled">系统全局自动同步已禁用</string>
-  <string name="accounts_global_sync_enable">启用</string>
-  <!--DavService-->
-  <string name="dav_service_refresh_failed">服务配置检测失败</string>
-  <string name="dav_service_refresh_couldnt_refresh">无法刷新集合列表</string>
-  <!--AppSettingsActivity-->
-  <string name="app_settings">设置</string>
-  <string name="app_settings_user_interface">用户界面</string>
-  <string name="app_settings_reset_hints">重设提示</string>
-  <string name="app_settings_reset_hints_summary">重新显示之前忽略过的提示</string>
-  <string name="app_settings_reset_hints_success">所有提示将会再次显示</string>
-  <string name="app_settings_connection">连接</string>
-  <string name="app_settings_override_proxy">覆盖代理设置</string>
-  <string name="app_settings_override_proxy_on">使用自定义代理设置</string>
-  <string name="app_settings_override_proxy_off">使用系统默认代理设置</string>
-  <string name="app_settings_override_proxy_host">HTTP 代理主机名</string>
-  <string name="app_settings_override_proxy_port">HTTP 代理端口</string>
-  <string name="app_settings_security">安全</string>
-  <string name="app_settings_distrust_system_certs">不信任系统证书</string>
-  <string name="app_settings_distrust_system_certs_on">系统和用户增加的发布者不会被信任</string>
-  <string name="app_settings_distrust_system_certs_off">系统和用户增加的发布者会被信任（推荐）</string>
-  <string name="app_settings_reset_certificates">重设证书信任状态</string>
-  <string name="app_settings_reset_certificates_summary">重设所有自定义证书的信任状态</string>
-  <string name="app_settings_reset_certificates_success">所有自定义证书已清除</string>
-  <string name="app_settings_debug">调试</string>
-  <string name="app_settings_log_to_external_storage">外部文件日志</string>
-  <string name="app_settings_log_to_external_storage_on">记录日志到外部存储（如果可用）</string>
-  <string name="app_settings_log_to_external_storage_off">外部文件日志已禁用</string>
-  <string name="app_settings_show_debug_info">显示调试信息</string>
-  <string name="app_settings_show_debug_info_details">查看软件和配置信息</string>
-  <!--AccountActivity-->
-  <string name="account_synchronize_now"> 立即同步</string>
-  <string name="account_synchronizing_now">正在同步</string>
-  <string name="account_settings">账户设置</string>
-  <string name="account_rename">重命名账户</string>
-  <string name="account_rename_new_name">重命名后，未上传的本地修改会被撤销，您需要重新执行同步。新账户名：</string>
-  <string name="account_rename_rename">重命名</string>
-  <string name="account_delete">删除账户</string>
-  <string name="account_delete_confirmation_title">真的要删除账户吗？</string>
-  <string name="account_delete_confirmation_text">所有通讯录、日历和任务列表的本机存储将被删除。</string>
-  <string name="account_refresh_address_book_list">刷新通讯录列表</string>
-  <string name="account_create_new_address_book">创建通讯录</string>
-  <string name="account_refresh_calendar_list">刷新日历列表</string>
-  <string name="account_create_new_calendar">创建日历</string>
-  <!--PermissionsActivity-->
-  <string name="permissions_title">DAVdroid 权限</string>
-  <string name="permissions_calendar">日历权限</string>
-  <string name="permissions_calendar_details">要把 CalDAV 事件与本地日历同步，DAVdroid 需要日历权限。</string>
-  <string name="permissions_calendar_request">请求日历权限</string>
-  <string name="permissions_contacts">通讯录权限</string>
-  <string name="permissions_contacts_details">要把 CardDAV 通讯录与本地通讯录同步，DAVdroid 需要通讯录权限。</string>
-  <string name="permissions_contacts_request">请求通讯录权限</string>
-  <string name="permissions_opentasks">OpenTasks 权限</string>
-  <string name="permissions_opentasks_details">要把 CalDAV 任务与本地任务列表同步，DAVdroid 需要访问 OpenTasks。</string>
-  <string name="permissions_opentasks_request">请求 OpenTasks 权限</string>
-  <!--AddAccountActivity-->
-  <string name="login_help_url">https://davdroid.bitfire.at/configuration/?pk_campaign=davdroid-app</string>
-  <string name="login_title">增加账户</string>
-  <string name="login_type_email">使用邮箱地址登录</string>
-  <string name="login_email_address">Email 地址</string>
-  <string name="login_email_address_error">请输入有效 Email 地址</string>
-  <string name="login_password">密码</string>
-  <string name="login_password_required">请输入密码</string>
-  <string name="login_type_url">使用 URL 和用户名登录</string>
-  <string name="login_url_must_be_http_or_https">URL 必须以 http(s):// 为开头</string>
-  <string name="login_url_host_name_required">请输入主机名</string>
-  <string name="login_user_name">用户名</string>
-  <string name="login_user_name_required">请输入用户名</string>
-  <string name="login_base_url">根地址</string>
-  <string name="login_login">登录</string>
-  <string name="login_back">返回</string>
-  <string name="login_create_account">创建账户</string>
-  <string name="login_account_name">账户显示名</string>
-  <string name="login_account_name_info">请使用你的邮箱地址作为帐户名，因为 Android 会将你创建的日历事件的创建者项设置为帐户名。你不能拥有多个帐户名相同的账户。</string>
-  <string name="login_account_contact_group_method">联系人分组方式</string>
-  <string name="login_account_name_required">请输入账户名</string>
-  <string name="login_account_not_created">账户无法创建</string>
-  <string name="login_configuration_detection">正在配置</string>
-  <string name="login_querying_server">正在与服务器通信，请稍等...</string>
-  <string name="login_no_caldav_carddav">找不到 CalDAV 或 CardDAV 服务。</string>
-  <string name="login_view_logs">查看日志</string>
-  <!--AccountSettingsActivity-->
-  <string name="settings_title">设置：%s</string>
-  <string name="settings_authentication">认证</string>
-  <string name="settings_username">用户名</string>
-  <string name="settings_enter_username">输入用户名</string>
-  <string name="settings_password">密码</string>
-  <string name="settings_password_summary">修改服务器密码</string>
-  <string name="settings_enter_password">输入密码</string>
-  <string name="settings_sync">同步</string>
-  <string name="settings_sync_interval_contacts">通讯录自动同步间隔</string>
-  <string name="settings_sync_summary_manually">手动同步</string>
-  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">每 %d 分钟或本地修改后</string>
-  <string name="settings_sync_interval_calendars">日历自动同步间隔</string>
-  <string name="settings_sync_interval_tasks">任务自动同步间隔</string>
-  <string-array name="settings_sync_interval_seconds">
-    <item>-1</item>
-    <item>300</item>
-    <item>600</item>
-    <item>900</item>
-    <item>3600</item>
-    <item>7200</item>
-    <item>14400</item>
-    <item>86400</item>
-  </string-array>
-  <string-array name="settings_sync_interval_names">
-    <item>手动同步</item>
-    <item>每 5 分钟</item>
-    <item>每 10 分钟</item>
-    <item>每 15 分钟</item>
-    <item>每 1 小时</item>
-    <item>每 2 小时</item>
-    <item>每 4 小时</item>
-    <item>每 24 小时</item>
-  </string-array>
-  <string name="settings_sync_wifi_only">只在 WiFi 下同步</string>
-  <string name="settings_sync_wifi_only_on">同步只在 WiFi 连接下进行</string>
-  <string name="settings_sync_wifi_only_off">同步不受数据连接类型限制</string>
-  <string name="settings_sync_wifi_only_ssid">WiFi SSID 限制</string>
-  <string name="settings_sync_wifi_only_ssid_on">同步只在 %s 网络下进行</string>
-  <string name="settings_sync_wifi_only_ssid_off">任何 WiFi 网络下均会同步</string>
-  <string name="settings_sync_wifi_only_ssid_message">输入 WiFi 网络的名称 (SSID) ，即可限制同步只在此网络下进行。留空则不限制。</string>
-  <string name="settings_carddav">CardDAV</string>
-  <string name="settings_contact_group_method">联系人分组方式</string>
-  <string-array name="settings_contact_group_method_values">
-    <item>GROUP_VCARDS</item>
-    <item>CATEGORIES</item>
-  </string-array>
-  <string-array name="settings_contact_group_method_entries">
-    <item>分为不同的 VCards</item>
-    <item>每个联系人的分类</item>
-  </string-array>
-  <string name="settings_caldav">CalDAV</string>
-  <string name="settings_sync_time_range_past">旧日程时间限制</string>
-  <string name="settings_sync_time_range_past_none">同步所有日程</string>
-  <plurals name="settings_sync_time_range_past_days">
-    <item quantity="other">%d 天前的日程不会被同步</item>
-  </plurals>
-  <string name="settings_sync_time_range_past_message">超过这个数字的天数的旧日程将会被忽略（可以为 0）。留空则同步所有日程。</string>
-  <string name="settings_manage_calendar_colors">管理日历颜色</string>
-  <string name="settings_manage_calendar_colors_on">日历颜色由 DAVdroid 设置</string>
-  <string name="settings_manage_calendar_colors_off">日历颜色不由 DAVdroid 设置</string>
-  <!--collection management-->
-  <string name="create_addressbook">创建通讯录</string>
-  <string name="create_addressbook_display_name_hint">我的通讯录</string>
-  <string name="create_calendar">创建 CalDAV 集合</string>
-  <string name="create_calendar_display_name_hint">我的日历</string>
-  <string name="create_calendar_time_zone">时区</string>
-  <string name="create_calendar_type">集合类型</string>
-  <string name="create_calendar_type_only_events">日历（只有日程）</string>
-  <string name="create_calendar_type_only_tasks">任务列表（只有任务）</string>
-  <string name="create_calendar_type_events_and_tasks">混合（日程和任务）</string>
-  <string name="create_collection_color">设置集合颜色</string>
-  <string name="create_collection_creating">正在创建集合</string>
-  <string name="create_collection_display_name">集合显示名称（标题）</string>
-  <string name="create_collection_display_name_required">请输入标题</string>
-  <string name="create_collection_description">简介（可选）</string>
-  <string name="create_collection_home_set">主集合</string>
-  <string name="create_collection_create">创建</string>
-  <string name="delete_collection">删除集合</string>
-  <string name="delete_collection_confirm_title">你确定吗？</string>
-  <string name="delete_collection_confirm_warning">这个集合 %s 及其所有数据将会从服务器删除。</string>
-  <string name="delete_collection_deleting_collection">正在删除集合</string>
-  <!--ExceptionInfoFragment-->
-  <string name="exception">出现错误</string>
-  <string name="exception_httpexception">出现 HTTP 错误</string>
-  <string name="exception_ioexception">出现 I/O 错误</string>
-  <string name="exception_show_details">显示详情</string>
-  <!--sync errors and DebugInfoActivity-->
-  <string name="debug_info_title">调试信息</string>
-  <string name="sync_error_permissions">DAVdroid 权限</string>
-  <string name="sync_error_permissions_text">需要额外权限</string>
-  <string name="sync_error_calendar">日历同步失败（%s）</string>
-  <string name="sync_error_contacts">通讯录同步失败（%s）</string>
-  <string name="sync_error_tasks">任务同步失败（%s）</string>
-  <string name="sync_error">%s时错误</string>
-  <string name="sync_error_http_dav">%s时服务器错误</string>
-  <string name="sync_error_local_storage">%s时数据库错误</string>
-  <string-array name="sync_error_phases">
-    <item>准备同步</item>
-    <item>请求功能列表</item>
-    <item>处理本地删除项目</item>
-    <item>准备创建/修改项目</item>
-    <item>上传创建/修改项目</item>
-    <item>检查同步状态</item>
-    <item>检查本地数据</item>
-    <item>检查远程数据</item>
-    <item>比较本地和远程数据</item>
-    <item>下载远程数据</item>
-    <item>预处理</item>
-    <item>保存同步状态</item>
-  </string-array>
-  <string name="sync_error_unauthorized">用户名或密码错误</string>
-  <!--cert4android-->
-  <string name="certificate_notification_connection_security">DAVdroid: 连接安全性</string>
-  <string name="trust_certificate_unknown_certificate_found">DAVdroid 遇到了未知证书。你是否要信任该证书？</string>
-</resources>

app/src/gplay/AndroidManifest.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="at.bitfire.davdroid"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-permission android:name="com.android.vending.CHECK_LICENSE" />
-
-</manifest>

app/src/gplay/res/menu/activity_accounts_drawer.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
-  ~ All rights reserved. This program and the accompanying materials
-  ~ are made available under the terms of the GNU Public License v3.0
-  ~ which accompanies this distribution, and is available at
-  ~ http://www.gnu.org/licenses/gpl.html
-  -->
-
-<menu xmlns:tools="http://schemas.android.com/tools"
-      xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/nav_about"
-        android:icon="@drawable/ic_info_dark"
-        android:title="@string/navigation_drawer_about"/>
-    <item
-        android:id="@+id/nav_app_settings"
-        android:icon="@drawable/ic_settings_action"
-        android:title="@string/navigation_drawer_settings"/>
-
-    <item android:title="@string/navigation_drawer_news_updates">
-        <menu>
-            <item
-                android:id="@+id/nav_twitter"
-                android:icon="@drawable/twitter"
-                android:title="\@davdroidapp"
-                tools:ignore="HardcodedText"/>
-        </menu>
-    </item>
-
-    <item android:title="@string/navigation_drawer_external_links">
-        <menu>
-            <item
-                android:id="@+id/nav_website"
-                android:icon="@drawable/ic_home_dark"
-                android:title="@string/navigation_drawer_website"/>
-            <item
-                android:id="@+id/nav_faq"
-                android:icon="@drawable/ic_help_action"
-                android:title="@string/navigation_drawer_faq"/>
-            <item
-                android:id="@+id/nav_forums"
-                android:icon="@drawable/ic_forum_dark"
-                android:title="@string/navigation_drawer_forums"/>
-            <item
-                android:id="@+id/nav_donate"
-                android:icon="@drawable/ic_attach_money_dark"
-                android:title="@string/navigation_drawer_donate"
-                android:visible="false"/>
-        </menu>
-    </item>
-
-</menu>

app/src/main/AndroidManifest.xml

@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
-  ~ All rights reserved. This program and the accompanying materials
-  ~ are made available under the terms of the GNU Public License v3.0
-  ~ which accompanies this distribution, and is available at
-  ~ http://www.gnu.org/licenses/gpl.html
--->
 <manifest package="at.bitfire.davdroid"
           xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
@@ -14,10 +7,12 @@
     <!-- normal permissions -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
     <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
 
     <!-- account management permissions not required for own accounts since API level 22 -->
@@ -25,13 +20,6 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" android:maxSdkVersion="22"/>
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" android:maxSdkVersion="22"/>
 
-    <!--
-         for writing external log files; permission only required for SDK <= 18 because since then,
-         writing to app-private directory doesn't require extra permissions
-    -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="18"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18"/>
-
     <!-- other permissions -->
     <!-- android.permission-group.CONTACTS -->
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
@@ -40,43 +28,112 @@
     <uses-permission android:name="android.permission.READ_CALENDAR"/>
     <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
 
+    <!-- android.permission-group.LOCATION -->
+    <!-- getting the WiFi name (for "sync in Wifi only") requires
+      - coarse location (Android 8.1)
+      - fine location (Android 10) -->
+    <uses-permission-sdk-23 android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission-sdk-23 android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <!-- required since Android 10 to get the WiFi name while in background (= while syncing) -->
+    <uses-permission-sdk-23 android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+
     <!-- ical4android declares task access permissions -->
 
     <application
         android:name=".App"
-        android:allowBackup="true"
-        android:fullBackupContent="false"
+        android:allowBackup="false"
         android:networkSecurityConfig="@xml/network_security_config"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
+        android:resizeableActivity="true"
         tools:ignore="UnusedAttribute">
 
-        <receiver
-            android:name=".model.Settings$ReinitSettingsReceiver"
-            android:exported="false"
-            android:process=":sync">
+        <service android:name=".DavService"/>
+        <service android:name=".ForegroundService"/>
+
+        <activity android:name=".ui.intro.IntroActivity" android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".ui.AccountsActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="at.bitfire.davdroid.REINIT_SETTINGS"/>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-        </receiver>
-        <receiver
-            android:name=".AccountSettings$AppUpdatedReceiver"
+        </activity>
+
+        <activity
+            android:name=".ui.AboutActivity"
+            android:label="@string/navigation_drawer_about"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:parentActivityName=".ui.AccountsActivity"/>
+
+        <activity
+            android:name=".ui.AppSettingsActivity"
+            android:label="@string/app_settings"
+            android:parentActivityName=".ui.AccountsActivity"
             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <data android:scheme="package" android:path="at.bitfire.davdroid" />
+                <action android:name="android.intent.action.APPLICATION_PREFERENCES"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-        </receiver>
+        </activity>
+        <activity
+            android:name=".ui.DebugInfoActivity"
+            android:parentActivityName=".ui.AppSettingsActivity"
+            android:exported="true"
+            android:label="@string/debug_info_title">
+            <intent-filter>
+                <action android:name="android.intent.action.BUG_REPORT"/>
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ui.PermissionsActivity"
+            android:label="@string/app_settings_security_app_permissions"
+            android:parentActivityName=".ui.AppSettingsActivity" />
+        <activity
+            android:name=".ui.TasksActivity"
+            android:label="@string/intro_tasks_title"
+            android:parentActivityName=".ui.AppSettingsActivity" />
 
-        <!-- account type "DAVdroid" -->
+        <activity
+            android:name=".ui.setup.LoginActivity"
+            android:label="@string/login_title"
+            android:parentActivityName=".ui.AccountsActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ui.account.AccountActivity"
+            android:parentActivityName=".ui.AccountsActivity"
+            android:theme="@style/AppTheme.NoActionBar"/>
+        <activity
+            android:name=".ui.account.CreateAddressBookActivity"
+            android:label="@string/create_addressbook"
+            android:parentActivityName=".ui.account.AccountActivity" />
+        <activity
+            android:name=".ui.account.CreateCalendarActivity"
+            android:label="@string/create_calendar"
+            android:parentActivityName=".ui.account.AccountActivity" />
+        <activity
+            android:name=".ui.account.SettingsActivity"
+            android:parentActivityName=".ui.account.AccountActivity" />
+        <activity
+            android:name=".ui.account.WifiPermissionsActivity"
+            android:label="@string/wifi_permissions_label"
+            android:parentActivityName=".ui.account.SettingsActivity" />
+
+        <!-- account type "DAVx⁵" -->
         <service
             android:name=".syncadapter.AccountAuthenticatorService"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator"/>
             </intent-filter>
-
             <meta-data
                 android:name="android.accounts.AccountAuthenticator"
                 android:resource="@xml/account_authenticator"/>
@@ -84,35 +141,41 @@
         <service
             android:name=".syncadapter.CalendarsSyncAdapterService"
             android:exported="true"
-            android:process=":sync"
             tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="android.content.SyncAdapter"/>
             </intent-filter>
-
             <meta-data
                 android:name="android.content.SyncAdapter"
                 android:resource="@xml/sync_calendars"/>
         </service>
-
         <service
-            android:name=".syncadapter.TasksSyncAdapterService"
+            android:name=".syncadapter.OpenTasksSyncAdapterService"
             android:exported="true"
-            android:process=":sync"
             tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="android.content.SyncAdapter"/>
             </intent-filter>
-
             <meta-data
                 android:name="android.content.SyncAdapter"
-                android:resource="@xml/sync_tasks"/>
+                android:resource="@xml/sync_opentasks"/>
+        </service>
+        <service
+            android:name=".syncadapter.TasksOrgSyncAdapterService"
+            android:exported="true"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter"/>
+            </intent-filter>
+            <meta-data
+                android:name="android.content.SyncAdapter"
+                android:resource="@xml/sync_tasks_org"/>
         </service>
 
-        <!-- account type "DAVdroid Address book" -->
+        <!-- account type "DAVx⁵ Address book" -->
         <service
             android:name=".syncadapter.NullAuthenticatorService"
-            android:exported="false">
+            android:exported="true">   <!-- Since Android 11, this must be true so that Google Contacts shows the address book accounts -->
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator"/>
             </intent-filter>
@@ -130,7 +193,6 @@
         <service
             android:name=".syncadapter.AddressBooksSyncAdapterService"
             android:exported="true"
-            android:process=":sync"
             tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="android.content.SyncAdapter"/>
@@ -143,7 +205,6 @@
         <service
             android:name=".syncadapter.ContactsSyncAdapterService"
             android:exported="true"
-            android:process=":sync"
             tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="android.content.SyncAdapter"/>
@@ -157,85 +218,48 @@
                 android:resource="@xml/contacts"/>
         </service>
 
-        <service
-            android:name=".DavService"
-            android:enabled="true">
-        </service>
-
-        <receiver android:name=".AccountsChangedReceiver">
+        <receiver android:name=".BootCompletedReceiver">
             <intent-filter>
-                <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED"/>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".PackageChangedReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_ADDED"/>
-                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED"/>
-                <data android:scheme="package"/>
-            </intent-filter>
-        </receiver>
-
-        <activity
-            android:name=".ui.AccountsActivity"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".ui.AboutActivity"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:parentActivityName=".ui.AccountsActivity"/>
-
-        <activity
-            android:name=".ui.AppSettingsActivity"
-            android:label="@string/app_settings"
-            android:parentActivityName=".ui.AccountsActivity"/>
-
-        <activity android:name=".ui.PermissionsActivity"
-                  android:label="@string/permissions_title"
-                  android:parentActivityName=".ui.AccountsActivity"/>
-
-        <activity
-            android:name=".ui.setup.LoginActivity"
-            android:label="@string/login_title"
-            android:parentActivityName=".ui.AccountsActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".ui.AccountActivity"
-            android:parentActivityName=".ui.AccountsActivity">
-        </activity>
-        <activity android:name=".ui.AccountSettingsActivity"/>
-        <activity android:name=".ui.CreateAddressBookActivity"
-            android:label="@string/create_addressbook"/>
-        <activity android:name=".ui.CreateCalendarActivity"
-                  android:label="@string/create_calendar"/>
-
-        <activity
-            android:name=".ui.DebugInfoActivity"
-            android:exported="true"
-            android:label="@string/debug_info_title">
-        </activity>
+        <!-- provider to share debug info/logs -->
         <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="@string/authority_log_provider"
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="@string/authority_debug_provider"
             android:grantUriPermissions="true"
             android:exported="false">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/log_paths" />
+                android:resource="@xml/debug_paths" />
         </provider>
 
-
     </application>
 
+    <!-- package visiblity – which apps do we need to see? -->
+    <queries>
+        <!-- task providers -->
+        <package android:name="org.dmfs.tasks" />
+        <package android:name="org.tasks" />
+
+        <!-- ICSx5 for Webcal feeds -->
+        <package android:name="at.bitfire.icsdroid"/>
+
+        <!-- apps that interact with contact, calendar, task data (for debug info) -->
+        <intent>
+            <action android:name="*" />
+            <data android:scheme="content" android:host="com.android.contacts" />
+        </intent>
+        <intent>
+            <action android:name="*" />
+            <data android:scheme="content" android:host="com.android.calendar" />
+        </intent>
+
+        <!-- Custom Tabs support (e.g. Nextcloud Login Flow) -->
+        <intent>
+            <action android:name="android.support.customtabs.action.CustomTabsService" />
+        </intent>
+    </queries>
+
 </manifest>

app/src/main/assets/apache2.html

@@ -1,153 +0,0 @@
-<h3>Apache License, Version 2.0, January 2004</h3>
-<p><a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a> </p>
-<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
-<p><strong><a name="definitions">1. Definitions</a></strong>.</p>
-<p>"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.</p>
-<p>"Licensor" shall mean the copyright owner or entity authorized by the
-copyright owner that is granting the License.</p>
-<p>"Legal Entity" shall mean the union of the acting entity and all other
-entities that control, are controlled by, or are under common control with
-that entity. For the purposes of this definition, "control" means (i) the
-power, direct or indirect, to cause the direction or management of such
-entity, whether by contract or otherwise, or (ii) ownership of fifty
-percent (50%) or more of the outstanding shares, or (iii) beneficial
-ownership of such entity.</p>
-<p>"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.</p>
-<p>"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation source,
-and configuration files.</p>
-<p>"Object" form shall mean any form resulting from mechanical transformation
-or translation of a Source form, including but not limited to compiled
-object code, generated documentation, and conversions to other media types.</p>
-<p>"Work" shall mean the work of authorship, whether in Source or Object form,
-made available under the License, as indicated by a copyright notice that
-is included in or attached to the work (an example is provided in the
-Appendix below).</p>
-<p>"Derivative Works" shall mean any work, whether in Source or Object form,
-that is based on (or derived from) the Work and for which the editorial
-revisions, annotations, elaborations, or other modifications represent, as
-a whole, an original work of authorship. For the purposes of this License,
-Derivative Works shall not include works that remain separable from, or
-merely link (or bind by name) to the interfaces of, the Work and Derivative
-Works thereof.</p>
-<p>"Contribution" shall mean any work of authorship, including the original
-version of the Work and any modifications or additions to that Work or
-Derivative Works thereof, that is intentionally submitted to Licensor for
-inclusion in the Work by the copyright owner or by an individual or Legal
-Entity authorized to submit on behalf of the copyright owner. For the
-purposes of this definition, "submitted" means any form of electronic,
-verbal, or written communication sent to the Licensor or its
-representatives, including but not limited to communication on electronic
-mailing lists, source code control systems, and issue tracking systems that
-are managed by, or on behalf of, the Licensor for the purpose of discussing
-and improving the Work, but excluding communication that is conspicuously
-marked or otherwise designated in writing by the copyright owner as "Not a
-Contribution."</p>
-<p>"Contributor" shall mean Licensor and any individual or Legal Entity on
-behalf of whom a Contribution has been received by Licensor and
-subsequently incorporated within the Work.</p>
-<p><strong><a name="copyright">2. Grant of Copyright License</a></strong>. Subject to the
-terms and conditions of this License, each Contributor hereby grants to You
-a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of, publicly
-display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.</p>
-<p><strong><a name="patent">3. Grant of Patent License</a></strong>. Subject to the terms
-and conditions of this License, each Contributor hereby grants to You a
-perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have made, use,
-offer to sell, sell, import, and otherwise transfer the Work, where such
-license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by
-combination of their Contribution(s) with the Work to which such
-Contribution(s) was submitted. If You institute patent litigation against
-any entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that the Work or a Contribution incorporated within the Work constitutes
-direct or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate as of the
-date such litigation is filed.</p>
-<p><strong><a name="redistribution">4. Redistribution</a></strong>. You may reproduce and
-distribute copies of the Work or Derivative Works thereof in any medium,
-with or without modifications, and in Source or Object form, provided that
-You meet the following conditions:</p>
-
-<p>a. You must give any other recipients of the Work or Derivative Works a
-copy of this License; and</p>
-
-<p>b. You must cause any modified files to carry prominent notices stating
-that You changed the files; and</p>
-
-<p>c. You must retain, in the Source form of any Derivative Works that You
-distribute, all copyright, patent, trademark, and attribution notices from
-the Source form of the Work, excluding those notices that do not pertain to
-any part of the Derivative Works; and</p>
-
-<p>d. If the Work includes a "NOTICE" text file as part of its distribution,
-then any Derivative Works that You distribute must include a readable copy
-of the attribution notices contained within such NOTICE file, excluding
-those notices that do not pertain to any part of the Derivative Works, in
-at least one of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or documentation,
-if provided along with the Derivative Works; or, within a display generated
-by the Derivative Works, if and wherever such third-party notices normally
-appear. The contents of the NOTICE file are for informational purposes only
-and do not modify the License. You may add Your own attribution notices
-within Derivative Works that You distribute, alongside or as an addendum to
-the NOTICE text from the Work, provided that such additional attribution
-notices cannot be construed as modifying the License.
-<br/>
-<br/>
-You may add Your own copyright statement to Your modifications and may
-provide additional or different license terms and conditions for use,
-reproduction, or distribution of Your modifications, or for any such
-Derivative Works as a whole, provided Your use, reproduction, and
-distribution of the Work otherwise complies with the conditions stated in
-this License.
-</p>
-
-<p><strong><a name="contributions">5. Submission of Contributions</a></strong>. Unless You
-explicitly state otherwise, any Contribution intentionally submitted for
-inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the
-terms of any separate license agreement you may have executed with Licensor
-regarding such Contributions.</p>
-<p><strong><a name="trademarks">6. Trademarks</a></strong>. This License does not grant
-permission to use the trade names, trademarks, service marks, or product
-names of the Licensor, except as required for reasonable and customary use
-in describing the origin of the Work and reproducing the content of the
-NOTICE file.</p>
-<p><strong><a name="no-warranty">7. Disclaimer of Warranty</a></strong>. Unless required by
-applicable law or agreed to in writing, Licensor provides the Work (and
-each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
-without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
-are solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise
-of permissions under this License.</p>
-<p><strong><a name="no-liability">8. Limitation of Liability</a></strong>. In no event and
-under no legal theory, whether in tort (including negligence), contract, or
-otherwise, unless required by applicable law (such as deliberate and
-grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special,
-incidental, or consequential damages of any character arising as a result
-of this License or out of the use or inability to use the Work (including
-but not limited to damages for loss of goodwill, work stoppage, computer
-failure or malfunction, or any and all other commercial damages or losses),
-even if such Contributor has been advised of the possibility of such
-damages.</p>
-<p><strong><a name="additional">9. Accepting Warranty or Additional Liability</a></strong>.
-While redistributing the Work or Derivative Works thereof, You may choose
-to offer, and charge a fee for, acceptance of support, warranty, indemnity,
-or other liability obligations and/or rights consistent with this License.
-However, in accepting such obligations, You may act only on Your own behalf
-and on Your sole responsibility, not on behalf of any other Contributor,
-and only if You agree to indemnify, defend, and hold each Contributor
-harmless for any liability incurred by, or claims asserted against, such
-Contributor by reason of your accepting any such warranty or additional
-liability.</p>
-
-<p>END OF TERMS AND CONDITIONS</p>

app/src/main/assets/bsd-3clause.html

@@ -1,28 +0,0 @@
-<h3>BSD License (3-clause)</h3>
-
-<p>Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:</p>
-
-<p>o Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.</p>
-
-<p>o Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.</p>
-
-<p>o Neither the name of Ben Fortuna nor the names of any other contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.</p>
-
-<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>

app/src/main/assets/bsd.html

@@ -1,23 +0,0 @@
-<h3>BSD License</h3>
-
-<p>Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:</p>
-
-<p>1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.</p>
-
-<p>2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.</p>
-
-<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
-

app/src/main/assets/gplv3.html

@@ -2,9 +2,9 @@
 <p style="text-align: center;">Version 3, 29 June 2007</p>
 
 <p>Copyright &copy; 2007 Free Software Foundation, Inc.
- &lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;</p><p>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.</p>
+&lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;</p><p>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.</p>
 
 <h3><a name="preamble"></a>Preamble</h3>
 
@@ -42,16 +42,16 @@ know their rights.</p>
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.</p>
 
-<p>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
+<p>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.</p>
 
 <p>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
+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
@@ -77,7 +77,7 @@ modification follow.</p>
 
 <p>&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.</p>
- 
+
 <p>&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as &ldquo;you&rdquo;.  &ldquo;Licensees&rdquo; and
 &ldquo;recipients&rdquo; may be individuals or organizations.</p>
@@ -135,7 +135,7 @@ produce the work, or an object code interpreter used to run it.</p>
 <p>The &ldquo;Corresponding Source&rdquo; 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
+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
@@ -177,7 +177,7 @@ your copyrighted material outside their relationship with you.</p>
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.</p>
 
-<h4><a name="section3"></a>3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
+<h4><a name="section3"></a>3. Protecting Users\' Legal Rights From Anti-Circumvention Law.</h4>
 
 <p>No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
@@ -189,13 +189,13 @@ measures.</p>
 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
+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.</p>
 
 <h4><a name="section4"></a>4. Conveying Verbatim Copies.</h4>
 
-<p>You may convey verbatim copies of the Program's source code as you
+<p>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
@@ -240,7 +240,7 @@ 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
 &ldquo;aggregate&rdquo; if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
+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.</p>
@@ -462,7 +462,7 @@ 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
+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.</p>
@@ -479,9 +479,9 @@ sale, or importing the Program or any portion of it.</p>
 
 <p>A &ldquo;contributor&rdquo; 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 &ldquo;contributor version&rdquo;.</p>
+work thus licensed is called the contributor\'s &ldquo;contributor version&rdquo;.</p>
 
-<p>A contributor's &ldquo;essential patent claims&rdquo; are all patent claims
+<p>A contributor\'s &ldquo;essential patent claims&rdquo; 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,
@@ -492,7 +492,7 @@ patent sublicenses in a manner consistent with the requirements of
 this License.</p>
 
 <p>Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
+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.</p>
 
@@ -513,10 +513,10 @@ 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.  &ldquo;Knowingly relying&rdquo; 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
+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.</p>
-  
+
 <p>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
@@ -544,7 +544,7 @@ or that patent license was granted, prior to 28 March 2007.</p>
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.</p>
 
-<h4><a name="section12"></a>12. No Surrender of Others' Freedom.</h4>
+<h4><a name="section12"></a>12. No Surrender of Others\' Freedom.</h4>
 
 <p>If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
@@ -584,7 +584,7 @@ GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.</p>
 
 <p>If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+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.</p>
 

app/src/main/assets/mit.html

@@ -1,7 +0,0 @@
-<h3>The MIT License (MIT)</h3>
-
-<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
-
-<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
-
-<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>

app/src/main/assets/translators.json

@@ -0,0 +1 @@
+{"ar_SA":["abdunnasir"],"bg":["dpa_transifex","ma4ko","stoyan"],"ca":["ettenmoors","hegocr_1709","jordibrus","Kintu","Solatec","zagur"],"cs":["Kryšpin","pavelb","tomas.odehnal"],"da":["knutztar","mjjzf","Tntdruid_","twikedk"],"de":["amandablue","anestiskaci","Atalanttore","corppneq","crit12","hammaschlach","maxkl","nicolas_git","owncube","TheName","Waldmeisda","Wyrrrd","YvanM"],"el":["anestiskaci","diamond_gr","KristinaQejvanaj"],"es":["aluaces","Anoih","Ark74","Elhea","GranPC","jcvielma","oscfdezdz","plaguna","polkhas","xphnx"],"eu":["cockeredradiation","Osoitz","Thadah"],"fa":["ahangarha","amiraliakbari","javad.aboutorabi","joojoojoo","maryambehzi","mtashackori","Numb","taranehsaei"],"fi_FI":["raketti","tseipii"],"fr":["AlainR","alkino2","Amadeen","boutil","callmemagnus","chfo","chrcha","Floflr","grenatrad","jokx","Jorg722","JorisBodin","Llorc","LoiX07","mathieugfortin","Novick","paullbn","Poussinou","RomainTT","Synochy","Thecross","unareil","vincen","YvanM","ÉricB."],"fr_FR":["chrcha","Llorc","Poussinou"],"gl":["aluaces","pikamoku"],"hr":["tomiis"],"hr_HR":["tomiis"],"hu":["infeeeee","jtg","meskobalazs","Roshek"],"it":["Damtux","ed0","FranzMari","lzambarda","malaerba","noccio","nwandy","rickyroo","technezio"],"it_IT":["malaerba"],"ja":["Naofumi","yanorei32"],"nb_NO":["elonus"],"nl":["davtemp","dehart","erikhubers","frankyboy1963","glotzbach","toonvangerwen","XtremeNova"],"pl":["gsz","mg6","oskarjakiela","TheName","TORminator","Valdnet"],"pt":["amalvarenga","wanderlei.huttel"],"pt_BR":["wanderlei.huttel"],"ru":["aigoshin","anm","ashed","astalavister","nick.savin","vaddd"],"sk_SK":["brango67","tiborepcek"],"sl_SI":["MrLaaky","uroszor"],"sr":["daimonion"],"sv":["campbelldavid","Mikaelb"],"szl":["chlodny"],"tr_TR":["ooguz","pultars"],"uk":["androsua","olexn","twixi007"],"uk_UA":["astalavister"],"zh_CN":["anolir","jxj2zzz79pfp9bpo","linuxbckp","mofitt2016","oksjd","phy","spice2wolf"],"zh_TW":["linuxbckp","mofitt2016","phy","waiabsfabuloushk"]}

app/src/main/java/at/bitfire/davdroid/AccountSettings.kt

@@ -1,460 +0,0 @@
-/*
- * Copyright © Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-package at.bitfire.davdroid
-
-import android.accounts.Account
-import android.accounts.AccountManager
-import android.annotation.SuppressLint
-import android.content.*
-import android.os.Build
-import android.os.Bundle
-import android.os.Parcel
-import android.os.RemoteException
-import android.provider.CalendarContract
-import android.provider.ContactsContract
-import at.bitfire.davdroid.log.Logger
-import at.bitfire.davdroid.model.CollectionInfo
-import at.bitfire.davdroid.model.ServiceDB
-import at.bitfire.davdroid.model.ServiceDB.*
-import at.bitfire.davdroid.model.ServiceDB.Collections
-import at.bitfire.davdroid.resource.LocalAddressBook
-import at.bitfire.davdroid.resource.LocalCalendar
-import at.bitfire.davdroid.resource.LocalTaskList
-import at.bitfire.ical4android.AndroidCalendar
-import at.bitfire.ical4android.AndroidTaskList
-import at.bitfire.ical4android.CalendarStorageException
-import at.bitfire.vcard4android.ContactsStorageException
-import at.bitfire.vcard4android.GroupMethod
-import okhttp3.HttpUrl
-import java.util.*
-import java.util.logging.Level
-
-class AccountSettings @Throws(InvalidAccountException::class) constructor(
-        val context: Context,
-        val account: Account
-) {
-
-    companion object {
-
-        val CURRENT_VERSION = 6
-        val KEY_SETTINGS_VERSION = "version"
-
-        val KEY_USERNAME = "user_name"
-
-        val KEY_WIFI_ONLY = "wifi_only"             // sync on WiFi only (default: false)
-        val KEY_WIFI_ONLY_SSID = "wifi_only_ssid"   // restrict sync to specific WiFi SSID
-
-        /** Time range limitation to the past [in days]
-        value = null            default value (DEFAULT_TIME_RANGE_PAST_DAYS)
-        < 0 (-1)          no limit
-        >= 0              entries more than n days in the past won't be synchronized
-         */
-        val KEY_TIME_RANGE_PAST_DAYS = "time_range_past_days"
-        val DEFAULT_TIME_RANGE_PAST_DAYS = 90
-
-        /* Whether DAVdroid sets the local calendar color to the value from service DB at every sync
-           value = null (not existing)     true (default)
-                   "0"                     false */
-        val KEY_MANAGE_CALENDAR_COLORS = "manage_calendar_colors"
-
-        /** Contact group method:
-        value = null (not existing)     groups as separate VCards (default)
-        "CATEGORIES"            groups are per-contact CATEGORIES
-         */
-        val KEY_CONTACT_GROUP_METHOD = "contact_group_method"
-
-        @JvmField
-        val SYNC_INTERVAL_MANUALLY = -1L
-
-        @JvmStatic
-        fun initialUserData(userName: String): Bundle
-        {
-            val bundle = Bundle(2)
-            bundle.putString(KEY_SETTINGS_VERSION, CURRENT_VERSION.toString())
-            bundle.putString(KEY_USERNAME, userName)
-            return bundle
-        }
-
-    }
-
-
-    val accountManager: AccountManager = AccountManager.get(context)
-
-    init {
-        synchronized(AccountSettings::class.java) {
-            val versionStr = accountManager.getUserData(account, KEY_SETTINGS_VERSION) ?: throw InvalidAccountException(account)
-            var version = 0
-            try {
-                version = Integer.parseInt(versionStr)
-            } catch (e: NumberFormatException) {
-            }
-            Logger.log.fine("Account ${account.name} has version $version, current version: $CURRENT_VERSION")
-
-            if (version < CURRENT_VERSION)
-                update(version)
-        }
-    }
-
-
-
-    // authentication settings
-
-    fun username(): String? = accountManager.getUserData(account, KEY_USERNAME)
-    fun username(userName: String) = accountManager.setUserData(account, KEY_USERNAME, userName)
-
-    fun password(): String? = accountManager.getPassword(account)
-    fun password(password: String) = accountManager.setPassword(account, password)
-
-
-    // sync. settings
-
-    fun getSyncInterval(authority: String): Long? {
-        if (ContentResolver.getIsSyncable(account, authority) <= 0)
-            return null
-
-        return if (ContentResolver.getSyncAutomatically(account, authority))
-            ContentResolver.getPeriodicSyncs(account, authority).firstOrNull()?.period ?: SYNC_INTERVAL_MANUALLY
-        else
-            SYNC_INTERVAL_MANUALLY
-    }
-
-    fun setSyncInterval(authority: String, seconds: Long) {
-        if (seconds == SYNC_INTERVAL_MANUALLY) {
-            ContentResolver.setSyncAutomatically(account, authority, false)
-        } else {
-            ContentResolver.setSyncAutomatically(account, authority, true)
-            ContentResolver.addPeriodicSync(account, authority, Bundle(), seconds)
-        }
-    }
-
-    fun getSyncWifiOnly() = accountManager.getUserData(account, KEY_WIFI_ONLY) != null
-    fun setSyncWiFiOnly(wiFiOnly: Boolean) =
-            accountManager.setUserData(account, KEY_WIFI_ONLY, if (wiFiOnly) "1" else null)
-
-    fun getSyncWifiOnlySSID(): String? = accountManager.getUserData(account, KEY_WIFI_ONLY_SSID)
-    fun setSyncWifiOnlySSID(ssid: String?) = accountManager.setUserData(account, KEY_WIFI_ONLY_SSID, ssid)
-
-
-    // CalDAV settings
-
-    fun getTimeRangePastDays(): Int? {
-        val strDays = accountManager.getUserData(account, KEY_TIME_RANGE_PAST_DAYS)
-        if (strDays != null) {
-            val days = Integer.valueOf(strDays)
-            return if (days < 0) null else days
-        } else
-            return DEFAULT_TIME_RANGE_PAST_DAYS
-    }
-
-    fun setTimeRangePastDays(days: Int?) =
-            accountManager.setUserData(account, KEY_TIME_RANGE_PAST_DAYS, (days ?: -1).toString())
-
-    fun getManageCalendarColors() = accountManager.getUserData(account, KEY_MANAGE_CALENDAR_COLORS) == null
-    fun setManageCalendarColors(manage: Boolean) =
-            accountManager.setUserData(account, KEY_MANAGE_CALENDAR_COLORS, if (manage) null else "0")
-
-
-    // CardDAV settings
-
-    fun getGroupMethod(): GroupMethod {
-        BuildConfig.settingContactGroupMethod?.let { return it }
-
-        val name = accountManager.getUserData(account, KEY_CONTACT_GROUP_METHOD)
-        return if (name != null)
-            GroupMethod.valueOf(name)
-        else
-            GroupMethod.GROUP_VCARDS
-    }
-
-    fun setGroupMethod(method: GroupMethod) {
-        if (BuildConfig.settingContactGroupMethod == null) {
-            val name = if (method == GroupMethod.GROUP_VCARDS) null else method.name
-            accountManager.setUserData(account, KEY_CONTACT_GROUP_METHOD, name)
-        } else if (BuildConfig.settingContactGroupMethod != method)
-            throw UnsupportedOperationException("Group method setting is read-only")
-    }
-
-
-    // update from previous account settings
-
-    private fun update(baseVersion: Int) {
-        for (toVersion in baseVersion+1 .. CURRENT_VERSION) {
-            val fromVersion = toVersion-1
-            Logger.log.info("Updating account ${account.name} from version $fromVersion to $toVersion")
-            try {
-                val updateProc = this::class.java.getDeclaredMethod("update_${fromVersion}_$toVersion")
-                updateProc.invoke(this)
-                accountManager.setUserData(account, KEY_SETTINGS_VERSION, toVersion.toString())
-            } catch (e: Exception) {
-                Logger.log.log(Level.SEVERE, "Couldn't update account settings", e)
-            }
-        }
-    }
-
-    @Suppress("unused")
-    private fun update_1_2() {
-        /* - KEY_ADDRESSBOOK_URL ("addressbook_url"),
-           - KEY_ADDRESSBOOK_CTAG ("addressbook_ctag"),
-           - KEY_ADDRESSBOOK_VCARD_VERSION ("addressbook_vcard_version") are not used anymore (now stored in ContactsContract.SyncState)
-           - KEY_LAST_ANDROID_VERSION ("last_android_version") has been added
-        */
-
-        // move previous address book info to ContactsContract.SyncState
-        val provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY) ?:
-            throw ContactsStorageException("Couldn't access Contacts provider")
-
-        try {
-            val addr = LocalAddressBook(context, account, provider)
-
-            // until now, ContactsContract.Settings.UNGROUPED_VISIBLE was not set explicitly
-            val values = ContentValues()
-            values.put(ContactsContract.Settings.UNGROUPED_VISIBLE, 1)
-            addr.updateSettings(values)
-
-            val url = accountManager.getUserData(account, "addressbook_url")
-            if (!url.isNullOrEmpty())
-                addr.setURL(url)
-            accountManager.setUserData(account, "addressbook_url", null)
-
-            val cTag = accountManager.getUserData (account, "addressbook_ctag")
-            if (!cTag.isNullOrEmpty())
-                addr.setCTag(cTag)
-            accountManager.setUserData(account, "addressbook_ctag", null)
-        } finally {
-            if (Build.VERSION.SDK_INT >= 24)
-                provider.close()
-            else
-                @Suppress("deprecation")
-                provider.release()
-        }
-    }
-
-    @Suppress("unused")
-    private fun update_2_3() {
-        // Don't show a warning for Android updates anymore
-        accountManager.setUserData(account, "last_android_version", null)
-
-        var serviceCardDAV: Long? = null
-        var serviceCalDAV: Long? = null
-
-        ServiceDB.OpenHelper(context).use { dbHelper ->
-            val db = dbHelper.writableDatabase
-            // we have to create the WebDAV Service database only from the old address book, calendar and task list URLs
-
-            // CardDAV: migrate address books
-            context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)?.let { client ->
-                try {
-                    val addrBook = LocalAddressBook(context, account, client)
-                    val url = addrBook.getURL()
-                    Logger.log.fine("Migrating address book $url")
-
-                    // insert CardDAV service
-                    val values = ContentValues(3)
-                    values.put(Services.ACCOUNT_NAME, account.name)
-                    values.put(Services.SERVICE, Services.SERVICE_CARDDAV)
-                    serviceCardDAV = db.insert(Services._TABLE, null, values)
-
-                    // insert address book
-                    values.clear()
-                    values.put(Collections.SERVICE_ID, serviceCardDAV)
-                    values.put(Collections.URL, url)
-                    values.put(Collections.SYNC, 1)
-                    db.insert(Collections._TABLE, null, values)
-
-                    // insert home set
-                    HttpUrl.parse(url)?.let {
-                        val homeSet = it.resolve("../")
-                        values.clear()
-                        values.put(HomeSets.SERVICE_ID, serviceCardDAV)
-                        values.put(HomeSets.URL, homeSet.toString())
-                        db.insert(HomeSets._TABLE, null, values)
-                    }
-                } catch (e: ContactsStorageException) {
-                    Logger.log.log(Level.SEVERE, "Couldn't migrate address book", e)
-                } finally {
-                    if (Build.VERSION.SDK_INT >= 24)
-                        client.close()
-                    else
-                        @Suppress("deprecation")
-                        client.release()
-                }
-            }
-
-            // CalDAV: migrate calendars + task lists
-            val collections = HashSet<String>()
-            val homeSets = HashSet<HttpUrl>()
-
-            context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)?.let { client ->
-                try {
-                    val calendars = AndroidCalendar.find(account, client, LocalCalendar.Factory, null, null)
-                    for (calendar in calendars)
-                        calendar.name?.let { url ->
-                            Logger.log.fine("Migrating calendar $url")
-                            collections.add(url)
-                            HttpUrl.parse(url)?.resolve("../")?.let { homeSets.add(it) }
-                        }
-                } catch (e: CalendarStorageException) {
-                    Logger.log.log(Level.SEVERE, "Couldn't migrate calendars", e)
-                } finally {
-                    if (Build.VERSION.SDK_INT >= 24)
-                        client.close()
-                    else
-                        @Suppress("deprecation")
-                        client.release()
-                }
-            }
-
-            AndroidTaskList.acquireTaskProvider(context.contentResolver)?.use { provider ->
-                try {
-                    val taskLists = AndroidTaskList.find(account, provider, LocalTaskList.Factory, null, null)
-                    for (taskList in taskLists)
-                        taskList.syncId?.let { url ->
-                            Logger.log.fine("Migrating task list $url")
-                            collections.add(url)
-                            HttpUrl.parse(url)?.resolve("../")?.let { homeSets.add(it) }
-                        }
-                } catch (e: CalendarStorageException) {
-                    Logger.log.log(Level.SEVERE, "Couldn't migrate task lists", e)
-                }
-            }
-
-            if (!collections.isEmpty()) {
-                // insert CalDAV service
-                val values = ContentValues(3)
-                values.put(Services.ACCOUNT_NAME, account.name)
-                values.put(Services.SERVICE, Services.SERVICE_CALDAV)
-                serviceCalDAV = db.insert(Services._TABLE, null, values)
-
-                // insert collections
-                for (url in collections) {
-                    values.clear()
-                    values.put(Collections.SERVICE_ID, serviceCalDAV)
-                    values.put(Collections.URL, url)
-                    values.put(Collections.SYNC, 1)
-                    db.insert(Collections._TABLE, null, values)
-                }
-
-                // insert home sets
-                for (homeSet in homeSets) {
-                    values.clear()
-                    values.put(HomeSets.SERVICE_ID, serviceCalDAV)
-                    values.put(HomeSets.URL, homeSet.toString())
-                    db.insert(HomeSets._TABLE, null, values)
-                }
-            }
-        }
-
-        // initiate service detection (refresh) to get display names, colors etc.
-        val refresh = Intent(context, DavService::class.java)
-        refresh.action = DavService.ACTION_REFRESH_COLLECTIONS
-        serviceCardDAV?.let {
-            refresh.putExtra(DavService.EXTRA_DAV_SERVICE_ID, it)
-            context.startService(refresh)
-        }
-        serviceCalDAV?.let {
-            refresh.putExtra(DavService.EXTRA_DAV_SERVICE_ID, it)
-            context.startService(refresh)
-        }
-    }
-
-    @Suppress("unused")
-    private fun update_3_4() {
-        setGroupMethod(GroupMethod.CATEGORIES)
-    }
-
-    /* Android 7.1.1 OpenTasks fix */
-    @Suppress("unused")
-    private fun update_4_5() {
-        // call PackageChangedReceiver which then enables/disables OpenTasks sync when it's (not) available
-        PackageChangedReceiver.updateTaskSync(context)
-    }
-
-    @Suppress("unused")
-    private fun update_5_6() {
-        context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)?.use { provider ->
-            // don't run syncs during the migration
-            ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 0)
-            ContentResolver.setIsSyncable(account, App.addressBooksAuthority, 0)
-            ContentResolver.cancelSync(account, null)
-
-            val parcel = Parcel.obtain()
-            try {
-                // get previous address book settings (including URL)
-                val raw = ContactsContract.SyncState.get(provider, account)
-                if (raw == null)
-                    Logger.log.info("No contacts sync state, ignoring account")
-                else {
-                    parcel.unmarshall(raw, 0, raw.size)
-                    parcel.setDataPosition(0)
-                    val params = parcel.readBundle()
-                    val url = params.getString("url")
-                    if (url == null)
-                        Logger.log.info("No address book URL, ignoring account")
-                    else {
-                        // create new address book
-                        val info = CollectionInfo(url)
-                        info.type = CollectionInfo.Type.ADDRESS_BOOK
-                        info.displayName = account.name
-                        Logger.log.log(Level.INFO, "Creating new address book account", url)
-                        val addressBookAccount = Account(LocalAddressBook.accountName(account, info), App.addressBookAccountType)
-                        if (!accountManager.addAccountExplicitly(addressBookAccount, null, LocalAddressBook.initialUserData(account, info.url)))
-                            throw ContactsStorageException("Couldn't create address book account")
-
-                        // move contacts to new address book
-                        Logger.log.info("Moving contacts from $account to $addressBookAccount")
-                        val newAccount = ContentValues(2)
-                        newAccount.put(ContactsContract.RawContacts.ACCOUNT_NAME, addressBookAccount.name)
-                        newAccount.put(ContactsContract.RawContacts.ACCOUNT_TYPE, addressBookAccount.type)
-                        val affected = provider.update(ContactsContract.RawContacts.CONTENT_URI.buildUpon()
-                                        .appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_NAME, account.name)
-                                        .appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_TYPE, account.type)
-                                        .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true").build(),
-                                newAccount,
-                                "${ContactsContract.RawContacts.ACCOUNT_NAME}=? AND ${ContactsContract.RawContacts.ACCOUNT_TYPE}=?",
-                                arrayOf(account.name, account.type))
-                        Logger.log.info("$affected contacts moved to new address book")
-                    }
-
-                    ContactsContract.SyncState.set(provider, account, null)
-                }
-            } catch(e: RemoteException) {
-                throw ContactsStorageException("Couldn't migrate contacts to new address book", e)
-            } finally {
-                parcel.recycle()
-            }
-        }
-
-        // update version number so that further syncs don't repeat the migration
-        accountManager.setUserData(account, KEY_SETTINGS_VERSION, "6")
-
-        // request sync of new address book account
-        ContentResolver.setIsSyncable(account, App.addressBooksAuthority, 1)
-        setSyncInterval(App.addressBooksAuthority, Constants.DEFAULT_SYNC_INTERVAL)
-    }
-
-
-    class AppUpdatedReceiver: BroadcastReceiver() {
-
-        @SuppressLint("UnsafeProtectedBroadcastReceiver,MissingPermission")
-        override fun onReceive(context: Context, intent: Intent?) {
-            Logger.log.info("DAVdroid was updated, checking for AccountSettings version")
-
-            // peek into AccountSettings to initiate a possible migration
-            val accountManager = AccountManager.get(context)
-            for (account in accountManager.getAccountsByType(context.getString(R.string.account_type)))
-                try {
-                    Logger.log.info("Checking account ${account.name}")
-                    AccountSettings(context, account)
-                } catch(e: InvalidAccountException) {
-                    Logger.log.log(Level.SEVERE, "Couldn't check for updated account settings", e)
-                }
-        }
-
-    }
-
-}

app/src/main/java/at/bitfire/davdroid/AccountsChangedReceiver.kt

@@ -1,48 +0,0 @@
-/*
- * Copyright © Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid
-
-import android.accounts.AccountManager
-import android.accounts.OnAccountsUpdateListener
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import java.util.*
-
-class AccountsChangedReceiver: BroadcastReceiver() {
-
-    companion object {
-
-        private val listeners = LinkedList<OnAccountsUpdateListener>()
-
-        @JvmStatic
-        fun registerListener(listener: OnAccountsUpdateListener, callImmediately: Boolean) {
-            listeners += listener
-            if (callImmediately)
-                listener.onAccountsUpdated(null)
-        }
-
-        @JvmStatic
-        fun unregisterListener(listener: OnAccountsUpdateListener) {
-            listeners -= listener
-        }
-    }
-
-    override fun onReceive(context: Context, intent: Intent) {
-        if (intent.action == AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION) {
-            val serviceIntent = Intent(context, DavService::class.java)
-            serviceIntent.action = DavService.ACTION_ACCOUNTS_UPDATED
-            context.startService(serviceIntent)
-
-            for (listener in listeners)
-                listener.onAccountsUpdated(null)
-        }
-    }
-
-}

app/src/main/java/at/bitfire/davdroid/AndroidSingleton.kt

@@ -0,0 +1,29 @@
+package at.bitfire.davdroid
+
+import android.content.Context
+
+abstract class AndroidSingleton<T> {
+
+    var creatingSingleton = false
+    var singleton: T? = null
+
+    @Synchronized
+    fun getInstance(context: Context): T {
+        singleton?.let {
+            return it
+        }
+
+        if (creatingSingleton)
+            throw IllegalStateException("AndroidSingleton::getInstance() must not be called while createInstance()")
+        creatingSingleton = true
+
+        val newSingleton = createInstance(context.applicationContext)
+        singleton = newSingleton
+
+        creatingSingleton = false
+        return newSingleton
+    }
+
+    abstract fun createInstance(context: Context): T
+
+}

app/src/main/java/at/bitfire/davdroid/App.kt

@@ -10,56 +10,86 @@ package at.bitfire.davdroid
 
 import android.app.Application
 import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.drawable.BitmapDrawable
+import android.content.Intent
+import android.net.Uri
+import android.os.StrictMode
+import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.graphics.drawable.toBitmap
 import at.bitfire.davdroid.log.Logger
+import at.bitfire.davdroid.settings.AccountSettings
+import at.bitfire.davdroid.ui.DebugInfoActivity
+import at.bitfire.davdroid.ui.NotificationUtils
+import at.bitfire.davdroid.ui.UiUtils
+import java.util.logging.Level
+import kotlin.concurrent.thread
+import kotlin.system.exitProcess
 
-class App: Application() {
+@Suppress("unused")
+class App: Application(), Thread.UncaughtExceptionHandler {
 
     companion object {
 
-        @JvmField val FLAVOR_GOOGLE_PLAY = "gplay"
-        @JvmField val FLAVOR_ICLOUD = "icloud"
-        @JvmField val FLAVOR_SOLDUPE = "soldupe"
-        @JvmField val FLAVOR_STANDARD = "standard"
+        fun getLauncherBitmap(context: Context) =
+                AppCompatResources.getDrawable(context, R.mipmap.ic_launcher)?.toBitmap()
 
-        @JvmField val DISTRUST_SYSTEM_CERTIFICATES = "distrustSystemCerts"
-        @JvmField val LOG_TO_EXTERNAL_STORAGE = "logToExternalStorage"
-        @JvmField val OVERRIDE_PROXY = "overrideProxy"
-        @JvmField val OVERRIDE_PROXY_HOST = "overrideProxyHost"
-        @JvmField val OVERRIDE_PROXY_PORT = "overrideProxyPort"
-
-        @JvmField val OVERRIDE_PROXY_HOST_DEFAULT = "localhost"
-        @JvmField val OVERRIDE_PROXY_PORT_DEFAULT = 8118
-
-        lateinit var addressBookAccountType: String
-        lateinit var addressBooksAuthority: String
-
-        @JvmStatic
-        fun getLauncherBitmap(context: Context): Bitmap? {
-            val drawableLogo = if (android.os.Build.VERSION.SDK_INT >= 21)
-                    context.getDrawable(R.mipmap.ic_launcher)
-                else
-                    @Suppress("deprecation")
-                    context.resources.getDrawable(R.mipmap.ic_launcher)
-            return if (drawableLogo is BitmapDrawable)
-                drawableLogo.bitmap
-            else
-                null
-        }
+        fun homepageUrl(context: Context) =
+                Uri.parse(context.getString(R.string.homepage_url)).buildUpon()
+                        .appendQueryParameter("pk_campaign", BuildConfig.APPLICATION_ID)
+                        .appendQueryParameter("pk_kwd", context::class.java.simpleName)
+                        .appendQueryParameter("app-version", BuildConfig.VERSION_NAME)
+                        .build()!!
 
     }
 
 
     override fun onCreate() {
         super.onCreate()
+        Logger.initialize(this)
 
-        CustomCertificates.reinitCertManager(this)
-        Logger.reinitLogger(this)
+        if (BuildConfig.DEBUG)
+            // debug builds
+            StrictMode.setVmPolicy(StrictMode.VmPolicy.Builder()
+                    .detectActivityLeaks()
+                    .detectFileUriExposure()
+                    .detectLeakedClosableObjects()
+                    .detectLeakedRegistrationObjects()
+                    .detectLeakedSqlLiteObjects()
+                    .penaltyLog()
+                    .build())
+        else // if (BuildConfig.FLAVOR == FLAVOR_STANDARD)
+            // handle uncaught exceptions in non-debug standard flavor
+            Thread.setDefaultUncaughtExceptionHandler(this)
 
-        addressBookAccountType = getString(R.string.account_type_address_book)
-        addressBooksAuthority = getString(R.string.address_books_authority)
+        NotificationUtils.createChannels(this)
+
+        // don't block UI for some background checks
+        thread {
+            // create/update app shortcuts
+            UiUtils.updateShortcuts(this@App)
+
+            // watch installed/removed apps
+            TasksWatcher(this@App)
+
+            // check whether a tasks app is currently installed
+            TasksWatcher.updateTaskSync(this@App)
+
+            // check/repair sync intervals
+            AccountSettings.repairSyncIntervals(this@App)
+
+            // foreground service (possible workaround for devices which prevent DAVx5 from being started)
+            ForegroundService.startIfEnabled(this)
+        }
     }
 
+    override fun uncaughtException(t: Thread, e: Throwable) {
+        Logger.log.log(Level.SEVERE, "Unhandled exception!", e)
 
-}
+        val intent = Intent(this, DebugInfoActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        intent.putExtra(DebugInfoActivity.EXTRA_CAUSE, e)
+        startActivity(intent)
+
+        exitProcess(1)
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/BootCompletedReceiver.kt

@@ -0,0 +1,22 @@
+package at.bitfire.davdroid
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import at.bitfire.davdroid.log.Logger
+
+/**
+ * There are circumstances when Android drops automatic sync of accounts and resets them
+ * to manual synchronization, for instance when the device is booted into safe mode.
+ *
+ * This receiver causes the app to be started when the device is rebooted. When the app
+ * is started, it checks (and repairs, if necessary) the sync intervals in [App.onCreate].
+ */
+class BootCompletedReceiver: BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        Logger.log.info("Device has been rebooted; checking sync intervals etc.")
+        // sync intervals are checked in App.onCreate()
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/CompatUtils.kt

@@ -0,0 +1,12 @@
+package at.bitfire.davdroid
+
+import android.content.ContentProviderClient
+import android.os.Build
+
+@Suppress("DEPRECATION")
+fun ContentProviderClient.closeCompat() {
+    if (Build.VERSION.SDK_INT >= 24)
+        close()
+    else
+        release()
+}

app/src/main/java/at/bitfire/davdroid/Constants.kt

@@ -5,20 +5,24 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package at.bitfire.davdroid;
+package at.bitfire.davdroid
 
 object Constants {
 
-    // notification IDs
-    @JvmField val NOTIFICATION_EXTERNAL_FILE_LOGGING = 1
-    @JvmField val NOTIFICATION_REFRESH_COLLECTIONS = 2
-    @JvmField val NOTIFICATION_CONTACTS_SYNC = 10
-    @JvmField val NOTIFICATION_CALENDAR_SYNC = 11
-    @JvmField val NOTIFICATION_TASK_SYNC = 12
-    @JvmField val NOTIFICATION_PERMISSIONS = 20
-    @JvmField val NOTIFICATION_SUBSCRIPTION = 21
+    const val DAVDROID_GREEN_RGBA = 0xFF8bc34a.toInt()
 
-    @JvmField
-    val DEFAULT_SYNC_INTERVAL = 4 * 3600L    // 4 hours
+    /**
+     * Context label for [org.apache.commons.lang3.exception.ContextedException].
+     * Context value is the [at.bitfire.davdroid.resource.LocalResource]
+     * which is related to the exception cause.
+     */
+    const val EXCEPTION_CONTEXT_LOCAL_RESOURCE = "localResource"
+
+    /**
+     * Context label for [org.apache.commons.lang3.exception.ContextedException].
+     * Context value is the [okhttp3.HttpUrl] of the remote resource
+     * which is related to the exception cause.
+     */
+    const val EXCEPTION_CONTEXT_REMOTE_RESOURCE = "remoteResource"
 
 }

app/src/main/java/at/bitfire/davdroid/CustomCertificates.kt

@@ -1,41 +0,0 @@
-/*
- * Copyright © Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid
-
-import android.content.Context
-import android.os.Build
-import at.bitfire.cert4android.CustomCertManager
-import at.bitfire.davdroid.model.ServiceDB
-import at.bitfire.davdroid.model.Settings
-import okhttp3.internal.tls.OkHostnameVerifier
-import javax.net.ssl.HostnameVerifier
-import javax.net.ssl.SSLSocketFactory
-
-object CustomCertificates {
-
-    @JvmField var certManager: CustomCertManager? = null
-    var sslSocketFactoryCompat: SSLSocketFactory? = null
-    var hostnameVerifier: HostnameVerifier? = null
-
-    fun reinitCertManager(context: Context) {
-        if (BuildConfig.customCerts) {
-            certManager?.close()
-
-            ServiceDB.OpenHelper(context).use { dbHelper ->
-                val settings = Settings(dbHelper.readableDatabase)
-
-                val mgr = CustomCertManager(context.applicationContext, !settings.getBoolean(App.DISTRUST_SYSTEM_CERTIFICATES, false))
-                certManager = mgr
-                hostnameVerifier = mgr.hostnameVerifier(OkHostnameVerifier.INSTANCE)
-                sslSocketFactoryCompat = SSLSocketFactoryCompat(mgr)
-            }
-        }
-    }
-
-}

app/src/main/java/at/bitfire/davdroid/DavService.kt

@@ -9,66 +9,99 @@
 package at.bitfire.davdroid
 
 import android.accounts.Account
-import android.accounts.AccountManager
-import android.annotation.SuppressLint
+import android.app.IntentService
 import android.app.PendingIntent
-import android.app.Service
-import android.content.ContentValues
+import android.content.ContentResolver
 import android.content.Intent
-import android.database.DatabaseUtils
-import android.database.sqlite.SQLiteDatabase
 import android.os.Binder
-import android.support.v4.app.NotificationManagerCompat
-import android.support.v7.app.NotificationCompat
-import at.bitfire.dav4android.DavResource
-import at.bitfire.dav4android.UrlUtils
-import at.bitfire.dav4android.exception.DavException
-import at.bitfire.dav4android.exception.HttpException
-import at.bitfire.dav4android.property.*
+import android.os.Bundle
+import androidx.annotation.WorkerThread
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import at.bitfire.dav4jvm.DavResource
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.UrlUtils
+import at.bitfire.dav4jvm.exception.HttpException
+import at.bitfire.dav4jvm.property.*
 import at.bitfire.davdroid.log.Logger
-import at.bitfire.davdroid.model.CollectionInfo
-import at.bitfire.davdroid.model.ServiceDB.*
-import at.bitfire.davdroid.model.ServiceDB.Collections
-import at.bitfire.davdroid.resource.LocalAddressBook
+import at.bitfire.davdroid.model.*
+import at.bitfire.davdroid.model.Collection
+import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.ui.DebugInfoActivity
-import at.bitfire.vcard4android.ContactsStorageException
+import at.bitfire.davdroid.ui.NotificationUtils
 import okhttp3.HttpUrl
-import org.apache.commons.collections4.iterators.IteratorChain
-import org.apache.commons.collections4.iterators.SingletonIterator
-import java.io.IOException
+import okhttp3.OkHttpClient
 import java.lang.ref.WeakReference
 import java.util.*
 import java.util.logging.Level
-import kotlin.concurrent.thread
+import kotlin.collections.*
 
-class DavService: Service() {
+@Suppress("DEPRECATION")
+class DavService: IntentService("DavService") {
 
     companion object {
-        @JvmField val ACTION_ACCOUNTS_UPDATED = "accountsUpdated"
-        @JvmField val ACTION_REFRESH_COLLECTIONS = "refreshCollections"
-        @JvmField val EXTRA_DAV_SERVICE_ID = "davServiceID"
+
+        const val ACTION_REFRESH_COLLECTIONS = "refreshCollections"
+        const val EXTRA_DAV_SERVICE_ID = "davServiceID"
+
+        /** Initialize a forced synchronization. Expects intent data
+            to be an URI of this format:
+            contents://<authority>/<account.type>/<account name>
+         **/
+        const val ACTION_FORCE_SYNC = "forceSync"
+
+        val DAV_COLLECTION_PROPERTIES = arrayOf(
+                ResourceType.NAME,
+                CurrentUserPrivilegeSet.NAME,
+                DisplayName.NAME,
+                Owner.NAME,
+                AddressbookDescription.NAME, SupportedAddressData.NAME,
+                CalendarDescription.NAME, CalendarColor.NAME, SupportedCalendarComponentSet.NAME,
+                Source.NAME
+        )
+
     }
 
-    private val runningRefresh = HashSet<Long>()
-    private val refreshingStatusListeners = LinkedList<WeakReference<RefreshingStatusListener>>()
+    /**
+     * List of [Service] IDs for which the collections are currently refreshed
+     */
+    private val runningRefresh = Collections.synchronizedSet(HashSet<Long>())
 
+    /**
+     * Currently registered [RefreshingStatusListener]s, which will be notified
+     * when a collection refresh status changes
+     */
+    private val refreshingStatusListeners = Collections.synchronizedList(LinkedList<WeakReference<RefreshingStatusListener>>())
 
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        intent?.let {
-            val id = intent.getLongExtra(EXTRA_DAV_SERVICE_ID, -1)
+    @WorkerThread
+    override fun onHandleIntent(intent: Intent?) {
+        if (intent == null)
+            return
 
-            when (intent.action) {
-                ACTION_ACCOUNTS_UPDATED ->
-                    cleanupAccounts()
-                ACTION_REFRESH_COLLECTIONS ->
-                    if (runningRefresh.add(id)) {
-                        thread { refreshCollections(id) }
-                        refreshingStatusListeners.forEach { it.get()?.onDavRefreshStatusChanged(id, true) }
+        val id = intent.getLongExtra(EXTRA_DAV_SERVICE_ID, -1)
+
+        when (intent.action) {
+            ACTION_REFRESH_COLLECTIONS ->
+                if (runningRefresh.add(id)) {
+                    refreshingStatusListeners.forEach { listener ->
+                        listener.get()?.onDavRefreshStatusChanged(id, true)
                     }
-            }
-        }
 
-        return START_NOT_STICKY
+                    val db = AppDatabase.getInstance(this@DavService)
+                    refreshCollections(db, id)
+                }
+
+            ACTION_FORCE_SYNC -> {
+                val uri = intent.data!!
+                val authority = uri.authority!!
+                val account = Account(
+                        uri.pathSegments[1],
+                        uri.pathSegments[0]
+                )
+                forceSync(authority, account)
+            }
+
+        }
     }
 
 
@@ -85,17 +118,20 @@ class DavService: Service() {
     inner class InfoBinder: Binder() {
         fun isRefreshing(id: Long) = runningRefresh.contains(id)
 
-        fun addRefreshingStatusListener(listener: RefreshingStatusListener, callImmediate: Boolean) {
+        fun addRefreshingStatusListener(listener: RefreshingStatusListener, callImmediateIfRunning: Boolean) {
             refreshingStatusListeners += WeakReference<RefreshingStatusListener>(listener)
-            if (callImmediate)
-                runningRefresh.forEach { id -> listener.onDavRefreshStatusChanged(id, true) }
+            if (callImmediateIfRunning)
+                synchronized(runningRefresh) {
+                    for (id in runningRefresh)
+                        listener.onDavRefreshStatusChanged(id, true)
+                }
         }
 
         fun removeRefreshingStatusListener(listener: RefreshingStatusListener) {
             val iter = refreshingStatusListeners.iterator()
             while (iter.hasNext()) {
                 val item = iter.next().get()
-                if (listener == item)
+                if (item == listener || item == null)
                     iter.remove()
             }
         }
@@ -109,203 +145,188 @@ class DavService: Service() {
        which actually do the work
      */
 
-    @SuppressLint("MissingPermission")
-    fun cleanupAccounts() {
-        Logger.log.info("Cleaning up orphaned accounts")
-
-        OpenHelper(this).use { dbHelper ->
-            val db = dbHelper.writableDatabase
-
-            val sqlAccountNames = LinkedList<String>()
-            val accountNames = HashSet<String>()
-            val accountManager = AccountManager.get(this)
-            for (account in accountManager.getAccountsByType(getString(R.string.account_type))) {
-                sqlAccountNames.add(DatabaseUtils.sqlEscapeString(account.name))
-                accountNames += account.name
-            }
-
-            // delete orphaned address book accounts
-            accountManager.getAccountsByType(App.addressBookAccountType)
-                    .map { LocalAddressBook(this, it, null) }
-                    .forEach {
-                        try {
-                            if (!accountNames.contains(it.getMainAccount().name))
-                                it.delete()
-                        } catch(e: ContactsStorageException) {
-                            Logger.log.log(Level.SEVERE, "Couldn't get address book main account", e)
-                        }
-                    }
-
-            // delete orphaned services in DB
-            if (sqlAccountNames.isEmpty())
-                db.delete(Services._TABLE, null, null)
-            else
-                db.delete(Services._TABLE, "${Services.ACCOUNT_NAME} NOT IN (${sqlAccountNames.joinToString(",")})", null)
-        }
+    private fun forceSync(authority: String, account: Account) {
+        Logger.log.info("Forcing $authority synchronization of $account")
+        val extras = Bundle(2)
+        extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true)        // manual sync
+        extras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true)     // run immediately (don't queue)
+        ContentResolver.requestSync(account, authority, extras)
     }
 
-    fun refreshCollections(service: Long) {
-        OpenHelper(this@DavService).use { dbHelper ->
-            val db = dbHelper.writableDatabase
+    private fun refreshCollections(db: AppDatabase, serviceId: Long) {
+        val homeSetDao = db.homeSetDao()
+        val collectionDao = db.collectionDao()
 
-            val serviceType by lazy {
-                db.query(Services._TABLE, arrayOf(Services.SERVICE), "${Services.ID}=?", arrayOf(service.toString()), null, null, null)?.use { cursor ->
-                    if (cursor.moveToNext())
-                        return@lazy cursor.getString(0)
-                } ?: throw IllegalArgumentException("Service not found")
-            }
+        val service = db.serviceDao().get(serviceId) ?: throw IllegalArgumentException("Service not found")
+        val account = Account(service.accountName, getString(R.string.account_type))
 
-            val account by lazy {
-                db.query(Services._TABLE, arrayOf(Services.ACCOUNT_NAME), "${Services.ID}=?", arrayOf(service.toString()), null, null, null)?.use { cursor ->
-                    if (cursor.moveToNext())
-                        return@lazy Account(cursor.getString(0), getString(R.string.account_type))
-                }
-                throw IllegalArgumentException("Account not found")
-            }
+        val homeSets = homeSetDao.getByService(serviceId).associateBy { it.url }.toMutableMap()
+        val collections = collectionDao.getByService(serviceId).associateBy { it.url }.toMutableMap()
 
-            val homeSets by lazy {
-                val homeSets = mutableSetOf<HttpUrl>()
-                db.query(HomeSets._TABLE, arrayOf(HomeSets.URL), "${HomeSets.SERVICE_ID}=?", arrayOf(service.toString()), null, null, null)?.use { cursor ->
-                    while (cursor.moveToNext())
-                        HttpUrl.parse(cursor.getString(0))?.let { homeSets += it }
-                }
-                homeSets
-            }
+        /**
+         * Checks if the given URL defines home sets and adds them to the home set list.
+         *
+         * @param personal Whether this is the "outer" call of the recursion.
+         *
+         * *true* = found home sets belong to the current-user-principal; recurse if
+         * calendar proxies or group memberships are found
+         *
+         * *false* = found home sets don't directly belong to the current-user-principal; don't recurse
+         *
+         * @throws java.io.IOException
+         * @throws HttpException
+         * @throws at.bitfire.dav4jvm.exception.DavException
+         */
+        fun queryHomeSets(client: OkHttpClient, url: HttpUrl, personal: Boolean = true) {
+            val related = mutableSetOf<HttpUrl>()
 
-            val collections by lazy {
-                val collections = mutableMapOf<HttpUrl, CollectionInfo>()
-                db.query(Collections._TABLE, null, "${Collections.SERVICE_ID}=?", arrayOf(service.toString()), null, null, null)?.use { cursor ->
-                    while (cursor.moveToNext()) {
-                        val values = ContentValues()
-                        DatabaseUtils.cursorRowToContentValues(cursor, values)
-                        values.getAsString(Collections.URL)?.let { url ->
-                            HttpUrl.parse(url)?.let { collections.put(it, CollectionInfo(values)) }
+            fun findRelated(root: HttpUrl, dav: Response) {
+                // refresh home sets: calendar-proxy-read/write-for
+                dav[CalendarProxyReadFor::class.java]?.let {
+                    for (href in it.hrefs) {
+                        Logger.log.fine("Principal is a read-only proxy for $href, checking for home sets")
+                        root.resolve(href)?.let { proxyReadFor ->
+                            related += proxyReadFor
                         }
                     }
                 }
-                collections
-            }
-
-            fun readPrincipal(): HttpUrl? {
-                db.query(Services._TABLE, arrayOf(Services.PRINCIPAL), "${Services.ID}=?", arrayOf(service.toString()), null, null, null)?.use { cursor ->
-                    if (cursor.moveToNext())
-                        cursor.getString(0)?.let { return HttpUrl.parse(it) }
-                }
-                return null
-            }
-
-            /**
-             * Checks if the given URL defines home sets and adds them to the home set list.
-             * @param dav               DavResource to check
-             */
-            @Throws(IOException::class, HttpException::class, DavException::class)
-            fun queryHomeSets(dav: DavResource) {
-                when (serviceType) {
-                    Services.SERVICE_CARDDAV -> {
-                        dav.propfind(0, AddressbookHomeSet.NAME, GroupMembership.NAME)
-                        for ((resource, addressbookHomeSet) in dav.findProperties(AddressbookHomeSet.NAME) as List<Pair<DavResource, AddressbookHomeSet>>)
-                            for (href in addressbookHomeSet.hrefs)
-                                resource.location.resolve(href)?.let { homeSets += UrlUtils.withTrailingSlash(it) }
+                dav[CalendarProxyWriteFor::class.java]?.let {
+                    for (href in it.hrefs) {
+                        Logger.log.fine("Principal is a read/write proxy for $href, checking for home sets")
+                        root.resolve(href)?.let { proxyWriteFor ->
+                            related += proxyWriteFor
+                        }
                     }
-                    Services.SERVICE_CALDAV -> {
-                        dav.propfind(0, CalendarHomeSet.NAME, CalendarProxyReadFor.NAME, CalendarProxyWriteFor.NAME, GroupMembership.NAME)
-                        for ((resource, calendarHomeSet) in dav.findProperties(CalendarHomeSet.NAME) as List<Pair<DavResource, CalendarHomeSet>>)
-                            for (href in calendarHomeSet.hrefs)
-                                resource.location.resolve(href)?.let { homeSets.add(UrlUtils.withTrailingSlash(it)) }
+                }
+
+                // refresh home sets: direct group memberships
+                dav[GroupMembership::class.java]?.let {
+                    for (href in it.hrefs) {
+                        Logger.log.fine("Principal is member of group $href, checking for home sets")
+                        root.resolve(href)?.let { groupMembership ->
+                            related += groupMembership
+                        }
                     }
                 }
             }
 
-            fun saveHomeSets() {
-                db.delete(HomeSets._TABLE, "${HomeSets.SERVICE_ID}=?", arrayOf(service.toString()))
-                for (homeSet in homeSets) {
-                    val values = ContentValues(2)
-                    values.put(HomeSets.SERVICE_ID, service)
-                    values.put(HomeSets.URL, homeSet.toString())
-                    db.insertOrThrow(HomeSets._TABLE, null, values)
+            val dav = DavResource(client, url)
+            when (service.type) {
+                Service.TYPE_CARDDAV ->
+                    try {
+                        dav.propfind(0, DisplayName.NAME, AddressbookHomeSet.NAME, GroupMembership.NAME) { response, _ ->
+                            response[AddressbookHomeSet::class.java]?.let { homeSet ->
+                                for (href in homeSet.hrefs)
+                                    dav.location.resolve(href)?.let {
+                                        val foundUrl = UrlUtils.withTrailingSlash(it)
+                                        homeSets[foundUrl] = HomeSet(0, service.id, personal, foundUrl)
+                                    }
+                            }
+
+                            if (personal)
+                                findRelated(dav.location, response)
+                        }
+                    } catch (e: HttpException) {
+                        if (e.code/100 == 4)
+                            Logger.log.log(Level.INFO, "Ignoring Client Error 4xx while looking for addressbook home sets", e)
+                        else
+                            throw e
+                    }
+                Service.TYPE_CALDAV -> {
+                    try {
+                        dav.propfind(0, DisplayName.NAME, CalendarHomeSet.NAME, CalendarProxyReadFor.NAME, CalendarProxyWriteFor.NAME, GroupMembership.NAME) { response, _ ->
+                            response[CalendarHomeSet::class.java]?.let { homeSet ->
+                                for (href in homeSet.hrefs)
+                                    dav.location.resolve(href)?.let {
+                                        val foundUrl = UrlUtils.withTrailingSlash(it)
+                                        homeSets[foundUrl] = HomeSet(0, service.id, personal, foundUrl)
+                                    }
+                            }
+
+                            if (personal)
+                                findRelated(dav.location, response)
+                        }
+                    } catch (e: HttpException) {
+                        if (e.code/100 == 4)
+                            Logger.log.log(Level.INFO, "Ignoring Client Error 4xx while looking for calendar home sets", e)
+                        else
+                            throw e
+                    }
                 }
             }
 
-            fun saveCollections() {
-                db.delete(Collections._TABLE, "${HomeSets.SERVICE_ID}=?", arrayOf(service.toString()))
-                for ((_,collection) in collections) {
-                    val values = collection.toDB()
-                    Logger.log.log(Level.FINE, "Saving collection", values)
-                    values.put(Collections.SERVICE_ID, service)
-                    db.insertWithOnConflict(Collections._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE)
-                }
+            // query related homesets (those that do not belong to the current-user-principal)
+            for (resource in related)
+                queryHomeSets(client, resource, false)
+        }
+
+        fun saveHomesets() {
+            DaoTools(homeSetDao).syncAll(
+                    homeSetDao.getByService(serviceId),
+                    homeSets,
+                    { it.url })
+        }
+
+        fun saveCollections() {
+            DaoTools(collectionDao).syncAll(
+                    collectionDao.getByService(serviceId),
+                    collections, { it.url }) { new, old ->
+                new.forceReadOnly = old.forceReadOnly
+                new.sync = old.sync
             }
+        }
 
+        try {
+            Logger.log.info("Refreshing ${service.type} collections of service #$service")
 
-            try {
-                Logger.log.info("Refreshing $serviceType collections of service #$service")
+            // cancel previous notification
+            NotificationManagerCompat.from(this)
+                    .cancel(service.toString(), NotificationUtils.NOTIFY_REFRESH_COLLECTIONS)
 
-                // create authenticating OkHttpClient (credentials taken from account settings)
-                val httpClient = HttpClient.create(this@DavService, account)
+            // create authenticating OkHttpClient (credentials taken from account settings)
+            HttpClient.Builder(this, AccountSettings(this, account))
+                    .setForeground(true)
+                    .build().use { client ->
+                val httpClient = client.okHttpClient
 
                 // refresh home set list (from principal)
-                readPrincipal()?.let { principalUrl ->
+                service.principal?.let { principalUrl ->
                     Logger.log.fine("Querying principal $principalUrl for home sets")
-                    val principal = DavResource(httpClient, principalUrl)
-                    queryHomeSets(principal)
-
-                    // refresh home sets: calendar-proxy-read/write-for
-                    for ((resource, proxyRead) in principal.findProperties(CalendarProxyReadFor.NAME) as List<Pair<DavResource, CalendarProxyReadFor>>)
-                        for (href in proxyRead.hrefs) {
-                            Logger.log.fine("Principal is a read-only proxy for $href, checking for home sets")
-                            resource.location.resolve(href)?.let { queryHomeSets(DavResource(httpClient, it)) }
-                        }
-                    for ((resource, proxyWrite) in principal.findProperties(CalendarProxyWriteFor.NAME) as List<Pair<DavResource, CalendarProxyWriteFor>>)
-                        for (href in proxyWrite.hrefs) {
-                            Logger.log.fine("Principal is a read/write proxy for $href, checking for home sets")
-                            resource.location.resolve(href)?.let { queryHomeSets(DavResource(httpClient, it)) }
-                        }
-
-                    // refresh home sets: direct group memberships
-                    (principal.properties[GroupMembership.NAME] as GroupMembership?)?.let { groupMembership ->
-                        for (href in groupMembership.hrefs) {
-                            Logger.log.fine("Principal is member of group $href, checking for home sets")
-                            principal.location.resolve(href)?.let { url ->
-                                try {
-                                    queryHomeSets(DavResource(httpClient, url))
-                                } catch(e: HttpException) {
-                                    Logger.log.log(Level.WARNING, "Couldn't query member group", e)
-                                } catch(e: DavException) {
-                                    Logger.log.log(Level.WARNING, "Couldn't query member group", e)
-                                }
-                            }
-                        }
-                    }
+                    queryHomeSets(httpClient, principalUrl)
                 }
 
-                // remember selected collections
-                val selectedCollections = HashSet<HttpUrl>()
-                collections.values
-                        .filter { it.selected }
-                        .forEach { (url,_) -> HttpUrl.parse(url)?.let { selectedCollections.add(it) } }
-
-                // now refresh collections (taken from home sets)
+                // now refresh homesets and their member collections
                 val itHomeSets = homeSets.iterator()
                 while (itHomeSets.hasNext()) {
-                    val homeSetUrl = itHomeSets.next()
-                    Logger.log.fine("Listing home set $homeSetUrl")
+                    val (homeSetUrl, homeSet) = itHomeSets.next()
+                    Logger.log.fine("Listing home set ${homeSetUrl}")
 
-                    val homeSet = DavResource(httpClient, homeSetUrl)
                     try {
-                        homeSet.propfind(1, *CollectionInfo.DAV_PROPERTIES)
-                        val itCollections = IteratorChain<DavResource>(homeSet.members.iterator(), SingletonIterator(homeSet))
-                        while (itCollections.hasNext()) {
-                            val member = itCollections.next()
-                            val info = CollectionInfo(member)
+                        DavResource(httpClient, homeSetUrl).propfind(1, *DAV_COLLECTION_PROPERTIES) { response, relation ->
+                            if (!response.isSuccess())
+                                return@propfind
+
+                            if (relation == Response.HrefRelation.SELF) {
+                                // this response is about the homeset itself
+                                homeSet.displayName = response[DisplayName::class.java]?.displayName
+                                homeSet.privBind = response[CurrentUserPrivilegeSet::class.java]?.mayBind ?: true
+                            }
+
+                            // in any case, check whether the response is about a useable collection
+                            val info = Collection.fromDavResponse(response) ?: return@propfind
+                            info.serviceId = serviceId
+                            info.refHomeSet = homeSet
                             info.confirmed = true
+                            info.owner = response[Owner::class.java]?.href?.let { response.href.resolve(it) }
                             Logger.log.log(Level.FINE, "Found collection", info)
 
-                            if ((serviceType == Services.SERVICE_CARDDAV && info.type == CollectionInfo.Type.ADDRESS_BOOK) ||
-                                (serviceType == Services.SERVICE_CALDAV && info.type == CollectionInfo.Type.CALENDAR))
-                                collections[member.location] = info
+                            // remember usable collections
+                            if ((service.type == Service.TYPE_CARDDAV && info.type == Collection.TYPE_ADDRESSBOOK) ||
+                                    (service.type == Service.TYPE_CALDAV && arrayOf(Collection.TYPE_CALENDAR, Collection.TYPE_WEBCAL).contains(info.type)))
+                                collections[response.href] = info
                         }
                     } catch(e: HttpException) {
-                        if (e.status in arrayOf(403, 404, 410))
+                        if (e.code in arrayOf(403, 404, 410))
                             // delete home set only if it was not accessible (40x)
                             itHomeSets.remove()
                     }
@@ -317,61 +338,69 @@ class DavService: Service() {
                     val (url, info) = itCollections.next()
                     if (!info.confirmed)
                         try {
-                            val collection = DavResource(httpClient, url)
-                            collection.propfind(0, *CollectionInfo.DAV_PROPERTIES)
-                            val info = CollectionInfo(collection)
-                            info.confirmed = true
+                            // this collection doesn't belong to a homeset anymore, otherwise it would have been confirmed
+                            info.homeSetId = null
 
-                            // remove unusable collections
-                            if ((serviceType == Services.SERVICE_CARDDAV && info.type != CollectionInfo.Type.ADDRESS_BOOK) ||
-                                (serviceType == Services.SERVICE_CALDAV && info.type != CollectionInfo.Type.CALENDAR))
-                                itCollections.remove()
+                            DavResource(httpClient, url).propfind(0, *DAV_COLLECTION_PROPERTIES) { response, _ ->
+                                if (!response.isSuccess())
+                                    return@propfind
+
+                                val collection = Collection.fromDavResponse(response) ?: return@propfind
+                                collection.confirmed = true
+
+                                // remove unusable collections
+                                if ((service.type == Service.TYPE_CARDDAV && collection.type != Collection.TYPE_ADDRESSBOOK) ||
+                                    (service.type == Service.TYPE_CALDAV && !arrayOf(Collection.TYPE_CALENDAR, Collection.TYPE_WEBCAL).contains(collection.type)) ||
+                                    (collection.type == Collection.TYPE_WEBCAL && collection.source == null))
+                                    itCollections.remove()
+                            }
                         } catch(e: HttpException) {
-                            if (e.status in arrayOf(403, 404, 410))
+                            if (e.code in arrayOf(403, 404, 410))
                                 // delete collection only if it was not accessible (40x)
                                 itCollections.remove()
                             else
                                 throw e
                         }
                 }
+            }
 
-                // restore selections
-                for (url in selectedCollections)
-                    collections[url]?.let { it.selected = true }
+            db.runInTransaction {
+                saveHomesets()
 
-                db.beginTransactionNonExclusive()
-                try {
-                    saveHomeSets()
-                    saveCollections()
-                    db.setTransactionSuccessful()
-                } finally {
-                    db.endTransaction()
-                }
+                // use refHomeSet (if available) to determine homeset ID
+                for (collection in collections.values)
+                    collection.refHomeSet?.let { homeSet ->
+                        collection.homeSetId = homeSet.id
+                    }
+                saveCollections()
+            }
 
-            } catch(e: InvalidAccountException) {
-                Logger.log.log(Level.SEVERE, "Invalid account", e)
-            } catch(e: Exception) {
-                Logger.log.log(Level.SEVERE, "Couldn't refresh collection list", e)
+        } catch(e: InvalidAccountException) {
+            Logger.log.log(Level.SEVERE, "Invalid account", e)
+        } catch(e: Exception) {
+            Logger.log.log(Level.SEVERE, "Couldn't refresh collection list", e)
 
-                val debugIntent = Intent(this@DavService, DebugInfoActivity::class.java)
-                debugIntent.putExtra(DebugInfoActivity.KEY_THROWABLE, e)
-                debugIntent.putExtra(DebugInfoActivity.KEY_ACCOUNT, account)
+            val debugIntent = Intent(this, DebugInfoActivity::class.java)
+            debugIntent.putExtra(DebugInfoActivity.EXTRA_CAUSE, e)
+            debugIntent.putExtra(DebugInfoActivity.EXTRA_ACCOUNT, account)
 
-                val nm = NotificationManagerCompat.from(this@DavService)
-                val notify = NotificationCompat.Builder(this@DavService)
-                        .setSmallIcon(R.drawable.ic_error_light)
-                        .setLargeIcon(App.getLauncherBitmap(this@DavService))
-                        .setContentTitle(getString(R.string.dav_service_refresh_failed))
-                        .setContentText(getString(R.string.dav_service_refresh_couldnt_refresh))
-                        .setContentIntent(PendingIntent.getActivity(this@DavService, 0, debugIntent, PendingIntent.FLAG_UPDATE_CURRENT))
-                        .build()
-                nm.notify(Constants.NOTIFICATION_REFRESH_COLLECTIONS, notify)
-            } finally {
-                runningRefresh.remove(service)
-                refreshingStatusListeners.forEach { it.get()?.onDavRefreshStatusChanged(service, false) }
+            val notify = NotificationUtils.newBuilder(this, NotificationUtils.CHANNEL_GENERAL)
+                    .setSmallIcon(R.drawable.ic_sync_problem_notify)
+                    .setContentTitle(getString(R.string.dav_service_refresh_failed))
+                    .setContentText(getString(R.string.dav_service_refresh_couldnt_refresh))
+                    .setContentIntent(PendingIntent.getActivity(this, 0, debugIntent, PendingIntent.FLAG_UPDATE_CURRENT))
+                    .setSubText(account.name)
+                    .setCategory(NotificationCompat.CATEGORY_ERROR)
+                    .build()
+            NotificationManagerCompat.from(this)
+                    .notify(serviceId.toString(), NotificationUtils.NOTIFY_REFRESH_COLLECTIONS, notify)
+        } finally {
+            runningRefresh.remove(serviceId)
+            refreshingStatusListeners.mapNotNull { it.get() }.forEach {
+                it.onDavRefreshStatusChanged(serviceId, false)
             }
         }
 
     }
 
-}
+}

app/src/main/java/at/bitfire/davdroid/DavUtils.kt

@@ -6,33 +6,199 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package at.bitfire.davdroid;
+package at.bitfire.davdroid
 
+import android.accounts.Account
+import android.annotation.TargetApi
+import android.content.ContentResolver
+import android.content.Context
+import android.net.ConnectivityManager
+import android.os.Build
+import android.os.Bundle
+import android.provider.CalendarContract
+import android.provider.ContactsContract
+import androidx.core.content.getSystemService
+import at.bitfire.davdroid.log.Logger
+import at.bitfire.davdroid.resource.LocalAddressBook
+import at.bitfire.davdroid.resource.TaskUtils
 import okhttp3.HttpUrl
+import org.xbill.DNS.*
 import java.util.*
 
+/**
+ * Some WebDAV and related network utility methods
+ */
 object DavUtils {
 
-    @JvmStatic
+    enum class SyncStatus {
+        ACTIVE, PENDING, IDLE
+    }
+
+
+    @Suppress("FunctionName")
     fun ARGBtoCalDAVColor(colorWithAlpha: Int): String {
         val alpha = (colorWithAlpha shr 24) and 0xFF
         val color = colorWithAlpha and 0xFFFFFF
-        return String.format("#%06X%02X", color, alpha)
+        return String.format(Locale.ROOT, "#%06X%02X", color, alpha)
     }
 
-    @JvmStatic
-    fun lastSegmentOfUrl(url: String): String {
-        val httpUrl = HttpUrl.parse(url) ?: throw IllegalArgumentException("url not parsable")
 
+    fun lastSegmentOfUrl(url: HttpUrl): String {
         // the list returned by HttpUrl.pathSegments() is unmodifiable, so we have to create a copy
-        val segments = LinkedList<String>(httpUrl.pathSegments())
-        Collections.reverse(segments)
+        val segments = LinkedList<String>(url.pathSegments)
+        segments.reverse()
 
-        for (segment in segments)
-            if (segment.isNotEmpty())
-                return segment
+        return segments.firstOrNull { it.isNotEmpty() } ?: "/"
+    }
 
-        return "/"
+
+    fun prepareLookup(context: Context, lookup: Lookup) {
+        @TargetApi(Build.VERSION_CODES.O)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            /* Since Android 8, the system properties net.dns1, net.dns2, ... are not available anymore.
+               The current version of dnsjava relies on these properties to find the default name servers,
+               so we have to add the servers explicitly (fortunately, there's an Android API to
+               get the active DNS servers). */
+            val connectivity = context.getSystemService<ConnectivityManager>()!!
+            val activeLink = connectivity.getLinkProperties(connectivity.activeNetwork)
+            if (activeLink != null) {
+                // get DNS servers of active network link and set them for dnsjava so that it can send SRV queries
+                val simpleResolvers = activeLink.dnsServers.map {
+                    Logger.log.fine("Using DNS server ${it.hostAddress}")
+                    val resolver = SimpleResolver()
+                    resolver.setAddress(it)
+                    resolver
+                }
+                val resolver = ExtendedResolver(simpleResolvers.toTypedArray())
+                lookup.setResolver(resolver)
+            } else
+                Logger.log.severe("Couldn't determine DNS servers, dnsjava queries (SRV/TXT records) won't work")
+        }
+    }
+
+    fun selectSRVRecord(records: Array<out Record>?): SRVRecord? {
+        if (records == null)
+            return null
+
+        val srvRecords = records.filterIsInstance(SRVRecord::class.java)
+        if (srvRecords.size <= 1)
+            return srvRecords.firstOrNull()
+
+        /* RFC 2782
+
+           Priority
+                The priority of this target host.  A client MUST attempt to
+                contact the target host with the lowest-numbered priority it can
+                reach; target hosts with the same priority SHOULD be tried in an
+                order defined by the weight field. [...]
+
+           Weight
+                A server selection mechanism.  The weight field specifies a
+                relative weight for entries with the same priority. [...]
+
+                To select a target to be contacted next, arrange all SRV RRs
+                (that have not been ordered yet) in any order, except that all
+                those with weight 0 are placed at the beginning of the list.
+
+                Compute the sum of the weights of those RRs, and with each RR
+                associate the running sum in the selected order. Then choose a
+                uniform random number between 0 and the sum computed
+                (inclusive), and select the RR whose running sum value is the
+                first in the selected order which is greater than or equal to
+                the random number selected. The target host specified in the
+                selected SRV RR is the next one to be contacted by the client.
+        */
+        val minPriority = srvRecords.map { it.priority }.minOrNull()
+        val useableRecords = srvRecords.filter { it.priority == minPriority }.sortedBy { it.weight != 0 }
+
+        val map = TreeMap<Int, SRVRecord>()
+        var runningWeight = 0
+        for (record in useableRecords) {
+            val weight = record.weight
+            runningWeight += weight
+            map[runningWeight] = record
+        }
+
+        val selector = (0..runningWeight).random()
+        return map.ceilingEntry(selector)!!.value
+    }
+
+    fun pathsFromTXTRecords(records: Array<Record>?): List<String> {
+        val paths = LinkedList<String>()
+        records?.filterIsInstance(TXTRecord::class.java)?.forEach { txt ->
+            @Suppress("UNCHECKED_CAST")
+            for (segment in txt.strings as List<String>)
+                if (segment.startsWith("path=")) {
+                    paths.add(segment.substring(5))
+                    break
+                }
+        }
+        return paths
+    }
+
+
+    /**
+     * Returns the sync status of a given account. Checks the account itself and possible
+     * sub-accounts (address book accounts).
+     *
+     * @param authorities sync authorities to check (usually taken from [syncAuthorities])
+     *
+     * @return sync status of the given account
+     */
+    fun accountSyncStatus(context: Context, authorities: Iterable<String>, account: Account): SyncStatus {
+        // check active syncs
+        if (authorities.any { ContentResolver.isSyncActive(account, it) })
+            return SyncStatus.ACTIVE
+
+        val addrBookAccounts = LocalAddressBook.findAll(context, null, account).map { it.account }
+        if (addrBookAccounts.any { ContentResolver.isSyncActive(it, ContactsContract.AUTHORITY) })
+            return SyncStatus.ACTIVE
+
+        // check get pending syncs
+        if (authorities.any { ContentResolver.isSyncPending(account, it) } ||
+            addrBookAccounts.any { ContentResolver.isSyncPending(it, ContactsContract.AUTHORITY) })
+            return SyncStatus.PENDING
+
+        return SyncStatus.IDLE
+    }
+
+    /**
+     * Requests an immediate, manual sync of all available authorities for the given account.
+     *
+     * @param account account to sync
+     */
+    fun requestSync(context: Context, account: Account) {
+        for (authority in syncAuthorities(context)) {
+            val extras = Bundle(2)
+            extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true)        // manual sync
+            extras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true)     // run immediately (don't queue)
+            ContentResolver.requestSync(account, authority, extras)
+        }
+    }
+
+    /**
+     * Returns a list of all available sync authorities for main accounts (!= address book accounts):
+     *
+     *   1. address books authority (not [ContactsContract.AUTHORITY], but the one which manages address book accounts)
+     *   1. calendar authority
+     *   1. tasks authority (if available)
+     *
+     * Checking the availability of authorities may be relatively expensive, so the
+     * result should be cached for the current operation.
+     *
+     * @return list of available sync authorities for main accounts
+     */
+    fun syncAuthorities(context: Context): List<String> {
+        val result = mutableListOf(
+                context.getString(R.string.address_books_authority),
+                CalendarContract.AUTHORITY
+        )
+
+        TaskUtils.currentProvider(context)?.let { taskProvider ->
+            result += taskProvider.authority
+        }
+
+        return result
     }
 
 }

app/src/main/java/at/bitfire/davdroid/ForegroundService.kt

@@ -0,0 +1,62 @@
+package at.bitfire.davdroid
+
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import at.bitfire.davdroid.settings.Settings
+import at.bitfire.davdroid.settings.SettingsManager
+import at.bitfire.davdroid.ui.AppSettingsActivity
+import at.bitfire.davdroid.ui.NotificationUtils
+
+class ForegroundService : Service() {
+
+    companion object {
+
+        /**
+         * Starts/stops a foreground service, according to the app setting [Settings.FOREGROUND_SERVICE].
+         */
+        const val ACTION_FOREGROUND = "foreground"
+
+        fun isEnabled(context: Context): Boolean {
+            val settings = SettingsManager.getInstance(context)
+            return settings.getBooleanOrNull(Settings.FOREGROUND_SERVICE) == true
+        }
+
+        fun startIfEnabled(context: Context) {
+            if (isEnabled(context)) {
+                val serviceIntent = Intent(ForegroundService.ACTION_FOREGROUND, null, context, ForegroundService::class.java)
+                if (Build.VERSION.SDK_INT >= 26)
+                    context.startForegroundService(serviceIntent)
+                else
+                    context.startService(serviceIntent)
+            }
+        }
+
+    }
+
+
+    override fun onBind(intent: Intent?) = null
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (isEnabled(this)) {
+            val settingsIntent = Intent(this, AppSettingsActivity::class.java).apply {
+                putExtra(AppSettingsActivity.EXTRA_SCROLL_TO, Settings.FOREGROUND_SERVICE)
+            }
+            val builder = NotificationCompat.Builder(this, NotificationUtils.CHANNEL_STATUS)
+                    .setSmallIcon(R.drawable.ic_foreground_notify)
+                    .setContentTitle(getString(R.string.foreground_service_notify_title))
+                    .setContentText(getString(R.string.foreground_service_notify_text))
+                    .setStyle(NotificationCompat.BigTextStyle())
+                    .setContentIntent(PendingIntent.getActivity(this, 0, settingsIntent, PendingIntent.FLAG_UPDATE_CURRENT))
+            startForeground(NotificationUtils.NOTIFY_FOREGROUND, builder.build())
+            return START_STICKY
+        } else {
+            stopForeground(true)
+            return START_NOT_STICKY
+        }
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/HttpClient.kt

@@ -6,139 +6,236 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package at.bitfire.davdroid;
+package at.bitfire.davdroid
 
-import android.accounts.Account
 import android.content.Context
 import android.os.Build
-import at.bitfire.dav4android.BasicDigestAuthHandler
-import at.bitfire.dav4android.UrlUtils
+import android.security.KeyChain
+import at.bitfire.cert4android.CustomCertManager
+import at.bitfire.dav4jvm.BasicDigestAuthHandler
+import at.bitfire.dav4jvm.UrlUtils
 import at.bitfire.davdroid.log.Logger
-import at.bitfire.davdroid.model.ServiceDB
-import at.bitfire.davdroid.model.Settings
-import okhttp3.Interceptor
-import okhttp3.OkHttpClient
-import okhttp3.Response
+import at.bitfire.davdroid.model.Credentials
+import at.bitfire.davdroid.settings.AccountSettings
+import at.bitfire.davdroid.settings.Settings
+import at.bitfire.davdroid.settings.SettingsManager
+import okhttp3.*
+import okhttp3.brotli.BrotliInterceptor
+import okhttp3.internal.tls.OkHostnameVerifier
 import okhttp3.logging.HttpLoggingInterceptor
+import java.io.File
 import java.net.InetSocketAddress
 import java.net.Proxy
+import java.net.Socket
+import java.security.KeyStore
+import java.security.Principal
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.concurrent.TimeUnit
 import java.util.logging.Level
+import javax.net.ssl.*
 
-class HttpClient private constructor() {
+class HttpClient private constructor(
+        val okHttpClient: OkHttpClient,
+        private val certManager: CustomCertManager?
+): AutoCloseable {
 
     companion object {
+        /** max. size of disk cache (10 MB) */
+        const val DISK_CACHE_MAX_SIZE: Long = 10*1024*1024
 
-        private val client = OkHttpClient()
-        private val userAgentInterceptor = UserAgentInterceptor()
+        /** [OkHttpClient] singleton to build all clients from */
+        val sharedClient: OkHttpClient = OkHttpClient.Builder()
+                // Set timeouts. According to [AbstractThreadedSyncAdapter], when there is no network
+                // traffic within a minute, a sync will be cancelled.
+                .connectTimeout(15, TimeUnit.SECONDS)
+                .writeTimeout(30, TimeUnit.SECONDS)
+                .readTimeout(120, TimeUnit.SECONDS)
+                .pingInterval(45, TimeUnit.SECONDS)     // avoid cancellation because of missing traffic; only works for HTTP/2
 
-        private val productName = when(BuildConfig.FLAVOR) {
-            App.FLAVOR_ICLOUD  -> "MultiSync for Cloud"
-            App.FLAVOR_SOLDUPE -> "Soldupe Sync"
-            else               -> "DAVdroid"
-        }
-        private val userAgentDate = SimpleDateFormat("yyyy/MM/dd", Locale.US).format(Date(BuildConfig.buildTime))
-        private val userAgent = "$productName/${BuildConfig.VERSION_NAME} ($userAgentDate; dav4android; okhttp3) Android/${Build.VERSION.RELEASE}"
+                // keep TLS 1.0 and 1.1 for now; remove when major browsers have dropped it (probably 2020)
+                .connectionSpecs(listOf(
+                        ConnectionSpec.CLEARTEXT,
+                        ConnectionSpec.COMPATIBLE_TLS
+                ))
+
+                // don't allow redirects by default, because it would break PROPFIND handling
+                .followRedirects(false)
+
+                // offer Brotli and gzip compression
+                .addInterceptor(BrotliInterceptor)
+
+                // add User-Agent to every request
+                .addNetworkInterceptor(UserAgentInterceptor)
+
+                .build()
+    }
 
 
-        @JvmStatic
-        @JvmOverloads
-        fun create(context: Context?, settings: AccountSettings? = null, logger: java.util.logging.Logger = Logger.log): OkHttpClient {
-            var builder = defaultBuilder(context, logger)
+    override fun close() {
+        okHttpClient.cache?.close()
+        certManager?.close()
+    }
 
-            // use account settings for authentication
-            settings?.let {
-                val userName = it.username()
-                val password = it.password()
-                if (userName != null && password != null)
-                    builder = addAuthentication(builder, null, userName, password)
-            }
+    class Builder(
+            val context: Context? = null,
+            accountSettings: AccountSettings? = null,
+            val logger: java.util.logging.Logger = Logger.log
+    ) {
+        private var certManager: CustomCertManager? = null
+        private var certificateAlias: String? = null
+        private var cache: Cache? = null
 
-            return builder.build()
-        }
-
-        @JvmStatic
-        @Throws(InvalidAccountException::class)
-        fun create(context: Context, account: Account) =
-            create(context, AccountSettings(context, account))
-
-
-        private fun defaultBuilder(context: Context?, logger: java.util.logging.Logger): OkHttpClient.Builder {
-            val builder = client.newBuilder()
-
-            // use MemorizingTrustManager to manage self-signed certificates
-            if (CustomCertificates.sslSocketFactoryCompat != null && CustomCertificates.certManager != null)
-                builder.sslSocketFactory(CustomCertificates.sslSocketFactoryCompat, CustomCertificates.certManager)
-            CustomCertificates.hostnameVerifier?.let { builder.hostnameVerifier(it) }
-
-            // set timeouts
-            builder.connectTimeout(30, TimeUnit.SECONDS)
-            builder.writeTimeout(30, TimeUnit.SECONDS)
-            builder.readTimeout(120, TimeUnit.SECONDS)
-
-            // don't allow redirects, because it would break PROPFIND handling
-            builder.followRedirects(false)
-
-            // custom proxy support
-            context?.let {
-                ServiceDB.OpenHelper(it).use { dbHelper ->
-                    try {
-                        val settings = Settings(dbHelper.readableDatabase)
-                        if (settings.getBoolean(App.OVERRIDE_PROXY, false)) {
-                            val address = InetSocketAddress(
-                                    settings.getString(App.OVERRIDE_PROXY_HOST, App.OVERRIDE_PROXY_HOST_DEFAULT),
-                                    settings.getInt(App.OVERRIDE_PROXY_PORT, App.OVERRIDE_PROXY_PORT_DEFAULT)
-                            )
-
-                            val proxy = Proxy(Proxy.Type.HTTP, address)
-                            builder.proxy(proxy)
-                            Logger.log.log(Level.INFO, "Using proxy", proxy)
-                        }
-                    } catch(e: Exception) {
-                        Logger.log.log(Level.SEVERE, "Can't set proxy, ignoring", e)
-                    }
-                }
-            }
-
-            // add User-Agent to every request
-            builder.addNetworkInterceptor(userAgentInterceptor)
+        private val orig = sharedClient.newBuilder()
 
+        init {
             // add cookie store for non-persistent cookies (some services like Horde use cookies for session tracking)
-            builder.cookieJar(MemoryCookieStore())
+            orig.cookieJar(MemoryCookieStore())
 
             // add network logging, if requested
             if (logger.isLoggable(Level.FINEST)) {
-                val loggingInterceptor = HttpLoggingInterceptor(HttpLoggingInterceptor.Logger {
-                    message -> logger.finest(message)
-                })
+                val loggingInterceptor = HttpLoggingInterceptor { message -> logger.finest(message) }
                 loggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
-                builder.addInterceptor(loggingInterceptor)
+                orig.addInterceptor(loggingInterceptor)
             }
 
-            return builder
+            if (context != null) {
+                val settings = SettingsManager.getInstance(context)
+
+                // custom proxy support
+                try {
+                    if (settings.getBoolean(Settings.OVERRIDE_PROXY)) {
+                        val address = InetSocketAddress(
+                                settings.getString(Settings.OVERRIDE_PROXY_HOST),
+                                settings.getInt(Settings.OVERRIDE_PROXY_PORT)
+                        )
+
+                        val proxy = Proxy(Proxy.Type.HTTP, address)
+                        orig.proxy(proxy)
+                        Logger.log.log(Level.INFO, "Using proxy", proxy)
+                    }
+                } catch (e: Exception) {
+                    Logger.log.log(Level.SEVERE, "Can't set proxy, ignoring", e)
+                }
+
+                // TODO don't instantiate CustomCertManager in .Builder (causes service leaks)
+                customCertManager(CustomCertManager(context, true /*BuildConfig.customCertsUI*/,
+                        !(settings.getBoolean(Settings.DISTRUST_SYSTEM_CERTIFICATES))))
+            }
+
+            // use account settings for authentication
+            accountSettings?.let {
+                addAuthentication(null, it.credentials())
+            }
         }
 
-        fun addAuthentication(builder: OkHttpClient.Builder, host: String?, username: String, password: String): OkHttpClient.Builder {
-            val authHandler = BasicDigestAuthHandler(UrlUtils.hostToDomain(host), username, password);
-            return builder
-                    .addNetworkInterceptor(authHandler)
-                    .authenticator(authHandler)
+        constructor(context: Context, host: String?, credentials: Credentials): this(context) {
+            addAuthentication(host, credentials)
         }
 
-        @JvmOverloads
-        @JvmStatic
-        fun addAuthentication(client: OkHttpClient, host: String? = null, username: String, password: String): OkHttpClient {
-            val builder = client.newBuilder()
-            addAuthentication(builder, host, username, password)
-            return builder.build()
+        fun withDiskCache(context: Context): Builder {
+            for (dir in arrayOf(context.externalCacheDir, context.cacheDir).filterNotNull()) {
+                if (dir.exists() && dir.canWrite()) {
+                    val cacheDir = File(dir, "HttpClient")
+                    cacheDir.mkdir()
+                    Logger.log.fine("Using disk cache: $cacheDir")
+                    orig.cache(Cache(cacheDir, DISK_CACHE_MAX_SIZE))
+                    break
+                }
+            }
+            return this
+        }
+
+        fun followRedirects(follow: Boolean): Builder {
+            orig.followRedirects(follow)
+            return this
+        }
+
+        fun customCertManager(manager: CustomCertManager) {
+            certManager = manager
+        }
+        fun setForeground(foreground: Boolean): Builder {
+            certManager?.appInForeground = foreground
+            return this
+        }
+
+        fun addAuthentication(host: String?, credentials: Credentials): Builder {
+            if (credentials.userName != null && credentials.password != null) {
+                val authHandler = BasicDigestAuthHandler(UrlUtils.hostToDomain(host), credentials.userName, credentials.password)
+                orig    .addNetworkInterceptor(authHandler)
+                        .authenticator(authHandler)
+            }
+            if (credentials.certificateAlias != null)
+                certificateAlias = credentials.certificateAlias
+            return this
+        }
+
+        fun build(): HttpClient {
+            val trustManager = certManager ?: {
+                val factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
+                factory.init(null as KeyStore?)
+                factory.trustManagers.first() as X509TrustManager
+            }()
+
+            val hostnameVerifier = certManager?.hostnameVerifier(OkHostnameVerifier)
+                    ?: OkHostnameVerifier
+
+            var keyManager: KeyManager? = null
+            certificateAlias?.let { alias ->
+                val context = requireNotNull(context)
+
+                // get provider certificate and private key
+                val certs = KeyChain.getCertificateChain(context, alias) ?: return@let
+                val key = KeyChain.getPrivateKey(context, alias) ?: return@let
+                logger.fine("Using provider certificate $alias for authentication (chain length: ${certs.size})")
+
+                // create KeyManager
+                keyManager = object : X509ExtendedKeyManager() {
+                    override fun getServerAliases(p0: String?, p1: Array<out Principal>?): Array<String>? = null
+                    override fun chooseServerAlias(p0: String?, p1: Array<out Principal>?, p2: Socket?) = null
+
+                    override fun getClientAliases(p0: String?, p1: Array<out Principal>?) =
+                            arrayOf(alias)
+
+                    override fun chooseClientAlias(p0: Array<out String>?, p1: Array<out Principal>?, p2: Socket?) =
+                            alias
+
+                    override fun getCertificateChain(forAlias: String?) =
+                            certs.takeIf { forAlias == alias }
+
+                    override fun getPrivateKey(forAlias: String?) =
+                            key.takeIf { forAlias == alias }
+                }
+
+                // HTTP/2 doesn't support client certificates (yet)
+                // see https://tools.ietf.org/html/draft-ietf-httpbis-http2-secondary-certs-04
+                orig.protocols(listOf(Protocol.HTTP_1_1))
+            }
+
+            val sslContext = SSLContext.getInstance("TLS")
+            sslContext.init(
+                    if (keyManager != null) arrayOf(keyManager) else null,
+                    arrayOf(trustManager),
+                    null)
+            orig.sslSocketFactory(sslContext.socketFactory, trustManager)
+            orig.hostnameVerifier(hostnameVerifier)
+
+            return HttpClient(orig.build(), certManager)
         }
 
     }
 
 
-    private class UserAgentInterceptor: Interceptor {
+    private object UserAgentInterceptor: Interceptor {
+        // use Locale.ROOT because numbers may be encoded as non-ASCII characters in other locales
+        private val userAgentDateFormat = SimpleDateFormat("yyyy/MM/dd", Locale.ROOT)
+        private val userAgentDate = userAgentDateFormat.format(Date(BuildConfig.buildTime))
+        private val userAgent = "${BuildConfig.userAgent}/${BuildConfig.VERSION_NAME} ($userAgentDate; dav4jvm; " +
+                "okhttp/${OkHttp.VERSION}) Android/${Build.VERSION.RELEASE}"
+
+        init {
+            Logger.log.info("Will set \"User-Agent: $userAgent\" for further requests")
+        }
 
         override fun intercept(chain: Interceptor.Chain): Response {
             val locale = Locale.getDefault()

app/src/main/java/at/bitfire/davdroid/MemoryCookieStore.kt

@@ -27,12 +27,12 @@ class MemoryCookieStore: CookieJar {
      * This ensures that cookies can be overwritten. [RFC 6265 5.3 Storage Model]
      * Not thread-safe!
      */
-    val storage = MultiKeyMap.multiKeyMap(HashedMap<MultiKey<out String>, Cookie>())!!
+    private val storage = MultiKeyMap.multiKeyMap(HashedMap<MultiKey<out String>, Cookie>())!!
 
     override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
         synchronized(storage) {
             for (cookie in cookies)
-                storage.put(cookie.name(), cookie.domain(), cookie.path(), cookie)
+                storage.put(cookie.name, cookie.domain, cookie.path, cookie)
         }
     }
 
@@ -46,7 +46,7 @@ class MemoryCookieStore: CookieJar {
                 val cookie = iter.value
 
                 // remove expired cookies
-                if (cookie.expiresAt() <= System.currentTimeMillis()) {
+                if (cookie.expiresAt <= System.currentTimeMillis()) {
                     iter.remove()
                     continue
                 }

app/src/main/java/at/bitfire/davdroid/PackageChangedReceiver.kt

@@ -1,65 +1,25 @@
-/*
- * Copyright © Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
 package at.bitfire.davdroid
 
-import android.accounts.Account
-import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
-import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
-import android.os.Bundle
-import at.bitfire.davdroid.log.Logger
-import at.bitfire.davdroid.model.ServiceDB
-import at.bitfire.davdroid.model.ServiceDB.Services
-import at.bitfire.davdroid.resource.LocalTaskList
-import at.bitfire.ical4android.TaskProvider
+import android.content.IntentFilter
 
-class PackageChangedReceiver: BroadcastReceiver() {
+abstract class PackageChangedReceiver(
+        val context: Context
+): BroadcastReceiver(), AutoCloseable {
 
-    @SuppressLint("MissingPermission")
-    override fun onReceive(context: Context, intent: Intent) {
-        if (intent.action == Intent.ACTION_PACKAGE_ADDED || intent.action == Intent.ACTION_PACKAGE_FULLY_REMOVED)
-            updateTaskSync(context)
-    }
-
-
-    companion object {
-
-        @JvmStatic
-        fun updateTaskSync(context: Context) {
-            val tasksInstalled = LocalTaskList.tasksProviderAvailable(context)
-            Logger.log.info("Package (un)installed; OpenTasks provider now available = $tasksInstalled")
-
-            // check all accounts and (de)activate OpenTasks if a CalDAV service is defined
-            ServiceDB.OpenHelper(context).use { dbHelper ->
-                val db = dbHelper.readableDatabase
-
-                db.query(Services._TABLE, arrayOf(Services.ACCOUNT_NAME),
-                        "${Services.SERVICE}=?", arrayOf(Services.SERVICE_CALDAV), null, null, null)?.use { cursor ->
-                    while (cursor.moveToNext()) {
-                        val account = Account(cursor.getString(0), context.getString(R.string.account_type))
-
-                        if (tasksInstalled) {
-                            if (ContentResolver.getIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority) <= 0) {
-                                ContentResolver.setIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority, 1)
-                                ContentResolver.setSyncAutomatically(account, TaskProvider.ProviderName.OpenTasks.authority, true)
-                                ContentResolver.addPeriodicSync(account, TaskProvider.ProviderName.OpenTasks.authority, Bundle(), Constants.DEFAULT_SYNC_INTERVAL.toLong())
-                            }
-                        } else
-                            ContentResolver.setIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority, 0)
-
-                    }
-                }
-            }
+    init {
+        val filter = IntentFilter(Intent.ACTION_PACKAGE_ADDED).apply {
+            addAction(Intent.ACTION_PACKAGE_CHANGED)
+            addAction(Intent.ACTION_PACKAGE_REMOVED)
+            addDataScheme("package")
         }
-
+        context.registerReceiver(this, filter)
     }
 
-}
+    override fun close() {
+        context.unregisterReceiver(this)
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/PermissionUtils.kt

@@ -0,0 +1,126 @@
+package at.bitfire.davdroid
+
+import android.Manifest
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.location.LocationManager
+import android.net.Uri
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
+import androidx.core.location.LocationManagerCompat
+import at.bitfire.davdroid.log.Logger
+import at.bitfire.davdroid.ui.NotificationUtils
+import at.bitfire.davdroid.ui.PermissionsActivity
+
+object PermissionUtils {
+
+    val CONTACT_PERMISSIONS = arrayOf(
+            Manifest.permission.READ_CONTACTS,
+            Manifest.permission.WRITE_CONTACTS
+    )
+    val CALENDAR_PERMISSIONS = arrayOf(
+            Manifest.permission.READ_CALENDAR,
+            Manifest.permission.WRITE_CALENDAR
+    )
+
+    val WIFI_SSID_PERMISSIONS =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+                arrayOf(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION)
+            else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1)
+                arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION)
+            else
+                arrayOf()
+
+    /**
+     * Checks whether all conditions to access the current WiFi's SSID are met:
+     *
+     * 1. location permissions ([WIFI_SSID_PERMISSIONS]) granted (Android 8.1+)
+     * 2. location enabled (Android 9+)
+     *
+     * @return *true* if SSID can be obtained; *false* if the SSID will be <unknown> or something like that
+     */
+    fun canAccessWifiSsid(context: Context): Boolean {
+        // before Android 8.1, SSIDs are always readable
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1)
+            return true
+
+        val locationAvailable =
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P)
+                    true    // Android <9 doesn't require active location services
+                else
+                    ContextCompat.getSystemService(context, LocationManager::class.java)?.let { locationManager ->
+                        LocationManagerCompat.isLocationEnabled(locationManager)
+                    } ?: /* location feature not available on this device */ false
+
+        return  havePermissions(context, WIFI_SSID_PERMISSIONS) &&
+                locationAvailable
+    }
+
+    /**
+     * Whether this app declares the given permission (regardless of whether it has been granted or not).
+     *
+     * @param permisssion  permission to check
+     *
+     * @return *true* if this app declares [permission] in the manifest; *false* otherwise
+     */
+    fun declaresPermission(packageManager: PackageManager, permission: String): Boolean {
+        val info = packageManager.getPackageInfo(BuildConfig.APPLICATION_ID, PackageManager.GET_PERMISSIONS)
+        return info.requestedPermissions.contains(permission)
+    }
+
+    /**
+     * Checks whether at least one of the given permissions is granted.
+     *
+     * @param context context to check
+     * @param permissions array of permissions to check
+     *
+     * @return whether at least one of [permissions] is granted
+     */
+    fun haveAnyPermission(context: Context, permissions: Array<String>) =
+            permissions.any { ContextCompat.checkSelfPermission(context, it) == PackageManager.PERMISSION_GRANTED }
+
+    /**
+     * Checks whether all given permissions are granted.
+     *
+     * @param context context to check
+     * @param permissions array of permissions to check
+     *
+     * @return whether all [permissions] are granted
+     */
+    fun havePermissions(context: Context, permissions: Array<String>) =
+            permissions.all { ContextCompat.checkSelfPermission(context, it) == PackageManager.PERMISSION_GRANTED }
+
+    /**
+     * Shows a notification about missing permissions.
+     *
+     * @param context notification context
+     * @param intent will be set as content Intent; if null, an Intent to launch PermissionsActivity will be used
+     */
+    fun notifyPermissions(context: Context, intent: Intent?) {
+        val contentIntent = intent ?: Intent(context, PermissionsActivity::class.java)
+        val notify = NotificationUtils.newBuilder(context, NotificationUtils.CHANNEL_SYNC_ERRORS)
+                .setSmallIcon(R.drawable.ic_sync_problem_notify)
+                .setContentTitle(context.getString(R.string.sync_error_permissions))
+                .setContentText(context.getString(R.string.sync_error_permissions_text))
+                .setContentIntent(PendingIntent.getActivity(context, 0, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT))
+                .setCategory(NotificationCompat.CATEGORY_ERROR)
+                .setAutoCancel(true)
+                .build()
+        NotificationManagerCompat.from(context)
+                .notify(NotificationUtils.NOTIFY_PERMISSIONS, notify)
+    }
+
+    fun showAppSettings(context: Context) {
+        val intent = Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+                Uri.fromParts("package", BuildConfig.APPLICATION_ID, null))
+        if (intent.resolveActivity(context.packageManager) != null)
+            context.startActivity(intent)
+        else
+            Logger.log.warning("App settings Intent not resolvable")
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/SSLSocketFactoryCompat.kt

@@ -1,160 +0,0 @@
-/*
- * Copyright © Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid
-
-import android.os.Build
-import at.bitfire.davdroid.log.Logger
-import java.io.IOException
-import java.net.InetAddress
-import java.net.Socket
-import java.security.GeneralSecurityException
-import java.util.*
-import javax.net.ssl.SSLContext
-import javax.net.ssl.SSLSocket
-import javax.net.ssl.SSLSocketFactory
-import javax.net.ssl.X509TrustManager
-
-class SSLSocketFactoryCompat(trustManager: X509TrustManager): SSLSocketFactory() {
-
-    private var delegate: SSLSocketFactory
-
-    companion object {
-        // Android 5.0+ (API level 21) provides reasonable default settings
-        // but it still allows SSLv3
-        // https://developer.android.com/reference/javax/net/ssl/SSLSocket.html
-        var protocols: Array<String>? = null
-        var cipherSuites: Array<String>? = null
-        init {
-            if (Build.VERSION.SDK_INT >= 23) {
-                // Since Android 6.0 (API level 23),
-                // - TLSv1.1 and TLSv1.2 is enabled by default
-                // - SSLv3 is disabled by default
-                // - all modern ciphers are activated by default
-                protocols = null
-                cipherSuites = null
-                Logger.log.fine("Using device default TLS protocols/ciphers")
-            } else {
-                val socket = SSLSocketFactory.getDefault().createSocket() as SSLSocket?
-                try {
-                    socket?.let {
-                        /* set reasonable protocol versions */
-                        // - enable all supported protocols (enables TLSv1.1 and TLSv1.2 on Android <5.0)
-                        // - remove all SSL versions (especially SSLv3) because they're insecure now
-                        val _protocols = LinkedList<String>()
-                        for (protocol in socket.supportedProtocols.filterNot { it.contains("SSL", true) })
-                            _protocols += protocol
-                        Logger.log.info("Enabling (only) these TLS protocols: ${_protocols.joinToString(", ")}")
-                        protocols = _protocols.toTypedArray()
-
-                        /* set up reasonable cipher suites */
-                       val knownCiphers = arrayOf<String>(
-                                // TLS 1.2
-                                "TLS_RSA_WITH_AES_256_GCM_SHA384",
-                                "TLS_RSA_WITH_AES_128_GCM_SHA256",
-                                "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
-                                "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
-                                "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
-                                "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
-                                "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
-                                // maximum interoperability
-                                "TLS_RSA_WITH_3DES_EDE_CBC_SHA",
-                                "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
-                                "TLS_RSA_WITH_AES_128_CBC_SHA",
-                                // additionally
-                                "TLS_RSA_WITH_AES_256_CBC_SHA",
-                                "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
-                                "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
-                                "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
-                                "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"
-                        )
-                        val availableCiphers = socket.supportedCipherSuites
-                        Logger.log.info("Available cipher suites: ${availableCiphers.joinToString(", ")}")
-
-                        /* For maximum security, preferredCiphers should *replace* enabled ciphers (thus
-                         * disabling ciphers which are enabled by default, but have become unsecure), but for
-                         * the security level of DAVdroid and maximum compatibility, disabling of insecure
-                         * ciphers should be a server-side task */
-
-                        // for the final set of enabled ciphers, take the ciphers enabled by default, ...
-                        val _cipherSuites = LinkedList<String>()
-                        _cipherSuites.addAll(socket.enabledCipherSuites)
-                        Logger.log.fine("Cipher suites enabled by default: ${_cipherSuites.joinToString(", ")}")
-                        // ... add explicitly allowed ciphers ...
-                        _cipherSuites.addAll(knownCiphers)
-                        // ... and keep only those which are actually available
-                        _cipherSuites.retainAll(availableCiphers)
-
-                        Logger.log.info("Enabling (only) these TLS ciphers: " + _cipherSuites.joinToString(", "))
-                        cipherSuites = _cipherSuites.toTypedArray()
-                    }
-                } catch(e: IOException) {
-                    Logger.log.severe("Couldn't determine default TLS settings")
-                } finally {
-                    socket?.close()     // doesn't implement Closeable on all supported Android versions
-                }
-            }
-        }
-    }
-
-
-    init {
-        try {
-            val sslContext = SSLContext.getInstance("TLS")
-            sslContext.init(null, arrayOf(trustManager), null)
-            delegate = sslContext.socketFactory
-        } catch (e: GeneralSecurityException) {
-            throw IllegalStateException()      // system has no TLS
-        }
-    }
-
-    override fun getDefaultCipherSuites(): Array<String>? = cipherSuites ?: delegate.defaultCipherSuites
-    override fun getSupportedCipherSuites(): Array<String>? = cipherSuites ?: delegate.supportedCipherSuites
-
-    override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket {
-        val ssl = delegate.createSocket(s, host, port, autoClose)
-        if (ssl is SSLSocket)
-            upgradeTLS(ssl)
-        return ssl
-    }
-
-    override fun createSocket(host: String, port: Int): Socket {
-        val ssl = delegate.createSocket(host, port)
-        if (ssl is SSLSocket)
-            upgradeTLS(ssl)
-        return ssl
-    }
-
-    override fun createSocket(host: String, port: Int, localHost: InetAddress, localPort: Int): Socket {
-        val ssl = delegate.createSocket(host, port, localHost, localPort)
-        if (ssl is SSLSocket)
-            upgradeTLS(ssl)
-        return ssl
-    }
-
-    override fun createSocket(host: InetAddress, port: Int): Socket {
-        val ssl = delegate.createSocket(host, port)
-        if (ssl is SSLSocket)
-            upgradeTLS(ssl)
-        return ssl
-    }
-
-    override fun createSocket(address: InetAddress, port: Int, localAddress: InetAddress, localPort: Int): Socket {
-        val ssl = delegate.createSocket(address, port, localAddress, localPort)
-        if (ssl is SSLSocket)
-            upgradeTLS(ssl)
-        return ssl
-    }
-
-
-    private fun upgradeTLS(ssl: SSLSocket) {
-        protocols?.let { ssl.enabledProtocols = it }
-        cipherSuites?.let { ssl.enabledCipherSuites = it }
-    }
-
-}

app/src/main/java/at/bitfire/davdroid/TasksWatcher.kt

@@ -0,0 +1,97 @@
+/*
+ * Copyright © Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid
+
+import android.accounts.Account
+import android.accounts.AccountManager
+import android.content.ContentResolver
+import android.content.Context
+import android.content.Intent
+import androidx.annotation.WorkerThread
+import at.bitfire.davdroid.log.Logger
+import at.bitfire.davdroid.model.AppDatabase
+import at.bitfire.davdroid.model.Service
+import at.bitfire.davdroid.resource.TaskUtils
+import at.bitfire.davdroid.settings.AccountSettings
+import at.bitfire.davdroid.settings.Settings
+import at.bitfire.davdroid.settings.SettingsManager
+import at.bitfire.ical4android.TaskProvider
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class TasksWatcher(
+        context: Context
+): PackageChangedReceiver(context) {
+
+    companion object {
+
+        @WorkerThread
+        fun updateTaskSync(context: Context) {
+            val tasksProvider = TaskUtils.currentProvider(context)
+            Logger.log.info("App launched or other package (un)installed; current tasks provider = $tasksProvider")
+
+            var permissionsRequired = false     // whether additional permissions are required
+            val currentProvider by lazy {       // only this provider shall be enabled (null to disable all providers)
+                TaskUtils.currentProvider(context)
+            }
+
+            // check all accounts and (de)activate task provider(s) if a CalDAV service is defined
+            val db = AppDatabase.getInstance(context)
+            val accountManager = AccountManager.get(context)
+            for (account in accountManager.getAccountsByType(context.getString(R.string.account_type))) {
+                val hasCalDAV = db.serviceDao().getByAccountAndType(account.name, Service.TYPE_CALDAV) != null
+                for (providerName in TaskProvider.ProviderName.values()) {
+                    val isSyncable = ContentResolver.getIsSyncable(account, providerName.authority)     // may be -1 (unknown state)
+                    val shallBeSyncable = hasCalDAV && providerName == currentProvider
+                    if ((shallBeSyncable && isSyncable != 1) || (!shallBeSyncable && isSyncable != 0)) {
+                        // enable/disable sync
+                        setSyncable(context, account, providerName.authority, shallBeSyncable)
+
+                        // if sync has just been enabled: check whether additional permissions are required
+                        if (shallBeSyncable && !PermissionUtils.havePermissions(context, providerName.permissions))
+                            permissionsRequired = true
+                    }
+                }
+            }
+
+            if (permissionsRequired) {
+                Logger.log.warning("Tasks synchronization is now enabled for at least one account, but permissions are not granted")
+                PermissionUtils.notifyPermissions(context, null)
+            }
+        }
+
+        private fun setSyncable(context: Context, account: Account, authority: String, syncable: Boolean) {
+            if (syncable) {
+                Logger.log.info("Enabling $authority sync for $account")
+                ContentResolver.setIsSyncable(account, authority, 1)
+                try {
+                    val settings = AccountSettings(context, account)
+                    val interval = settings.getSavedTasksSyncInterval() ?:
+                            SettingsManager.getInstance(context).getLong(Settings.DEFAULT_SYNC_INTERVAL)
+                    settings.setSyncInterval(authority, interval)
+                } catch (e: InvalidAccountException) {
+                    // account has already been removed
+                }
+            } else {
+                Logger.log.info("Disabling $authority sync for $account")
+                ContentResolver.setIsSyncable(account, authority, 0)
+            }
+        }
+
+    }
+
+
+    override fun onReceive(context: Context, intent: Intent) {
+        CoroutineScope(Dispatchers.Default).launch {
+            updateTaskSync(context)
+        }
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/TextTable.kt

@@ -0,0 +1,79 @@
+package at.bitfire.davdroid
+
+import org.apache.commons.lang3.StringUtils
+import java.util.*
+
+class TextTable(
+        vararg val headers: String
+) {
+
+    companion object {
+
+        fun indent(str: String, pos: Int): String =
+                " ".repeat(pos) +
+                str.split('\n').joinToString("\n" + " ".repeat(pos))
+
+    }
+
+
+    private val lines = mutableListOf<Array<String>>()
+
+    fun addLine(vararg values: Any?) {
+        if (values.size != headers.size)
+            throw IllegalArgumentException("Table line must have ${headers.size} column(s)")
+        lines += values.map {
+            it?.toString() ?: "—"
+        }.toTypedArray()
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder()
+
+        val headerWidths = headers.map { it.length }
+        val colWidths = Array<Int>(headers.size) { colIdx ->
+            Collections.max(listOf(headerWidths[colIdx]) + lines.map { it[colIdx] }.map { it.length })
+        }
+
+        // first line
+        sb.append("\n┌")
+        for (colIdx in 0 until headers.size)
+            sb  .append(StringUtils.repeat('─', colWidths[colIdx] + 2))
+                .append(if (colIdx == headers.size - 1) '┐' else '┬')
+        sb.append('\n')
+
+        // header
+        sb.append('│')
+        for (colIdx in 0 until headers.size)
+            sb  .append(' ')
+                .append(StringUtils.rightPad(headers[colIdx], colWidths[colIdx] + 1))
+                .append('│')
+        sb.append('\n')
+
+        // separator between header and body
+        sb.append('├')
+        for (colIdx in 0 until headers.size) {
+            sb  .append(StringUtils.repeat('─', colWidths[colIdx] + 2))
+                .append(if (colIdx == headers.size - 1) '┤' else '┼')
+        }
+        sb.append('\n')
+
+        // body
+        for (line in lines) {
+            for (colIdx in 0 until headers.size)
+                sb  .append("│ ")
+                    .append(StringUtils.rightPad(line[colIdx], colWidths[colIdx] + 1))
+            sb.append("│\n")
+        }
+
+        // last line
+        sb.append("└")
+        for (colIdx in 0 until headers.size) {
+            sb  .append("─".repeat(colWidths[colIdx] + 2))
+                .append(if (colIdx == headers.size - 1) '┘' else '┴')
+        }
+        sb.append("\n\n")
+
+        return sb.toString()
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/log/LogcatHandler.kt

@@ -18,7 +18,7 @@ import java.util.logging.LogRecord
 
 object LogcatHandler: Handler() {
 
-    private val MAX_LINE_LENGTH = 3000
+    private const val MAX_LINE_LENGTH = 3000
 
     init {
         formatter = PlainTextFormatter.LOGCAT

app/src/main/java/at/bitfire/davdroid/log/Logger.kt

@@ -8,89 +8,138 @@
 
 package at.bitfire.davdroid.log
 
-import android.content.Context
+import android.app.Application
+import android.app.PendingIntent
+import android.content.Intent
+import android.content.SharedPreferences
 import android.os.Process
-import android.support.v4.app.NotificationCompat
-import android.support.v4.app.NotificationManagerCompat
 import android.util.Log
-import at.bitfire.davdroid.App
-import at.bitfire.davdroid.Constants
+import android.widget.Toast
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.preference.PreferenceManager
+import at.bitfire.davdroid.BuildConfig
 import at.bitfire.davdroid.R
-import at.bitfire.davdroid.model.ServiceDB
-import at.bitfire.davdroid.model.Settings
-import org.apache.commons.lang3.time.DateFormatUtils
+import at.bitfire.davdroid.ui.AppSettingsActivity
+import at.bitfire.davdroid.ui.DebugInfoActivity
+import at.bitfire.davdroid.ui.NotificationUtils
 import java.io.File
 import java.io.IOException
+import java.util.*
 import java.util.logging.FileHandler
 import java.util.logging.Level
-import java.util.logging.Logger
 
-object Logger {
+object Logger : SharedPreferences.OnSharedPreferenceChangeListener {
 
-    @JvmField
-    val log = Logger.getLogger("davdroid")!!
-    init {
-        at.bitfire.dav4android.Constants.log = Logger.getLogger("davdroid.dav4android")
-        at.bitfire.cert4android.Constants.log = Logger.getLogger("davdroid.cert4android")
+    private const val LOG_TO_FILE = "log_to_file"
+
+    val log: java.util.logging.Logger = java.util.logging.Logger.getLogger("davx5")
+
+    private lateinit var context: Application
+    private lateinit var preferences: SharedPreferences
+
+
+    fun initialize(app: Application) {
+        context = app
+        preferences = PreferenceManager.getDefaultSharedPreferences(context)
+        preferences.registerOnSharedPreferenceChangeListener(this)
+
+        reinitialize()
     }
 
-    fun reinitLogger(context: Context) {
-        ServiceDB.OpenHelper(context).use { dbHelper ->
-            val settings = Settings(dbHelper.getReadableDatabase())
-
-            val logToFile = settings.getBoolean(App.LOG_TO_EXTERNAL_STORAGE, false)
-            val logVerbose = logToFile || Log.isLoggable(log.name, Log.DEBUG)
-
-            log.info("Verbose logging: $logVerbose")
-
-            // set logging level according to preferences
-            val rootLogger = Logger.getLogger("")
-            rootLogger.level = if (logVerbose) Level.ALL else Level.INFO
-
-            // remove all handlers and add our own logcat handler
-            rootLogger.useParentHandlers = false
-            rootLogger.handlers.forEach { rootLogger.removeHandler(it) }
-            rootLogger.addHandler(LogcatHandler)
-
-            val nm = NotificationManagerCompat.from(context)
-            // log to external file according to preferences
-            if (logToFile) {
-                val builder = NotificationCompat.Builder(context)
-                builder .setSmallIcon(R.drawable.ic_sd_storage_light)
-                        .setLargeIcon(App.getLauncherBitmap(context))
-                        .setContentTitle(context.getString(R.string.logging_davdroid_file_logging))
-                        .setLocalOnly(true)
-
-                val dir = context.getExternalFilesDir(null)
-                if (dir != null)
-                    try {
-                        val fileName = File(dir, "davdroid-${Process.myPid()}-${DateFormatUtils.format(System.currentTimeMillis(), "yyyyMMdd-HHmmss")}.txt").toString()
-                        log.info("Logging to $fileName")
-
-                        val fileHandler = FileHandler(fileName)
-                        fileHandler.formatter = PlainTextFormatter.DEFAULT
-                        log.addHandler(fileHandler)
-                        builder .setContentText(dir.path)
-                                .setSubText(context.getString(R.string.logging_to_external_storage_warning))
-                                .setCategory(NotificationCompat.CATEGORY_STATUS)
-                                .setPriority(NotificationCompat.PRIORITY_HIGH)
-                                .setStyle(NotificationCompat.BigTextStyle()
-                                        .bigText(context.getString(R.string.logging_to_external_storage, dir.path)))
-                                .setOngoing(true)
-
-                    } catch (e: IOException) {
-                        log.log(Level.SEVERE, "Couldn't create external log file", e)
-
-                        builder .setContentText(context.getString(R.string.logging_couldnt_create_file, e.localizedMessage))
-                                .setCategory(NotificationCompat.CATEGORY_ERROR)
-                    }
-                else
-                    builder.setContentText(context.getString(R.string.logging_no_external_storage))
-
-                nm.notify(Constants.NOTIFICATION_EXTERNAL_FILE_LOGGING, builder.build())
-            } else
-                nm.cancel(Constants.NOTIFICATION_EXTERNAL_FILE_LOGGING)
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        if (key == LOG_TO_FILE) {
+            log.info("Logging settings changed; re-initializing logger")
+            reinitialize()
         }
     }
 
+    @Synchronized
+    private fun reinitialize() {
+        val logToFile = preferences.getBoolean(LOG_TO_FILE, false)
+        val logVerbose = logToFile || BuildConfig.DEBUG || Log.isLoggable(log.name, Log.DEBUG)
+
+        log.info("Verbose logging: $logVerbose; to file: $logToFile")
+
+        // set logging level according to preferences
+        val rootLogger = java.util.logging.Logger.getLogger("")
+        rootLogger.level = if (logVerbose) Level.ALL else Level.INFO
+
+        // reset all handlers and add our own logcat handler
+        rootLogger.useParentHandlers = false
+        rootLogger.handlers.forEach { handler ->
+            rootLogger.removeHandler(handler)
+            if (handler is FileHandler)     // gracefully close previous verbose-logging FileHandlers
+                handler.close()
+        }
+        rootLogger.addHandler(LogcatHandler)
+
+        val nm = NotificationManagerCompat.from(context)
+        // log to external file according to preferences
+        if (logToFile) {
+            val logDir = debugDir() ?: return
+            val logFile = File(logDir, "davx5-log.txt")
+            if (logFile.createNewFile())
+                logFile.writeText("Log file created at ${Date()}; PID ${Process.myPid()}; UID ${Process.myUid()}\n")
+
+            try {
+                val fileHandler = FileHandler(logFile.toString(), true).apply {
+                    formatter = PlainTextFormatter.DEFAULT
+                }
+                rootLogger.addHandler(fileHandler)
+                log.info("Now logging to file: $logFile")
+
+                val builder = NotificationUtils.newBuilder(context, NotificationUtils.CHANNEL_DEBUG)
+                builder .setSmallIcon(R.drawable.ic_sd_card_notify)
+                        .setContentTitle(context.getString(R.string.app_settings_logging))
+                        .setCategory(NotificationCompat.CATEGORY_STATUS)
+                        .setPriority(NotificationCompat.PRIORITY_HIGH)
+                        .setContentText(context.getString(R.string.logging_notification_text, context.getString(R.string.app_name)))
+                        .setOngoing(true)
+
+                val shareIntent = Intent(Intent.ACTION_SEND, null, context, DebugInfoActivity::class.java)
+                shareIntent.putExtra(DebugInfoActivity.EXTRA_LOG_FILE, logFile.absolutePath)
+                shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                val pendingShare = PendingIntent.getActivity(context, 0, shareIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+                builder.addAction(NotificationCompat.Action.Builder(
+                        R.drawable.ic_share_action,
+                        context.getString(R.string.logging_notification_view_share),
+                        pendingShare
+                ).build())
+
+                val prefIntent = Intent(context, AppSettingsActivity::class.java)
+                prefIntent.putExtra(AppSettingsActivity.EXTRA_SCROLL_TO, LOG_TO_FILE)
+                prefIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                val pendingPref = PendingIntent.getActivity(context, 0, prefIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+                builder.addAction(NotificationCompat.Action.Builder(
+                        R.drawable.ic_settings_action,
+                        context.getString(R.string.logging_notification_disable),
+                        pendingPref
+                ).build())
+
+                nm.notify(NotificationUtils.NOTIFY_EXTERNAL_FILE_LOGGING, builder.build())
+            } catch(e: IOException) {
+                log.log(Level.SEVERE, "Couldn't create log file", e)
+                Toast.makeText(context, context.getString(R.string.logging_couldnt_create_file), Toast.LENGTH_LONG).show()
+            }
+        } else {
+            // verbose logging is disabled -> cancel notification and remove old logs
+            nm.cancel(NotificationUtils.NOTIFY_EXTERNAL_FILE_LOGGING)
+            debugDir()?.deleteRecursively()
+        }
+    }
+
+
+    private fun debugDir(): File? {
+        val dir = File(context.filesDir, "debug")
+        if (dir.exists() && dir.isDirectory)
+            return dir
+
+        if (dir.mkdir())
+            return dir
+
+        Toast.makeText(context, context.getString(R.string.logging_couldnt_create_file), Toast.LENGTH_LONG).show()
+        return null
+    }
+
 }

app/src/main/java/at/bitfire/davdroid/log/PlainTextFormatter.kt

@@ -8,34 +8,36 @@
 
 package at.bitfire.davdroid.log
 
+import org.apache.commons.lang3.StringUtils
 import org.apache.commons.lang3.exception.ExceptionUtils
 import org.apache.commons.lang3.time.DateFormatUtils
+import java.util.*
 import java.util.logging.Formatter
 import java.util.logging.LogRecord
 
 class PlainTextFormatter private constructor(
-        val logcat: Boolean
+        private val logcat: Boolean
 ): Formatter() {
 
     companion object {
-        @JvmField val LOGCAT = PlainTextFormatter(true)
-        @JvmField val DEFAULT = PlainTextFormatter(false)
+        val LOGCAT = PlainTextFormatter(true)
+        val DEFAULT = PlainTextFormatter(false)
+
+        const val MAX_MESSAGE_LENGTH = 20000
     }
 
     override fun format(r: LogRecord): String {
         val builder = StringBuilder()
 
         if (!logcat)
-            builder .append(DateFormatUtils.format(r.millis, "yyyy-MM-dd HH:mm:ss"))
+            builder .append(DateFormatUtils.format(r.millis, "yyyy-MM-dd HH:mm:ss", Locale.ROOT))
                     .append(" ").append(r.threadID).append(" ")
 
-        if (r.sourceClassName.replaceFirst("\\$.*", "") != r.loggerName) {
-            val className = shortClassName(r.sourceClassName)
-            if (className != "ical4android.AndroidAppender")
-                builder.append("[").append(className).append("] ")
-        }
+        val className = shortClassName(r.sourceClassName)
+        if (className != r.loggerName)
+            builder.append("[").append(className).append("] ")
 
-        builder.append(r.message)
+        builder.append(StringUtils.abbreviate(r.message, MAX_MESSAGE_LENGTH))
 
         r.thrown?.let {
             builder .append("\nEXCEPTION ")
@@ -54,8 +56,7 @@ class PlainTextFormatter private constructor(
     }
 
     private fun shortClassName(className: String) = className
-            .replace("at.bitfire.davdroid.", "")
-            .replace("at.bitfire.", "")
+            .replace(Regex("^at\\.bitfire\\.(dav|cert4an|dav4an|ical4an|vcard4an)droid\\."), "")
             .replace(Regex("\\$.*$"), "")
 
 }

app/src/main/java/at/bitfire/davdroid/log/StringHandler.kt

@@ -8,8 +8,8 @@
 
 package at.bitfire.davdroid.log
 
-import java.util.logging.Handler;
-import java.util.logging.LogRecord;
+import java.util.logging.Handler
+import java.util.logging.LogRecord
 
 class StringHandler: Handler() {
 

app/src/main/java/at/bitfire/davdroid/model/AppDatabase.kt

@@ -0,0 +1,201 @@
+package at.bitfire.davdroid.model
+
+import android.content.Context
+import android.database.sqlite.SQLiteQueryBuilder
+import androidx.core.database.getStringOrNull
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import at.bitfire.davdroid.AndroidSingleton
+import at.bitfire.davdroid.TextTable
+import at.bitfire.davdroid.log.Logger
+import java.io.Writer
+
+@Suppress("ClassName")
+@Database(entities = [
+    Service::class,
+    HomeSet::class,
+    Collection::class
+], exportSchema = true, version = 8)
+@TypeConverters(Converters::class)
+abstract class AppDatabase: RoomDatabase() {
+
+    abstract fun serviceDao(): ServiceDao
+    abstract fun homeSetDao(): HomeSetDao
+    abstract fun collectionDao(): CollectionDao
+
+    companion object: AndroidSingleton<AppDatabase>() {
+
+        override fun createInstance(context: Context): AppDatabase =
+                Room.databaseBuilder(context.applicationContext, AppDatabase::class.java, "services.db")
+                    .addMigrations(*migrations)
+                    .fallbackToDestructiveMigration()   // as a last fallback, recreate database instead of crashing
+                    .build()
+
+
+        // migrations
+
+        val migrations: Array<Migration> = arrayOf(
+            object : Migration(7, 8) {
+                override fun migrate(db: SupportSQLiteDatabase) {
+                    db.execSQL("ALTER TABLE homeset ADD COLUMN personal INTEGER NOT NULL DEFAULT 1")
+                    db.execSQL("ALTER TABLE collection ADD COLUMN homeSetId INTEGER DEFAULT NULL REFERENCES homeset(id) ON DELETE SET NULL")
+                    db.execSQL("ALTER TABLE collection ADD COLUMN owner TEXT DEFAULT NULL")
+                    db.execSQL("CREATE INDEX index_collection_homeSetId_type ON collection(homeSetId, type)")
+                }
+            },
+
+            object : Migration(6, 7) {
+                override fun migrate(db: SupportSQLiteDatabase) {
+                    db.execSQL("ALTER TABLE homeset ADD COLUMN privBind INTEGER NOT NULL DEFAULT 1")
+                    db.execSQL("ALTER TABLE homeset ADD COLUMN displayName TEXT DEFAULT NULL")
+                }
+            },
+
+            object : Migration(5, 6) {
+                override fun migrate(db: SupportSQLiteDatabase) {
+                    val sql = arrayOf(
+                        // migrate "services" to "service": rename columns, make id NOT NULL
+                        "CREATE TABLE service(" +
+                                "id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT," +
+                                "accountName TEXT NOT NULL," +
+                                "type TEXT NOT NULL," +
+                                "principal TEXT DEFAULT NULL" +
+                                ")",
+                        "CREATE UNIQUE INDEX index_service_accountName_type ON service(accountName, type)",
+                        "INSERT INTO service(id, accountName, type, principal) SELECT _id, accountName, service, principal FROM services",
+                        "DROP TABLE services",
+
+                        // migrate "homesets" to "homeset": rename columns, make id NOT NULL
+                        "CREATE TABLE homeset(" +
+                                "id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT," +
+                                "serviceId INTEGER NOT NULL," +
+                                "url TEXT NOT NULL," +
+                                "FOREIGN KEY (serviceId) REFERENCES service(id) ON DELETE CASCADE" +
+                                ")",
+                        "CREATE UNIQUE INDEX index_homeset_serviceId_url ON homeset(serviceId, url)",
+                        "INSERT INTO homeset(id, serviceId, url) SELECT _id, serviceID, url FROM homesets",
+                        "DROP TABLE homesets",
+
+                        // migrate "collections" to "collection": rename columns, make id NOT NULL
+                        "CREATE TABLE collection(" +
+                                "id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT," +
+                                "serviceId INTEGER NOT NULL," +
+                                "type TEXT NOT NULL," +
+                                "url TEXT NOT NULL," +
+                                "privWriteContent INTEGER NOT NULL DEFAULT 1," +
+                                "privUnbind INTEGER NOT NULL DEFAULT 1," +
+                                "forceReadOnly INTEGER NOT NULL DEFAULT 0," +
+                                "displayName TEXT DEFAULT NULL," +
+                                "description TEXT DEFAULT NULL," +
+                                "color INTEGER DEFAULT NULL," +
+                                "timezone TEXT DEFAULT NULL," +
+                                "supportsVEVENT INTEGER DEFAULT NULL," +
+                                "supportsVTODO INTEGER DEFAULT NULL," +
+                                "supportsVJOURNAL INTEGER DEFAULT NULL," +
+                                "source TEXT DEFAULT NULL," +
+                                "sync INTEGER NOT NULL DEFAULT 0," +
+                                "FOREIGN KEY (serviceId) REFERENCES service(id) ON DELETE CASCADE" +
+                                ")",
+                        "CREATE INDEX index_collection_serviceId_type ON collection(serviceId,type)",
+                        "INSERT INTO collection(id, serviceId, type, url, privWriteContent, privUnbind, forceReadOnly, displayName, description, color, timezone, supportsVEVENT, supportsVTODO, source, sync) " +
+                                "SELECT _id, serviceID, type, url, privWriteContent, privUnbind, forceReadOnly, displayName, description, color, timezone, supportsVEVENT, supportsVTODO, source, sync FROM collections",
+                        "DROP TABLE collections"
+                    )
+                    sql.forEach { db.execSQL(it) }
+                }
+            },
+
+            object : Migration(4, 5) {
+                override fun migrate(db: SupportSQLiteDatabase) {
+                    db.execSQL("ALTER TABLE collections ADD COLUMN privWriteContent INTEGER DEFAULT 0 NOT NULL")
+                    db.execSQL("UPDATE collections SET privWriteContent=NOT readOnly")
+
+                    db.execSQL("ALTER TABLE collections ADD COLUMN privUnbind INTEGER DEFAULT 0 NOT NULL")
+                    db.execSQL("UPDATE collections SET privUnbind=NOT readOnly")
+
+                    // there's no DROP COLUMN in SQLite, so just keep the "readOnly" column
+                }
+            },
+
+            object : Migration(3, 4) {
+                override fun migrate(db: SupportSQLiteDatabase) {
+                    db.execSQL("ALTER TABLE collections ADD COLUMN forceReadOnly INTEGER DEFAULT 0 NOT NULL")
+                }
+            },
+
+            object : Migration(2, 3) {
+                override fun migrate(db: SupportSQLiteDatabase) {
+                    // We don't have access to the context in a Room migration now, so
+                    // we will just drop those settings from old DAVx5 versions.
+                    Logger.log.warning("Dropping settings distrustSystemCerts and overrideProxy*")
+
+                    /*val edit = PreferenceManager.getDefaultSharedPreferences(context).edit()
+                    try {
+                        db.query("settings", arrayOf("setting", "value"), null, null, null, null, null).use { cursor ->
+                            while (cursor.moveToNext()) {
+                                when (cursor.getString(0)) {
+                                    "distrustSystemCerts" -> edit.putBoolean(App.DISTRUST_SYSTEM_CERTIFICATES, cursor.getInt(1) != 0)
+                                    "overrideProxy" -> edit.putBoolean(App.OVERRIDE_PROXY, cursor.getInt(1) != 0)
+                                    "overrideProxyHost" -> edit.putString(App.OVERRIDE_PROXY_HOST, cursor.getString(1))
+                                    "overrideProxyPort" -> edit.putInt(App.OVERRIDE_PROXY_PORT, cursor.getInt(1))
+
+                                    StartupDialogFragment.HINT_GOOGLE_PLAY_ACCOUNTS_REMOVED ->
+                                        edit.putBoolean(StartupDialogFragment.HINT_GOOGLE_PLAY_ACCOUNTS_REMOVED, cursor.getInt(1) != 0)
+                                    StartupDialogFragment.HINT_OPENTASKS_NOT_INSTALLED ->
+                                        edit.putBoolean(StartupDialogFragment.HINT_OPENTASKS_NOT_INSTALLED, cursor.getInt(1) != 0)
+                                }
+                            }
+                        }
+                        db.execSQL("DROP TABLE settings")
+                    } finally {
+                        edit.apply()
+                    }*/
+                }
+            },
+
+            object : Migration(1, 2) {
+                override fun migrate(db: SupportSQLiteDatabase) {
+                    db.execSQL("ALTER TABLE collections ADD COLUMN type TEXT NOT NULL DEFAULT ''")
+                    db.execSQL("ALTER TABLE collections ADD COLUMN source TEXT DEFAULT NULL")
+                    db.execSQL("UPDATE collections SET type=(" +
+                            "SELECT CASE service WHEN ? THEN ? ELSE ? END " +
+                            "FROM services WHERE _id=collections.serviceID" +
+                            ")",
+                            arrayOf("caldav", "CALENDAR", "ADDRESS_BOOK"))
+                }
+            }
+        )
+
+    }
+
+
+    fun dump(writer: Writer) {
+        val db = openHelper.readableDatabase
+        db.beginTransactionNonExclusive()
+
+        // iterate through all tables
+        db.query(SQLiteQueryBuilder.buildQueryString(false, "sqlite_master", arrayOf("name"), "type='table'", null, null, null, null)).use { cursorTables ->
+            while (cursorTables.moveToNext()) {
+                val tableName = cursorTables.getString(0)
+
+                writer.append("$tableName\n")
+                db.query("SELECT * FROM $tableName").use { cursor ->
+                    val table = TextTable(*cursor.columnNames)
+                    val cols = cursor.columnCount
+                    // print rows
+                    while (cursor.moveToNext()) {
+                        val values = Array<String?>(cols) { idx -> cursor.getStringOrNull(idx) }
+                        table.addLine(*values)
+                    }
+                    writer.append(table.toString())
+                }
+            }
+            db.endTransaction()
+        }
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/model/Collection.kt

@@ -0,0 +1,169 @@
+package at.bitfire.davdroid.model
+
+import androidx.room.*
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.UrlUtils
+import at.bitfire.dav4jvm.property.*
+import at.bitfire.davdroid.DavUtils
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import org.apache.commons.lang3.StringUtils
+
+@Entity(tableName = "collection",
+        foreignKeys = [
+            ForeignKey(entity = Service::class, parentColumns = arrayOf("id"), childColumns = arrayOf("serviceId"), onDelete = ForeignKey.CASCADE),
+            ForeignKey(entity = HomeSet::class, parentColumns = arrayOf("id"), childColumns = arrayOf("homeSetId"), onDelete = ForeignKey.SET_NULL)
+        ],
+        indices = [
+            Index("serviceId","type"),
+            Index("homeSetId","type")
+        ]
+)
+data class Collection(
+    @PrimaryKey(autoGenerate = true)
+    override var id: Long = 0,
+
+    var serviceId: Long = 0,
+    var homeSetId: Long? = null,
+
+    var type: String,
+    var url: HttpUrl,
+
+    var privWriteContent: Boolean = true,
+    var privUnbind: Boolean = true,
+    var forceReadOnly: Boolean = false,
+
+    var displayName: String? = null,
+    var description: String? = null,
+    var owner: HttpUrl? = null,
+
+    // CalDAV only
+    var color: Int? = null,
+
+    /** timezone definition (full VTIMEZONE) - not a TZID! **/
+    var timezone: String? = null,
+
+    /** whether the collection supports VEVENT; in case of calendars: null means true */
+    var supportsVEVENT: Boolean? = null,
+
+    /** whether the collection supports VTODO; in case of calendars: null means true */
+    var supportsVTODO: Boolean? = null,
+
+    /** whether the collection supports VJOURNAL; in case of calendars: null means true */
+    var supportsVJOURNAL: Boolean? = null,
+
+    /** Webcal subscription source URL */
+    var source: HttpUrl? = null,
+
+    /** whether this collection has been selected for synchronization */
+    var sync: Boolean = false
+
+): IdEntity() {
+
+    @Ignore
+    var refHomeSet: HomeSet? = null
+
+
+    companion object {
+
+        const val TYPE_ADDRESSBOOK = "ADDRESS_BOOK"
+        const val TYPE_CALENDAR = "CALENDAR"
+        const val TYPE_WEBCAL = "WEBCAL"
+
+        /**
+         * Generates a collection entity from a WebDAV response.
+         * @param dav WebDAV response
+         * @return null if the response doesn't represent a collection
+         */
+        fun fromDavResponse(dav: Response): Collection? {
+            val url = UrlUtils.withTrailingSlash(dav.href)
+            val type: String = dav[ResourceType::class.java]?.let { resourceType ->
+                when {
+                    resourceType.types.contains(ResourceType.ADDRESSBOOK) -> TYPE_ADDRESSBOOK
+                    resourceType.types.contains(ResourceType.CALENDAR)    -> TYPE_CALENDAR
+                    resourceType.types.contains(ResourceType.SUBSCRIBED)  -> TYPE_WEBCAL
+                    else -> null
+                }
+            } ?: return null
+
+            var privWriteContent = true
+            var privUnbind = true
+            dav[CurrentUserPrivilegeSet::class.java]?.let { privilegeSet ->
+                privWriteContent = privilegeSet.mayWriteContent
+                privUnbind = privilegeSet.mayUnbind
+            }
+
+            val displayName = StringUtils.trimToNull(dav[DisplayName::class.java]?.displayName)
+            val owner = dav[Owner::class.java]?.href?.let { ownerHref ->
+                dav.href.resolve(ownerHref)
+            }
+
+            var description: String? = null
+            var color: Int? = null
+            var timezone: String? = null
+            var supportsVEVENT: Boolean? = null
+            var supportsVTODO: Boolean? = null
+            var supportsVJOURNAL: Boolean? = null
+            var source: HttpUrl? = null
+            when (type) {
+                TYPE_ADDRESSBOOK -> {
+                    dav[AddressbookDescription::class.java]?.let { description = it.description }
+                }
+                TYPE_CALENDAR, TYPE_WEBCAL -> {
+                    dav[CalendarDescription::class.java]?.let { description = it.description }
+                    dav[CalendarColor::class.java]?.let { color = it.color }
+                    dav[CalendarTimezone::class.java]?.let { timezone = it.vTimeZone }
+
+                    if (type == TYPE_CALENDAR) {
+                        supportsVEVENT = true
+                        supportsVTODO = true
+                        supportsVJOURNAL = true
+                        dav[SupportedCalendarComponentSet::class.java]?.let {
+                            supportsVEVENT = it.supportsEvents
+                            supportsVTODO = it.supportsTasks
+                            supportsVJOURNAL = it.supportsJournal
+                        }
+                    } else { // Type.WEBCAL
+                        dav[Source::class.java]?.let {
+                            source = it.hrefs.firstOrNull()?.let { rawHref ->
+                                val href = rawHref
+                                        .replace("^webcal://".toRegex(), "http://")
+                                        .replace("^webcals://".toRegex(), "https://")
+                                href.toHttpUrlOrNull()
+                            }
+                        }
+                        supportsVEVENT = true
+                    }
+                }
+            }
+
+            return Collection(
+                    type = type,
+                    url = url,
+                    privWriteContent = privWriteContent,
+                    privUnbind = privUnbind,
+                    displayName = displayName,
+                    owner = owner,
+                    description = description,
+                    color = color,
+                    timezone = timezone,
+                    supportsVEVENT = supportsVEVENT,
+                    supportsVTODO = supportsVTODO,
+                    supportsVJOURNAL = supportsVJOURNAL,
+                    source = source
+            )
+        }
+
+    }
+
+
+    // non-persistent properties
+    @Ignore
+    var confirmed: Boolean = false
+
+
+    // calculated properties
+    fun title() = displayName ?: DavUtils.lastSegmentOfUrl(url)
+    fun readOnly() = forceReadOnly || !privWriteContent
+
+}

app/src/main/java/at/bitfire/davdroid/model/CollectionDao.kt

@@ -0,0 +1,52 @@
+package at.bitfire.davdroid.model
+
+import androidx.lifecycle.LiveData
+import androidx.paging.DataSource
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface CollectionDao: SyncableDao<Collection> {
+
+    @Query("SELECT * FROM collection WHERE id=:id")
+    fun get(id: Long): Collection?
+
+    @Query("SELECT * FROM collection WHERE serviceId=:serviceId")
+    fun getByService(serviceId: Long): List<Collection>
+
+    @Query("SELECT * FROM collection WHERE serviceId=:serviceId AND type=:type ORDER BY displayName, url")
+    fun getByServiceAndType(serviceId: Long, type: String): List<Collection>
+
+    /**
+     * Returns collections which
+     *   - support VEVENT and/or VTODO (= supported calendar collections), or
+     *   - have supportsVEVENT = supportsVTODO = null (= address books)
+     */
+    @Query("SELECT * FROM collection WHERE serviceId=:serviceId AND type=:type " +
+            "AND (supportsVTODO OR supportsVEVENT OR (supportsVEVENT IS NULL AND supportsVTODO IS NULL)) ORDER BY displayName, URL")
+    fun pageByServiceAndType(serviceId: Long, type: String): DataSource.Factory<Int, Collection>
+
+    @Query("SELECT * FROM collection WHERE serviceId=:serviceId AND sync")
+    fun getByServiceAndSync(serviceId: Long): List<Collection>
+
+    @Query("SELECT collection.* FROM collection, homeset WHERE collection.serviceId=:serviceId AND type=:type AND homeSetId=homeset.id AND homeset.personal ORDER BY collection.displayName, collection.url")
+    fun pagePersonalByServiceAndType(serviceId: Long, type: String): DataSource.Factory<Int, Collection>
+
+    @Query("SELECT COUNT(*) FROM collection WHERE serviceId=:serviceId AND sync")
+    fun observeHasSyncByService(serviceId: Long): LiveData<Boolean>
+
+    @Query("SELECT * FROM collection WHERE serviceId=:serviceId AND type='${Collection.TYPE_CALENDAR}' AND supportsVEVENT AND sync ORDER BY displayName, url")
+    fun getSyncCalendars(serviceId: Long): List<Collection>
+
+    @Query("SELECT * FROM collection WHERE serviceId=:serviceId AND type='${Collection.TYPE_CALENDAR}' AND supportsVTODO AND sync ORDER BY displayName, url")
+    fun getSyncTaskLists(serviceId: Long): List<Collection>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertOrReplace(collection: Collection)
+
+    @Insert
+    fun insert(collection: Collection)
+
+}

app/src/main/java/at/bitfire/davdroid/model/CollectionInfo.kt

@@ -1,140 +0,0 @@
-/*
- * Copyright © Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid.model
-
-import android.content.ContentValues
-import at.bitfire.dav4android.DavResource
-import at.bitfire.dav4android.property.*
-import at.bitfire.davdroid.model.ServiceDB.Collections
-import java.io.Serializable
-
-data class CollectionInfo @JvmOverloads constructor(
-        val url: String,
-
-        var id: Long? = null,
-        var serviceID: Long? = null,
-
-        var type: Type? = null,
-
-        var readOnly: Boolean = false,
-        var displayName: String? = null,
-        var description: String? = null,
-        var color: Int? = null,
-
-        var timeZone: String? = null,
-        var supportsVEVENT: Boolean = false,
-        var supportsVTODO: Boolean = false,
-
-        var selected: Boolean = false,
-
-        // non-persistent properties
-        var confirmed: Boolean = false
-): Serializable {
-
-    enum class Type {
-        ADDRESS_BOOK,
-        CALENDAR
-    }
-
-    companion object {
-
-        @JvmField
-        val DAV_PROPERTIES = arrayOf(
-            ResourceType.NAME,
-            CurrentUserPrivilegeSet.NAME,
-            DisplayName.NAME,
-            AddressbookDescription.NAME, SupportedAddressData.NAME,
-            CalendarDescription.NAME, CalendarColor.NAME, SupportedCalendarComponentSet.NAME
-        )
-
-    }
-
-
-    constructor(dav: DavResource): this(dav.location.toString()) {
-        (dav.properties[ResourceType.NAME] as ResourceType?)?.let { type ->
-            when {
-                type.types.contains(ResourceType.ADDRESSBOOK) -> this.type = Type.ADDRESS_BOOK
-                type.types.contains(ResourceType.CALENDAR)    -> this.type = Type.CALENDAR
-            }
-        }
-
-        (dav.properties[CurrentUserPrivilegeSet.NAME] as CurrentUserPrivilegeSet?)?.let { privilegeSet ->
-            readOnly = !privilegeSet.mayWriteContent
-        }
-
-        (dav.properties[DisplayName.NAME] as DisplayName?)?.let {
-            if (!it.displayName.isNullOrEmpty())
-                displayName = it.displayName
-        }
-
-        when (type) {
-            Type.ADDRESS_BOOK -> {
-                (dav.properties[AddressbookDescription.NAME] as AddressbookDescription?)?.let { description = it.description }
-            }
-            Type.CALENDAR -> {
-                (dav.properties[CalendarDescription.NAME] as CalendarDescription?)?.let { description = it.description }
-                (dav.properties[CalendarColor.NAME] as CalendarColor?)?.let { color = it.color }
-                (dav.properties[CalendarTimezone.NAME] as CalendarTimezone?)?.let { timeZone = it.vTimeZone }
-
-                supportsVEVENT = true
-                supportsVTODO = true
-                (dav.properties[SupportedCalendarComponentSet.NAME] as SupportedCalendarComponentSet?)?.let {
-                    supportsVEVENT = it.supportsEvents
-                    supportsVTODO = it.supportsTasks
-                }
-            }
-        }
-    }
-
-
-    constructor(values: ContentValues): this(values.getAsString(Collections.URL)) {
-        id = values.getAsLong(Collections.ID)
-        serviceID = values.getAsLong(Collections.SERVICE_ID)
-
-        readOnly = values.getAsInteger(Collections.READ_ONLY) != 0
-        displayName = values.getAsString(Collections.DISPLAY_NAME)
-        description = values.getAsString(Collections.DESCRIPTION)
-
-        color = values.getAsInteger(Collections.COLOR)
-
-        timeZone = values.getAsString(Collections.TIME_ZONE)
-        supportsVEVENT = getAsBooleanOrNull(values, Collections.SUPPORTS_VEVENT) ?: false
-        supportsVTODO = getAsBooleanOrNull(values, Collections.SUPPORTS_VTODO) ?: false
-
-        selected = values.getAsInteger(Collections.SYNC) != 0
-    }
-
-    fun toDB(): ContentValues {
-        val values = ContentValues()
-        // Collections.SERVICE_ID is never changed
-
-        values.put(Collections.URL, url)
-        values.put(Collections.READ_ONLY, if (readOnly) 1 else 0)
-        values.put(Collections.DISPLAY_NAME, displayName)
-        values.put(Collections.DESCRIPTION, description)
-        values.put(Collections.COLOR, color)
-
-        values.put(Collections.TIME_ZONE, timeZone)
-        values.put(Collections.SUPPORTS_VEVENT, if (supportsVEVENT) 1 else 0)
-        values.put(Collections.SUPPORTS_VTODO, if (supportsVTODO) 1 else 0)
-
-        values.put(Collections.SYNC, if (selected) 1 else 0)
-        return values
-    }
-
-
-    private fun getAsBooleanOrNull(values: ContentValues, field: String): Boolean? {
-        val i = values.getAsInteger(field)
-        return if (i == null)
-            null
-        else
-            (i != 0)
-    }
-
-}

app/src/main/java/at/bitfire/davdroid/model/Converters.kt

@@ -0,0 +1,17 @@
+package at.bitfire.davdroid.model
+
+import androidx.room.TypeConverter
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+
+class Converters {
+
+    @TypeConverter
+    fun httpUrlToString(url: HttpUrl?) =
+            url?.toString()
+
+    @TypeConverter
+    fun stringToHttpUrl(url: String?): HttpUrl? =
+            url?.toHttpUrlOrNull()
+
+}

app/src/main/java/at/bitfire/davdroid/model/Credentials.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright © Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.model
+
+class Credentials(
+        val userName: String? = null,
+        val password: String? = null,
+        val certificateAlias: String? = null
+) {
+
+    override fun toString(): String {
+        val maskedPassword = "*****".takeIf { password != null }
+        return "Credentials(userName=$userName, password=$maskedPassword, certificateAlias=$certificateAlias)"
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/model/DaoTools.kt

@@ -0,0 +1,46 @@
+package at.bitfire.davdroid.model
+
+import at.bitfire.davdroid.log.Logger
+import java.util.logging.Level
+
+class DaoTools<T: IdEntity>(dao: SyncableDao<T>): SyncableDao<T> by dao {
+
+    /**
+     * Synchronizes a list of "old" elements with a list of "new" elements so that the list
+     * only contain equal elements.
+     *
+     * @param allOld      list of old elements
+     * @param allNew      map of new elements (stored in key map)
+     * @param selectKey   generates a unique key from the element (will be called on old elements)
+     * @param prepareNew  prepares new elements (can be used to take over properties of old elements)
+     */
+    fun <K> syncAll(allOld: List<T>, allNew: Map<K,T>, selectKey: (T) -> K, prepareNew: (new: T, old: T) -> Unit = { _, _ -> }) {
+        Logger.log.log(Level.FINE, "Syncing tables", arrayOf(allOld, allNew))
+        val remainingNew = allNew.toMutableMap()
+        allOld.forEach { old ->
+            val key = selectKey(old)
+            val matchingNew = remainingNew[key]
+            if (matchingNew != null) {
+                // keep this old item, but maybe update it
+                matchingNew.id = old.id     // identity is proven by key
+                prepareNew(matchingNew, old)
+
+                if (matchingNew != old)
+                    update(matchingNew)
+
+                // remove from remainingNew
+                remainingNew -= key
+            } else {
+                // this old item is not present anymore, delete it
+                delete(old)
+            }
+        }
+
+        val toInsert = remainingNew.values.toList()
+        val insertIds = insert(toInsert)
+        insertIds.withIndex().forEach { (idx, id) ->
+            toInsert[idx].id = id
+        }
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/model/HomeSet.kt

@@ -0,0 +1,34 @@
+package at.bitfire.davdroid.model
+
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import okhttp3.HttpUrl
+
+@Entity(tableName = "homeset",
+        foreignKeys = [
+            ForeignKey(entity = Service::class, parentColumns = arrayOf("id"), childColumns = arrayOf("serviceId"), onDelete = ForeignKey.CASCADE)
+        ],
+        indices = [
+            // index by service; no duplicate URLs per service
+            Index("serviceId", "url", unique = true)
+        ]
+)
+data class HomeSet(
+    @PrimaryKey(autoGenerate = true)
+    override var id: Long,
+
+    var serviceId: Long,
+
+    /**
+     * Whether this homeset belongs to the [Service.principal] given by [serviceId].
+     */
+    var personal: Boolean,
+
+    var url: HttpUrl,
+
+    var privBind: Boolean = true,
+
+    var displayName: String? = null
+): IdEntity()

app/src/main/java/at/bitfire/davdroid/model/HomeSetDao.kt

@@ -0,0 +1,24 @@
+package at.bitfire.davdroid.model
+
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface HomeSetDao: SyncableDao<HomeSet> {
+
+    @Query("SELECT * FROM homeset WHERE serviceId=:serviceId")
+    fun getByService(serviceId: Long): List<HomeSet>
+
+    @Query("SELECT * FROM homeset WHERE serviceId=:serviceId AND privBind")
+    fun getBindableByService(serviceId: Long): List<HomeSet>
+
+    @Query("SELECT COUNT(*) FROM homeset WHERE serviceId=:serviceId AND privBind")
+    fun hasBindableByService(serviceId: Long): LiveData<Boolean>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertOrReplace(homeSet: HomeSet): Long
+
+}

app/src/main/java/at/bitfire/davdroid/model/IdEntity.kt

@@ -0,0 +1,5 @@
+package at.bitfire.davdroid.model
+
+abstract class IdEntity {
+    abstract var id: Long
+}

app/src/main/java/at/bitfire/davdroid/model/Service.kt

@@ -0,0 +1,28 @@
+package at.bitfire.davdroid.model
+
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import okhttp3.HttpUrl
+
+@Entity(tableName = "service",
+        indices = [
+            // only one service per type and account
+            Index("accountName", "type", unique = true)
+        ])
+data class Service(
+    @PrimaryKey(autoGenerate = true)
+    var id: Long,
+
+    var accountName: String,
+    var type: String,
+
+    var principal: HttpUrl?
+) {
+
+    companion object {
+        const val TYPE_CALDAV = "caldav"
+        const val TYPE_CARDDAV = "carddav"
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/model/ServiceDB.kt

@@ -1,176 +0,0 @@
-/*
- * Copyright © Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid.model
-
-import android.content.ContentValues
-import android.content.Context
-import android.database.sqlite.SQLiteDatabase
-import android.database.sqlite.SQLiteException
-import android.database.sqlite.SQLiteOpenHelper
-import at.bitfire.davdroid.log.Logger
-import java.io.Closeable
-
-class ServiceDB {
-
-    object Settings {
-        @JvmField val _TABLE = "settings"
-        @JvmField val NAME = "setting"
-        @JvmField val VALUE = "value"
-    }
-
-    object Services {
-        @JvmField val _TABLE = "services"
-        @JvmField val ID = "_id"
-        @JvmField val ACCOUNT_NAME = "accountName"
-        @JvmField val SERVICE = "service"
-        @JvmField val PRINCIPAL = "principal"
-
-        // allowed values for SERVICE column
-        @JvmField val SERVICE_CALDAV = "caldav"
-        @JvmField val SERVICE_CARDDAV = "carddav"
-    }
-
-    object HomeSets {
-        @JvmField val _TABLE = "homesets"
-        @JvmField val ID = "_id"
-        @JvmField val SERVICE_ID = "serviceID"
-        @JvmField val URL = "url"
-    }
-
-    object Collections {
-        @JvmField val _TABLE = "collections"
-        @JvmField val ID = "_id"
-        @JvmField val SERVICE_ID = "serviceID"
-        @JvmField val URL = "url"
-        @JvmField val READ_ONLY = "readOnly"
-        @JvmField val DISPLAY_NAME = "displayName"
-        @JvmField val DESCRIPTION = "description"
-        @JvmField val COLOR = "color"
-        @JvmField val TIME_ZONE = "timezone"
-        @JvmField val SUPPORTS_VEVENT = "supportsVEVENT"
-        @JvmField val SUPPORTS_VTODO = "supportsVTODO"
-        @JvmField val SYNC = "sync"
-    }
-
-    companion object {
-
-        @JvmStatic
-        fun onRenameAccount(db: SQLiteDatabase, oldName: String, newName: String) {
-            val values = ContentValues(1)
-            values.put(Services.ACCOUNT_NAME, newName)
-            db.update(Services._TABLE, values, Services.ACCOUNT_NAME + "=?", arrayOf(oldName))
-        }
-
-    }
-
-
-    class OpenHelper(
-            context: Context
-    ): SQLiteOpenHelper(context, DATABASE_NAME, null, DATABASE_VERSION), Closeable {
-
-        companion object {
-            val DATABASE_NAME = "services.db"
-            val DATABASE_VERSION = 1
-        }
-
-        override fun onConfigure(db: SQLiteDatabase) {
-            setWriteAheadLoggingEnabled(true)
-            db.setForeignKeyConstraintsEnabled(true)
-        }
-
-        override fun onCreate(db: SQLiteDatabase) {
-            Logger.log.info("Creating database " + db.path)
-
-            db.execSQL("CREATE TABLE ${Settings._TABLE}(" +
-                    "${Settings.NAME} TEXT NOT NULL," +
-                    "${Settings.VALUE} TEXT NOT NULL)")
-            db.execSQL("CREATE UNIQUE INDEX settings_name ON ${Settings._TABLE} (${Settings.NAME})")
-
-            db.execSQL("CREATE TABLE ${Services._TABLE}(" +
-                    "${Services.ID} INTEGER PRIMARY KEY AUTOINCREMENT," +
-                    "${Services.ACCOUNT_NAME} TEXT NOT NULL," +
-                    "${Services.SERVICE} TEXT NOT NULL," +
-                    "${Services.PRINCIPAL} TEXT NULL)")
-            db.execSQL("CREATE UNIQUE INDEX services_account ON ${Services._TABLE} (${Services.ACCOUNT_NAME},${Services.SERVICE})")
-
-            db.execSQL("CREATE TABLE ${HomeSets._TABLE}(" +
-                    "${HomeSets.ID} INTEGER PRIMARY KEY AUTOINCREMENT," +
-                    "${HomeSets.SERVICE_ID} INTEGER NOT NULL REFERENCES ${Services._TABLE} ON DELETE CASCADE," +
-                    "${HomeSets.URL} TEXT NOT NULL)")
-            db.execSQL("CREATE UNIQUE INDEX homesets_service_url ON ${HomeSets._TABLE}(${HomeSets.SERVICE_ID},${HomeSets.URL})")
-
-            db.execSQL("CREATE TABLE ${Collections._TABLE}(" +
-                    "${Collections.ID} INTEGER PRIMARY KEY AUTOINCREMENT," +
-                    "${Collections.SERVICE_ID} INTEGER NOT NULL REFERENCES ${Services._TABLE} ON DELETE CASCADE," +
-                    "${Collections.URL} TEXT NOT NULL," +
-                    "${Collections.READ_ONLY} INTEGER DEFAULT 0 NOT NULL," +
-                    "${Collections.DISPLAY_NAME} TEXT NULL," +
-                    "${Collections.DESCRIPTION} TEXT NULL," +
-                    "${Collections.COLOR} INTEGER NULL," +
-                    "${Collections.TIME_ZONE} TEXT NULL," +
-                    "${Collections.SUPPORTS_VEVENT} INTEGER NULL," +
-                    "${Collections.SUPPORTS_VTODO} INTEGER NULL," +
-                    "${Collections.SYNC} INTEGER DEFAULT 0 NOT NULL)")
-            db.execSQL("CREATE UNIQUE INDEX collections_service_url ON ${Collections._TABLE}(${Collections.SERVICE_ID},${Collections.URL})")
-        }
-
-        override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-            // no different versions yet
-        }
-
-
-        fun dump(sb: StringBuilder) {
-            val db = readableDatabase
-            db.beginTransactionNonExclusive()
-
-            // iterate through all tables
-            db.query("sqlite_master", arrayOf("name"), "type='table'", null, null, null, null).use { cursorTables ->
-                while (cursorTables.moveToNext()) {
-                    val table = cursorTables.getString(0)
-                    sb.append(table).append("\n")
-                    db.query(table, null, null, null, null, null, null).use { cursor ->
-                        // print columns
-                        val cols = cursor.columnCount
-                        sb.append("\t| ")
-                        for (i in 0 .. cols-1)
-                            sb  .append(" ")
-                                .append(cursor.getColumnName(i))
-                                .append(" |")
-                        sb.append("\n")
-
-                        // print rows
-                        while (cursor.moveToNext()) {
-                            sb.append("\t| ")
-                            for (i in 0 .. cols-1) {
-                                sb.append(" ")
-                                try {
-                                    val value = cursor.getString(i)
-                                    if (value != null)
-                                        sb.append(value
-                                                .replace("\r", "<CR>")
-                                                .replace("\n", "<LF>"))
-                                    else
-                                        sb.append("<null>")
-
-                                } catch (e: SQLiteException) {
-                                    sb.append("<unprintable>")
-                                }
-                                sb.append(" |")
-                            }
-                            sb.append("\n")
-                        }
-                        sb.append("----------\n")
-                    }
-                }
-                db.endTransaction()
-            }
-        }
-    }
-
-}

app/src/main/java/at/bitfire/davdroid/model/ServiceDao.kt

@@ -0,0 +1,33 @@
+package at.bitfire.davdroid.model
+
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface ServiceDao {
+
+    @Query("SELECT * FROM service WHERE accountName=:accountName AND type=:type")
+    fun getByAccountAndType(accountName: String, type: String): Service?
+
+    @Query("SELECT id FROM service WHERE accountName=:accountName AND type=:type")
+    fun getIdByAccountAndType(accountName: String, type: String): LiveData<Long>
+
+    @Query("SELECT * FROM service WHERE id=:id")
+    fun get(id: Long): Service?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertOrReplace(service: Service): Long
+
+    @Query("DELETE FROM service")
+    fun deleteAll()
+
+    @Query("DELETE FROM service WHERE accountName NOT IN (:accountNames)")
+    fun deleteExceptAccounts(accountNames: Array<String>)
+
+    @Query("UPDATE service SET accountName=:newName WHERE accountName=:oldName")
+    fun renameAccount(oldName: String, newName: String)
+
+}

app/src/main/java/at/bitfire/davdroid/model/Settings.kt

@@ -1,94 +0,0 @@
-/*
- * Copyright © Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- */
-
-package at.bitfire.davdroid.model
-
-import android.content.BroadcastReceiver
-import android.content.ContentValues;
-import android.content.Context
-import android.content.Intent
-import android.database.sqlite.SQLiteDatabase
-import at.bitfire.davdroid.CustomCertificates
-import at.bitfire.davdroid.log.Logger
-
-class Settings(
-        val db: SQLiteDatabase
-) {
-
-    fun getBoolean(name: String, defaultValue: Boolean): Boolean {
-        db.query(ServiceDB.Settings._TABLE, arrayOf(ServiceDB.Settings.VALUE),
-                "${ServiceDB.Settings.NAME}=?", arrayOf(name), null, null, null)?.use { cursor ->
-            if (cursor.moveToNext() && !cursor.isNull(0))
-                return cursor.getInt(0) != 0
-        }
-        return defaultValue
-    }
-
-    fun putBoolean(name: String, value: Boolean) {
-        val values = ContentValues(2)
-        values.put(ServiceDB.Settings.NAME, name)
-        values.put(ServiceDB.Settings.VALUE, if (value) 1 else 0)
-        db.insertWithOnConflict(ServiceDB.Settings._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE)
-    }
-
-
-    fun getInt(name: String, defaultValue: Int): Int {
-        db.query(ServiceDB.Settings._TABLE, arrayOf(ServiceDB.Settings.VALUE),
-                "${ServiceDB.Settings.NAME}=?", arrayOf(name), null, null, null)?.use { cursor ->
-            if (cursor.moveToNext() && !cursor.isNull(0))
-                return if (cursor.isNull(0)) defaultValue else cursor.getInt(0)
-        }
-        return defaultValue
-    }
-
-    fun putInt(name: String, value: Int?) {
-        val values = ContentValues(2)
-        values.put(ServiceDB.Settings.NAME, name)
-        values.put(ServiceDB.Settings.VALUE, value)
-        db.insertWithOnConflict(ServiceDB.Settings._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE)
-    }
-
-
-    fun getString(name: String, defaultValue: String?): String? {
-        db.query(ServiceDB.Settings._TABLE, arrayOf(ServiceDB.Settings.VALUE),
-                "${ServiceDB.Settings.NAME}=?", arrayOf(name), null, null, null)?.use { cursor ->
-            if (cursor.moveToNext())
-                return cursor.getString(0)
-        }
-        return defaultValue
-    }
-
-    fun putString(name: String, value: String?) {
-        val values = ContentValues(2)
-        values.put(ServiceDB.Settings.NAME, name)
-        values.put(ServiceDB.Settings.VALUE, value)
-        db.insertWithOnConflict(ServiceDB.Settings._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE)
-    }
-
-
-    fun remove(name: String) {
-        db.delete(ServiceDB.Settings._TABLE, "${ServiceDB.Settings.NAME}=?", arrayOf(name))
-    }
-
-
-    class ReinitSettingsReceiver: BroadcastReceiver() {
-
-        companion object {
-            @JvmField val ACTION_REINIT_SETTINGS = "at.bitfire.davdroid.REINIT_SETTINGS"
-        }
-
-        override fun onReceive(context: Context, intent: Intent) {
-            Logger.log.info("Received broadcast: re-initializing settings (logger/cert manager)")
-
-            CustomCertificates.reinitCertManager(context)
-            Logger.reinitLogger(context)
-        }
-
-    }
-
-}

app/src/main/java/at/bitfire/davdroid/model/SyncState.kt

@@ -0,0 +1,63 @@
+/*
+ * Copyright © Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.model
+
+import at.bitfire.dav4jvm.property.SyncToken
+import org.json.JSONException
+import org.json.JSONObject
+
+data class SyncState(
+        val type: Type,
+        val value: String,
+
+        /**
+         * Whether this sync state occurred during an initial sync as described
+         * in RFC 6578, which means the initial sync is not complete yet.
+         */
+        var initialSync: Boolean? = null
+) {
+
+    companion object {
+
+        private const val KEY_TYPE = "type"
+        private const val KEY_VALUE = "value"
+        private const val KEY_INITIAL_SYNC = "initialSync"
+
+        fun fromString(s: String?): SyncState? {
+            if (s == null)
+                return null
+
+            return try {
+                val json = JSONObject(s)
+                SyncState(
+                        Type.valueOf(json.getString(KEY_TYPE)),
+                        json.getString(KEY_VALUE),
+                        try { json.getBoolean(KEY_INITIAL_SYNC) } catch(e: JSONException) { null }
+                )
+            } catch (e: JSONException) {
+                null
+            }
+        }
+
+        fun fromSyncToken(token: SyncToken, initialSync: Boolean? = null) =
+                SyncState(Type.SYNC_TOKEN, requireNotNull(token.token), initialSync)
+
+    }
+
+    enum class Type { CTAG, SYNC_TOKEN }
+
+    override fun toString(): String {
+        val json = JSONObject()
+        json.put(KEY_TYPE, type.name)
+        json.put(KEY_VALUE, value)
+        initialSync?.let { json.put(KEY_INITIAL_SYNC, it) }
+        return json.toString()
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/model/SyncableDao.kt

@@ -0,0 +1,19 @@
+package at.bitfire.davdroid.model
+
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Update
+import java.util.*
+
+interface SyncableDao<T: IdEntity> {
+
+    @Insert
+    fun insert(items: List<T>): LongArray
+
+    @Update
+    fun update(item: T)
+
+    @Delete
+    fun delete(item: T)
+
+}

app/src/main/java/at/bitfire/davdroid/model/UnknownProperties.kt

@@ -6,23 +6,16 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package at.bitfire.davdroid.model;
+package at.bitfire.davdroid.model
 
-import android.provider.ContactsContract.RawContacts;
+import android.provider.ContactsContract.RawContacts
 
 object UnknownProperties {
 
-    @JvmField
-    val CONTENT_ITEM_TYPE = "x.davdroid/unknown-properties"
+    const val CONTENT_ITEM_TYPE = "x.davdroid/unknown-properties"
 
-
-    @JvmField
-    val MIMETYPE = RawContacts.Data.MIMETYPE
-
-    @JvmField
-    val RAW_CONTACT_ID = RawContacts.Data.RAW_CONTACT_ID
-
-    @JvmField
-    val UNKNOWN_PROPERTIES = RawContacts.Data.DATA1
+    const val MIMETYPE = RawContacts.Data.MIMETYPE
+    const val RAW_CONTACT_ID = RawContacts.Data.RAW_CONTACT_ID
+    const val UNKNOWN_PROPERTIES = RawContacts.Data.DATA1
 
 }

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

@@ -0,0 +1,17 @@
+/*
+ * Copyright © Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.bitfire.davdroid.resource
+
+import at.bitfire.vcard4android.Contact
+
+interface LocalAddress: LocalResource<Contact> {
+
+    fun resetDeleted()
+
+}

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

@@ -18,73 +18,84 @@ import android.provider.ContactsContract.CommonDataKinds.GroupMembership
 import android.provider.ContactsContract.Groups
 import android.provider.ContactsContract.RawContacts
 import android.util.Base64
-import at.bitfire.davdroid.App
 import at.bitfire.davdroid.DavUtils
+import at.bitfire.davdroid.R
 import at.bitfire.davdroid.log.Logger
-import at.bitfire.davdroid.model.CollectionInfo
+import at.bitfire.davdroid.model.Collection
+import at.bitfire.davdroid.model.SyncState
+import at.bitfire.davdroid.syncadapter.AccountUtils
 import at.bitfire.vcard4android.*
 import java.io.ByteArrayOutputStream
-import java.io.FileNotFoundException
 import java.util.*
 import java.util.logging.Level
 
+/**
+ * A local address book. Requires an own Android account, because Android manages contacts per
+ * account and there is no such thing as "address books". So, DAVx5 creates a "DAVx5
+ * address book" account for every CardDAV address book. These accounts are bound to a
+ * DAVx5 main account.
+ */
 class LocalAddressBook(
         private val context: Context,
         account: Account,
         provider: ContentProviderClient?
-): AndroidAddressBook<LocalContact, LocalGroup>(account, provider, LocalContact.Factory, LocalGroup.Factory), LocalCollection<LocalResource> {
+): AndroidAddressBook<LocalContact, LocalGroup>(account, provider, LocalContact.Factory, LocalGroup.Factory), LocalCollection<LocalAddress> {
 
     companion object {
 
-        val USER_DATA_MAIN_ACCOUNT_TYPE = "real_account_type"
-        val USER_DATA_MAIN_ACCOUNT_NAME = "real_account_name"
-        val USER_DATA_URL = "url"
-        val USER_DATA_CTAG = "ctag"
+        const val USER_DATA_MAIN_ACCOUNT_TYPE = "real_account_type"
+        const val USER_DATA_MAIN_ACCOUNT_NAME = "real_account_name"
+        const val USER_DATA_URL = "url"
+        const val USER_DATA_READ_ONLY = "read_only"
 
-        @JvmStatic
-        @Throws(ContactsStorageException::class)
-        fun create(context: Context, provider: ContentProviderClient, mainAccount: Account, info: CollectionInfo): LocalAddressBook {
-            val accountManager = AccountManager.get(context)
-
-            val account = Account(accountName(mainAccount, info), App.addressBookAccountType)
-            if (!accountManager.addAccountExplicitly(account, null, initialUserData(mainAccount, info.url)))
-                throw ContactsStorageException("Couldn't create address book account")
+        fun create(context: Context, provider: ContentProviderClient, mainAccount: Account, info: Collection): LocalAddressBook {
+            val account = Account(accountName(mainAccount, info), context.getString(R.string.account_type_address_book))
+            val userData = initialUserData(mainAccount, info.url.toString())
+            Logger.log.log(Level.INFO, "Creating local address book $account", userData)
+            if (!AccountUtils.createAccount(context, account, userData))
+                throw IllegalStateException("Couldn't create address book account")
 
             val addressBook = LocalAddressBook(context, account, provider)
+            ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1)
             ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true)
+
+            // initialize Contacts Provider Settings
+            val values = ContentValues(2)
+            values.put(ContactsContract.Settings.SHOULD_SYNC, 1)
+            values.put(ContactsContract.Settings.UNGROUPED_VISIBLE, 1)
+            addressBook.settings = values
+            addressBook.readOnly = !info.privWriteContent || info.forceReadOnly
+
             return addressBook
         }
 
-        @JvmStatic
-        @Throws(ContactsStorageException::class)
-        fun find(context: Context, provider: ContentProviderClient, mainAccount: Account?): List<LocalAddressBook> {
-            val accountManager = AccountManager.get(context)
+        fun findAll(context: Context, provider: ContentProviderClient?, mainAccount: Account) = AccountManager.get(context)
+                .getAccountsByType(context.getString(R.string.account_type_address_book))
+                .map { LocalAddressBook(context, it, provider) }
+                .filter {
+                    try {
+                        it.mainAccount == mainAccount
+                    } catch(e: IllegalStateException) {
+                        false
+                    }
+                }
+                .toList()
 
-            val result = LinkedList<LocalAddressBook>()
-            accountManager.getAccountsByType(App.addressBookAccountType)
-                    .map { LocalAddressBook(context, it, provider) }
-                    .filter { mainAccount == null || it.getMainAccount() == mainAccount }
-                    .forEach { result += it }
-
-            return result
-        }
-
-        @JvmStatic
-        fun accountName(mainAccount: Account, info: CollectionInfo): String {
+        fun accountName(mainAccount: Account, info: Collection): String {
             val baos = ByteArrayOutputStream()
             baos.write(info.url.hashCode())
             val hash = Base64.encodeToString(baos.toByteArray(), Base64.NO_WRAP or Base64.NO_PADDING)
 
-            val sb = StringBuilder(if (info.displayName.isNullOrEmpty()) DavUtils.lastSegmentOfUrl(info.url) else info.displayName)
-            sb      .append(" (")
-                    .append(mainAccount.name)
-                    .append(" ")
-                    .append(hash)
-                    .append(")")
+            val sb = StringBuilder(info.displayName.let {
+                if (it.isNullOrEmpty())
+                    DavUtils.lastSegmentOfUrl(info.url)
+                else
+                    it
+            })
+            sb.append(" (${mainAccount.name} $hash)")
             return sb.toString()
         }
 
-        @JvmStatic
         fun initialUserData(mainAccount: Account, url: String): Bundle {
             val bundle = Bundle(3)
             bundle.putString(USER_DATA_MAIN_ACCOUNT_NAME, mainAccount.name)
@@ -93,177 +104,239 @@ class LocalAddressBook(
             return bundle
         }
 
+        fun mainAccount(context: Context, account: Account): Account =
+                if (account.type == context.getString(R.string.account_type_address_book)) {
+                    val manager = AccountManager.get(context)
+                    Account(
+                            manager.getUserData(account, USER_DATA_MAIN_ACCOUNT_NAME),
+                            manager.getUserData(account, USER_DATA_MAIN_ACCOUNT_TYPE)
+                    )
+                } else
+                    account
+
     }
 
+    override val tag: String
+        get() = "contacts-${account.name}"
+
+    override val title = account.name!!
+
     /**
-     * Whether contact groups (LocalGroup resources) are included in query results for
-     * {@link #getAll()}, {@link #getDeleted()}, {@link #getDirty()} and
-     * {@link #getWithoutFileName()}.
+     * Whether contact groups ([LocalGroup]) are included in query results
+     * and are affected by updates/deletes on generic members.
+     *
+     * For instance, if this option is disabled, [findDirty] will find only dirty [LocalContact]s,
+     * but if it is enabled, [findDirty] will find dirty [LocalContact]s and [LocalGroup]s.
      */
     var includeGroups = true
 
+    private var _mainAccount: Account? = null
+    /**
+     * The associated main account which this address book accounts belongs to.
+     * @throws IllegalStateException when no main account is assigned
+     */
+    var mainAccount: Account
+        get() {
+            _mainAccount?.let { return it }
+
+            AccountManager.get(context).let { accountManager ->
+                val name = accountManager.getUserData(account, USER_DATA_MAIN_ACCOUNT_NAME)
+                val type = accountManager.getUserData(account, USER_DATA_MAIN_ACCOUNT_TYPE)
+                if (name != null && type != null)
+                    return Account(name, type)
+                else
+                    throw IllegalStateException("No main account assigned to address book account")
+            }
+        }
+        set(newMainAccount) {
+            AccountManager.get(context).let { accountManager ->
+                accountManager.setUserData(account, USER_DATA_MAIN_ACCOUNT_NAME, newMainAccount.name)
+                accountManager.setUserData(account, USER_DATA_MAIN_ACCOUNT_TYPE, newMainAccount.type)
+            }
+
+            _mainAccount = newMainAccount
+        }
+
+    var url: String
+        get() = AccountManager.get(context).getUserData(account, USER_DATA_URL)
+                ?: throw IllegalStateException("Address book has no URL")
+        set(url) = AccountManager.get(context).setUserData(account, USER_DATA_URL, url)
+
+    override var readOnly: Boolean
+        get() = AccountManager.get(context).getUserData(account, USER_DATA_READ_ONLY) != null
+        set(readOnly) = AccountManager.get(context).setUserData(account, USER_DATA_READ_ONLY, if (readOnly) "1" else null)
+
+    override var lastSyncState: SyncState?
+        get() = syncState?.let { SyncState.fromString(String(it)) }
+        set(state) {
+            syncState = state?.toString()?.toByteArray()
+        }
+
 
     /* operations on the collection (address book) itself */
 
-    @Throws(ContactsStorageException::class)
-    fun update(info: CollectionInfo) {
-        val newAccountName = accountName(getMainAccount(), info)
+    override fun markNotDirty(flags: Int): Int {
+        val values = ContentValues(1)
+        values.put(LocalContact.COLUMN_FLAGS, flags)
+        var number = provider!!.update(rawContactsSyncUri(), values, "${RawContacts.DIRTY}=0", null)
+
+        if (includeGroups) {
+            values.clear()
+            values.put(LocalGroup.COLUMN_FLAGS, flags)
+            number += provider.update(groupsSyncUri(), values, "NOT ${Groups.DIRTY}", null)
+        }
+
+        return number
+    }
+
+    override fun removeNotDirtyMarked(flags: Int): Int {
+        var number = provider!!.delete(rawContactsSyncUri(),
+                "NOT ${RawContacts.DIRTY} AND ${LocalContact.COLUMN_FLAGS}=?", arrayOf(flags.toString()))
+
+        if (includeGroups)
+            number += provider.delete(groupsSyncUri(),
+                    "NOT ${Groups.DIRTY} AND ${LocalGroup.COLUMN_FLAGS}=?", arrayOf(flags.toString()))
+
+        return number
+    }
+
+    fun update(info: Collection) {
+        val newAccountName = accountName(mainAccount, info)
+
         if (account.name != newAccountName && Build.VERSION.SDK_INT >= 21) {
+            // no need to re-assign contacts to new account, because they will be deleted by contacts provider in any case
             val accountManager = AccountManager.get(context)
-            val future = accountManager.renameAccount(account, newAccountName, {
-                try {
-                    // update raw contacts to new account name
-                    provider?.let { provider ->
-                        val values = ContentValues(1)
-                        values.put(RawContacts.ACCOUNT_NAME, newAccountName)
-                        provider.update(syncAdapterURI(RawContacts.CONTENT_URI), values, "${RawContacts.ACCOUNT_NAME}=?", arrayOf(account.name))
-                    }
-                } catch(e: RemoteException) {
-                    Logger.log.log(Level.WARNING, "Couldn't re-assign contacts to new account name", e)
-                }
-            }, null)
+            val future = accountManager.renameAccount(account, newAccountName, null, null)
             account = future.result
         }
 
+        val nowReadOnly = !info.privWriteContent || info.forceReadOnly
+        if (nowReadOnly != readOnly) {
+            Constants.log.info("Address book now read-only = $nowReadOnly, updating contacts")
+
+            // update address book itself
+            readOnly = nowReadOnly
+
+            // update raw contacts
+            val rawContactValues = ContentValues(1)
+            rawContactValues.put(RawContacts.RAW_CONTACT_IS_READ_ONLY, if (nowReadOnly) 1 else 0)
+            provider!!.update(rawContactsSyncUri(), rawContactValues, null, null)
+
+            // update data rows
+            val dataValues = ContentValues(1)
+            dataValues.put(ContactsContract.Data.IS_READ_ONLY, if (nowReadOnly) 1 else 0)
+            provider.update(syncAdapterURI(ContactsContract.Data.CONTENT_URI), dataValues, null, null)
+        }
+
         // make sure it will still be synchronized when contacts are updated
-        ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true)
+        if (ContentResolver.getIsSyncable(account, ContactsContract.AUTHORITY) <= 0)
+            ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1)
+        if (!ContentResolver.getSyncAutomatically(account, ContactsContract.AUTHORITY))
+            ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true)
     }
 
-    @Throws(ContactsStorageException::class)
     fun delete() {
         val accountManager = AccountManager.get(context)
-        try {
-            if (Build.VERSION.SDK_INT >= 22)
-                accountManager.removeAccount(account, null, null, null)
-            else
-                @Suppress("deprecation")
-                accountManager.removeAccount(account, null, null)
-        } catch(e: Exception) {
-            throw ContactsStorageException("Couldn't remove address book", e)
-        }
+        @Suppress("DEPRECATION")
+        if (Build.VERSION.SDK_INT >= 22)
+            accountManager.removeAccount(account, null, null, null)
+        else
+            accountManager.removeAccount(account, null, null)
     }
 
 
     /* operations on members (contacts/groups) */
 
-    @Throws(ContactsStorageException::class, FileNotFoundException::class)
-    fun findContactByUID(uid: String): LocalContact {
-        val contacts = queryContacts("${AndroidContact.COLUMN_UID}=?", arrayOf(uid))
-        if (contacts.isEmpty())
-            throw FileNotFoundException()
-        return contacts.first()
+    override fun findByName(name: String): LocalAddress? {
+        val result = queryContacts("${AndroidContact.COLUMN_FILENAME}=?", arrayOf(name)).firstOrNull()
+        return if (includeGroups)
+            result ?: queryGroups("${AndroidGroup.COLUMN_FILENAME}=?", arrayOf(name)).firstOrNull()
+        else
+            result
     }
 
-    @Throws(ContactsStorageException::class)
-    override fun getAll(): List<LocalResource> {
-        val all = LinkedList<LocalResource>()
-        all.addAll(queryContacts(null, null))
-        if (includeGroups)
-            all.addAll(queryGroups(null, null))
-        return all
-    }
 
     /**
      * Returns an array of local contacts/groups which have been deleted locally. (DELETED != 0).
+     * @throws RemoteException on content provider errors
      */
-    @Throws(ContactsStorageException::class)
-    override fun getDeleted(): List<LocalResource> {
-        val deleted = LinkedList<LocalResource>()
-        deleted.addAll(getDeletedContacts())
-        if (includeGroups)
-            deleted.addAll(getDeletedGroups())
-        return deleted
+    override fun findDeleted() =
+            if (includeGroups)
+                findDeletedContacts() + findDeletedGroups()
+            else
+                findDeletedContacts()
+
+    fun findDeletedContacts() = queryContacts(RawContacts.DELETED, null)
+    fun findDeletedGroups() = queryGroups(Groups.DELETED, null)
+
+    /**
+     * Returns an array of local contacts/groups which have been changed locally (DIRTY != 0).
+     * @throws RemoteException on content provider errors
+     */
+    override fun findDirty() =
+            if (includeGroups)
+                findDirtyContacts() + findDirtyGroups()
+            else
+                findDirtyContacts()
+    fun findDirtyContacts() = queryContacts(RawContacts.DIRTY, null)
+    fun findDirtyGroups() = queryGroups(Groups.DIRTY, null)
+
+    override fun forgetETags() {
+        if (includeGroups) {
+            val values = ContentValues(1)
+            values.putNull(AndroidGroup.COLUMN_ETAG)
+            provider!!.update(groupsSyncUri(), values, null, null)
+        }
+        val values = ContentValues(1)
+        values.putNull(AndroidContact.COLUMN_ETAG)
+        provider!!.update(rawContactsSyncUri(), values, null, null)
     }
 
+
     /**
      * Queries all contacts with DIRTY flag and checks whether their data checksum has changed, i.e.
      * if they're "really dirty" (= data has changed, not only metadata, which is not hashed).
      * The DIRTY flag is removed from contacts which are not "really dirty", i.e. from contacts
      * whose contact data checksum has not changed.
      * @return number of "really dirty" contacts
+     * @throws RemoteException on content provider errors
      */
-    @Throws(ContactsStorageException::class)
     fun verifyDirty(): Int {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N || Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
             throw IllegalStateException("verifyDirty() should not be called on Android != 7")
 
         var reallyDirty = 0
-        for (contact in getDirtyContacts())
-            try {
-                val lastHash = contact.getLastHashCode()
-                val currentHash = contact.dataHashCode()
-                if (lastHash == currentHash) {
-                    // hash is code still the same, contact is not "really dirty" (only metadata been have changed)
-                    Logger.log.log(Level.FINE, "Contact data hash has not changed, resetting dirty flag", contact)
-                    contact.resetDirty()
-                } else {
-                    Logger.log.log(Level.FINE, "Contact data has changed from hash $lastHash to $currentHash", contact)
-                    reallyDirty++
-                }
-            } catch(e: FileNotFoundException) {
-                throw ContactsStorageException("Couldn't calculate hash code", e)
+        for (contact in findDirtyContacts()) {
+            val lastHash = contact.getLastHashCode()
+            val currentHash = contact.dataHashCode()
+            if (lastHash == currentHash) {
+                // hash is code still the same, contact is not "really dirty" (only metadata been have changed)
+                Logger.log.log(Level.FINE, "Contact data hash has not changed, resetting dirty flag", contact)
+                contact.resetDirty()
+            } else {
+                Logger.log.log(Level.FINE, "Contact data has changed from hash $lastHash to $currentHash", contact)
+                reallyDirty++
             }
+        }
 
         if (includeGroups)
-            reallyDirty += getDirtyGroups().size
+            reallyDirty += findDirtyGroups().size
 
         return reallyDirty
     }
 
-    /**
-     * Returns an array of local contacts/groups which have been changed locally (DIRTY != 0).
-     */
-    @Throws(ContactsStorageException::class)
-    override fun getDirty(): List<LocalResource> {
-        val dirty = LinkedList<LocalResource>()
-        dirty.addAll(getDirtyContacts())
-        if (includeGroups)
-            dirty.addAll(getDirtyGroups())
-        return dirty
-    }
-
-    /**
-     * Returns an array of local contacts which don't have a file name yet.
-     */
-    @Throws(ContactsStorageException::class)
-    override fun getWithoutFileName(): List<LocalResource> {
-        val nameless = LinkedList<LocalResource>()
-        nameless.addAll(queryContacts("${AndroidContact.COLUMN_FILENAME} IS NULL", null))
-        if (includeGroups)
-            nameless.addAll(queryGroups("${AndroidGroup.COLUMN_FILENAME} IS NULL", null))
-        return nameless
-    }
-
-    @Throws(ContactsStorageException::class)
-    fun getDeletedContacts() = queryContacts("${RawContacts.DELETED} != 0", null)
-
-    @Throws(ContactsStorageException::class)
-    fun getDirtyContacts() = queryContacts("${RawContacts.DIRTY} != 0", null)
-
-    @Throws(ContactsStorageException::class)
-    fun getDeletedGroups() = queryGroups("${Groups.DELETED} != 0", null)
-
-    @Throws(ContactsStorageException::class)
-    fun getDirtyGroups() = queryGroups("${Groups.DIRTY} != 0", null)
-
-    @Throws(ContactsStorageException::class)
     fun getByGroupMembership(groupID: Long): List<LocalContact> {
-        try {
-            val ids = HashSet<Long>()
-
-            provider!!.query(syncAdapterURI(ContactsContract.Data.CONTENT_URI),
-                    arrayOf(RawContacts.Data.RAW_CONTACT_ID),
-                    "(${GroupMembership.MIMETYPE}=? AND ${GroupMembership.GROUP_ROW_ID}=?) OR (${CachedGroupMembership.MIMETYPE}=? AND ${CachedGroupMembership.GROUP_ID}=?)",
-                    arrayOf(GroupMembership.CONTENT_ITEM_TYPE, groupID.toString(), CachedGroupMembership.CONTENT_ITEM_TYPE, groupID.toString()),
-                    null)?.use { cursor ->
-                while (cursor.moveToNext())
-                    ids += cursor.getLong(0)
-            }
-
-            return ids.map { id -> LocalContact(this, id, null, null) }
-        } catch (e: RemoteException) {
-            throw ContactsStorageException("Couldn't query contacts", e)
+        val ids = HashSet<Long>()
+        provider!!.query(syncAdapterURI(ContactsContract.Data.CONTENT_URI),
+                arrayOf(RawContacts.Data.RAW_CONTACT_ID),
+                "(${GroupMembership.MIMETYPE}=? AND ${GroupMembership.GROUP_ROW_ID}=?) OR (${CachedGroupMembership.MIMETYPE}=? AND ${CachedGroupMembership.GROUP_ID}=?)",
+                arrayOf(GroupMembership.CONTENT_ITEM_TYPE, groupID.toString(), CachedGroupMembership.CONTENT_ITEM_TYPE, groupID.toString()),
+                null)?.use { cursor ->
+            while (cursor.moveToNext())
+                ids += cursor.getLong(0)
         }
+
+        return ids.map { findContactByID(it) }
     }
 
 
@@ -272,29 +345,23 @@ class LocalAddressBook(
     /**
      * Finds the first group with the given title. If there is no group with this
      * title, a new group is created.
-     * @param title     title of the group to look for
-     * @return          id of the group with given title
-     * @throws ContactsStorageException on contact provider errors
+     * @param title title of the group to look for
+     * @return id of the group with given title
+     * @throws RemoteException on content provider errors
      */
-    @Throws(ContactsStorageException::class)
     fun findOrCreateGroup(title: String): Long {
-        try {
-            provider!!.query(syncAdapterURI(Groups.CONTENT_URI), arrayOf(Groups._ID),
-                    "${Groups.TITLE}=?", arrayOf(title), null)?.use { cursor ->
-                if (cursor.moveToNext())
-                    return cursor.getLong(0)
-            }
-
-            val values = ContentValues(1)
-            values.put(Groups.TITLE, title)
-            val uri = provider.insert(syncAdapterURI(Groups.CONTENT_URI), values)
-            return ContentUris.parseId(uri)
-        } catch(e: RemoteException) {
-            throw ContactsStorageException("Couldn't find local contact group", e)
+        provider!!.query(syncAdapterURI(Groups.CONTENT_URI), arrayOf(Groups._ID),
+                "${Groups.TITLE}=?", arrayOf(title), null)?.use { cursor ->
+            if (cursor.moveToNext())
+                return cursor.getLong(0)
         }
+
+        val values = ContentValues(1)
+        values.put(Groups.TITLE, title)
+        val uri = provider.insert(syncAdapterURI(Groups.CONTENT_URI), values) ?: throw RemoteException("Couldn't create contact group")
+        return ContentUris.parseId(uri)
     }
 
-    @Throws(ContactsStorageException::class)
     fun removeEmptyGroups() {
         // find groups without members
         /** should be done using {@link Groups.SUMMARY_COUNT}, but it's not implemented in Android yet */
@@ -304,54 +371,4 @@ class LocalAddressBook(
         }
     }
 
-    @Throws(ContactsStorageException::class)
-    fun removeGroups() {
-        try {
-            provider!!.delete(syncAdapterURI(Groups.CONTENT_URI), null, null)
-        } catch(e: RemoteException) {
-            throw ContactsStorageException("Couldn't remove all groups", e)
-        }
-    }
-
-
-    // SETTINGS
-
-    @Throws(ContactsStorageException::class)
-    fun getMainAccount(): Account {
-        val accountManager = AccountManager.get(context)
-        val name = accountManager.getUserData(account, USER_DATA_MAIN_ACCOUNT_NAME)
-        val type = accountManager.getUserData(account, USER_DATA_MAIN_ACCOUNT_TYPE)
-        if (name != null && type != null)
-            return Account(name, type)
-        else
-            throw ContactsStorageException("Address book doesn't exist anymore")
-    }
-
-    fun setMainAccount(mainAccount: Account) {
-        val accountManager = AccountManager.get(context)
-        accountManager.setUserData(account, USER_DATA_MAIN_ACCOUNT_NAME, mainAccount.name)
-        accountManager.setUserData(account, USER_DATA_MAIN_ACCOUNT_TYPE, mainAccount.type)
-    }
-
-    @Throws(ContactsStorageException::class)
-    fun getURL(): String {
-        val accountManager = AccountManager.get(context)
-        return accountManager.getUserData(account, USER_DATA_URL) ?: throw ContactsStorageException("Address book has no URL")
-    }
-
-    fun setURL(url: String) {
-        val accountManager = AccountManager.get(context)
-        accountManager.setUserData(account, USER_DATA_URL, url)
-    }
-
-    override fun getCTag(): String? {
-        val accountManager = AccountManager.get(context)
-        return accountManager.getUserData(account, USER_DATA_CTAG)
-    }
-
-    override fun setCTag(cTag: String?) {
-        val accountManager = AccountManager.get(context)
-        accountManager.setUserData(account, USER_DATA_CTAG, cTag)
-    }
-
-}
+}

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

@@ -10,18 +10,20 @@ package at.bitfire.davdroid.resource
 
 import android.accounts.Account
 import android.content.ContentProviderClient
-import android.content.ContentProviderOperation
 import android.content.ContentUris
 import android.content.ContentValues
 import android.net.Uri
-import android.os.RemoteException
-import android.provider.CalendarContract
-import android.provider.CalendarContract.*
+import android.provider.CalendarContract.Calendars
+import android.provider.CalendarContract.Events
+import at.bitfire.davdroid.Constants
 import at.bitfire.davdroid.DavUtils
 import at.bitfire.davdroid.log.Logger
-import at.bitfire.davdroid.model.CollectionInfo
-import at.bitfire.ical4android.*
-import java.io.FileNotFoundException
+import at.bitfire.davdroid.model.Collection
+import at.bitfire.davdroid.model.SyncState
+import at.bitfire.ical4android.AndroidCalendar
+import at.bitfire.ical4android.AndroidCalendarFactory
+import at.bitfire.ical4android.BatchOperation
+import at.bitfire.ical4android.DateUtils
 import java.util.*
 import java.util.logging.Level
 
@@ -33,51 +35,41 @@ class LocalCalendar private constructor(
 
     companion object {
 
-        val defaultColor = 0xFF8bc34a.toInt()     // light green 500
+        private const val COLUMN_SYNC_STATE = Calendars.CAL_SYNC1
 
-        val COLUMN_CTAG = Calendars.CAL_SYNC1
-
-        val BASE_INFO_COLUMNS = arrayOf(
-            Events._ID,
-            Events._SYNC_ID,
-            LocalEvent.COLUMN_ETAG
-        )
-
-
-        @JvmStatic
-        @Throws(CalendarStorageException::class)
-        fun create(account: Account, provider: ContentProviderClient, info: CollectionInfo): Uri {
+        fun create(account: Account, provider: ContentProviderClient, info: Collection): Uri {
             val values = valuesFromCollectionInfo(info, true)
 
             // ACCOUNT_NAME and ACCOUNT_TYPE are required (see docs)! If it's missing, other apps will crash.
             values.put(Calendars.ACCOUNT_NAME, account.name)
             values.put(Calendars.ACCOUNT_TYPE, account.type)
+
+            // Email address for scheduling. Used by the calendar provider to determine whether the
+            // user is ORGANIZER/ATTENDEE for a certain event.
             values.put(Calendars.OWNER_ACCOUNT, account.name)
 
             // flag as visible & synchronizable at creation, might be changed by user at any time
             values.put(Calendars.VISIBLE, 1)
             values.put(Calendars.SYNC_EVENTS, 1)
-
             return create(account, provider, values)
         }
 
-        private fun valuesFromCollectionInfo(info: CollectionInfo, withColor: Boolean): ContentValues {
+        private fun valuesFromCollectionInfo(info: Collection, withColor: Boolean): ContentValues {
             val values = ContentValues()
-            values.put(Calendars.NAME, info.url)
+            values.put(Calendars.NAME, info.url.toString())
             values.put(Calendars.CALENDAR_DISPLAY_NAME, if (info.displayName.isNullOrBlank()) DavUtils.lastSegmentOfUrl(info.url) else info.displayName)
 
             if (withColor)
-                values.put(Calendars.CALENDAR_COLOR, info.color ?: defaultColor)
+                values.put(Calendars.CALENDAR_COLOR, info.color ?: Constants.DAVDROID_GREEN_RGBA)
 
-            if (info.readOnly)
-                values.put(Calendars.CALENDAR_ACCESS_LEVEL, Calendars.CAL_ACCESS_READ)
-            else {
+            if (info.privWriteContent && !info.forceReadOnly) {
                 values.put(Calendars.CALENDAR_ACCESS_LEVEL, Calendars.CAL_ACCESS_OWNER)
                 values.put(Calendars.CAN_MODIFY_TIME_ZONE, 1)
                 values.put(Calendars.CAN_ORGANIZER_RESPOND, 1)
-            }
+            } else
+                values.put(Calendars.CALENDAR_ACCESS_LEVEL, Calendars.CAL_ACCESS_READ)
 
-            info.timeZone?.let { tzData ->
+            info.timezone?.let { tzData ->
                 try {
                     val timeZone = DateUtils.parseVTimeZone(tzData)
                     timeZone.timeZoneId?.let { tzId ->
@@ -87,143 +79,174 @@ class LocalCalendar private constructor(
                     Logger.log.log(Level.WARNING, "Couldn't parse calendar default time zone", e)
                 }
             }
-            values.put(Calendars.ALLOWED_REMINDERS, Reminders.METHOD_ALERT)
-            values.put(Calendars.ALLOWED_AVAILABILITY, "${Reminders.AVAILABILITY_TENTATIVE},${Reminders.AVAILABILITY_FREE},${Reminders.AVAILABILITY_BUSY}")
-            values.put(Calendars.ALLOWED_ATTENDEE_TYPES, "${CalendarContract.Attendees.TYPE_OPTIONAL},${CalendarContract.Attendees.TYPE_REQUIRED},${CalendarContract.Attendees.TYPE_RESOURCE}")
+
+            // add base values for Calendars
+            values.putAll(calendarBaseValues)
+
             return values
         }
-
     }
 
+    override val tag: String
+        get() = "events-${account.name}-$id"
 
-    override fun eventBaseInfoColumns() = BASE_INFO_COLUMNS
+    override val title: String
+        get() = displayName ?: id.toString()
+
+    override var lastSyncState: SyncState?
+        get() = provider.query(calendarSyncURI(), arrayOf(COLUMN_SYNC_STATE), null, null, null)?.use { cursor ->
+                    if (cursor.moveToNext())
+                        return SyncState.fromString(cursor.getString(0))
+                    else
+                        null
+                }
+        set(state) {
+            val values = ContentValues(1)
+            values.put(COLUMN_SYNC_STATE, state.toString())
+            provider.update(calendarSyncURI(), values, null, null)
+        }
 
 
-    @Throws(CalendarStorageException::class)
-    fun update(info: CollectionInfo, updateColor: Boolean) =
+    fun update(info: Collection, updateColor: Boolean) =
             update(valuesFromCollectionInfo(info, updateColor))
 
-    @Throws(CalendarStorageException::class)
-    override fun getAll(): List<LocalEvent> =
-            queryEvents("${Events.ORIGINAL_ID} IS NULL", null)
 
-    @Throws(CalendarStorageException::class)
-    override fun getDeleted() =
-            queryEvents("${Events.DELETED}!=0 AND ${Events.ORIGINAL_ID} IS NULL", null)
+    override fun findDeleted() =
+            queryEvents("${Events.DELETED} AND ${Events.ORIGINAL_ID} IS NULL", null)
 
-    @Throws(CalendarStorageException::class)
-    override fun getWithoutFileName() =
-            queryEvents("${Events._SYNC_ID} IS NULL AND ${Events.ORIGINAL_ID} IS NULL", null)
-
-    @Throws(FileNotFoundException::class, CalendarStorageException::class)
-    override fun getDirty(): List<LocalEvent> {
+    override fun findDirty(): List<LocalEvent> {
         val dirty = LinkedList<LocalEvent>()
 
-        // get dirty events which are required to have an increased SEQUENCE value
-        for (localEvent in queryEvents("${Events.DIRTY}!=0 AND ${Events.ORIGINAL_ID} IS NULL", null)) {
-            val event = localEvent.event!!
-            val sequence = event.sequence
-            if (event.sequence == null)      // sequence has not been assigned yet (i.e. this event was just locally created)
-                event.sequence = 0
-            else if (localEvent.weAreOrganizer)
-                event.sequence = sequence!! + 1
+        /*
+         * RFC 5545 3.8.7.4. Sequence Number
+         * When a calendar component is created, its sequence number is 0. It is monotonically incremented by the "Organizer's"
+         * CUA each time the "Organizer" makes a significant revision to the calendar component.
+         */
+        for (localEvent in queryEvents("${Events.DIRTY} AND ${Events.ORIGINAL_ID} IS NULL", null)) {
+            try {
+                val event = requireNotNull(localEvent.event)
+
+                val nonGroupScheduled = event.attendees.isEmpty()
+                val weAreOrganizer = localEvent.weAreOrganizer
+
+                val sequence = event.sequence
+                if (sequence == null)
+                    // sequence has not been assigned yet (i.e. this event was just locally created)
+                    event.sequence = 0
+                else if (nonGroupScheduled || weAreOrganizer)   // increase sequence
+                    event.sequence = sequence + 1
+
+            } catch(e: Exception) {
+                Logger.log.log(Level.WARNING, "Couldn't check/increase sequence", e)
+            }
             dirty += localEvent
         }
 
         return dirty
     }
 
-    @Throws(CalendarStorageException::class)
-    override fun getCTag(): String? =
-        try {
-            provider.query(calendarSyncURI(), arrayOf(COLUMN_CTAG), null, null, null)?.use { cursor ->
-                if (cursor.moveToNext())
-                    return cursor.getString(0)
-            }
-            null
-        } catch (e: RemoteException) {
-            throw CalendarStorageException("Couldn't read local (last known) CTag", e)
-        }
+    override fun findByName(name: String) =
+            queryEvents("${Events._SYNC_ID}=?", arrayOf(name)).firstOrNull()
 
-    @Throws(CalendarStorageException::class)
-    override fun setCTag(cTag: String?) {
-        try {
-            val values = ContentValues(1)
-            values.put(COLUMN_CTAG, cTag)
-            provider.update(calendarSyncURI(), values, null, null)
-        } catch (e: RemoteException) {
-            throw CalendarStorageException("Couldn't write local (last known) CTag", e)
-        }
+
+    override fun markNotDirty(flags: Int): Int {
+        val values = ContentValues(1)
+        values.put(LocalEvent.COLUMN_FLAGS, flags)
+        return provider.update(eventsSyncURI(), values,
+                "${Events.CALENDAR_ID}=? AND NOT ${Events.DIRTY} AND ${Events.ORIGINAL_ID} IS NULL",
+                arrayOf(id.toString()))
     }
 
-    @Throws(CalendarStorageException::class)
+    override fun removeNotDirtyMarked(flags: Int): Int {
+        var deleted = 0
+        // list all non-dirty events with the given flags and delete every row + its exceptions
+        provider.query(eventsSyncURI(), arrayOf(Events._ID),
+                "${Events.CALENDAR_ID}=? AND NOT ${Events.DIRTY} AND ${Events.ORIGINAL_ID} IS NULL AND ${LocalEvent.COLUMN_FLAGS}=?",
+                arrayOf(id.toString(), flags.toString()), null)?.use { cursor ->
+            val batch = BatchOperation(provider)
+            while (cursor.moveToNext()) {
+                val id = cursor.getLong(0)
+                // delete event and possible exceptions (content provider doesn't delete exceptions itself)
+                batch.enqueue(BatchOperation.CpoBuilder
+                        .newDelete(eventsSyncURI())
+                        .withSelection("${Events._ID}=? OR ${Events.ORIGINAL_ID}=?", arrayOf(id.toString(), id.toString())))
+            }
+            deleted = batch.commit()
+        }
+        return deleted
+    }
+
+    override fun forgetETags() {
+        val values = ContentValues(1)
+        values.putNull(LocalEvent.COLUMN_ETAG)
+        provider.update(eventsSyncURI(), values, "${Events.CALENDAR_ID}=?",
+                arrayOf(id.toString()))
+    }
+
+
     fun processDirtyExceptions() {
-        try {
-            // process deleted exceptions
-            Logger.log.info("Processing deleted exceptions")
-            provider.query(
-                    syncAdapterURI(Events.CONTENT_URI),
-                    arrayOf(Events._ID, Events.ORIGINAL_ID, LocalEvent.COLUMN_SEQUENCE),
-                    "${Events.DELETED}!=0 AND ${Events.ORIGINAL_ID} IS NOT NULL", null, null)?.use { cursor ->
-                while (cursor.moveToNext()) {
-                    Logger.log.fine("Found deleted exception, removing; then re-scheduling original event")
-                    val id = cursor.getLong(0)             // can't be null (by definition)
-                    val originalID = cursor.getLong(1)     // can't be null (by query)
+        // process deleted exceptions
+        Logger.log.info("Processing deleted exceptions")
+        provider.query(
+                syncAdapterURI(Events.CONTENT_URI),
+                arrayOf(Events._ID, Events.ORIGINAL_ID, LocalEvent.COLUMN_SEQUENCE),
+                "${Events.CALENDAR_ID}=? AND ${Events.DELETED} AND ${Events.ORIGINAL_ID} IS NOT NULL",
+                arrayOf(id.toString()), null)?.use { cursor ->
+            while (cursor.moveToNext()) {
+                Logger.log.fine("Found deleted exception, removing and re-scheduling original event (if available)")
+                val id = cursor.getLong(0)             // can't be null (by definition)
+                val originalID = cursor.getLong(1)     // can't be null (by query)
 
-                    val batch = BatchOperation(provider)
+                val batch = BatchOperation(provider)
 
-                    // get original event's SEQUENCE
-                    provider.query(
-                            syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, originalID)),
-                            arrayOf(LocalEvent.COLUMN_SEQUENCE),
-                            null, null, null)?.use { cursor2 ->
+                // get original event's SEQUENCE
+                provider.query(
+                        syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, originalID)),
+                        arrayOf(LocalEvent.COLUMN_SEQUENCE),
+                        null, null, null)?.use { cursor2 ->
+                    if (cursor2.moveToNext()) {
+                        // original event is available
                         val originalSequence = if (cursor2.isNull(0)) 0 else cursor2.getInt(0)
 
                         // re-schedule original event and set it to DIRTY
-                        batch.enqueue(BatchOperation.Operation(
-                                ContentProviderOperation.newUpdate(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, originalID)))
-                                        .withValue(LocalEvent.COLUMN_SEQUENCE, originalSequence + 1)
-                                        .withValue(Events.DIRTY, 1)
-                        ))
+                        batch.enqueue(BatchOperation.CpoBuilder
+                                .newUpdate(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, originalID)))
+                                .withValue(LocalEvent.COLUMN_SEQUENCE, originalSequence + 1)
+                                .withValue(Events.DIRTY, 1))
                     }
-
-                    // remove exception
-                    batch.enqueue(BatchOperation.Operation(
-                            ContentProviderOperation.newDelete(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, id)))
-                    ))
-                    batch.commit()
                 }
-            }
 
-            // process dirty exceptions
-            Logger.log.info("Processing dirty exceptions")
-            provider.query(
-                    syncAdapterURI(Events.CONTENT_URI),
-                    arrayOf(Events._ID, Events.ORIGINAL_ID, LocalEvent.COLUMN_SEQUENCE),
-                    "${Events.DIRTY}!=0 AND ${Events.ORIGINAL_ID} IS NOT NULL", null, null)?.use { cursor ->
-                while (cursor.moveToNext()) {
-                    Logger.log.fine("Found dirty exception, increasing SEQUENCE to re-schedule")
-                    val id = cursor.getLong(0)             // can't be null (by definition)
-                    val originalID = cursor.getLong(1)     // can't be null (by query)
-                    val sequence = if (cursor.isNull(2)) 0 else cursor.getInt(2)
-
-                    val batch = BatchOperation(provider)
-                    // original event to DIRTY
-                    batch.enqueue(BatchOperation.Operation (
-                            ContentProviderOperation.newUpdate(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, originalID)))
-                                    .withValue(Events.DIRTY, 1)
-                    ))
-                    // increase SEQUENCE and set DIRTY to 0
-                    batch.enqueue(BatchOperation.Operation (
-                            ContentProviderOperation.newUpdate(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, id)))
-                                    .withValue(LocalEvent.COLUMN_SEQUENCE, sequence + 1)
-                                    .withValue(Events.DIRTY, 0)
-                    ))
-                    batch.commit()
-                }
+                // completely remove deleted exception
+                batch.enqueue(BatchOperation.CpoBuilder.newDelete(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, id))))
+                batch.commit()
+            }
+        }
+
+        // process dirty exceptions
+        Logger.log.info("Processing dirty exceptions")
+        provider.query(
+                syncAdapterURI(Events.CONTENT_URI),
+                arrayOf(Events._ID, Events.ORIGINAL_ID, LocalEvent.COLUMN_SEQUENCE),
+                "${Events.CALENDAR_ID}=? AND ${Events.DIRTY} AND ${Events.ORIGINAL_ID} IS NOT NULL",
+                arrayOf(id.toString()), null)?.use { cursor ->
+            while (cursor.moveToNext()) {
+                Logger.log.fine("Found dirty exception, increasing SEQUENCE to re-schedule")
+                val id = cursor.getLong(0)             // can't be null (by definition)
+                val originalID = cursor.getLong(1)     // can't be null (by query)
+                val sequence = if (cursor.isNull(2)) 0 else cursor.getInt(2)
+
+                val batch = BatchOperation(provider)
+                // original event to DIRTY
+                batch.enqueue(BatchOperation.CpoBuilder
+                        .newUpdate(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, originalID)))
+                        .withValue(Events.DIRTY, 1))
+                // increase SEQUENCE and set DIRTY to 0
+                batch.enqueue(BatchOperation.CpoBuilder
+                        .newUpdate(syncAdapterURI(ContentUris.withAppendedId(Events.CONTENT_URI, id)))
+                        .withValue(LocalEvent.COLUMN_SEQUENCE, sequence + 1)
+                        .withValue(Events.DIRTY, 0))
+                batch.commit()
             }
-        } catch (e: RemoteException) {
-            throw CalendarStorageException("Couldn't process locally modified exception", e)
         }
     }
 
@@ -235,4 +258,4 @@ class LocalCalendar private constructor(
 
     }
 
-}
+}