Version bump to 1.11.4.1-beta1

* HttpUrl is the preferred class because we use URLs mainly for okhttp
* don't use URI or String for URLs, if possible
* HttpUrl is not Serializable, so use Parcelable for data classes with HttpUrl

X

.github/CODEOWNERS

@@ -1,8 +0,0 @@
-# See https://docs.github.com/de/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
-# For combination with "Require review from code owners" for main-ose branch.
-
-# Dependabot
-gradle/**   @bitfireAT/app-dev
-
-# everything else
-*   @rfc2822

.github/FUNDING.yml

@@ -1,4 +0,0 @@
-
-github: bitfireAT
-liberapay: DAVx5
-custom: 'https://www.davx5.com/donate'

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: DAVx⁵ Community Support
-    url: https://github.com/bitfireAT/davx5-ose/discussions
-    about: Ask and answer questions (including feature requests and bug reports) here.

.github/ISSUE_TEMPLATE/qualified-bug.yml

@@ -1,44 +0,0 @@
-name: Qualified Bug Report
-description: "For qualified bug reports. (Use Discussions if unsure.)"
-type: bug
-labels: ["bug"]
-body:
-  - type: checkboxes
-    attributes:
-      label: Problem scope
-      description: Use Discussions if you're unsure which component (DAVx⁵, calendar app, server, …) causes your problem.
-      options:
-        - label: I'm sure that this is a DAVx⁵ problem.
-          required: true
-  - type: checkboxes
-    attributes:
-      label: App version
-      options:
-        - label: I'm using the latest available DAVx⁵ version.
-          required: true
-  - type: input
-    attributes:
-      label: Android version and device/firmware type
-      placeholder: "Android 13 (Samsung A32)"
-  - type: textarea
-    attributes:
-      label: Steps to reproduce
-      description: Provide detailed steps to reproduce the problem.
-      placeholder: |
-        1. Create DAVx⁵ account with Some Server (Version).
-        2. Sync Some Calendar.
-        3. SomeException appears.
-  - type: textarea
-    attributes:
-      label: Actual result
-      description: Describe what you DAVx⁵ currently does (and what is not expected).
-      placeholder: "Some Property in ICS file causes the whole synchronization to stop."
-  - type: textarea
-    attributes:
-      label: Expected result
-      description: Describe what you would expect DAVx⁵ to avoid/solve the problem.
-      placeholder: "Some Property in ICS file should be ignored even if faulty and sync should continue instead of showing an error."
-  - type: textarea
-    attributes:
-      label: Further info
-      description: Debug info, links to further information, …

.github/ISSUE_TEMPLATE/qualified-feature.yml

@@ -1,20 +0,0 @@
-name: Qualified Feature Request
-description: "For qualified feature requests. (Use Discussions if unsure.)"
-type: feature
-labels: ["enhancement"]
-body:
-  - type: checkboxes
-    attributes:
-      label: Scope
-      description: Use this form only for features that have been discussed in Discussions or if you're a DAVx5 developer.
-      options:
-        - label: I'm sure that this feature request belongs here and not into Discussions.
-          required: true
-  - type: textarea
-    attributes:
-      label: Description
-      description: Describe the requested feature and why it is desired.
-  - type: textarea
-    attributes:
-      label: Further info
-      description: How this could be implemented, links to further information, …

.github/dependabot.yml

@@ -1,32 +0,0 @@
-version: 2
-updates:
-  # Enable version updates for GitHub Actions
-  - package-ecosystem: "github-actions"
-    # Workflow files stored in the default location of `.github/workflows`
-    # You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "[CI] "
-    labels:
-      - "github_actions"
-      - "dependencies"
-    groups:
-      ci-actions:
-        patterns: ["*"]
-        
-  - package-ecosystem: "gradle"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    labels:             # don't create "java" label (default for gradle ecosystem)
-      - "dependencies"
-    groups:
-      app-dependencies:
-        patterns: ["*"]
-    ignore:
-      # dependencies without semantic versioning
-      - dependency-name: "com.github.bitfireat:cert4android"
-      - dependency-name: "com.github.bitfireat:dav4jvm"
-      - dependency-name: "com.github.bitfireat:synctools"

.github/pull_request_template.md

@@ -1,38 +0,0 @@
-
-Please delete this paragraph and other repeating text (like the examples) after reading and before submitting the PR.
-
-The PR should be in _Draft_ state during development. As soon as it's finished, it should be marked as _Ready for review_ and a reviewer should be chosen.
-
-See also: [Writing A Great Pull Request Description](https://www.pullrequest.com/blog/writing-a-great-pull-request-description/)
-
-
-### Purpose
-
-What this PR is intended to do and why this is desirable.
-
-Example: 
-
-> Adds support for AAA in BBB, as requested by several people in issue #XX.
-
-
-### Short description
-
-A short description of the chosen approach to achieve the purpose.
-
-Example:
-
-> - Added authentication option _Some authentication_ to _some module_.
-> - Added support for _Some authentication_ to _some content provider_.
-> - Added UI support for _Some authentication_ in account settings.
-
-Related information (links to Android docs and other resources that help to understand/review
-the changes) can also be put here.
-
-
-### Checklist
-
-- [ ] The PR has a proper title, description and label.
-- [ ] I have [self-reviewed the PR](https://patrickdinh.medium.com/review-your-own-pull-requests-5634cad10b7a).
-- [ ] I have added documentation to complex functions and functions that can be used by other modules.
-- [ ] I have added reasonable tests or consciously decided to not add tests.
-

.github/release.yml

@@ -1,20 +0,0 @@
-changelog:
-  exclude:
-    labels:
-      - ignore-for-release
-  categories:
-    - title: New features
-      labels:
-        - enhancement
-    - title: Bug fixes
-      labels:
-        - bug
-    - title: Refactoring
-      labels:
-        - refactoring
-    - title: Dependencies
-      labels:
-        - dependencies
-    - title: Other changes
-      labels:
-        - "*"

.github/workflows/codeql.yml

@@ -1,50 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ main-ose ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ main-ose ]
-  schedule:
-    - cron: '22 10 * * 1'
-
-concurrency:
-  group: codeql-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v6
-    - uses: actions/setup-java@v5
-      with:
-        distribution: temurin
-        java-version: 21
-    - uses: gradle/actions/setup-gradle@v5
-      with:
-        cache-encryption-key: ${{ secrets.gradle_encryption_key }}
-        cache-read-only: true         # gradle user home cache is generated by test jobs
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
-      with:
-        languages: java-kotlin
-        build-mode: manual            # autobuild uses older JDK
-
-    - name: Build                     # we must not use build cache here
-      run: ./gradlew --no-daemon --configuration-cache app:assembleDebug
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
-      with:
-        category: "/language:${{matrix.language}}"

.github/workflows/dependency-submission.yml

@@ -1,24 +0,0 @@
-name: Dependency Submission
-
-on:
-  push:
-    branches: [ 'main-ose' ]
-
-permissions:
-  contents: write
-
-jobs:
-  dependency-submission:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v6
-    - uses: actions/setup-java@v5
-      with:
-        distribution: temurin
-        java-version: 21
-
-    - name: Generate and submit dependency graph
-      uses: gradle/actions/dependency-submission@v5
-      with:
-        cache-encryption-key: ${{ secrets.gradle_encryption_key }}
-        dependency-graph-exclude-configurations: '.*[Tt]est.* .*[cC]heck.*'

.github/workflows/release.yml

@@ -1,47 +0,0 @@
-name: Create release
-on:
-  push:
-    tags:
-      - v*
-
-concurrency:
-  group: release-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  prerelease: ${{ contains(github.ref_name, '-alpha') || contains(github.ref_name, '-beta') || contains(github.ref_name, '-rc') }}
-
-jobs:
-  build:
-    name: Create release
-    permissions:
-      contents: write
-      discussions: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-java@v5
-        with:
-          distribution: temurin
-          java-version: 21
-      - uses: gradle/actions/setup-gradle@v5
-
-      - name: Prepare keystore
-        run: echo ${{ secrets.android_keystore_base64 }} | base64 -d >$GITHUB_WORKSPACE/keystore.jks
-
-      - name: Build signed package
-        # Use build cache to speed up building of build variants, but clean caches from previous tests before
-        run: ./gradlew --build-cache --configuration-cache --no-daemon app:clean app:assembleRelease
-        env:
-          ANDROID_KEYSTORE: ${{ github.workspace }}/keystore.jks
-          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.android_keystore_password }}
-          ANDROID_KEY_ALIAS: ${{ secrets.android_key_alias }}
-          ANDROID_KEY_PASSWORD: ${{ secrets.android_key_password }}
-
-      - name: Create Github release
-        uses: softprops/action-gh-release@v2
-        with:
-          prerelease: ${{ env.prerelease }}
-          files: app/build/outputs/apk/ose/release/*.apk
-          fail_on_unmatched_files: true
-          generate_release_notes: true

.github/workflows/test-dev.yml

@@ -1,136 +0,0 @@
-name: Development tests
-on:
-  push:
-    branches:
-      - 'main-ose'
-  pull_request:
-
-concurrency:
-  group: test-dev-${{ github.ref }}
-  cancel-in-progress: true
-
-# We provide a remote gradle build cache. Take the settings from the secrets and enable
-# configuration and build cache for all gradle jobs.
-#
-# Note: The secrets are not available for forks and Dependabot PRs.
-env:
-  GRADLE_BUILDCACHE_URL: ${{ secrets.gradle_buildcache_url }}
-  GRADLE_BUILDCACHE_USERNAME: ${{ secrets.gradle_buildcache_username }}
-  GRADLE_BUILDCACHE_PASSWORD: ${{ secrets.gradle_buildcache_password }}
-  GRADLE_OPTS: -Dorg.gradle.caching=true -Dorg.gradle.configuration-cache=true
-
-jobs:
-  compile:
-    name: Compile
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-java@v5
-        with:
-          distribution: temurin
-          java-version: 21
-
-      # See https://community.gradle.org/github-actions/docs/setup-gradle/ for more information
-      - uses: gradle/actions/setup-gradle@v5
-        with:
-          cache-encryption-key: ${{ secrets.gradle_encryption_key }}
-          cache-read-only: false                            # allow branches to update their configuration cache
-          gradle-home-cache-excludes: caches/build-cache-1  # don't cache local build cache because we use a remote cache
-
-      - name: Cache Android environment
-        uses: actions/cache@v5
-        with:
-          path: ~/.config/.android                          # needs to be cached so that configuration cache can work
-          key: android-${{ hashFiles('app/build.gradle.kts') }}
-
-      - name: Compile
-        run: ./gradlew app:compileOseDebugSource
-
-      # Cache configurations for the other jobs (including assemble for CodeQL)
-      - name: Populate configuration cache
-        run: |
-          ./gradlew --dry-run app:assembleDebug
-          ./gradlew --dry-run app:lintOseDebug
-          ./gradlew --dry-run app:testOseDebugUnitTest
-          ./gradlew --dry-run app:virtualOseDebugAndroidTest
-
-  unit_tests:
-    needs: compile
-    name: Lint and unit tests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-java@v5
-        with:
-          distribution: temurin
-          java-version: 21
-      - uses: gradle/actions/setup-gradle@v5
-        with:
-          cache-encryption-key: ${{ secrets.gradle_encryption_key }}
-          cache-read-only: true
-
-      - name: Restore Android environment
-        uses: actions/cache/restore@v5
-        with:
-          path: ~/.config/.android
-          key: android-${{ hashFiles('app/build.gradle.kts') }}
-
-      - name: Lint checks
-        run: ./gradlew app:lintOseDebug
-
-      - name: Unit tests
-        run: ./gradlew app:testOseDebugUnitTest
-
-  instrumented_tests:
-    needs: compile
-    name: Instrumented tests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-java@v5
-        with:
-          distribution: temurin
-          java-version: 21
-      - uses: gradle/actions/setup-gradle@v5
-        with:
-          cache-encryption-key: ${{ secrets.gradle_encryption_key }}
-          cache-read-only: true
-
-      - name: Restore Android environment
-        uses: actions/cache/restore@v5
-        with:
-          path: ~/.config/.android
-          key: android-${{ hashFiles('app/build.gradle.kts') }}
-
-      # gradle and Android SDK often take more space than what is available on the default runner.
-      # We try to free a few GB here to make gradle-managed devices more reliable.
-      - name: Free some disk space
-        uses: jlumbroso/free-disk-space@main
-        with:
-          android: false          # we need the Android SDK
-          large-packages: false   # apt takes too long
-          swap-storage: false     # gradle needs much memory
-
-      - name: Restore AVD
-        id: restore-avd
-        uses: actions/cache/restore@v5
-        with:
-          path: ~/.config/.android/avd                        # where AVD is stored
-          key: avd-${{ hashFiles('app/build.gradle.kts') }}   # gradle-managed devices are defined there
-
-      # Enable virtualization for Android emulator
-      - name: Enable KVM group perms
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
-      - name: Instrumented tests
-        run: ./gradlew app:virtualOseDebugAndroidTest
-
-      - name: Cache AVD
-        uses: actions/cache/save@v5
-        if: steps.restore-avd.outputs.cache-hit != 'true'
-        with:
-          path: ~/.config/.android/avd                        # where AVD is stored
-          key: avd-${{ hashFiles('app/build.gradle.kts') }}   # gradle-managed devices are defined there

.gitignore

@@ -8,14 +8,17 @@
 # Files for the Dalvik VM
 *.dex
 
-# Java/Kotlin
+# Java class files
 *.class
-.kotlin/
 
 # Generated files
 bin/
 gen/
 
+# Gradle files
+.gradle/
+build/
+
 # Local configuration file (sdk path, etc)
 local.properties
 

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "dav4android"]
+	path = dav4android
+	url = ../dav4android.git
+[submodule "ical4android"]
+	path = ical4android
+	url = ../ical4android.git
+[submodule "vcard4android"]
+	path = vcard4android
+	url = ../vcard4android.git
+[submodule "cert4android"]
+	path = cert4android
+	url = ../cert4android.git

.idea/codeStyles/Project.xml

@@ -1,9 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="LINE_SEPARATOR" value="&#10;" />
-    <option name="RIGHT_MARGIN" value="180" />
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

.idea/copyright/LICENSE.xml

@@ -1,6 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details." />
-    <option name="myName" value="LICENSE" />
-  </copyright>
-</component>

.idea/copyright/profiles_settings.xml

@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="LICENSE" />
-</component>

AUTHORS

@@ -1,7 +0,0 @@
-You can view the list of people who have contributed to the code base in the version control history:
-https://github.com/bitfireAT/davx5-ose/graphs/contributors
-
-Translators are not mentioned in the history explicitly.
-The list of translators can be found in the About screen.
-
-Every contribution is welcome. There are many other forms of contributing besides writing code!

CONTRIBUTING.md

@@ -1,99 +0,0 @@
-
-**Thank you for your interest in contributing to DAVx⁵!**
-
-
-# Licensing
-
-All work in this repository is [licensed under the GPLv3](LICENSE).
-
-We (bitfire.at, initial and main contributors) are also asking you to give us
-permission to use your contribution for related non-open source projects
-like [Managed DAVx⁵](https://www.davx5.com/organizations/managed-davx5).
-
-If you send us a pull request, our CLA bot will ask you to sign the
-Contributor's License Agreement so that we can use your contribution.
-
-
-# Copyright notice
-
-Make sure that every file that contains significant work (at least every code file)
-starts with the copyright header. Android Studio should do so automatically because the
-configuration is stored in the repository (`.idea/copyright`).
-
-
-# Style guide
-
-Please adhere to the [Kotlin style guide](https://developer.android.com/kotlin/style-guide) and
-the following hints to make the source code uniform.
-
-**Have a look at similar files and copy their style if you're not certain.**
-
-Sample file (pay attention to blank lines and other formatting):
-
-```
-<Copyright header, see above>
-
-class MyClass(int arg1) : SuperClass() {
-
-    companion object {
-
-        const val CONSTANT_STRING = "Constant String";
-
-        fun staticMethod() {	// Use static methods when you don't need the object context.
-            // …
-        }
-
-    }
-
-    var someProperty: String = "12345"
-    var someRelatedProperty: Int = 12345
-
-    init {
-        // constructor
-    }
-
-
-    /**
-     * Use KDoc to document important methods. Don't use it dogmatically, but writing proper documentation
-     * (not just the method name with spaces) helps you to re-think what the method shall really do.
-     */
-    fun aFun1() {		// Group methods by some logic (for instance, the order in which they will be called)
-    }				// and alphabetically within a group.
-
-    fun anotherFun() {
-        // …
-    }
-
-
-    fun somethingCompletelyDifferent() {	// two blank lines to separate groups
-    }
-
-    fun helperForSomethingCompletelyDifferent() {
-        someCall(arg1, arg2, arg3, arg4)	// function calls: stick to one line unless it becomes confusing
-    }
-
-
-    class Model(				// two blank lines before inner classes
-        someArgument: SomeLongClass,		// arguments in multiple lines when they're too long for one line
-        anotherArgument: AnotherLongType,
-        thirdArgument: AnotherLongTypeName
-    ) : ViewModel() {
-
-        fun abc() {
-        }
-
-    }
-
-}
-```
-
-In general, use one blank line to separate things within one group of things, and two blank lines
-to separate groups. In rare cases, when methods are tightly coupled and are only helpers for another
-method, they may follow the calling method without separating blank lines.
-
-## Tests
-
-Test classes should be in the appropriate directory (see existing tests) and in the same package as the
-tested class. Tests are usually be named like `methodToBeTested_Condition()`, see
-[Test apps on Android](https://developer.android.com/training/testing/).
-

README.md

@@ -1,47 +0,0 @@
-
-[![Follow @davx5app@fosstodon.org](https://img.shields.io/mastodon/follow/109598783742737223?domain=https%3A%2F%2Ffosstodon.org&style=flat-square)](https://fosstodon.org/@davx5app)
-[![Website](https://img.shields.io/website?style=flat-square&up_color=%237cb342&url=https%3A%2F%2Fwww.davx5.com)](https://www.davx5.com/)
-[![License](https://img.shields.io/github/license/bitfireAT/davx5-ose?style=flat-square)](https://github.com/bitfireAT/davx5-ose/blob/main/LICENSE)
-[![F-Droid](https://img.shields.io/f-droid/v/at.bitfire.davdroid?style=flat-square)](https://f-droid.org/packages/at.bitfire.davdroid/)
-![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/bitfireAT/davx5-ose/total?label=GitHub%20downloads)
-
-![DAVx⁵ logo](app/src/main/res/mipmap-xxxhdpi/ic_launcher.png)
-
-
-DAVx⁵
-========
-
-> [!IMPORTANT]
-> Please see the [DAVx⁵ Web site](https://www.davx5.com) for
-> comprehensive information about DAVx⁵, including a list of services it has been tested with,
-> a manual and FAQ.
-
-DAVx⁵ is licensed under the [GPLv3 License](LICENSE).
-
-News and updates: 
-
-* [@davx5app@fosstodon.org](https://fosstodon.org/@davx5app) on Mastodon
-
-**Help, feature requests, bug reports: [DAVx⁵ discussions](https://github.com/bitfireAT/davx5-ose/discussions)**
-
-Parts of DAVx⁵ have been outsourced into these libraries:
-
-* [cert4android](https://github.com/bitfireAT/cert4android) – custom certificate management
-* [dav4jvm](https://github.com/bitfireAT/dav4jvm) – WebDAV/CalDav/CardDAV framework
-* [synctools](https://github.com/bitfireAT/synctools) – iCalendar/vCard/Tasks processing and content provider access
-
-**If you want to support DAVx⁵, please consider [donating to DAVx⁵](https://www.davx5.com/donate)
-or [purchasing it](https://www.davx5.com/download).**
-
-
-USED THIRD-PARTY LIBRARIES
-==========================
-
-The most important libraries which are used by DAVx⁵ (alphabetically):
-
-* [dnsjava](https://github.com/dnsjava/dnsjava) – [BSD License](https://github.com/dnsjava/dnsjava/blob/master/LICENSE)
-* [ez-vcard](https://github.com/mangstadt/ez-vcard) – [New BSD License](https://github.com/mangstadt/ez-vcard/blob/master/LICENSE)
-* [iCal4j](https://github.com/ical4j/ical4j) – [New BSD License](https://github.com/ical4j/ical4j/blob/develop/LICENSE.txt)
-* [okhttp](https://square.github.io/okhttp) – [Apache License, Version 2.0](https://square.github.io/okhttp/#license)
-
-See _About / Libraries_ in the app for all used libraries and their licenses.

SECURITY.md

@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Please report security vulnerabilities using our [secure support form](https://www.davx5.com/support) or via email to support-en@davx5.com.

app/README

@@ -0,0 +1,9 @@
+
+flavor        directory
+
+gplay         main + davdroid + gplay
+icloud        main + icloud
+managed       main + managed
+soldupe       main + soldupe
+standard      main + davdroid
+

app/build.gradle

@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 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
+ */
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'org.jetbrains.dokka-android'
+
+android {
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
+
+    defaultConfig {
+        applicationId "at.bitfire.davdroid"
+        resValue "string", "packageID", applicationId
+
+        versionCode 230
+        buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
+
+        minSdkVersion 19        // Android 4.4
+        targetSdkVersion 27     // Android 8.1
+
+        buildConfigField "boolean", "customCerts", "false"
+        buildConfigField "boolean", "customCertsUI", "true"
+
+        // when using this, make sure that notification icons are real bitmaps
+        vectorDrawables.useSupportLibrary = true
+    }
+
+    flavorDimensions "type"
+
+    productFlavors {
+        standard {
+            dimension "type"
+            versionName "1.11.4.1-beta1"
+
+            buildConfigField "boolean", "customCerts", "true"
+        }
+        managed {
+            dimension "type"
+            versionName "1.11.4.1-beta1-mgd"
+
+            applicationId "com.davdroid.managed"
+            resValue "string", "packageID", applicationId
+
+            buildConfigField "boolean", "customCerts", "true"
+            buildConfigField "boolean", "customCertsUI", "false"
+            minSdkVersion 21
+        }
+
+        gplay {
+            dimension "type"
+            versionName "1.11.4.1-beta1-gplay"
+
+            buildConfigField "boolean", "customCerts", "true"
+        }
+        icloud {
+            dimension "type"
+            versionName "1.11.4.1-beta1-icloud"
+
+            applicationId "at.bitfire.cloudsync"
+            resValue "string", "packageID", applicationId
+        }
+        soldupe {
+            dimension "type"
+            versionName "1.11.4.1-beta1-soldupe"
+
+            applicationId "com.soldupe.cloudsync"
+            resValue "string", "packageID", applicationId
+            minSdkVersion 21
+        }
+    }
+
+    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" ]
+        androidTest.java.srcDirs = [ "src/androidTest/java", "src/espressoTest/java" ]
+    }
+
+    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'
+        }
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled false
+        }
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+
+            signingConfig signingConfigs.bitfire
+            productFlavors.soldupe.signingConfig signingConfigs.soldupe
+        }
+    }
+
+    lintOptions {
+        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 "OnClick"     // doesn't recognize Kotlin onClick methods
+        disable 'RtlEnabled'
+        disable 'RtlHardcoded'
+        disable 'Typos'
+    }
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/LICENSE'
+    }
+
+    defaultConfig {
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+}
+
+dependencies {
+    implementation project(':cert4android')
+    implementation project(':dav4android')
+    implementation project(':ical4android')
+    implementation project(':vcard4android')
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:preference-v14:27.1.1'
+    implementation 'com.android.support.test.espresso:espresso-idling-resource:3.0.2'
+
+    implementation 'com.github.yukuku:ambilwarna:2.0.1'
+
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
+    implementation 'commons-io:commons-io:2.6'
+    implementation 'dnsjava:dnsjava:2.1.8'
+    implementation 'org.apache.commons:commons-lang3:3.7'
+    implementation 'org.apache.commons:commons-collections4:4.1'
+
+    // for tests
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
+    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
+}

app/build.gradle.kts

@@ -1,233 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.compose.compiler)
-    alias(libs.plugins.hilt)
-    alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.mikepenz.aboutLibraries.android)
-}
-
-// Android configuration
-android {
-    compileSdk = 36
-
-    defaultConfig {
-        applicationId = "at.bitfire.davdroid"
-
-        versionCode = 405090005
-        versionName = "4.5.9"
-
-        base.archivesName = "davx5-$versionCode-$versionName"
-
-        minSdk = 24        // Android 7.0
-        targetSdk = 36     // Android 16
-
-        testInstrumentationRunner = "at.bitfire.davdroid.HiltTestRunner"
-    }
-
-    java {
-        toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
-        }
-    }
-
-    compileOptions {
-        // required for
-        // - dnsjava 3.x: java.nio.file.Path
-        // - ical4android: time API
-        isCoreLibraryDesugaringEnabled = true
-    }
-
-    buildFeatures {
-        buildConfig = true
-        compose = true
-    }
-
-    // Java namespace for our classes (not to be confused with Android package ID)
-    namespace = "com.davx5.ose"
-
-    flavorDimensions += "distribution"
-    productFlavors {
-        create("ose") {
-            dimension = "distribution"
-            versionNameSuffix = "-ose"
-        }
-    }
-
-    sourceSets {
-        getByName("androidTest") {
-            assets.srcDir("$projectDir/schemas")
-        }
-    }
-
-    signingConfigs {
-        create("bitfire") {
-            storeFile = file(System.getenv("ANDROID_KEYSTORE") ?: "/dev/null")
-            storePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD")
-            keyAlias = System.getenv("ANDROID_KEY_ALIAS")
-            keyPassword = System.getenv("ANDROID_KEY_PASSWORD")
-        }
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules-release.pro")
-
-            isShrinkResources = true
-
-            signingConfig = signingConfigs.findByName("bitfire")
-        }
-    }
-
-    lint {
-        disable += arrayOf("GoogleAppIndexingWarning", "ImpliedQuantity", "MissingQuantity", "MissingTranslation", "ExtraTranslation", "RtlEnabled", "RtlHardcoded", "Typos")
-    }
-
-    androidResources {
-        generateLocaleConfig = true
-    }
-
-    packaging {
-        resources {
-            // multiple (test) dependencies have LICENSE files at same location
-            merges += arrayOf("META-INF/LICENSE*")
-        }
-    }
-
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        managedDevices {
-            localDevices {
-                create("virtual") {
-                    device = "Pixel 3"
-                    // TBD: API level 35 and higher causes network tests to fail sometimes, see https://github.com/bitfireAT/davx5-ose/issues/1525
-                    // Suspected reason: https://developer.android.com/about/versions/15/behavior-changes-all#background-network-access
-                    apiLevel = 34
-                    systemImageSource = "aosp-atd"
-                }
-            }
-        }
-    }
-}
-
-ksp {
-    arg("room.schemaLocation", "$projectDir/schemas")
-}
-
-aboutLibraries {
-    export {
-        // exclude timestamps for reproducible builds [https://github.com/bitfireAT/davx5-ose/issues/994]
-        excludeFields.add("generated")
-    }
-}
-
-dependencies {
-    // app core
-    implementation(project(":core"))
-
-    // Kotlin / Android
-    implementation(libs.kotlin.stdlib)
-    implementation(libs.kotlinx.coroutines)
-    coreLibraryDesugaring(libs.android.desugaring)
-
-    // Hilt
-    implementation(libs.hilt.android.base)
-    ksp(libs.androidx.hilt.compiler)
-    ksp(libs.hilt.android.compiler)
-
-    // support libs
-    implementation(libs.androidx.activityCompose)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.androidx.browser)
-    implementation(libs.androidx.core)
-    implementation(libs.androidx.hilt.navigation.compose)
-    implementation(libs.androidx.hilt.work)
-    implementation(libs.androidx.lifecycle.runtime.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.base)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    implementation(libs.androidx.paging)
-    implementation(libs.androidx.paging.compose)
-    implementation(libs.androidx.preference)
-    implementation(libs.androidx.security)
-    implementation(libs.androidx.work.base)
-
-    // Jetpack Compose
-    implementation(libs.compose.accompanist.permissions)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.material3.adaptive)
-    implementation(libs.androidx.compose.materialIconsExtended)
-    debugImplementation(libs.androidx.compose.ui.tooling)
-    implementation(libs.androidx.compose.ui.toolingPreview)
-
-    // Glance Widgets
-    implementation(libs.androidx.glance.base)
-    implementation(libs.androidx.glance.material3)
-
-    // Jetpack Room
-    implementation(libs.androidx.room.runtime)
-    implementation(libs.androidx.room.base)
-    implementation(libs.androidx.room.paging)
-    ksp(libs.androidx.room.compiler)
-
-    // own libraries
-    implementation(libs.bitfire.cert4android)
-    implementation(libs.bitfire.dav4jvm) {
-        exclude(group="junit")
-        exclude(group="org.ogce", module="xpp3")    // Android has its own XmlPullParser implementation
-    }
-    implementation(libs.bitfire.synctools) {
-        exclude(group="androidx.test")              // synctools declares test rules, but we don't want them in non-test code
-        exclude(group = "junit")
-    }
-
-    // third-party libs
-    implementation(libs.conscrypt)
-    implementation(libs.dnsjava)
-    implementation(libs.guava)
-    implementation(libs.ktor.client.content.negotiation)
-    implementation(libs.ktor.client.core)
-    implementation(libs.ktor.client.okhttp)
-    implementation(libs.ktor.serialization.kotlinx.json)
-    implementation(libs.mikepenz.aboutLibraries.m3)
-    implementation(libs.okhttp.base)
-    implementation(libs.okhttp.brotli)
-    implementation(libs.okhttp.logging)
-    implementation(libs.openid.appauth)
-    implementation(libs.unifiedpush) {
-        // UnifiedPush connector seems to be using a workaround by importing this library.
-        // Will be removed after https://github.com/tink-crypto/tink-java-apps/pull/5 is merged.
-        // See: https://codeberg.org/UnifiedPush/android-connector/src/commit/28cb0d622ed0a972996041ab9cc85b701abc48c6/connector/build.gradle#L56-L59
-        exclude(group = "com.google.crypto.tink", module = "tink")
-    }
-    implementation(libs.unifiedpush.fcm)
-
-    // force some versions for compatibility with our minSdk level (see version catalog for details)
-    implementation(libs.commons.codec)
-    implementation(libs.commons.lang)
-
-    // for tests
-    androidTestImplementation(libs.androidx.arch.core.testing)
-    androidTestImplementation(libs.androidx.room.testing)
-    androidTestImplementation(libs.androidx.test.core)
-    androidTestImplementation(libs.androidx.test.junit)
-    androidTestImplementation(libs.androidx.test.rules)
-    androidTestImplementation(libs.androidx.test.runner)
-    androidTestImplementation(libs.androidx.work.testing)
-    androidTestImplementation(libs.hilt.android.testing)
-    androidTestImplementation(libs.junit)
-    androidTestImplementation(libs.kotlinx.coroutines.test)
-    androidTestImplementation(libs.mockk.android)
-    androidTestImplementation(libs.okhttp.mockwebserver)
-
-    testImplementation(libs.bitfire.dav4jvm)
-    testImplementation(libs.junit)
-    testImplementation(libs.mockk)
-    testImplementation(libs.okhttp.mockwebserver)
-    testImplementation(libs.robolectric)
-}

app/proguard-rules.txt

@@ -0,0 +1,44 @@
+
+# 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
+
+# Kotlin
+-dontwarn kotlin.**
+
+# 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
+-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 javax.cache.**                  # no JCache support in Android
+-dontwarn net.fortuna.ical4j.model.**
+-dontwarn org.codehaus.groovy.**
+-dontwarn org.apache.log4j.**             # ignore warnings from log4j dependency
+-keep class net.fortuna.ical4j.** { *; }  # keep all model classes (properties/factories, created at runtime)
+-keep class org.threeten.bp.** { *; }     # keep ThreeTen (for time zone processing)
+
+# okhttp
+-dontwarn okio.**
+-dontwarn javax.annotation.Nullable
+-dontwarn javax.annotation.ParametersAreNonnullByDefault
+-dontwarn org.conscrypt.**
+
+# dnsjava
+-dontwarn sun.net.spi.nameservice.**   # not available on Android
+
+# DAVdroid + libs
+-keep class at.bitfire.** { *; }       # all DAVdroid code is required

app/src/.gitignore

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

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

@@ -0,0 +1,128 @@
+/*
+ * 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.support.test.InstrumentationRegistry.getInstrumentation
+import at.bitfire.cert4android.CustomCertManager
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.mockwebserver.MockWebServer
+import org.apache.commons.io.IOUtils
+import org.apache.commons.lang3.ArrayUtils.contains
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+import java.net.Socket
+import java.security.KeyFactory
+import java.security.KeyStore
+import java.security.Principal
+import java.security.cert.CertificateFactory
+import java.security.cert.X509Certificate
+import java.security.spec.PKCS8EncodedKeySpec
+import javax.net.ssl.SSLSocket
+import javax.net.ssl.TrustManagerFactory
+import javax.net.ssl.X509ExtendedKeyManager
+import javax.net.ssl.X509TrustManager
+
+class CustomTlsSocketFactoryTest {
+
+    private lateinit var certMgr: CustomCertManager
+    private lateinit var factory: CustomTlsSocketFactory
+    private val server = MockWebServer()
+
+    @Before
+    fun startServer() {
+        certMgr = CustomCertManager(getInstrumentation().context, false, true)
+        factory = CustomTlsSocketFactory(null, certMgr)
+        server.start()
+    }
+
+    @After
+    fun stopServer() {
+        server.shutdown()
+        certMgr.close()
+    }
+
+
+    @Test
+    fun testSendClientCertificate() {
+        var public: X509Certificate? = null
+        javaClass.classLoader.getResourceAsStream("sample.crt").use {
+            public = CertificateFactory.getInstance("X509").generateCertificate(it) as? X509Certificate
+        }
+        assertNotNull(public)
+
+        val keyFactory = KeyFactory.getInstance("RSA")
+        val private = keyFactory.generatePrivate(PKCS8EncodedKeySpec(readResource("sample.key")))
+        assertNotNull(private)
+
+        val keyStore = KeyStore.getInstance("AndroidKeyStore")
+        keyStore.load(null)
+        val alias = "sample"
+        keyStore.setKeyEntry(alias, private, null, arrayOf(public))
+        assertTrue(keyStore.containsAlias(alias))
+
+        val trustManagerFactory = TrustManagerFactory.getInstance("X509")
+        trustManagerFactory.init(null as KeyStore?)
+        val trustManager = trustManagerFactory.trustManagers.first() as X509TrustManager
+
+        val factory = CustomTlsSocketFactory(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?) =
+                    arrayOf(public).takeIf { forAlias == alias }
+
+            override fun getPrivateKey(forAlias: String?) =
+                    private.takeIf { forAlias == alias }
+        }, trustManager)
+
+        /* known client cert test URLs (thanks!):
+        *  - https://prod.idrix.eu/secure/
+        *  - https://server.cryptomix.com/secure/
+        */
+        val client = OkHttpClient.Builder()
+                .sslSocketFactory(factory, trustManager)
+                .build()
+        client.newCall(Request.Builder()
+                .get()
+                .url("https://prod.idrix.eu/secure/")
+                .build()).execute().use { response ->
+            assertTrue(response.isSuccessful)
+            assertTrue(response.body()!!.string().contains("CN=User Cert,O=Internet Widgits Pty Ltd,ST=Some-State,C=CA"))
+        }
+    }
+
+    @Test
+    fun testUpgradeTLS() {
+        val s = factory.createSocket(server.hostName, server.port)
+        assertTrue(s is SSLSocket)
+        val ssl = s as SSLSocket
+
+        assertFalse(contains(ssl.enabledProtocols, "SSLv3"))
+        assertTrue(contains(ssl.enabledProtocols, "TLSv1"))
+        assertTrue(contains(ssl.enabledProtocols, "TLSv1.1"))
+        assertTrue(contains(ssl.enabledProtocols, "TLSv1.2"))
+    }
+
+
+    private fun readResource(name: String): ByteArray {
+        this.javaClass.classLoader.getResourceAsStream(name).use {
+            return IOUtils.toByteArray(it)
+        }
+    }
+
+}

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

@@ -0,0 +1,128 @@
+/*
+ * 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.support.test.filters.SmallTest
+import at.bitfire.dav4android.DavResource
+import at.bitfire.dav4android.property.ResourceType
+import at.bitfire.davdroid.HttpClient
+import at.bitfire.davdroid.model.ServiceDB.Collections
+import okhttp3.HttpUrl
+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 CollectionInfoTest {
+
+    private lateinit var httpClient: HttpClient
+    private val server = MockWebServer()
+
+    @Before
+    fun setUp() {
+        httpClient = HttpClient.Builder().build()
+    }
+
+    @After
+    fun shutDown() {
+        httpClient.close()
+    }
+
+
+    @Test
+    @SmallTest
+    fun testFromDavResource() {
+        // 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>"))
+
+        DavResource(httpClient.okHttpClient, server.url("/"))
+                .propfind(0, ResourceType.NAME).use {
+            val info = CollectionInfo(it)
+            assertEquals(CollectionInfo.Type.ADDRESS_BOOK, info.type)
+            assertFalse(info.readOnly)
+            assertEquals("My Contacts", info.displayName)
+            assertEquals("My Contacts Description", info.description)
+        }
+
+        // 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>"))
+
+        DavResource(httpClient.okHttpClient, server.url("/"))
+                .propfind(0, ResourceType.NAME).use {
+            val info = CollectionInfo(it)
+            assertEquals(CollectionInfo.Type.CALENDAR, info.type)
+            assertTrue(info.readOnly)
+            assertNull(info.displayName)
+            assertEquals("My Calendar", info.description)
+            assertEquals(0xFFFF0000.toInt(), info.color)
+            assertEquals("tzdata", info.timeZone)
+            assertTrue(info.supportsVEVENT)
+            assertTrue(info.supportsVTODO)
+        }
+    }
+
+    @Test
+    fun testFromDB() {
+        val values = ContentValues()
+        values.put(Collections.ID, 1)
+        values.put(Collections.SERVICE_ID, 1)
+        values.put(Collections.TYPE, CollectionInfo.Type.CALENDAR.name)
+        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)
+
+        val info = CollectionInfo(values)
+        assertEquals(CollectionInfo.Type.CALENDAR, info.type)
+        assertEquals(1.toLong(), info.id)
+        assertEquals(1.toLong(), info.serviceID)
+        assertEquals(HttpUrl.parse("http://example.com/"), info.url)
+        assertTrue(info.readOnly)
+        assertEquals("display name", info.displayName)
+        assertEquals("description", info.description)
+        assertEquals(0xFFFF0000.toInt(), info.color)
+        assertEquals("tzdata", info.timeZone)
+        assertTrue(info.supportsVEVENT)
+        assertTrue(info.supportsVTODO)
+        assertTrue(info.selected)
+    }
+
+}

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

@@ -0,0 +1,39 @@
+/*
+ * 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 at.bitfire.davdroid.App
+import junit.framework.Assert.assertEquals
+import junit.framework.Assert.assertFalse
+import org.junit.Test
+
+class DefaultsProviderTest {
+
+    private val provider: Provider = DefaultsProvider()
+
+    @Test
+    fun testHas() {
+        assertEquals(Pair(false, true), provider.has("notExisting"))
+        assertEquals(Pair(true, true), provider.has(App.OVERRIDE_PROXY))
+    }
+
+    @Test
+    fun testGet() {
+        assertEquals(Pair("localhost", true), provider.getString(App.OVERRIDE_PROXY_HOST))
+        assertEquals(Pair(8118, true), provider.getInt(App.OVERRIDE_PROXY_PORT))
+    }
+
+    @Test
+    fun testPutRemove() {
+        assertEquals(Pair(false, true), provider.isWritable(App.OVERRIDE_PROXY))
+        assertFalse(provider.putBoolean(App.OVERRIDE_PROXY, true))
+        assertFalse(provider.remove(App.OVERRIDE_PROXY))
+    }
+
+}

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

@@ -0,0 +1,44 @@
+/*
+ * 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 android.support.test.InstrumentationRegistry
+import android.support.test.InstrumentationRegistry.getTargetContext
+import at.bitfire.davdroid.App
+import junit.framework.Assert.assertFalse
+import junit.framework.Assert.assertTrue
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+class SettingsTest {
+
+    lateinit var settings: Settings.Stub
+
+    @Before
+    fun init() {
+        InstrumentationRegistry.getContext().isRestricted
+        settings = Settings.getInstance(getTargetContext())!!
+    }
+
+    @After
+    fun shutdown() {
+        settings.close()
+    }
+
+
+    @Test
+    fun testHas() {
+        assertFalse(settings.has("notExisting"))
+
+        // provided by DefaultsProvider
+        assertTrue(settings.has(App.OVERRIDE_PROXY))
+    }
+
+}

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

@@ -1,37 +1,32 @@
 /*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ * 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.servicedetection
+package at.bitfire.davdroid.ui.setup
 
-import at.bitfire.dav4jvm.okhttp.DavResource
-import at.bitfire.dav4jvm.property.carddav.CardDAV
-import at.bitfire.dav4jvm.property.webdav.WebDAV
-import at.bitfire.davdroid.network.HttpClientBuilder
-import at.bitfire.davdroid.servicedetection.DavResourceFinder.Configuration.ServiceInfo
-import at.bitfire.davdroid.settings.Credentials
-import at.bitfire.davdroid.util.SensitiveString.Companion.toSensitiveString
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import okhttp3.OkHttpClient
+import android.support.test.InstrumentationRegistry.getTargetContext
+import android.support.test.filters.SmallTest
+import at.bitfire.dav4android.DavResource
+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.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.assertArrayEquals
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
+import org.junit.Assert.*
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import java.net.URI
-import java.util.logging.Logger
-import javax.inject.Inject
 
-@HiltAndroidTest
 class DavResourceFinderTest {
 
     companion object {
@@ -45,67 +40,55 @@ class DavResourceFinderTest {
         private const val SUBPATH_ADDRESSBOOK = "/addressbooks/private-contacts"
     }
 
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
+    val server = MockWebServer()
 
-    @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
-
-    @Inject
-    lateinit var logger: Logger
-
-    @Inject
-    lateinit var resourceFinderFactory: DavResourceFinder.Factory
-
-    private lateinit var server: MockWebServer
-    private lateinit var client: OkHttpClient
-    private lateinit var finder: DavResourceFinder
+    lateinit var finder: DavResourceFinder
+    lateinit var client: HttpClient
+    lateinit var loginInfo: LoginInfo
 
     @Before
-    fun setUp() {
-        hiltRule.inject()
+    fun initServerAndClient() {
+        server.setDispatcher(TestDispatcher())
+        server.start()
 
-        server = MockWebServer().apply {
-            dispatcher = TestDispatcher(logger)
-            start()
-        }
+        loginInfo = LoginInfo(URI.create("/"), Credentials("mock", "12345"))
+        finder = DavResourceFinder(getTargetContext(), loginInfo)
 
-        val credentials = Credentials(username = "mock", password = "12345".toSensitiveString())
-        client = httpClientBuilder
-                .authenticate(domain = null, getCredentials = { credentials })
+        client = HttpClient.Builder()
+                .addAuthentication(null, loginInfo.credentials)
                 .build()
-
-        val baseURI = URI.create("/")
-        finder = resourceFinderFactory.create(baseURI, credentials)
     }
 
     @After
-    fun tearDown() {
+    fun stopServer() {
         server.shutdown()
     }
 
 
     @Test
+    @SmallTest
     fun testRememberIfAddressBookOrHomeset() {
         // recognize home set
-        var info = ServiceInfo()
-        DavResource(client, server.url(PATH_CARDDAV + SUBPATH_PRINCIPAL))
-                .propfind(0, CardDAV.AddressbookHomeSet) { response, _ ->
-            finder.scanResponse(CardDAV.Addressbook, response, info)
+        DavResource(client.okHttpClient, server.url(PATH_CARDDAV + SUBPATH_PRINCIPAL))
+                .propfind(0, AddressbookHomeSet.NAME).use {
+            ServiceInfo().let { info ->
+                finder.rememberIfAddressBookOrHomeset(it, info)
+                assertEquals(0, info.collections.size)
+                assertEquals(1, info.homeSets.size)
+                assertEquals(server.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK_HOMESET/"), info.homeSets.first())
+            }
         }
-        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, server.url(PATH_CARDDAV + SUBPATH_ADDRESSBOOK))
-                .propfind(0, WebDAV.ResourceType) { response, _ ->
-            finder.scanResponse(CardDAV.Addressbook, response, info)
+        DavResource(client.okHttpClient, server.url(PATH_CARDDAV + SUBPATH_ADDRESSBOOK))
+                .propfind(0, ResourceType.NAME).use {
+            ServiceInfo().let { info ->
+                finder.rememberIfAddressBookOrHomeset(it, info)
+                assertEquals(1, info.collections.size)
+                assertEquals(server.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"), info.collections.keys.first())
+                assertEquals(0, info.homeSets.size)
+            }
         }
-        assertEquals(1, info.collections.size)
-        assertEquals(server.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"), info.collections.keys.first())
-        assertEquals(0, info.homeSets.size)
     }
 
     @Test
@@ -141,33 +124,21 @@ class DavResourceFinderTest {
         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(
-        private val logger: Logger
-    ): Dispatcher() {
+    class TestDispatcher: Dispatcher() {
 
-        override fun dispatch(request: RecordedRequest): MockResponse {
-            if (!checkAuth(request)) {
+        override fun dispatch(rq: RecordedRequest): MockResponse {
+            if (!checkAuth(rq)) {
                 val authenticate = MockResponse().setResponseCode(401)
                 authenticate.setHeader("WWW-Authenticate", "Basic realm=\"test\"")
                 return authenticate
             }
 
-            val path = request.path!!
+            val path = rq.path
 
-            if (request.method.equals("OPTIONS", true)) {
+            if (rq.method.equals("OPTIONS", true)) {
                 val dav = when {
                     path.startsWith(PATH_CALDAV) -> "calendar-access"
                     path.startsWith(PATH_CARDDAV) -> "addressbook"
@@ -178,7 +149,7 @@ class DavResourceFinderTest {
                 if (dav != null)
                     response.addHeader("DAV", dav)
                 return response
-            } else if (request.method.equals("PROPFIND", true)) {
+            } else if (rq.method.equals("PROPFIND", true)) {
                 val props: String?
                 when (path) {
                     PATH_CALDAV,
@@ -196,21 +167,14 @@ class DavResourceFinderTest {
                                 "   <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.info("Sending props: $props")
+                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'>" +
+                        .setBody("<multistatus xmlns='DAV:' xmlns:CARD='urn:ietf:params:xml:ns:carddav'>" +
                                 "<response>" +
-                                "   <href>${request.path}</href>" +
+                                "   <href>${rq.path}</href>" +
                                 "   <propstat><prop>$props</prop></propstat>" +
                                 "</response>" +
                                 "</multistatus>")

app/src/androidTest/res/values/strings.xml

@@ -0,0 +1,14 @@
+<?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
+  -->
+
+<resources>
+
+    <string name="app_name">DavdroidTest</string>
+
+</resources>

app/src/androidTest/resources/sample.crt

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEEzCCAfsCAQEwDQYJKoZIhvcNAQEFBQAwRjELMAkGA1UEBhMCQ0ExEzARBgNV
+BAgMClNvbWUtU3RhdGUxEDAOBgNVBAoMB0NBIENlcnQxEDAOBgNVBAMMB0NBIENl
+cnQwHhcNMTgwMTEzMjAyOTI5WhcNMTkwMTEzMjAyOTI5WjBZMQswCQYDVQQGEwJD
+QTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0
+cyBQdHkgTHRkMRIwEAYDVQQDDAlVc2VyIENlcnQwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDqOyHAeG4psE/f6i/eTfwbhn6j7WaFXxZiSOWwpQZmzRrx
+MrfkABJCk0X7KNgCaJcmBkG9G1Ri4HfKrxvJFswMXknlq+0ulGBk7oDnZM+pihuX
+3D9VCWMMkCqYhLCGADj2zB2mkX4LpcMRi6XoOetKURE/vcIy7rSLAtJM6ZRdftfh
+2ZxnautS1Tyujh9Au3NI/+Of80tT/nA+oBJQeT1fB/ga1OQlZP5kjSaA7IPiIbTz
+QBO+r898MvqK/lwsvOYnWAp7TY03z+vPfCs0zjijZEl9Wrl0hW6o5db5kU1v5bcr
+p87hxFJsGD2HIr2y6kvYfL2hn+h9iANyYdRnUgapAgMBAAEwDQYJKoZIhvcNAQEF
+BQADggIBAHANsiJITedXPyp89lVMEmGY3zKtOqgQ3tqjvjlNt2sdPnj7wmZbmrNd
+sa90S/UwOn8PzEFOVxYy1BPlljlEjtjmc4OHMcm4P4Zv36uawHilmK8V+zT59gCK
+ftB5FP2TLFUFi2X9o8J06d0xJRE77uewN155NV4RmPuP4b/tMmeixoQppHqLqEr5
+lgEUnt3Mh1ctmeFQFJR6lJ01hlB0gdpVHIhzrVLTO3uo8ePLJTmxP6tyKl/HXj9F
+mpVsKb1kriKwbkGczfw99OUZeUVbTwQOR07r0SrG71B7IuDvxIORnhQc1OUjt7ob
+wjdaZauAHxpGBRu+hw9Yqaxchk9Gldy1nEjGyyVCD0FU5taXbl8PhBWEDc4U9tI+
+xVNmPpsSuCsbz3Mjd1YIVRGL99vLrKsQcj+TNM+jJKKRKes3ihl+l/0FwG6UuO7L
+EvjlUg5hOtYi1D7xuYyMjroGBGh7swYMt6w4eCDbcjzcCkaCi0H2pScM/rLBpDjS
+LIoGCvZ1LBdi933/iOj1/8dxGZwY6fEgcyiD2n0xAgYIniLWjEZXOMdIK5FNTNga
+Tswanvp+6Noa4oIu/hl/LXvPMsouaWfSEbRe0Dshi3GpLj3YtEHoN9DHB8bn7jy5
+34By81GT41m5kq3hWP//x9kSHYSADpbovCbKbElU1qSt6vTVR4nq
+-----END CERTIFICATE-----

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

@@ -0,0 +1,68 @@
+/*
+ * 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.Menu
+import android.view.MenuItem
+import at.bitfire.davdroid.App
+import at.bitfire.davdroid.BuildConfig
+import at.bitfire.davdroid.R
+import at.bitfire.davdroid.settings.ISettings
+
+class DefaultAccountsDrawerHandler: IAccountsDrawerHandler {
+
+    companion object {
+        private const val BETA_FEEDBACK_URI = "mailto:support@davdroid.com?subject=${BuildConfig.APPLICATION_ID}/${BuildConfig.VERSION_NAME} feedback (${BuildConfig.VERSION_CODE})"
+    }
+
+
+    override fun onSettingsChanged(settings: ISettings?, menu: Menu) {
+        if (BuildConfig.VERSION_NAME.contains("-beta") || BuildConfig.VERSION_NAME.contains("-rc"))
+            menu.findItem(R.id.nav_beta_feedback).isVisible = true
+    }
+
+    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_beta_feedback -> {
+                val intent = Intent(Intent.ACTION_SENDTO, Uri.parse(BETA_FEEDBACK_URI))
+                if (activity.packageManager.resolveActivity(intent, 0) != null)
+                    activity.startActivity(intent)
+            }
+            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_manual ->
+                activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.homepage_url))
+                        .buildUpon().appendEncodedPath("manual/").build()))
+            R.id.nav_faq ->
+                activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.homepage_url))
+                        .buildUpon().appendEncodedPath("faq/").build()))
+            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

@@ -0,0 +1,211 @@
+/*
+ * 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.net.Uri
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.security.KeyChain
+import android.support.v4.app.Fragment
+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_urlpwd.isChecked = true
+                    v.urlpwd_base_url.setText(url)
+                    v.urlpwd_user_name.setText(username)
+                    v.urlpwd_password.setText(password)
+                } else {
+                    v.login_type_email.isChecked = true
+                    v.email_address.setText(username)
+                    v.email_password.setText(password)
+                }
+            }
+        }
+
+        v.urlcert_select_cert.setOnClickListener {
+            KeyChain.choosePrivateKeyAlias(activity, { alias ->
+                Handler(Looper.getMainLooper()).post({
+                    v.urlcert_cert_alias.text = alias
+                    v.urlcert_cert_alias.error = null
+                })
+            }, null, null, null, -1, view!!.urlcert_cert_alias.text.toString())
+        }
+
+        v.login.setOnClickListener {
+            validateLoginData()?.let { info ->
+                DetectConfigurationFragment.newInstance(info).show(fragmentManager, null)
+            }
+        }
+
+        // initialize to Login by email
+        onCheckedChanged(v)
+
+        v.login_type_email.setOnCheckedChangeListener(this)
+        v.login_type_urlpwd.setOnCheckedChangeListener(this)
+        v.login_type_urlcert.setOnCheckedChangeListener(this)
+
+        return v
+    }
+
+    override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
+        onCheckedChanged(view!!)
+    }
+
+    private fun onCheckedChanged(v: View) {
+        v.login_type_email_details.visibility = if (v.login_type_email.isChecked) View.VISIBLE else View.GONE
+        v.login_type_urlpwd_details.visibility = if (v.login_type_urlpwd.isChecked) View.VISIBLE else View.GONE
+        v.login_type_urlcert_details.visibility = if (v.login_type_urlcert.isChecked) View.VISIBLE else View.GONE
+    }
+
+    private fun validateLoginData(): LoginInfo? {
+        val view = requireNotNull(view)
+        when {
+            // Login with email address
+            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.text.toString()
+                if (password.isEmpty()) {
+                    view.email_password.error = getString(R.string.login_password_required)
+                    valid = false
+                }
+
+                return if (valid && uri != null)
+                    LoginInfo(uri, email, password)
+                else
+                    null
+
+            }
+
+            // Login with URL and user name
+            view.login_type_urlpwd.isChecked -> {
+                var valid = true
+
+                val baseUrl = Uri.parse(view.urlpwd_base_url.text.toString())
+                val uri = validateBaseUrl(baseUrl, false, { message ->
+                    view.urlpwd_base_url.error = message
+                    valid = false
+                })
+
+                val userName = view.urlpwd_user_name.text.toString()
+                if (userName.isBlank()) {
+                    view.urlpwd_user_name.error = getString(R.string.login_user_name_required)
+                    valid = false
+                }
+
+                val password = view.urlpwd_password.text.toString()
+                if (password.isEmpty()) {
+                    view.urlpwd_password.error = getString(R.string.login_password_required)
+                    valid = false
+                }
+
+                return if (valid && uri != null)
+                    LoginInfo(uri, userName, password)
+                else
+                    null
+            }
+
+            // Login with URL and client certificate
+            view.login_type_urlcert.isChecked -> {
+                var valid = true
+
+                val baseUrl = Uri.parse(view.urlcert_base_url.text.toString())
+                val uri = validateBaseUrl(baseUrl, true, { message ->
+                    view.urlcert_base_url.error = message
+                    valid = false
+                })
+
+                val alias = view.urlcert_cert_alias.text.toString()
+                if (alias.isEmpty()) {
+                    view.urlcert_cert_alias.error = ""
+                    valid = false
+                }
+
+                if (valid && uri != null)
+                    return LoginInfo(uri, certificateAlias = alias)
+            }
+        }
+
+        return null
+    }
+
+    private fun validateBaseUrl(baseUrl: Uri, httpsRequired: Boolean, reportError: (String) -> Unit): URI? {
+        var uri: URI? = null
+        val scheme = baseUrl.scheme
+        if ((!httpsRequired && scheme.equals("http", true)) || scheme.equals("https", true)) {
+            var host = baseUrl.host
+            if (host.isNullOrBlank())
+                reportError(getString(R.string.login_url_host_name_required))
+            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) {
+                reportError(e.localizedMessage)
+            }
+        } else
+            reportError(getString(if (httpsRequired)
+                    R.string.login_url_must_be_https
+                else
+                    R.string.login_url_must_be_http_or_https))
+        return uri
+    }
+
+
+    class Factory: ILoginCredentialsFragment {
+
+        override fun getFragment() = DefaultLoginCredentialsFragment()
+
+    }
+
+}

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

@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              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:checked="true"
+                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:paddingTop="8dp"
+                android:paddingBottom="16dp"
+                android:orientation="vertical">
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/email_address"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/login_email_address"
+                        android:inputType="textEmailAddress"/>
+                </android.support.design.widget.TextInputLayout>
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:passwordToggleEnabled="true">
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/email_password"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/login_password"
+                        android:fontFamily="monospace"
+                        android:inputType="textPassword"/>
+                </android.support.design.widget.TextInputLayout>
+            </LinearLayout>
+
+            <RadioButton
+                android:id="@+id/login_type_urlpwd"
+                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_urlpwd_details"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="8dp"
+                android:paddingBottom="16dp"
+                android:orientation="vertical">
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/urlpwd_base_url"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/login_base_url"
+                        android:inputType="textUri"/>
+                </android.support.design.widget.TextInputLayout>
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/urlpwd_user_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/login_user_name"
+                        android:inputType="textEmailAddress"/>
+                </android.support.design.widget.TextInputLayout>
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:passwordToggleEnabled="true">
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/urlpwd_password"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="monospace"
+                        android:inputType="textPassword"
+                        android:hint="@string/login_password"/>
+                </android.support.design.widget.TextInputLayout>
+            </LinearLayout>
+
+            <RadioButton
+                android:id="@+id/login_type_urlcert"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/login_type_url_certificate"
+                android:layout_marginTop="16dp"
+                android:paddingLeft="14dp" tools:ignore="RtlSymmetry"
+                style="@style/login_type_headline"/>
+            <LinearLayout
+                android:id="@+id/login_type_urlcert_details"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="8dp"
+                android:paddingBottom="16dp"
+                android:orientation="vertical">
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/urlcert_base_url"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/login_base_url"
+                        android:inputType="textUri"/>
+                </android.support.design.widget.TextInputLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/urlcert_cert_alias"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="3dp"
+                        android:paddingRight="3dp"
+                        style="@style/Base.TextAppearance.AppCompat.Body1"
+                        android:textSize="16sp"/>
+
+                    <Button
+                        android:id="@+id/urlcert_select_cert"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                        android:text="@string/login_select_certificate"/>
+
+                </LinearLayout>
+
+            </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

@@ -0,0 +1,122 @@
+<?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 Llibreta d’Adreces</string>
+  <string name="address_books_authority_title">Llibreta d’adreces</string>
+  <string name="help">Ajuda</string>
+  <string name="manage_accounts">Gestiona comptes</string>
+  <string name="please_wait">Esperi si us plau...</string>
+  <string name="send">Enviar</string>
+  <string name="homepage_url">https://www.davdroid.com/?pk_campaign=davdroid-app</string>
+  <string name="beta_feedback_url">https://forums.bitfire.at/category/9/beta-test-discussion?pk_campaign=davdroid-app</string>
+  <string name="notification_channel_debugging">Depurador</string>
+  <string name="notification_channel_general">Altres missatges importants</string>
+  <string name="notification_channel_sync">Sincronització</string>
+  <string name="notification_channel_sync_io_errors">Xarxa i errors E/S</string>
+  <string name="notification_channel_sync_status">Estat dels misatges</string>
+  <!--startup dialogs-->
+  <string name="startup_autostart_permission">%s permisos d\'inici automàtic</string>
+  <string name="startup_autostart_permission_message">El microprogramari del dispositiu pot impedir la sincronització automàtica. Hauries de permetre la sincronització automàtica manualment.</string>
+  <string name="startup_battery_optimization">Optimització de la bateria</string>
+  <string name="startup_battery_optimization_message">Android pot desactivar/reduir la sincronització de DAVdroid després d\'uns dies. Per impedir això, desactiva l\'optimització de la bateria.</string>
+  <string name="startup_battery_optimization_disable">Desactiva per DAVdroid</string>
+  <string name="startup_dont_show_again">No mostrar de nou</string>
+  <string name="startup_donate">Informació de Codi Obert</string>
+  <string name="startup_donate_message">Som feliços de que utilitzis DAVdroid, el qual és programari lliure (GPLv3). Desenvolupar DAVdroid ens porte moltes hores i molta feina, si us plau, considera fer una donació.</string>
+  <string name="startup_donate_now">Mostra la pàgina de donació</string>
+  <string name="startup_donate_later">Més tard</string>
+  <string name="startup_google_play_accounts_removed">Informació d\'errors DRM a Play Store</string>
+  <string name="startup_more_info">Més informació</string>
+  <string name="startup_opentasks_not_installed">OpenTasks no està instal·lada</string>
+  <string name="startup_opentasks_not_installed_install">Instal·lar OpenTasks</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Termes de la llicència</string>
+  <!--global settings-->
+  <string name="logging_no_external_storage">Emmagatzematge extern no trobat</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_about">Quan a / Llicència</string>
+  <string name="navigation_drawer_beta_feedback">Retroacció de la Beta</string>
+  <string name="navigation_drawer_settings">Paràmetres</string>
+  <string name="navigation_drawer_news_updates">Novetats &amp; Actualitzacions</string>
+  <string name="navigation_drawer_external_links">Enllaços externs</string>
+  <string name="navigation_drawer_website">Pàgina web</string>
+  <string name="navigation_drawer_manual">Manual</string>
+  <string name="navigation_drawer_faq">Preguntes Freqüents</string>
+  <string name="navigation_drawer_forums">Ajuda / Fòrums</string>
+  <string name="navigation_drawer_donate">Fer donació</string>
+  <string name="accounts_global_sync_enable">Activar</string>
+  <!--DavService-->
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Paràmetres</string>
+  <string name="app_settings_user_interface">Interfície d’usuari</string>
+  <string name="app_settings_reset_hints">Reiniciar pistes</string>
+  <string name="app_settings_security">Seguretat</string>
+  <string name="app_settings_debug">Depurador</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Sincronitza ara</string>
+  <string name="account_synchronizing_now">Sincronitzant ara</string>
+  <string name="account_settings">Paràmetres del compte</string>
+  <string name="account_rename">Canvia el nom al compte</string>
+  <string name="account_rename_rename">Canvia el nom</string>
+  <string name="account_delete">Esborra el compte</string>
+  <string name="account_delete_confirmation_title">Segur que vols esborrar el compte?</string>
+  <string name="account_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">Webcal</string>
+  <string name="account_synchronize_this_collection">Sincronitzar aquesta col·lecció</string>
+  <string name="account_read_only">Només de lectura</string>
+  <string name="account_calendar">Calendari</string>
+  <string name="account_task_list">Llista de tasques</string>
+  <string name="account_refresh_address_book_list">Actualitza la llista de llibretes d’adreces</string>
+  <string name="account_create_new_address_book">Crear nova llibreta d’adreces</string>
+  <string name="account_refresh_calendar_list">Actualitzar llista de calendaris</string>
+  <string name="account_create_new_calendar">Crear nou calendari</string>
+  <string name="account_install_icsdroid">Instal·lar ICSdroid</string>
+  <!--AddAccountActivity-->
+  <string name="login_help_url">https://www.davdroid.com/tested-with/?pk_campaign=davdroid-app</string>
+  <string name="login_title">Afegir compte</string>
+  <string name="login_type_email">Entra amb una adreça de correu electrònic</string>
+  <string name="login_email_address">Correu electrònic</string>
+  <string name="login_email_address_error">Es requereix un correu electrònic vàlid</string>
+  <string name="login_password">Contrasenya</string>
+  <string name="login_password_required">Es requereix contrasenya</string>
+  <string name="login_type_url">Entra amb una URL i un nom d\'usuari</string>
+  <string name="login_url_must_be_http_or_https">La URL hauria de començar amb http(s)://</string>
+  <string name="login_url_must_be_https">La URL hauria de començar amb https://</string>
+  <string name="login_url_host_name_required">Es requereix nom d\'amfitrió</string>
+  <string name="login_user_name">Nom d\'usuari/a</string>
+  <string name="login_user_name_required">Es requereix nom d\'usuari/a</string>
+  <string name="login_base_url">URL base</string>
+  <string name="login_select_certificate">Selecciona certificat</string>
+  <string name="login_login">Entrada</string>
+  <string name="login_back">Sortir</string>
+  <string name="login_create_account">Crear compte</string>
+  <string name="login_account_name">Nom del compte</string>
+  <string name="login_view_logs">Veure els registres</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Paràmetres: %s</string>
+  <string name="settings_authentication">Autentificació</string>
+  <string name="settings_username">Nom d\'usuari/a</string>
+  <string name="settings_enter_username">Escriu el nom d\'usuari/a:</string>
+  <string name="settings_password">Contrasenya</string>
+  <string name="settings_enter_password">Escriu la teva contrasenya</string>
+  <string name="settings_sync">Sincronització</string>
+  <string name="settings_sync_summary_manually">Només a mà</string>
+  <string-array name="settings_sync_interval_names">
+    <item>Només a mà</item>
+    <item>Cada 15 minuts</item>
+    <item>Cada 30 minuts</item>
+    <item>Cada hora</item>
+    <item>Cada 2 hores</item>
+    <item>Cada 4 hores</item>
+    <item>Una vegada al dia</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Sincronitzar només amb WI-FI</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_caldav">CalDAV</string>
+  <!--collection management-->
+  <!--ExceptionInfoFragment-->
+  <!--sync adapters and DebugInfoActivity-->
+  <!--cert4android-->
+</resources>

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

@@ -0,0 +1,183 @@
+<?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_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_opentasks_not_installed">OpenTasks není nainstalován</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_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>
+  <!--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 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_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="many">Ignorovat události starší než %d dnů</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 adapters 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>
+  <!--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

@@ -0,0 +1,245 @@
+<?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 adressebog</string>
+  <string name="address_books_authority_title">Adressebøger</string>
+  <string name="help">Hjælp</string>
+  <string name="manage_accounts">Administrere konti</string>
+  <string name="please_wait">Vent...</string>
+  <string name="send">Send</string>
+  <string name="notification_channel_debugging">Fejlsøgning</string>
+  <string name="notification_channel_general">Andre vigtige beskeder</string>
+  <string name="notification_channel_sync">Synkronisering</string>
+  <string name="notification_channel_sync_errors">Synkroniserings-fejl</string>
+  <string name="notification_channel_sync_io_errors">Netværks- og I/O-fejl</string>
+  <string name="notification_channel_sync_status">Status beskeder</string>
+  <!--startup dialogs-->
+  <string name="startup_autostart_permission">%s tilladelse til at starte automatisk</string>
+  <string name="startup_autostart_permission_message">Enhedens firmware kan forbyde automatisk synkronisering. Du er muligvis nødt til at tillade automatisk synkronisering manuelt.</string>
+  <string name="startup_battery_optimization">Batteri optimering</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">Deaktivere DAVdroid</string>
+  <string name="startup_dont_show_again">Vis ikke igen</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_more_info">Mere information</string>
+  <string name="startup_opentasks_not_installed">OpenTasks ikke installeret</string>
+  <string name="startup_opentasks_not_installed_message">Du er nødt til at have den gratis app OpenTasks for at kunne synkronisere opgaver. (Ikke påkrævet for kontakter/begivenheder.)</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">Installere OpenTasks</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Licensbetingelser</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_couldnt_create_file">Kunne ikke oprette ekstern logfil: %s</string>
+  <string name="logging_no_external_storage">Eksternt lager ikke fundet</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 synkroniseringsadapter</string>
+  <string name="navigation_drawer_about">Om / licens</string>
+  <string name="navigation_drawer_beta_feedback">Beta tilbagemelding</string>
+  <string name="navigation_drawer_settings">Opsætning</string>
+  <string name="navigation_drawer_news_updates">Nyheder &amp; opdateringer</string>
+  <string name="navigation_drawer_external_links">Eksterne henvisninger</string>
+  <string name="navigation_drawer_website">Netsted</string>
+  <string name="navigation_drawer_manual">Manual</string>
+  <string name="navigation_drawer_faq">OSS</string>
+  <string name="navigation_drawer_forums">Hjælp / fora</string>
+  <string name="navigation_drawer_donate">Donation</string>
+  <string name="account_list_empty">Velkommen til DAVdroid!\n\nDu kan nu tilføje en CalDAV/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">Aktivere</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Registrering af tjeneste kunne ikke foretages</string>
+  <string name="dav_service_refresh_couldnt_refresh">Kunne ikke opdatere samling liste</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Indstillinger</string>
+  <string name="app_settings_user_interface">Brugerflade</string>
+  <string name="app_settings_reset_hints">Nulstil vejledende pop op</string>
+  <string name="app_settings_reset_hints_summary">Genaktivere tidligere lukket pop op</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">Fejlsøgning</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 fejlsøgnings information</string>
+  <string name="app_settings_show_debug_info_details">Vis/del software og opsætningsoplysninger</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Synkronisere</string>
+  <string name="account_synchronizing_now">Synkroniserer</string>
+  <string name="account_settings">Opsætning af konti</string>
+  <string name="account_rename">Omdøbe 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øbe</string>
+  <string name="account_delete">Slette konto</string>
+  <string name="account_delete_confirmation_title">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_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">Webcal</string>
+  <string name="account_synchronize_this_collection">synkronisere samling</string>
+  <string name="account_read_only">skrivebeskyttet</string>
+  <string name="account_calendar">kalender</string>
+  <string name="account_task_list">opgave liste</string>
+  <string name="account_refresh_address_book_list">Opdatere adressebogslister</string>
+  <string name="account_create_new_address_book">Oprette ny adressebog</string>
+  <string name="account_refresh_calendar_list">Opdatere kalenderliste</string>
+  <string name="account_create_new_calendar">Oprette ny kalender</string>
+  <string name="account_no_webcal_handler_found">Der er ikke fundet noget program der kan håndtere Webcal.</string>
+  <string name="account_install_icsdroid">Installere ICSdroid</string>
+  <!--AddAccountActivity-->
+  <string name="login_help_url">https://www.davdroid.com/tested-with/?pk_campaign=davdroid-app</string>
+  <string name="login_title">Tilføje konto</string>
+  <string name="login_type_email">Logge ind med e-post adresse</string>
+  <string name="login_email_address">E-post adresse</string>
+  <string name="login_email_address_error">Gyldig e-post adresse 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">Logge ind med URL og brugernavn</string>
+  <string name="login_url_must_be_http_or_https">URL skal starte med http(s)://</string>
+  <string name="login_url_must_be_https">URL skal starte med https://</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_type_url_certificate">Logge ind med URL og klientcertifikat</string>
+  <string name="login_select_certificate">Vælge certifikat</string>
+  <string name="login_login">Logge ind</string>
+  <string name="login_back">Tilbage</string>
+  <string name="login_create_account">Oprette 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 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">Indtaste 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_certificate_alias">Alias for klientcertifikat</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_names">
+    <item>Kun manuelt</item>
+    <item>Hvert 15. minut</item>
+    <item>Hver halve time</item>
+    <item>Hver time</item>
+    <item>Hver 2. time</item>
+    <item>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_ssids">WiFi SSID-begrænsning</string>
+  <string name="settings_sync_wifi_only_ssids_on">Synkroniserer kun over %s</string>
+  <string name="settings_sync_wifi_only_ssids_off">Alle WiFi-forbindelser vil blive anvendt</string>
+  <string name="settings_sync_wifi_only_ssids_message">Kommaseparerede navne (SSID\'er) over tilladte WiFi-netværk (efterlad blank for at bruge alle)</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_contact_group_method_change">Skift grupperingsmetode</string>
+  <string name="settings_contact_group_method_change_reload_contacts">Dette kræver, at alle kontakter genindlæses. Lokale ændringer, der ikke er gemt, vil blive slettet.</string>
+  <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>
+  <string name="settings_event_colors">Farver for begivenheder</string>
+  <string name="settings_event_colors_on">Synkroniser farver for begivenheder</string>
+  <string name="settings_event_colors_off">Synkroniser ikke farver for begivenheder</string>
+  <string name="settings_event_colors_off_confirm">Fjernes farver for begivenheder kan det fjerne farver, der allerede er synkroniseret.</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>
+  <string name="collection_force_read_only">Sæt skrivebeskyttet</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 adapters and DebugInfoActivity-->
+  <string name="debug_info_title">Debug-info</string>
+  <string name="sync_contacts_read_only_address_book">Skrivebeskyttet adressebog</string>
+  <plurals name="sync_contacts_local_contact_changes_discarded">
+    <item quantity="one">Lokal ændring slettet</item>
+    <item quantity="other">%d lokale ændringer slettet</item>
+  </plurals>
+  <string name="sync_error_permissions">DAVdroid-rettigheder</string>
+  <string name="sync_error_permissions_text">Yderligere adgang påkrævet</string>
+  <string name="sync_error_opentasks_too_old">OpenTasks-version for gammel</string>
+  <string name="sync_error_opentasks_required_version">Påkrævet version: %1$s (aktuelt%2$s)</string>
+  <string name="sync_error_authentication_failed">Login mislykkedes (check loginoplysninger)</string>
+  <string name="sync_error_io">Netværks- eller I/O-fejl - %s</string>
+  <string name="sync_error_http_dav">HTTP-serverfejl - %s</string>
+  <string name="sync_error_local_storage">Lokal lagringsfejl - %s</string>
+  <string name="sync_error_retry">Gentag</string>
+  <string name="sync_error_view_item">Vis element</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

@@ -0,0 +1,238 @@
+<?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">Agenda DAVdroid</string>
+  <string name="address_books_authority_title">Agendas</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>
+  <string name="homepage_url">https://www.davdroid.com/?pk_campaign=davdroid-app</string>
+  <string name="beta_feedback_url">https://forums.bitfire.at/category/9/beta-test-discussion?pk_campaign=davdroid-app</string>
+  <string name="notification_channel_debugging">Depuración</string>
+  <string name="notification_channel_general">Otros mensajes importantes</string>
+  <string name="notification_channel_sync">Sincronización</string>
+  <string name="notification_channel_sync_errors">Errores de sincronización</string>
+  <string name="notification_channel_sync_io_errors">Errores de Red y E/S</string>
+  <string name="notification_channel_sync_status">Mensajes de estado</string>
+  <!--startup dialogs-->
+  <string name="startup_autostart_permission">%s permisos de inicio automático</string>
+  <string name="startup_autostart_permission_message">El firmware del dispositivo podría prevenir sincronización automática. Podría necesitar permitir sincronización manualmente.</string>
+  <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_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_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">Para sincronizar tareas, la aplicación libre OpenTasks es requerida. (No necesaria para contactos/eventos.)</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_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_beta_feedback">Retroalimentación Beta</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_manual">Manual</string>
+  <string name="navigation_drawer_faq">Preguntas frequentes</string>
+  <string name="navigation_drawer_forums">Ayuda / Foros</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>
+  <string name="accounts_global_sync_disabled">Sincronización automática del sistema completo está deshabilitada</string>
+  <string name="accounts_global_sync_enable">Activar</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_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">Webcal</string>
+  <string name="account_synchronize_this_collection">sincronizar ésta colección</string>
+  <string name="account_read_only">solo lectura</string>
+  <string name="account_calendar">calendario</string>
+  <string name="account_task_list">lista de tareas</string>
+  <string name="account_refresh_address_book_list">Refrescar contactos</string>
+  <string name="account_create_new_address_book">Crear nueva agenda</string>
+  <string name="account_refresh_calendar_list">Refrescar calendario</string>
+  <string name="account_create_new_calendar">Crear nuevo calendario</string>
+  <string name="account_no_webcal_handler_found">No se encontró aplicación para administrar Webcal</string>
+  <string name="account_install_icsdroid">Instale ICSdroid</string>
+  <!--AddAccountActivity-->
+  <string name="login_help_url">https://www.davdroid.com/tested-with/?pk_campaign=davdroid-app</string>
+  <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_must_be_https">El URL debe comenzar con https://</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_type_url_certificate">Iniciar sesión con URL y certificado del cliente</string>
+  <string name="login_select_certificate">Seleccionar un certificado</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_certificate_alias">Alias del certificado cliente</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 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_ssids">Restricción WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssids_on">Solo se sincronizará a través de %s</string>
+  <string name="settings_sync_wifi_only_ssids_off">Todas las conexiones WiFi serán usadas</string>
+  <string name="settings_sync_wifi_only_ssids_message">Nombres separados por comas (SSIDs) de redes WiFi permitidas (deje vacío para todas)</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_contact_group_method_change">Cambie método de grupo</string>
+  <string name="settings_contact_group_method_change_reload_contacts">Esto requiere recargar todos los contactos. Cambios locales sin guardar serán descartados.</string>
+  <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>
+  <string name="settings_event_colors">Soporte de colores en eventos</string>
+  <string name="settings_event_colors_on">Sincronizar colores de eventos</string>
+  <string name="settings_event_colors_off">No sincronizar colores de eventos</string>
+  <string name="settings_event_colors_off_confirm">Desactivar colores de eventos podría remover colores de eventos ya sincronizados.</string>
+  <!--collection management-->
+  <string name="create_addressbook">Crear nueva agenda</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>
+  <string name="collection_force_read_only">Forzar solo-lectura</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 adapters and DebugInfoActivity-->
+  <string name="debug_info_title">Información de depuración</string>
+  <string name="sync_contacts_read_only_address_book">Libro de direcciones solo-lectura</string>
+  <plurals name="sync_contacts_local_contact_changes_discarded">
+    <item quantity="one">Cambio de contacto local descartado</item>
+    <item quantity="other">%d cambios de contactos locales descartados</item>
+  </plurals>
+  <string name="sync_error_permissions">Permisos de DAVdroid</string>
+  <string name="sync_error_permissions_text">Permisos adicionales requeridos</string>
+  <string name="sync_error_opentasks_too_old">OpenTasks muy viejo</string>
+  <string name="sync_error_opentasks_required_version">Versión requerida: %1$s (actual %2$s)</string>
+  <string name="sync_error_authentication_failed">Falló la autenticación (revise credenciales de inicio de sesión)</string>
+  <string name="sync_error_io">Error de red o E/S – %s</string>
+  <string name="sync_error_http_dav">Error de servidor – %s</string>
+  <string name="sync_error_local_storage">Error de almacenamiento local – %s</string>
+  <string name="sync_error_retry">Reintentar</string>
+  <string name="sync_error_view_item">Ver item</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

@@ -0,0 +1,210 @@
+<?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">patientez ...</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_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_opentasks_not_installed">L\'application OpenTasks n\'est pas installée</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_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és &amp; mises à jour</string>
+  <string name="navigation_drawer_external_links">Liens externes</string>
+  <string name="navigation_drawer_website">Site Web</string>
+  <string name="navigation_drawer_faq">Foire aux questions</string>
+  <string name="navigation_drawer_forums">Aide/Forum</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 ou 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_carddav">CardDAV (les carnets d\'adresse) </string>
+  <string name="account_caldav">CalDAV (les agendas) </string>
+  <string name="account_webcal">WebCal (les anciens agenda)</string>
+  <string name="account_calendar">calendrier</string>
+  <string name="account_task_list">liste de tâche</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>
+  <string name="account_no_webcal_handler_found">Aucune application compatible WebCal</string>
+  <string name="account_install_icsdroid">Installer ICSdroid</string>
+  <!--AddAccountActivity-->
+  <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">Veuillez patienter, nous interrogeons le serveur ...</string>
+  <string name="login_no_caldav_carddav">Aucun accès possible au service CalDAV ou CardDAV.</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_names">
+    <item>Manuellement</item>
+    <item>Tous les quarts d\'heure</item>
+    <item>Toutes les demi-heures</item>
+    <item>Toutes les heures</item>
+    <item>Toutes les deux heures</item>
+    <item>Toutes les quatre 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_ssids">Restriction WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssids_on">Synchronisation possible seulement en %s</string>
+  <string name="settings_sync_wifi_only_ssids_off">Toutes les connexions WiFi seront utilisées</string>
+  <string name="settings_sync_wifi_only_ssids_message">Liste des points d\'accès WiFi (SSID) autorisés, séparés par des virgules. (Laissez vide pour tous)</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>
+  <string name="settings_event_colors">Couleur associée aux événements</string>
+  <string name="settings_event_colors_on">Synchroniser la couleur associée aux événements</string>
+  <string name="settings_event_colors_off">Ne pas synchroniser la couleur associée aux événements</string>
+  <string name="settings_event_colors_off_confirm">Modifier la couleur associée aux événements peut affecter les valeurs déjà synchronisées.</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 adapters 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>
+  <!--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

@@ -0,0 +1,246 @@
+<?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>
+  <string name="homepage_url">https://www.davdroid.com/?pk_campaign=davdroid-app</string>
+  <string name="beta_feedback_url">https://forums.bitfire.at/category/9/beta-test-discussion?pk_campaign=davdroid-app</string>
+  <string name="notification_channel_debugging">Hibakeresés</string>
+  <string name="notification_channel_general">Egyéb fontos üzenetek</string>
+  <string name="notification_channel_sync">Szinkronizáció</string>
+  <string name="notification_channel_sync_errors">Szinkronizációs hibák</string>
+  <string name="notification_channel_sync_io_errors">Hálózati és I/O hibák</string>
+  <string name="notification_channel_sync_status">Státuszüzenetek</string>
+  <!--startup dialogs-->
+  <string name="startup_autostart_permission_message">Lehetséges,hogy az eszköz nem teszi lehetővé az automatikus szinkronizálást és az automatikus szinkronizálást lehetőségét kézzel kell beállítani.</string>
+  <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_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_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">A feladatok szinkronizálásához az ingyenes OpenTasks alkalmazásra van szükség.  (A névjegyek és események szinkronizálásához erre nincs szükség.)</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_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_beta_feedback">Tesztelői visszajelzés</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_manual">Kézikönyv</string>
+  <string name="navigation_drawer_faq">GYIK</string>
+  <string name="navigation_drawer_forums">Segítség / Fórumok</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_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">Webcal</string>
+  <string name="account_synchronize_this_collection">a gyűjtemény szinkronizálása</string>
+  <string name="account_read_only">csak olvasható</string>
+  <string name="account_calendar">naptár</string>
+  <string name="account_task_list">feladatlista</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>
+  <string name="account_no_webcal_handler_found">Nem található Webcal-képes alkalmazás</string>
+  <string name="account_install_icsdroid">ICSdroid telepítése</string>
+  <!--AddAccountActivity-->
+  <string name="login_help_url">https://www.davdroid.com/tested-with/?pk_campaign=davdroid-app</string>
+  <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_must_be_https">Az URL elején szerepeljen https://</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_type_url_certificate">Bejelentkezés URL és tanúsítvány segítségével</string>
+  <string name="login_select_certificate">Tanúsítvány kiválasztása</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_certificate_alias">Tanúsítvány alternatív megnevezése</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_names">
+    <item>Manális</item>
+    <item>15 percenként</item>
+    <item>30 percenként</item>
+    <item>Óránként</item>
+    <item>Kétóránként</item>
+    <item>Négyó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_ssids">WiFi SSID szűrés</string>
+  <string name="settings_sync_wifi_only_ssids_on">Az alábbi hálózatok használhatók: %s</string>
+  <string name="settings_sync_wifi_only_ssids_off">Minden hálózat használható</string>
+  <string name="settings_sync_wifi_only_ssids_message">A használható WiFi hálózatok nevei (SSID), vesszővel elválasztva (hagyja üresen, ha nem akar szűrést beállítani)</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_contact_group_method_change">A csoportok kezelésének megváltoztatása</string>
+  <string name="settings_contact_group_method_change_reload_contacts">Az összes névjegyet újra be kell olvasni.  Az el nem mentett helyi változások törlődni fognak.</string>
+  <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>
+  <string name="settings_event_colors">Eseményszínek támogatása</string>
+  <string name="settings_event_colors_on">Eseményszínek szinkronlzálása</string>
+  <string name="settings_event_colors_off">Az eseményszínek szinkronizálásának elhagyása</string>
+  <string name="settings_event_colors_off_confirm">A szinkronizálás kikapcsolása a már szinkronizált eseményszíneket törölheti.</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>
+  <string name="collection_force_read_only">Csak olvashatóvá tétel</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 adapters and DebugInfoActivity-->
+  <string name="debug_info_title">Hibakeresési információ</string>
+  <string name="sync_contacts_read_only_address_book">Csak olvasható címjegyzék</string>
+  <plurals name="sync_contacts_local_contact_changes_discarded">
+    <item quantity="one">Helyi névjegyváltozás elvetve</item>
+    <item quantity="other">%d helyi névjegyváltozás elvetve</item>
+  </plurals>
+  <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_opentasks_too_old">Az OpenTask verzió nem megfelelő</string>
+  <string name="sync_error_opentasks_required_version">Szükséges verzió: %1$s (jelenlegi verzió: %2$s)</string>
+  <string name="sync_error_authentication_failed">Authentikáció nem sikerült (ellenőrizze a hitelesítéshez megadott adatokat)</string>
+  <string name="sync_error_io">Hálózati vagy I/O hiba – %s</string>
+  <string name="sync_error_http_dav">HTTP szerver oldali hiba - %s</string>
+  <string name="sync_error_local_storage">Tárhelyhiba - %s</string>
+  <string name="sync_error_retry">Újbóli próbálkozás</string>
+  <string name="sync_error_view_item">Elem megtekintése</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

@@ -0,0 +1,223 @@
+<?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 DAVdroid</string>
+  <string name="address_books_authority_title">Rubriche</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>
+  <string name="notification_channel_general">Altri messaggi importanti</string>
+  <string name="notification_channel_sync">Sincronizzazione</string>
+  <string name="notification_channel_sync_errors">Errori di sincronizzazione</string>
+  <string name="notification_channel_sync_io_errors">Errori di Rete e di I/O</string>
+  <string name="notification_channel_sync_status">Messaggi di stato</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Ottimizzazione 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_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_more_info">Più informazioni</string>
+  <string name="startup_opentasks_not_installed">OpenTasks non installata</string>
+  <string name="startup_opentasks_not_installed_message">Per sincronizzare le attività è richiesta l\'app gratuita OpenTasks. (Non richiesta per contatti/eventi.)</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_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_manual">Manuale</string>
+  <string name="navigation_drawer_faq">Domande Frequenti</string>
+  <string name="navigation_drawer_forums">Aiuto / Forum</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_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">Webcal</string>
+  <string name="account_read_only">sola lettura</string>
+  <string name="account_calendar">calendario</string>
+  <string name="account_task_list">elenco attività</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>
+  <string name="account_install_icsdroid">Installa ICSdroid</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_must_be_https">L\'URL deve iniziare con https://</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_type_url_certificate">Accedi con URL e certificato client</string>
+  <string name="login_select_certificate">Seleziona certificato</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_names">
+    <item>Solo manualmente</item>
+    <item>Ogni 15 minuti</item>
+    <item>Ogni 30 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_ssids">Restrizione SSID WiFi</string>
+  <string name="settings_sync_wifi_only_ssids_message">Nomi (SSID) delle reti WiFi autorizzate separati da virgola (lascia vuoto per autorizzarle tutte)</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>
+  <string name="settings_event_colors">Supporto colore dell\'evento</string>
+  <string name="settings_event_colors_on">Sincronizza colori eventi</string>
+  <string name="settings_event_colors_off">Non sincronizza colori eventi</string>
+  <!--collection management-->
+  <string name="create_addressbook">Crea rubrica</string>
+  <string name="create_addressbook_display_name_hint">La mia rubrica</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>
+  <string name="collection_force_read_only">Forza sola lettura</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 adapters and DebugInfoActivity-->
+  <string name="debug_info_title">Informazioni di debug</string>
+  <string name="sync_contacts_read_only_address_book">Rubrica in sola lettura</string>
+  <string name="sync_error_permissions">Autorizzazioni DAVdroid</string>
+  <string name="sync_error_permissions_text">Autorizzazioni addizionali richieste</string>
+  <string name="sync_error_opentasks_too_old">OpenTasks troppo vecchia</string>
+  <string name="sync_error_opentasks_required_version">Versione richiesta: %1$s (attualmente %2$s)</string>
+  <string name="sync_error_authentication_failed">Autenticazione fallita (controlla credenziali login)</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-ja/strings.xml

@@ -0,0 +1,230 @@
+<?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://www.davdroid.com/?pk_campaign=davdroid-app</string>
+  <string name="beta_feedback_url">https://forums.bitfire.at/category/9/beta-test-discussion?pk_campaign=davdroid-app</string>
+  <string name="notification_channel_debugging">デバッグ中</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">バッテリー最適化</string>
+  <string name="startup_battery_optimization_message">Android は数日後に DAVdroid の同期を無効にする/減らすことがあります。これを防止するには、バッテリー最適化をオフにしてください。</string>
+  <string name="startup_battery_optimization_disable">DAVdroid 用にオフにする</string>
+  <string name="startup_dont_show_again">次回から表示しない</string>
+  <string name="startup_donate">オープンソース情報</string>
+  <string name="startup_donate_message">あなたがオープンソース ソフトウェア (GPLv3) の DAVdroid を使用していただくことに、私たちは満足しています。 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">特定の条件下で、DAVdroid を再起動後またはアップグレードした後、Play ストア DRM によりすべての DAVdroid アカウントがなくなる可能性があります。この問題の影響を受けている場合 (のみ)、Play ストアから「DAVdroid JB 回避策」をインストールしてください。</string>
+  <string name="startup_opentasks_not_installed">OpenTasks がインストールされていません</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_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_beta_feedback">ベータフィードバック</string>
+  <string name="navigation_drawer_settings">設定</string>
+  <string name="navigation_drawer_news_updates">ニュース &amp; 更新</string>
+  <string name="navigation_drawer_external_links">外部リンク</string>
+  <string name="navigation_drawer_website">Web サイト</string>
+  <string name="navigation_drawer_manual">手動</string>
+  <string name="navigation_drawer_faq">FAQ</string>
+  <string name="navigation_drawer_forums">ヘルプ / フォーラム</string>
+  <string name="navigation_drawer_donate">寄付</string>
+  <string name="account_list_empty">DAVdroid にようこそ!\n\nCalDAV/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">システムとユーザーが追加した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_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">Webcal</string>
+  <string name="account_synchronize_this_collection">このコレクションを同期</string>
+  <string name="account_read_only">読み取り専用</string>
+  <string name="account_calendar">カレンダー</string>
+  <string name="account_task_list">タスクリスト</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>
+  <string name="account_no_webcal_handler_found">Webcal に対応するアプリが見つかりません</string>
+  <string name="account_install_icsdroid">ICSdroid をインストール</string>
+  <!--AddAccountActivity-->
+  <string name="login_help_url">https://www.davdroid.com/tested-with/?pk_campaign=davdroid-app</string>
+  <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_must_be_https">URL は https:// で始まる必要があります</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_type_url_certificate">URL とクライアント証明書でログイン</string>
+  <string name="login_select_certificate">証明書を選択</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 フィールドとしてアカウント名を使用するので、アカウント名としてメールアドレスを使用してください。同じ名前のアカウントを 2 つ持つことはできません。</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_certificate_alias">クライアント証明書の別名</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_names">
+    <item>手動のみ</item>
+    <item>15 分ごと</item>
+    <item>30 分ごと</item>
+    <item>1 時間ごと</item>
+    <item>2 時間ごと</item>
+    <item>4 時間ごと</item>
+    <item>1 日 1 回</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_ssids">WiFi SSID 制限</string>
+  <string name="settings_sync_wifi_only_ssids_on">%s でのみ同期します</string>
+  <string name="settings_sync_wifi_only_ssids_off">すべての WiFi 接続が使用されます</string>
+  <string name="settings_sync_wifi_only_ssids_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_contact_group_method_change">グループ方法を変更</string>
+  <string name="settings_contact_group_method_change_reload_contacts">これはすべての連絡先を再読み込みする必要があります。 保存していないローカルの変更は破棄されます。</string>
+  <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>
+  <string name="settings_event_colors">イベントカラーサポート</string>
+  <string name="settings_event_colors_on">イベントカラーを同期</string>
+  <string name="settings_event_colors_off">イベントカラーを同期しない</string>
+  <string name="settings_event_colors_off_confirm">イベントカラーをオフにすると、すでに同期しているイベントカラーが削除されることがあります。</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>
+  <string name="collection_force_read_only">強制的に読み取り専用</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 adapters and DebugInfoActivity-->
+  <string name="debug_info_title">デバッグ情報</string>
+  <string name="sync_contacts_read_only_address_book">読み取り専用のアドレス帳</string>
+  <plurals name="sync_contacts_local_contact_changes_discarded">
+    <item quantity="other">%d ローカル連絡先の変更が破棄されました</item>
+  </plurals>
+  <string name="sync_error_permissions">DAVdroid アクセス許可</string>
+  <string name="sync_error_permissions_text">追加のアクセス許可が必要です</string>
+  <string name="sync_error_opentasks_too_old">OpenTasks が古すぎます</string>
+  <string name="sync_error_opentasks_required_version">必要なバージョン: %1$s (現在 %2$s)</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-nb-rNO/strings.xml

@@ -0,0 +1,224 @@
+<?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-adressebok</string>
+  <string name="address_books_authority_title">Adressebøker</string>
+  <string name="help">Hjelp</string>
+  <string name="manage_accounts">Behandle kontoer</string>
+  <string name="please_wait">Vent…</string>
+  <string name="send">Send</string>
+  <string name="homepage_url">https://www.davdroid.com/?pk_campaign=davdroid-app</string>
+  <string name="beta_feedback_url">https://forums.bitfire.at/category/9/beta-test-discussion?pk_campaign=davdroid-app</string>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Batterioptimisering</string>
+  <string name="startup_battery_optimization_message">Det kan hende Android skrur av/reduserer DAVdroid-synkronisering etter et par dager. For å forhindre dette, skru av batterioptimisering.</string>
+  <string name="startup_battery_optimization_disable">Skru av for DAVdroid</string>
+  <string name="startup_dont_show_again">Ikke vis igjen</string>
+  <string name="startup_donate">Friprog-informasjon</string>
+  <string name="startup_donate_message">Vi er glade for at du bruker DAVdroid, som er fri programvare (GPLv3). Siden utvikling av DAVdroid er hardt arbeid og har tatt tusenvis av arbeidstimer, bes du overveie en donasjon.</string>
+  <string name="startup_donate_now">Vis donasjonsside</string>
+  <string name="startup_donate_later">Kanskje senere</string>
+  <string name="startup_google_play_accounts_removed">DRM-feilinformasjon på Play-butikken</string>
+  <string name="startup_google_play_accounts_removed_message">Under gitte forhold vil DRM fra Play-butikken forårsake at alle DAVdroid-kontoer forsvinner etter omstart eller etter oppgradering av DAVdroid. Hvis du rammes av dette problemet (og bare da), installer \"DAVdroid JB Workaround\" fra Play-butikken.</string>
+  <string name="startup_opentasks_not_installed">OpenTasks er ikke installert</string>
+  <string name="startup_opentasks_reinstall_davdroid">Etter å ha installert OpenTasks, må du reinstallere Davdroid og legge til kontoene dine igjen (Android-feil).</string>
+  <string name="startup_opentasks_not_installed_install">Installer OpenTasks</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Lisensvilkår</string>
+  <string name="about_license_info_no_warranty">Dette programmet kommer uten NOEN FORM FOR GARANTI. Det er fri programvare, og du er velkommen til å redistribuere det under gitte forhold.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">DAVDroid fil-logging</string>
+  <string name="logging_to_external_storage">Logger til ekstern lagringsmedium: %s</string>
+  <string name="logging_couldnt_create_file">Kan ikke opprette ekstern loggfil: %s</string>
+  <string name="logging_no_external_storage">Fant ingen ekstern lagringsplass</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Åpne navigasjonsskuff</string>
+  <string name="navigation_drawer_close">Lukk navigasjonsskuff</string>
+  <string name="navigation_drawer_subtitle">CalDAV/CardDAV -synkroniseringsadapter</string>
+  <string name="navigation_drawer_about">Om / Lisens</string>
+  <string name="navigation_drawer_beta_feedback">Tilbakemelding om beta-en</string>
+  <string name="navigation_drawer_settings">Innstillinger</string>
+  <string name="navigation_drawer_news_updates">Nyheter og oppdateringer</string>
+  <string name="navigation_drawer_external_links">Eksterne lenker</string>
+  <string name="navigation_drawer_website">Nettside</string>
+  <string name="navigation_drawer_faq">O-S-S</string>
+  <string name="navigation_drawer_forums">Hjelp / Forum</string>
+  <string name="navigation_drawer_donate">Doner</string>
+  <string name="account_list_empty">Velkommen til DAVdroid.\n\nDu kan legge til en CalDAV/CardDAV-konto nå.</string>
+  <string name="accounts_global_sync_disabled">Systemomspennende automatisk synkronisering avskrudd</string>
+  <string name="accounts_global_sync_enable">Skru på</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Tjenesteoppdagelse mislyktes</string>
+  <string name="dav_service_refresh_couldnt_refresh">Kunne ikke gjenoppfriske innsamlingsliste</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Innstillinger</string>
+  <string name="app_settings_user_interface">Brukergrensesnitt</string>
+  <string name="app_settings_reset_hints">Tilbakestill hint</string>
+  <string name="app_settings_reset_hints_summary">Skrur på hint som har blitt avslått tidligere</string>
+  <string name="app_settings_reset_hints_success">Alle hint vil bli vist igjen</string>
+  <string name="app_settings_connection">Tilkobling</string>
+  <string name="app_settings_override_proxy">Overstyr mellomtjenerinnstillinger</string>
+  <string name="app_settings_override_proxy_on">Bruk egendefinerte mellomtjenerinnstillinger</string>
+  <string name="app_settings_override_proxy_off">Bruk systemets forvalgte mellomtjenerinnstillinger</string>
+  <string name="app_settings_override_proxy_host">Vertsnavn for HTTP-mellomtjener</string>
+  <string name="app_settings_override_proxy_port">HTTP-mellomtjeningsport</string>
+  <string name="app_settings_security">Sikkerhet</string>
+  <string name="app_settings_distrust_system_certs">Fjern tiltro til systemsertifikater</string>
+  <string name="app_settings_distrust_system_certs_on">System og brukertillagte sertifikatsmyntigheter vil ikke bli tiltrodd</string>
+  <string name="app_settings_distrust_system_certs_off">System- og bruker -tillagte sertifikatsmyndigheter vil bli tiltrodd (anbefalt)</string>
+  <string name="app_settings_reset_certificates">Tilbakestill (ikke)tiltrodde sertifikater</string>
+  <string name="app_settings_reset_certificates_summary">Tilbakestiller tillit til alle egendefinerte sertifikater</string>
+  <string name="app_settings_reset_certificates_success">Alle egendefinerte sertifikater har blitt fjernet</string>
+  <string name="app_settings_debug">Feilretting</string>
+  <string name="app_settings_log_to_external_storage">Logg til ekstern fil</string>
+  <string name="app_settings_log_to_external_storage_on">Logger til eksternt lagringsmedium (hvis tilgjengelig)</string>
+  <string name="app_settings_log_to_external_storage_off">Ekstern fillogging har blitt skrudd av</string>
+  <string name="app_settings_show_debug_info">Vis feilrettingsinfo</string>
+  <string name="app_settings_show_debug_info_details">Vis/del programvare- og oppsettsdetaljer</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Synkroniser nå</string>
+  <string name="account_synchronizing_now">Synkroniserer nå</string>
+  <string name="account_settings">Kontoinnstillinger</string>
+  <string name="account_rename">Gi konto nytt navn</string>
+  <string name="account_rename_new_name">Ulagret lokal data kan bli avslått. Ny synkronisering kreves etter ny navngivning. Nytt kontonavn:</string>
+  <string name="account_rename_rename">Gi nytt navn</string>
+  <string name="account_delete">Slett konto</string>
+  <string name="account_delete_confirmation_title">Vil du virkeling slette kontoen?</string>
+  <string name="account_delete_confirmation_text">Alle lokale kopier av adressebøker, kalendere og gjøremålslister vil bli slettet.</string>
+  <string name="account_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">Webcal</string>
+  <string name="account_synchronize_this_collection">synkroniser denne samlingen</string>
+  <string name="account_read_only">kun lesbar</string>
+  <string name="account_calendar">kalender</string>
+  <string name="account_task_list">oppgaveliste</string>
+  <string name="account_refresh_address_book_list">Gjenoppfrisk adressebokliste</string>
+  <string name="account_create_new_address_book">Opprett ny adressebok</string>
+  <string name="account_refresh_calendar_list">Gjenoppfrisk kalenderliste</string>
+  <string name="account_create_new_calendar">Opprett ny kalender</string>
+  <string name="account_no_webcal_handler_found">Fant ingen programmer med støtte for Webcal</string>
+  <string name="account_install_icsdroid">Installer ICSdroid</string>
+  <!--AddAccountActivity-->
+  <string name="login_help_url">https://www.davdroid.com/tested-with/?pk_campaign=davdroid-app</string>
+  <string name="login_title">Legg til konto</string>
+  <string name="login_type_email">Innlogging med e-postadresse</string>
+  <string name="login_email_address">E-postadresse</string>
+  <string name="login_email_address_error">Gyldig e-postadresse påkrevd</string>
+  <string name="login_password">Passord</string>
+  <string name="login_password_required">Passord kreves</string>
+  <string name="login_type_url">Logg inn med nettadresse og brukernavn</string>
+  <string name="login_url_must_be_http_or_https">Nettadresse må begynned med http(s)://</string>
+  <string name="login_url_host_name_required">Vertsnavn kreves</string>
+  <string name="login_user_name">Brukernavn</string>
+  <string name="login_user_name_required">Brukernavn påkrevd</string>
+  <string name="login_base_url">Landings-nettadresse</string>
+  <string name="login_login">Logg inn</string>
+  <string name="login_back">Tilbake</string>
+  <string name="login_create_account">Opprett konto</string>
+  <string name="login_account_name">Kontonavn</string>
+  <string name="login_account_name_info">Bruk din e-postadresse som kontonavn fordi Android vil bruke kontonavnet som ORGANISATOR-felt for hendelser du oppretter. Du kan ikke ha to kontoer med samme navn.</string>
+  <string name="login_account_contact_group_method">Kontaktgruppemetode:</string>
+  <string name="login_account_name_required">Kontonavn påkrevd</string>
+  <string name="login_account_not_created">Kontonavnet kan ikke opprettes</string>
+  <string name="login_configuration_detection">Oppdagelse av oppsett</string>
+  <string name="login_querying_server">Vent, spør tjener…</string>
+  <string name="login_no_caldav_carddav">Fant ikke CalDAV eller CardDAV-tjeneste.</string>
+  <string name="login_view_logs">Vis logger</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Innstillinger: %s</string>
+  <string name="settings_authentication">Identitetsbekreftelse</string>
+  <string name="settings_username">Brukernavn</string>
+  <string name="settings_enter_username">Skriv inn brukernavn:</string>
+  <string name="settings_password">Passord</string>
+  <string name="settings_password_summary">Oppdater passordet i henhold til din tjener.</string>
+  <string name="settings_enter_password">Skriv inn passordet ditt:</string>
+  <string name="settings_sync">Synkronisering</string>
+  <string name="settings_sync_interval_contacts">Intervall for kontaktsynkronisering</string>
+  <string name="settings_sync_summary_manually">Åpne manuelt</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Hvert %d minutt + umiddelbart ved lokale endringer</string>
+  <string name="settings_sync_interval_calendars">Kalendersynkroniseringsintervall</string>
+  <string name="settings_sync_interval_tasks">Gjøremålssynkroniseringsintervall</string>
+  <string-array name="settings_sync_interval_names">
+    <item>Bare manuelt</item>
+    <item>Hvert kvarter</item>
+    <item>Hver halvtime</item>
+    <item>Hver time</item>
+    <item>Hver andre time</item>
+    <item>Hver fjerde time</item>
+    <item>Én gang om dagen</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Bare synk. over Wi-Fi</string>
+  <string name="settings_sync_wifi_only_on">Synkronisering er begrenset til Wi-Fi -tilkoblinger</string>
+  <string name="settings_sync_wifi_only_off">Tilkoblingstypen blir ikke tatt i betraktning</string>
+  <string name="settings_sync_wifi_only_ssids">Wi-Fi SSID -begrensning</string>
+  <string name="settings_sync_wifi_only_ssids_on">Vil kun synkronisere over %s</string>
+  <string name="settings_sync_wifi_only_ssids_off">Alle Wi-Fi -tilkoblinger vil bli brukt</string>
+  <string name="settings_sync_wifi_only_ssids_message">Kommainndelte navn (SSID-er) på tillatte Wi-Fi -nettverk (la stå tomt for alle)</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">Kontaktgruppemetode</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 egne vKort</item>
+    <item>Grupper er kategorier per kontakt</item>
+  </string-array>
+  <string name="settings_contact_group_method_change">Endre gruppemetode</string>
+  <string name="settings_contact_group_method_change_reload_contacts">Dette krever ny innlasting av alle kontakter. Ulagrede lokale endringer vil bli forkastet.</string>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Tidsgrense for tidligere hendelser</string>
+  <string name="settings_sync_time_range_past_none">Alle gjøremål vil bli synkronisert</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Gjøremål for mer enn én dag siden vil bli sett bort fra</item>
+    <item quantity="other">Gjøremål for mer enn %d dager siden vil bli sett bort fra</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Hendelser som er mer enn dette antallet dager i fortid vil bli ignorert (kan være 0). La stå tomt for å synkronisere alle hendelser.</string>
+  <string name="settings_manage_calendar_colors">Velg kalenderfarger</string>
+  <string name="settings_manage_calendar_colors_on">Kalenderfarger behandles av DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">Kalenderfarger settes ikke av DAVdroid</string>
+  <string name="settings_event_colors">Støtte for fargelegging av hendelser</string>
+  <string name="settings_event_colors_on">Synkroniser hendelsesfarger</string>
+  <string name="settings_event_colors_off">Ikke synkroniser hendelsesfarger</string>
+  <string name="settings_event_colors_off_confirm">Det kan hende at det å skru av hendelsesfarger vil fjerne allerede synkroniserte hendelsesfarger.</string>
+  <!--collection management-->
+  <string name="create_addressbook">Opprett adressebok</string>
+  <string name="create_addressbook_display_name_hint">Min adressebok</string>
+  <string name="create_calendar">Opprett CalDAV-samling</string>
+  <string name="create_calendar_display_name_hint">Min kalender</string>
+  <string name="create_calendar_time_zone">Tidssone</string>
+  <string name="create_calendar_type">Samlingstype:</string>
+  <string name="create_calendar_type_only_events">Kalender (bare hendelser)</string>
+  <string name="create_calendar_type_only_tasks">Gjøremålsliste (bare gjøremål)</string>
+  <string name="create_calendar_type_events_and_tasks">Kombinert (hendelser og gjøremål)</string>
+  <string name="create_collection_color">Velg en samlingsfarge</string>
+  <string name="create_collection_creating">Oppretter samling</string>
+  <string name="create_collection_display_name">Vis navn (tittel) for denne samlingen:</string>
+  <string name="create_collection_display_name_required">Tittel kreves</string>
+  <string name="create_collection_description">Beskrivelse (valgfri):</string>
+  <string name="create_collection_home_set">Hjemmemappe:</string>
+  <string name="create_collection_create">Opprett</string>
+  <string name="delete_collection">Slett samling</string>
+  <string name="delete_collection_confirm_title">Er du sikker?</string>
+  <string name="delete_collection_confirm_warning">Denne samlingen (%s) og all dens data vil bli fjernet fra tjeneren.</string>
+  <string name="delete_collection_deleting_collection">Sletter samling</string>
+  <string name="collection_force_read_only">Tving kun lesbar</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">En feil har inntruffet</string>
+  <string name="exception_httpexception">En HTTP-feil har inntruffet.</string>
+  <string name="exception_ioexception">En I/O-feil har inntruffet.</string>
+  <string name="exception_show_details">Vis detaljer</string>
+  <!--sync adapters and DebugInfoActivity-->
+  <string name="debug_info_title">Feilrettingsinfo</string>
+  <string name="sync_contacts_read_only_address_book">Adressebok uten skrivetilgang</string>
+  <plurals name="sync_contacts_local_contact_changes_discarded">
+    <item quantity="one">Lokal kontaktendring forkastet</item>
+    <item quantity="other">%d lokale kontaktendringer forkastet</item>
+  </plurals>
+  <string name="sync_error_permissions">DAVdroid-tilganger</string>
+  <string name="sync_error_permissions_text">Ytterligere tilganger kreves</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: Tilkoblingssikkerhet</string>
+  <string name="trust_certificate_unknown_certificate_found">DAVdroid har støtt på et ukjent sertifikat. Har du tiltro til det?</string>
+</resources>

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

@@ -0,0 +1,200 @@
+<?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="beta_feedback_url">https://forums.bitfire.at/category/9/beta-test-discussion?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_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_opentasks_not_installed">OpenTasks niet geinstalleerd</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_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_beta_feedback">Beta terugkoppeling</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_forums">Help / Forums</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_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">Webcal</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>
+  <string name="account_no_webcal_handler_found">Geen mogelijke Webcal app gevonden</string>
+  <string name="account_install_icsdroid">ICSdroid installeren</string>
+  <!--AddAccountActivity-->
+  <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 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_ssids">WiFi SSID beperking</string>
+  <string name="settings_sync_wifi_only_ssids_on">Zal alleen synchroniseren over %s</string>
+  <string name="settings_sync_wifi_only_ssids_off">Alle WiFI verbindingen zullen worden gebruikt</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>
+  <string name="settings_event_colors">Evenement kleur ondersteuning</string>
+  <string name="settings_event_colors_on">Evenement kleuren synchroniseren</string>
+  <string name="settings_event_colors_off">Evenement kleuren niet synchroniseren</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 adapters and DebugInfoActivity-->
+  <string name="debug_info_title">Debug informatie</string>
+  <string name="sync_contacts_read_only_address_book">Alleen-lezen adresboek</string>
+  <string name="sync_error_permissions">DAVdroid rechten</string>
+  <string name="sync_error_permissions_text">Aanvullende rechten vereist</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

@@ -0,0 +1,232 @@
+<?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>
+  <string name="homepage_url">https://www.davdroid.com/?pk_campaign=davdroid-app</string>
+  <string name="beta_feedback_url">https://forums.bitfire.at/category/9/beta-test-discussion?pk_campaign=davdroid-app</string>
+  <string name="notification_channel_debugging">Debugowanie</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_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_opentasks_not_installed">OpenTasks nie jest zainstalowany</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_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_beta_feedback">Przekaż opinię</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_manual">Ręcznie</string>
+  <string name="navigation_drawer_faq">Pytania i odpowiedzi</string>
+  <string name="navigation_drawer_forums">Pomoc / Forum</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 proxy HTTP</string>
+  <string name="app_settings_override_proxy_port">Port proxy HTTP</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 do 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 wyłączone</string>
+  <string name="app_settings_show_debug_info">Pokaż informacje do debugowania</string>
+  <string name="app_settings_show_debug_info_details">Przejrzyj lub udostępnij informacje o programie i jego 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_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">Webcal</string>
+  <string name="account_synchronize_this_collection">Synchronizuj kolekcję</string>
+  <string name="account_read_only">tylko do odczytu</string>
+  <string name="account_calendar">kalendarz</string>
+  <string name="account_task_list">lista zadań</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ż listę kalendarzy</string>
+  <string name="account_create_new_calendar">Stwórz nowy kalendarz</string>
+  <string name="account_no_webcal_handler_found">Nie znaleziono aplikacji obsługującej Webcal</string>
+  <string name="account_install_icsdroid">Zainstaluj ICSdroid</string>
+  <!--AddAccountActivity-->
+  <string name="login_help_url">https://www.davdroid.com/tested-with/?pk_campaign=davdroid-app</string>
+  <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">Wymagany 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ę od http(s)://</string>
+  <string name="login_url_must_be_https">Adres URL musi zaczynać się od https://</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żytkownika</string>
+  <string name="login_base_url">Podstawowy URL</string>
+  <string name="login_type_url_certificate">Logowanie za pomocą adresu URL i certyfikatu klienta</string>
+  <string name="login_select_certificate">Wybierz certyfikat</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 nazwę 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_certificate_alias">Alias certyfikatu klienta</string>
+  <string name="settings_sync">Synchronizacja</string>
+  <string name="settings_sync_interval_contacts">Częstotliwość synchronizacji kontaktó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">Częstotliwość synchronizacji kalendarzy</string>
+  <string name="settings_sync_interval_tasks">Częstotliwość synchronizacji list zadań</string>
+  <string-array name="settings_sync_interval_names">
+    <item>Tylko ręcznie</item>
+    <item>Co 15 minut</item>
+    <item>Co 30 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 ograniczona 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_ssids">Ograniczenia WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssids_on">Będzie synchronizować tylko w %s</string>
+  <string name="settings_sync_wifi_only_ssids_off">Wszystkie połączenia WiFi będą używane</string>
+  <string name="settings_sync_wifi_only_ssids_message">Nazwy oddzielone przecinkami (SSID) dozwolonych sieci WiFi (pozostaw puste dla wszystkich)</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_contact_group_method_change">Zmień metodę grupową</string>
+  <string name="settings_contact_group_method_change_reload_contacts">Wymaga to ponownego pobrania wszystkich kontaktów. Niezapisane zmiany z tego telefonu zostaną usunięte.</string>
+  <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ą zsynchronizowane</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>
+  <string name="settings_event_colors">Obsługa kolorów wydarzeń</string>
+  <string name="settings_event_colors_on">Synchronizuj kolory zdarzeń</string>
+  <string name="settings_event_colors_off">Nie synchronizuj kolorów zdarzeń</string>
+  <string name="settings_event_colors_off_confirm">Wyłączenie kolorów zdarzeń może usunąć już zsynchronizowane kolory zdarzeń.</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 kolekcję 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 (opcjonalnie)</string>
+  <string name="create_collection_home_set">Ustaw początek:</string>
+  <string name="create_collection_create">Stwórz</string>
+  <string name="delete_collection">Usuń kolekcję</string>
+  <string name="delete_collection_confirm_title">Czy 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>
+  <string name="collection_force_read_only">Wymuś tylko do odczytu</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 adapters and DebugInfoActivity-->
+  <string name="debug_info_title">Informacje debugowe</string>
+  <string name="sync_contacts_read_only_address_book">Książka adresowa tylko do odczytu</string>
+  <plurals name="sync_contacts_local_contact_changes_discarded">
+    <item quantity="one">Lokalny kontakt zostanie odrzucony</item>
+    <item quantity="few">%d lokalne kontakty zostaną odrzucone</item>
+    <item quantity="many">%d lokalne kontakty zostaną odrzucone</item>
+    <item quantity="other">%d lokalne kontakty zostaną odrzucone</item>
+  </plurals>
+  <string name="sync_error_permissions">Uprawnienia DAVdroid</string>
+  <string name="sync_error_permissions_text">Wymagane dodatkowe uprawnienia</string>
+  <string name="sync_error_opentasks_too_old">OpenTask jest niekompatybilny</string>
+  <string name="sync_error_opentasks_required_version">Wymagana wersja: %1$s (obecna %2$s)</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

@@ -0,0 +1,244 @@
+<?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>
+  <string name="notification_channel_debugging">Depuração</string>
+  <string name="notification_channel_general">Outras mensagens importantes</string>
+  <string name="notification_channel_sync">Sincronização</string>
+  <string name="notification_channel_sync_errors">Erros de sincronização</string>
+  <string name="notification_channel_sync_io_errors">Erros de rede e E/S</string>
+  <string name="notification_channel_sync_status">Mensagens de status</string>
+  <!--startup dialogs-->
+  <string name="startup_autostart_permission">%s permissão de início automático</string>
+  <string name="startup_autostart_permission_message">O firmware do aparelho pode impedir a sincronização automática. Você pode ter que definir a sincronização automática de forma manual.</string>
+  <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_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_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">Para sincronizar tarefas é necessário instalar o aplicativo livre OpenTasks. (Não é necessário para contatos/eventos)</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_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_beta_feedback">Comentários sobre a versão beta</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_manual">Manual</string>
+  <string name="navigation_drawer_faq">Perguntas fequentes</string>
+  <string name="navigation_drawer_forums">Ajuda / Fóruns</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_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">Webcal</string>
+  <string name="account_synchronize_this_collection">sincronizar esta coleção</string>
+  <string name="account_read_only">Somente leitura</string>
+  <string name="account_calendar">calendário</string>
+  <string name="account_task_list">lista de tarefas</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>
+  <string name="account_no_webcal_handler_found">Não foi encontrado um aplicativo capaz de lidar com Webcal</string>
+  <string name="account_install_icsdroid">Instalar ICSdroid</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_must_be_https">A URL deve começar com https://</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_type_url_certificate">Autenticação com URL e certificado do cliente</string>
+  <string name="login_select_certificate">Selecionar certificado</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_certificate_alias">Nome do certificado do cliente</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_names">
+    <item>Apenas manualmente</item>
+    <item>A cada 15 minutos</item>
+    <item>A cada 30 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_ssids">Restrição de WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssids_on">Sincronizar apenas com %s</string>
+  <string name="settings_sync_wifi_only_ssids_off">Todas as conexões WiFi serão usadas</string>
+  <string name="settings_sync_wifi_only_ssids_message">Nomes separados por vírgula (SSIDs) das redes WiFi (deixe em branco para todas)</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_contact_group_method_change">Alterar a forma de agrupamento</string>
+  <string name="settings_contact_group_method_change_reload_contacts">É necessário recarregar todos os contatos. As alterações locais que não foram salvas serão descartadas.</string>
+  <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>
+  <string name="settings_event_colors">Suporte para cor de evento</string>
+  <string name="settings_event_colors_on">Sincronizar cores de eventos</string>
+  <string name="settings_event_colors_off">Não sincronizar cores de eventos</string>
+  <string name="settings_event_colors_off_confirm">Desativar as cores de eventos poderá remover as que já foram sincronizadas</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>
+  <string name="collection_force_read_only">Forçar somente leitura</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 adapters and DebugInfoActivity-->
+  <string name="debug_info_title">Informações de depuração</string>
+  <string name="sync_contacts_read_only_address_book">Livro de endereços somente leitura</string>
+  <plurals name="sync_contacts_local_contact_changes_discarded">
+    <item quantity="one">Alteração local de contato descartada</item>
+    <item quantity="other">%d alterações locais de contatos descartadas</item>
+  </plurals>
+  <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_opentasks_too_old">A versão do OpenTasks é muito antiga</string>
+  <string name="sync_error_opentasks_required_version">Versão necessária: %1$s (atual %2$s)</string>
+  <string name="sync_error_authentication_failed">Falha de autenticação (verifique as credenciais)</string>
+  <string name="sync_error_io">Erro de rede ou E/S – %s</string>
+  <string name="sync_error_http_dav">Erro no servidor HTTP – %s</string>
+  <string name="sync_error_local_storage">Erro de armazenamento local – %s</string>
+  <string name="sync_error_retry">Repetir</string>
+  <string name="sync_error_view_item">Ver item</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

@@ -0,0 +1,32 @@
+<?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-->
+  <!--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>
+  <!--collection management-->
+  <!--ExceptionInfoFragment-->
+  <!--sync adapters and DebugInfoActivity-->
+  <!--cert4android-->
+</resources>

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

@@ -0,0 +1,251 @@
+<?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://www.davdroid.com/?pk_campaign=davdroid-app</string>
+  <string name="beta_feedback_url">https://forums.bitfire.at/category/9/beta-test-discussion?pk_campaign=davdroid-app</string>
+  <string name="notification_channel_debugging">Отладка</string>
+  <string name="notification_channel_general">Другие важные сообщения</string>
+  <string name="notification_channel_sync">Синхронизация</string>
+  <string name="notification_channel_sync_errors">Ошибки синхронизации</string>
+  <string name="notification_channel_sync_io_errors">Ошибки сети и ввода/вывода</string>
+  <string name="notification_channel_sync_status">Сообщения о состоянии</string>
+  <!--startup dialogs-->
+  <string name="startup_autostart_permission">Разрешение автозапуска %s</string>
+  <string name="startup_autostart_permission_message">Прошивка устройства может препятствовать автоматической синхронизации. Возможно, придется разрешить автоматическую синхронизацию вручную.</string>
+  <string name="startup_battery_optimization">Оптимизация батареи</string>
+  <string name="startup_battery_optimization_message">Android может ограничить работу DAVdroid в фоновом режиме. Чтобы этого не произошло, необходимо отключить оптимизацию энергопотребления .</string>
+  <string name="startup_battery_optimization_disable">Отключить для DAVdroid</string>
+  <string name="startup_dont_show_again">Не показывать снова</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_more_info">Дополнительная информация</string>
+  <string name="startup_opentasks_not_installed">OpenTasks не установлен</string>
+  <string name="startup_opentasks_not_installed_message">Для синхронизации задач требуется бесплатное приложение OpenTasks. (Не требуется для контактов/событий.)</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_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_beta_feedback">Отзыв о бета-тестировании</string>
+  <string name="navigation_drawer_settings">Настройки</string>
+  <string name="navigation_drawer_news_updates">Новости &amp; обновления</string>
+  <string name="navigation_drawer_external_links">Внешние ссылки</string>
+  <string name="navigation_drawer_website">Веб-сайт</string>
+  <string name="navigation_drawer_manual">Руководство</string>
+  <string name="navigation_drawer_faq">FAQ</string>
+  <string name="navigation_drawer_forums">Помощь / Форумы</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">Не доверять системным и добавленным пользователем 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_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">WebСal</string>
+  <string name="account_synchronize_this_collection">синхронизировать эту коллекцию</string>
+  <string name="account_read_only">только для чтения</string>
+  <string name="account_calendar">календарь</string>
+  <string name="account_task_list">список задач</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>
+  <string name="account_no_webcal_handler_found">Не найдено приложение, поддерживающее WebCal</string>
+  <string name="account_install_icsdroid">Установить ICSdroid</string>
+  <!--AddAccountActivity-->
+  <string name="login_help_url">https://www.davdroid.com/tested-with/?pk_campaign=davdroid-app</string>
+  <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_must_be_https">URL-адрес должен начинаться с https://</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_type_url_certificate">Войти с URL-адресом и сертификатом клиента</string>
+  <string name="login_select_certificate">Выберите сертификат</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_certificate_alias">Псевдоним сертификата клиента</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_names">
+    <item>Только вручную</item>
+    <item>Каждые 15 минут</item>
+    <item>Каждые 30 минут</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_ssids">Ограничение WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssids_on">Будет синхронизироваться только  %s</string>
+  <string name="settings_sync_wifi_only_ssids_off">Все соединения WiFi будут использоваться</string>
+  <string name="settings_sync_wifi_only_ssids_message">Названия (SSID), разделенные запятыми разрешенных сетей Wi-Fi (оставьте пустым для всех)</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_contact_group_method_change">Изменить метод группировки</string>
+  <string name="settings_contact_group_method_change_reload_contacts">Вам потребуется перезагрузить все контакты. Несохраненные локальные изменения будут отброшены.</string>
+  <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>
+  <string name="settings_event_colors">Поддержка цвета событий</string>
+  <string name="settings_event_colors_on">Синхронизация цветов событий</string>
+  <string name="settings_event_colors_off">Не синхронизировать цвета событий</string>
+  <string name="settings_event_colors_off_confirm">Отключение цветов событий может удалить уже синхронизированные цвета событий.</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>
+  <string name="collection_force_read_only">Только для чтения</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Произошла ошибка.</string>
+  <string name="exception_httpexception">Произошла ошибка HTTP</string>
+  <string name="exception_ioexception">Произошла ошибка ввода/вывода.</string>
+  <string name="exception_show_details">Показать детали</string>
+  <!--sync adapters and DebugInfoActivity-->
+  <string name="debug_info_title">Отладочная информация</string>
+  <string name="sync_contacts_read_only_address_book">Адресная книга только для чтения</string>
+  <plurals name="sync_contacts_local_contact_changes_discarded">
+    <item quantity="one">Локальное изменение контакта отменено</item>
+    <item quantity="few">%d локальных изменений контакта отменены</item>
+    <item quantity="many">%d локальных изменений контакта отменены</item>
+    <item quantity="other">%d локальных изменений контакта отменены</item>
+  </plurals>
+  <string name="sync_error_permissions">Разрешения DAVdroid</string>
+  <string name="sync_error_permissions_text">Требуются дополнительные разрешения</string>
+  <string name="sync_error_opentasks_too_old">OpenTasks устарел</string>
+  <string name="sync_error_opentasks_required_version">Требуется версия: %1$s (текущая %2$s)</string>
+  <string name="sync_error_authentication_failed">Ошибка аутентификации (проверьте учетные данные)</string>
+  <string name="sync_error_io">Ошибка сети или ввода/вывода – %s</string>
+  <string name="sync_error_http_dav">Ошибка HTTP-сервера – %s</string>
+  <string name="sync_error_local_storage">Ошибка локального хранилища – %s</string>
+  <string name="sync_error_retry">Повторить</string>
+  <string name="sync_error_view_item">Просмотр элемента</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-sr/strings.xml

@@ -0,0 +1,186 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">ДАВдроид</string>
+  <string name="account_title_address_book">ДАВдроид адресар</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>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">Оптимизација батерије</string>
+  <string name="startup_battery_optimization_message">Андроид може да искључи/умањи синхронизацију ДАВдроида након неколико дана. Да бисте спречили ово, искључите оптимизацију батерије.</string>
+  <string name="startup_battery_optimization_disable">Искључи за ДАВдроид</string>
+  <string name="startup_dont_show_again">Не приказуј поново</string>
+  <string name="startup_donate">Подаци о отвореном кôду</string>
+  <string name="startup_donate_message">Драго нам је да користите ДАВдроид, софтвер отвореног кôда (ГПЛв3). Развој ДАВдроида није баш лак посао и захтева хиљаде радних сати, стога вас молимо да размотрите донацију.</string>
+  <string name="startup_donate_now">Прикажи страницу за донације</string>
+  <string name="startup_donate_later">Можда касније</string>
+  <string name="startup_google_play_accounts_removed">Грешка ДРМ-а Плеј продавнице</string>
+  <string name="startup_google_play_accounts_removed_message">Под одређеним околностима ДРМ Плеј продавнице може да узрокује да сви налози ДАВдроида нестане након рестарта или ажурирања ДАВдроида. Ако и само ако имате овај проблем, инсталирајте „DAVdroid JB Workaround“ са Плеј продавнице.</string>
+  <string name="startup_opentasks_not_installed">Отворени задаци нису инсталирани</string>
+  <string name="startup_opentasks_reinstall_davdroid">Након инсталирања Отворених задатака, морате поново да инсталирате ДАВдроид и поново додате ваше налоге (због грешке у Андроиду).</string>
+  <string name="startup_opentasks_not_installed_install">Инсталирај Отворене задатке</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Услови лиценце</string>
+  <string name="about_license_info_no_warranty">Овај програм НЕМА НИКАКВЕ ГАРАНЦИЈЕ. Бесплатан је софтвер којег можете слободно да делите под одређеним условима.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">ДАВдроид евиденција</string>
+  <string name="logging_to_external_storage">Уписивање евиденције у спољашње складиште: %s</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">КалДАВ/КардДАВ адаптер синхронизације</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">Добро дошли у ДАВдроид!\n\nМожете сада да додате КалДАВ/КардДАВ налог.</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">ХТТП прокси домаћин</string>
+  <string name="app_settings_override_proxy_port">ХТТП прокси порт</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>
+  <!--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">Пријавите се УРЛ-ом и корисничким именом</string>
+  <string name="login_url_must_be_http_or_https">УРЛ мора започињати са 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">Користите вашу е-адресу за назив налога јер Андроид користи назив налога за поље ОРГАНИЗАТОР за догађаје које направите. Не можете имати два налога истог назива.</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">Не могох да нађем КалДАВ или КардДАВ услугу.</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 name="settings_sync_wifi_only">Само преко бежичног</string>
+  <string name="settings_sync_wifi_only_on">Синхронизовање само преко бежичних мрежа</string>
+  <string name="settings_sync_wifi_only_off">Тип везе није узет у обзир</string>
+  <string name="settings_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>Групе су одвојене В-карте</item>
+    <item>Групе су категорије по контакту</item>
+  </string-array>
+  <string name="settings_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="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">Бојама календара управља ДАВдроид</string>
+  <string name="settings_manage_calendar_colors_off">Боје календара није поставио ДАВдроид</string>
+  <!--collection management-->
+  <string name="create_addressbook">Направи адресар</string>
+  <string name="create_addressbook_display_name_hint">Мој адресар</string>
+  <string name="create_calendar">Направи КалДАВ збирку</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">Десила се ХТТП грешка.</string>
+  <string name="exception_ioexception">Десила се У/И грешка.</string>
+  <string name="exception_show_details">Прикажи детаље</string>
+  <!--sync adapters and DebugInfoActivity-->
+  <string name="debug_info_title">Подаци за исправљање грешака</string>
+  <string name="sync_error_permissions">ДАВдроид дозволе</string>
+  <string name="sync_error_permissions_text">Потребне су додатне доволе</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">ДАВдроид: Безбедност везе</string>
+  <string name="trust_certificate_unknown_certificate_found">ДАВдроид је наишао на непознат сертификат. Желите ли да се поуздате у њега?</string>
+</resources>

app/src/davdroid/res/values-tr-rTR/strings.xml

@@ -0,0 +1,151 @@
+<?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">Yardım</string>
+  <string name="manage_accounts">Hesapları yönet</string>
+  <string name="please_wait">Lütfen bekle ...</string>
+  <string name="send">Gönder</string>
+  <!--startup dialogs-->
+  <string name="startup_dont_show_again">Bir daha gösterme</string>
+  <string name="startup_donate">Açık-Kaynak Bilgisi</string>
+  <string name="startup_donate_message">Açık kaynaklı yazılım (GPLv3) olan DAVdroid\'i kullandığına çok mutluyuz. DAVdroid\'i geliştirmek zor bir iş ve üzerinde binlerce saat çalıştığımızdan, lütfen bir bağışta bulunmayı düşün.</string>
+  <string name="startup_donate_now">Bağış sayfasını göster</string>
+  <string name="startup_donate_later">Belki sonra</string>
+  <string name="startup_google_play_accounts_removed">Play Store DRM hata bilgisi</string>
+  <string name="startup_google_play_accounts_removed_message">Bazı durumlarda Play Store DRM\'i, cihazı yeniden başlatınca veya DAVdroid\'i yükseltince DAVdroid hesaplarının yokolmasına sebep olabiliyor. Bu sorundan etkileniyorsan (ve sadece bu durumda), lütfen Play Store\'daki \"DAVdroid JB Workaround\" uygulamasını kur.</string>
+  <string name="startup_opentasks_not_installed">OpenTasks kurulu değil</string>
+  <string name="startup_opentasks_reinstall_davdroid">OpenTasks\'i kurduktan sonra, DAVdroid\'i YENİDEN KURMAN ve hesaplarını yeniden eklemen gerek. (Android hatası).</string>
+  <string name="startup_opentasks_not_installed_install">OpenTasks kur</string>
+  <!--AboutActivity-->
+  <string name="about_license_terms">Lisans şartları</string>
+  <string name="about_license_info_no_warranty">Bu uygulama HİÇ BİR GARANTİ ile gelmemektedir. Bedava bir yazılımdır ve belli koşullar altında dağıtabilirsiniz.</string>
+  <!--global settings-->
+  <string name="logging_davdroid_file_logging">DAVdroid dosya jurnallemesi</string>
+  <string name="logging_to_external_storage">Harici depolamaya jurnalleniyor: %s</string>
+  <string name="logging_couldnt_create_file">Harici jurnal dosyası yaratılamadı: %s </string>
+  <string name="logging_no_external_storage">Harici depolama alanı bulunamadı</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Navigasyon çekmecesini aç</string>
+  <string name="navigation_drawer_close">Navigasyon çekmecesini kapat</string>
+  <string name="navigation_drawer_subtitle">CalDAV/CardDAV Senkronizasyon Adaptörü</string>
+  <string name="navigation_drawer_about">Hakkında / Lisans</string>
+  <string name="navigation_drawer_settings">Ayarlar</string>
+  <string name="navigation_drawer_news_updates">Haberler  &amp; güncellemeler </string>
+  <string name="navigation_drawer_external_links">Harici bağlantılar</string>
+  <string name="navigation_drawer_website">Web sitesi</string>
+  <string name="navigation_drawer_faq">SSS</string>
+  <string name="navigation_drawer_donate">Bağış yap</string>
+  <string name="account_list_empty">DAVdroid\'e hoşgeldin!\n\nŞimdi bir CalDAV/CardDAV hesabı ekleyebilirsin.</string>
+  <!--DavService-->
+  <string name="dav_service_refresh_failed">Servis keşfi başarısız</string>
+  <string name="dav_service_refresh_couldnt_refresh">Kolleksiyon listesi yenilenemedi</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Ayarlar</string>
+  <string name="app_settings_user_interface">Kullanıcı arayüzü</string>
+  <string name="app_settings_reset_hints">İpuçlarını sıfırla</string>
+  <string name="app_settings_reset_hints_summary">Daha önceden azat edilen ipuçlarını yeniden etkinleştirir</string>
+  <string name="app_settings_reset_hints_success">Tüm ipuçları artık gösterilecek</string>
+  <string name="app_settings_security">Güvenlik</string>
+  <string name="app_settings_debug">Hata ayıklama</string>
+  <string name="app_settings_log_to_external_storage">Harici dosyaya jurnalle</string>
+  <string name="app_settings_log_to_external_storage_on">Harici depolamaya jurnalleniyor (eğer uygunsa)</string>
+  <string name="app_settings_log_to_external_storage_off">Harici depolama mevcut değil</string>
+  <string name="app_settings_show_debug_info">Hata ayıklama bilgilerini göster</string>
+  <string name="app_settings_show_debug_info_details">Yazılım ve konfigürasyon detaylarına bak/paylaş</string>
+  <!--AccountActivity-->
+  <string name="account_synchronize_now">Şimdi senkronize et</string>
+  <string name="account_synchronizing_now">Senkronize ediyor</string>
+  <string name="account_settings">Hesap ayarları</string>
+  <string name="account_delete">Hesabı sil</string>
+  <string name="account_delete_confirmation_title">Hesap gerçekten silinsin mi?</string>
+  <string name="account_delete_confirmation_text">Rehber, takvim ve iş listelerinin tüm yerel kopyaları silinecektir.</string>
+  <string name="account_refresh_address_book_list">Rehber listesini yenile</string>
+  <string name="account_create_new_address_book">Yeni rehber oluştur</string>
+  <string name="account_refresh_calendar_list">Takvim listesini yenile</string>
+  <string name="account_create_new_calendar">Yeni takvim oluştur</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Hesap ekle</string>
+  <string name="login_type_email">Eposta adresi ile giriş yap</string>
+  <string name="login_email_address">Eposta adresi</string>
+  <string name="login_email_address_error">Geçerli eposta adresi zorunludur</string>
+  <string name="login_password">Parola</string>
+  <string name="login_password_required">Parola zorunludur</string>
+  <string name="login_type_url">URL ve kullanıcı adı ile giriş yap</string>
+  <string name="login_url_must_be_http_or_https">URL http(s):// ile başlamalıdır</string>
+  <string name="login_url_host_name_required">Sunucu adı zorunludur</string>
+  <string name="login_user_name">Kullanıcı adı</string>
+  <string name="login_user_name_required">Kullanıcı adı zorunludur</string>
+  <string name="login_base_url">Baz URL</string>
+  <string name="login_login">Giriş</string>
+  <string name="login_back">Geri</string>
+  <string name="login_create_account">Hesap yarat</string>
+  <string name="login_account_name">Hesap adı</string>
+  <string name="login_account_name_info">Hesap ismi olarak e-posta adresini kullan çünkü Android hesap ismini yarattığın olaylarda DÜZENLEYEN alanında kullanacaktır. Aynı isimde iki faklı hesabın olamaz.</string>
+  <string name="login_account_name_required">Hesap adı zorunludur</string>
+  <string name="login_account_not_created">Hesap yaratılamadı</string>
+  <string name="login_configuration_detection">Konfigürasyon keşfi</string>
+  <string name="login_querying_server">Lütfen bekle, sunucu sorgulanıyor...</string>
+  <string name="login_no_caldav_carddav">CalDAV veya CardDAV servisi bulunamadı.</string>
+  <string name="login_view_logs">Jurnallere bak</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Ayarlar: %s</string>
+  <string name="settings_authentication">Doğrulama</string>
+  <string name="settings_username">Kullanıcı adı</string>
+  <string name="settings_enter_username">Kullanıcı adı girin:</string>
+  <string name="settings_password">Parola</string>
+  <string name="settings_password_summary">Parolayı sunucunuza göre güncelleyin.</string>
+  <string name="settings_enter_password">Parola girin:</string>
+  <string name="settings_sync">Senkronizasyon</string>
+  <string name="settings_sync_interval_contacts">Kişiler senk. aralığı</string>
+  <string name="settings_sync_summary_manually">Sadece elle</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Her %d dakika + yerel değişikliklerde hemen</string>
+  <string name="settings_sync_interval_calendars">Takvimler senk. aralığı</string>
+  <string name="settings_sync_interval_tasks">İşler senk. aralığı</string>
+  <string name="settings_sync_wifi_only">Sadece WiFi üzerinden senkronize et</string>
+  <string name="settings_sync_wifi_only_on">Senkronizasyon WiFi bağlantıları ile kısıtlıdır</string>
+  <string name="settings_sync_wifi_only_off">Bağlantı tipi göz önünde bulundurulmaz</string>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Geçmiş olay zaman sınırı</string>
+  <string name="settings_sync_time_range_past_none">Tüm olaylar senkronize edilecek</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">%d günden daha eski olaylar göz ardı edilecektir</item>
+    <item quantity="other">%d günden daha eski olaylar göz ardı edilecektir</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Bu sayıdan daha eski olan olaylar yok sayılacaktır (0 olabilir). Tüm olayları senkronize etmek için boş bırak.</string>
+  <string name="settings_manage_calendar_colors">Takvim renklerini yönet</string>
+  <string name="settings_manage_calendar_colors_on">Takvim renkleri DAVdroid tarafından yönetilmekte</string>
+  <string name="settings_manage_calendar_colors_off">Takvim renkleri DAVdroid tarafından ayarlanmadı</string>
+  <!--collection management-->
+  <string name="create_addressbook">Rehber yarat</string>
+  <string name="create_addressbook_display_name_hint">Benim Rehberim</string>
+  <string name="create_calendar">CalDav koleksiyonu yarat</string>
+  <string name="create_calendar_display_name_hint">Benim Takvimim</string>
+  <string name="create_calendar_time_zone">Saat dilimi:</string>
+  <string name="create_calendar_type">Koleksiyon Tipi:</string>
+  <string name="create_calendar_type_only_events">Takvim (sadece olaylar)</string>
+  <string name="create_calendar_type_only_tasks">İşler listesi (sadece işler)
+</string>
+  <string name="create_calendar_type_events_and_tasks">Birleşik (olaylar ve işler)</string>
+  <string name="create_collection_color">Bir koleksiyon rengi tanımla</string>
+  <string name="create_collection_creating">Koleksiyon yaratılıyor</string>
+  <string name="create_collection_display_name">Bu koleksiyonun gösterilen adı (başlığı):</string>
+  <string name="create_collection_display_name_required">Başlık zorunlu</string>
+  <string name="create_collection_description">Açıklama (isteğe bağlı):</string>
+  <string name="create_collection_home_set">Ev seti:</string>
+  <string name="create_collection_create">Yarat</string>
+  <string name="delete_collection">Koleksiyonu sil</string>
+  <string name="delete_collection_confirm_title">Emin misin?</string>
+  <string name="delete_collection_confirm_warning">Bu koleksiyon (%s) ve tüm verisi sunucudan silinecek.</string>
+  <string name="delete_collection_deleting_collection">Koleksiyon siliniyor</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">Bir hata oluştu.</string>
+  <string name="exception_httpexception">Bir HTTP hatası oluştu.</string>
+  <string name="exception_ioexception">Bir I/O hatası oluştu.</string>
+  <string name="exception_show_details">Detayları göster</string>
+  <!--sync adapters and DebugInfoActivity-->
+  <string name="debug_info_title">Hata ayıklama bilgisi</string>
+  <string name="sync_error_permissions">DAVdroid izinleri</string>
+  <string name="sync_error_permissions_text">Ek izinler zorunludur</string>
+  <!--cert4android-->
+</resources>

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

@@ -0,0 +1,251 @@
+<?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://www.davdroid.com/?pk_campaign=davdroid-app</string>
+  <string name="beta_feedback_url">https://forums.bitfire.at/category/9/beta-test-discussion?pk_campaign=davdroid-app</string>
+  <string name="notification_channel_debugging">Зневадження</string>
+  <string name="notification_channel_general">Інші важливі повідомлення</string>
+  <string name="notification_channel_sync">Синхронізація</string>
+  <string name="notification_channel_sync_errors">Помилки синхронізації</string>
+  <string name="notification_channel_sync_io_errors">Помилка мережі та вводу/виводу</string>
+  <string name="notification_channel_sync_status">Повідомлення про стан</string>
+  <!--startup dialogs-->
+  <string name="startup_autostart_permission">Дозвіл автозапуску %s</string>
+  <string name="startup_autostart_permission_message">Програмне забезпечення пристрою може запобігати автоматичні синхронізації. Можливо доведеться дозволити автоматичну синхронізацію вручну.</string>
+  <string name="startup_battery_optimization">Оптимізація енергоспоживання</string>
+  <string name="startup_battery_optimization_message">Android може вимкнути, чи призупинити синхронізацію DAVdroid через деякий час. Аби запобігти цьому, вимкніть оптимізацію енергоспоживання для додатку.</string>
+  <string name="startup_battery_optimization_disable">Вимкнути для DAVdroid</string>
+  <string name="startup_dont_show_again">Не показувати знову</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_more_info">Додаткова інформація</string>
+  <string name="startup_opentasks_not_installed">OpenTasks не встановлено</string>
+  <string name="startup_opentasks_not_installed_message">Для синхронізації завдань необхідно встановити додаток OpenTasks. (Не має потреби для контактів/подій.)</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_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_beta_feedback">Beta відгук</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_manual">Посібник</string>
+  <string name="navigation_drawer_faq">Питання/Відповіді</string>
+  <string name="navigation_drawer_forums">Допомога / Форуми</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_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">Webcal</string>
+  <string name="account_synchronize_this_collection">синхронізувати дану колекцію</string>
+  <string name="account_read_only">лише читання</string>
+  <string name="account_calendar">календар</string>
+  <string name="account_task_list">перелік завдань</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>
+  <string name="account_no_webcal_handler_found">Не знайдено додатку з підтримкою Webcal</string>
+  <string name="account_install_icsdroid">Встановити ICSdroid</string>
+  <!--AddAccountActivity-->
+  <string name="login_help_url">https://www.davdroid.com/tested-with/?pk_campaign=davdroid-app</string>
+  <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_must_be_https">Посилання повинно починатися з https://</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_type_url_certificate">Вхід по посиланню та сертифікату клієнта</string>
+  <string name="login_select_certificate">Обрати сертифікат</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_certificate_alias">Прив\'язка сертифікату клієнта</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_names">
+    <item>Вручну</item>
+    <item>Кожні 15 хвилин</item>
+    <item>Кожні 30 хвилин</item>
+    <item>Щогодинно</item>
+    <item>Кожні 2 години</item>
+    <item>Кожні 4 години</item>
+    <item>Щоденно</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Синхронізувати лише через Wi-Fi</string>
+  <string name="settings_sync_wifi_only_on">Виконувати синхронізацію лише через Wi-Fi</string>
+  <string name="settings_sync_wifi_only_off">Не враховувати тип з\'єднання</string>
+  <string name="settings_sync_wifi_only_ssids">Обмеження WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssids_on">Синхронізувати лише через %s</string>
+  <string name="settings_sync_wifi_only_ssids_off">Може використовуватись всі Wi-Fi з\'єднання</string>
+  <string name="settings_sync_wifi_only_ssids_message">Назви (SSID) дозволених Wi-Fi мереж, розділені комами (залиште порожнім для всіх)</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>Групи як окремі VCard</item>
+    <item>Групи як категорії в середині контактів</item>
+  </string-array>
+  <string name="settings_contact_group_method_change">Змінити метод групування</string>
+  <string name="settings_contact_group_method_change_reload_contacts">Це потребує перезавантаження всіх контактів. Незбережені локальні зміни буде відхилено.</string>
+  <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>
+  <string name="settings_event_colors">Підтримка кольорів подій</string>
+  <string name="settings_event_colors_on">Синхронізувати кольори подій</string>
+  <string name="settings_event_colors_off">Не синхронізувати кольори подій</string>
+  <string name="settings_event_colors_off_confirm">Вимикання кольорів подій може видалити вже синхронізовані кольори подій.</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>
+  <string name="collection_force_read_only">Примусово лише читання</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 adapters and DebugInfoActivity-->
+  <string name="debug_info_title">Інформація зневадження</string>
+  <string name="sync_contacts_read_only_address_book">Адресна книга лише для читання</string>
+  <plurals name="sync_contacts_local_contact_changes_discarded">
+    <item quantity="one">Локальну зміну контакту відхилено</item>
+    <item quantity="few">%d локальні зміни контакту відхилено</item>
+    <item quantity="many">%d локальних змін контакту відхилено</item>
+    <item quantity="other">%d локальних змін контакту відхилено</item>
+  </plurals>
+  <string name="sync_error_permissions">Дозволи DAVdroid</string>
+  <string name="sync_error_permissions_text">Потребує додаткові дозволи</string>
+  <string name="sync_error_opentasks_too_old">OpenTasks застарів</string>
+  <string name="sync_error_opentasks_required_version">Необхідна версія: %1$s (поточна %2$s)</string>
+  <string name="sync_error_authentication_failed">Помилка аутентифікації (перевірте обліковий запис)</string>
+  <string name="sync_error_io">Помилка мережі та вводу/виводу — %s</string>
+  <string name="sync_error_http_dav">Помилка сервера HTTP — %s</string>
+  <string name="sync_error_local_storage">Помилка локального сховища — %s</string>
+  <string name="sync_error_retry">Повторити</string>
+  <string name="sync_error_view_item">Перегляд елементу</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

@@ -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
+  -->
+
+<resources>
+
+    <style name="AppThemeExt" parent="AppTheme">
+        <item name="android:windowActivityTransitions">true</item>
+        <item name="android:windowEnterTransition">@android:transition/slide_right</item>
+        <item name="android:windowExitTransition">@android:transition/slide_left</item>
+    </style>
+
+</resources>

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

@@ -0,0 +1,230 @@
+<?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://www.davdroid.com/?pk_campaign=davdroid-app</string>
+  <string name="beta_feedback_url">https://forums.bitfire.at/category/9/beta-test-discussion?pk_campaign=davdroid-app</string>
+  <string name="notification_channel_debugging">调试</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_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_opentasks_not_installed">OpenTasks 未安装</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_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_beta_feedback">测试版反馈</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_manual">手动</string>
+  <string name="navigation_drawer_faq">常见问题</string>
+  <string name="navigation_drawer_forums">帮助 / 论坛</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_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">Webcal</string>
+  <string name="account_synchronize_this_collection">同步该集合</string>
+  <string name="account_read_only">只读</string>
+  <string name="account_calendar">日历</string>
+  <string name="account_task_list">任务列表</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>
+  <string name="account_no_webcal_handler_found">找不到支持 Webcal 的应用</string>
+  <string name="account_install_icsdroid">安装 ICSdroid</string>
+  <!--AddAccountActivity-->
+  <string name="login_help_url">https://www.davdroid.com/tested-with/?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_must_be_https">URL 需以 https:// 为开头</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_type_url_certificate">使用 URL 和客户端证书登录</string>
+  <string name="login_select_certificate">选择证书</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_certificate_alias">客户端证书别名</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_names">
+    <item>手动同步</item>
+    <item>每 15 分钟</item>
+    <item>每 30 分钟</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_ssids">WiFi SSID 限制</string>
+  <string name="settings_sync_wifi_only_ssids_on">只使用 %s 网络同步</string>
+  <string name="settings_sync_wifi_only_ssids_off">任意 WiFi 网络均可同步</string>
+  <string name="settings_sync_wifi_only_ssids_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>按 VCard 文件分组</item>
+    <item>按联系人分类分组</item>
+  </string-array>
+  <string name="settings_contact_group_method_change">修改分组方式</string>
+  <string name="settings_contact_group_method_change_reload_contacts">本次操作需要重新载入所有联系人，未同步的本地修改会被撤销。</string>
+  <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>
+  <string name="settings_event_colors">事件日历颜色支持</string>
+  <string name="settings_event_colors_on">同步日历事件颜色</string>
+  <string name="settings_event_colors_off">不同步日历事件颜色</string>
+  <string name="settings_event_colors_off_confirm">关闭事件颜色功能将删除已同步的日历颜色。</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>
+  <string name="collection_force_read_only">强制只读</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 adapters and DebugInfoActivity-->
+  <string name="debug_info_title">调试信息</string>
+  <string name="sync_contacts_read_only_address_book">只读通讯录</string>
+  <plurals name="sync_contacts_local_contact_changes_discarded">
+    <item quantity="other">%d 本地联系人修改被撤销</item>
+  </plurals>
+  <string name="sync_error_permissions">DAVdroid 权限</string>
+  <string name="sync_error_permissions_text">需要额外权限</string>
+  <string name="sync_error_opentasks_too_old">OpenTasks 版本太旧</string>
+  <string name="sync_error_opentasks_required_version">最低版本 %1$s （当前 %2$s）</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-zh-rTW/strings.xml

@@ -0,0 +1,183 @@
+<?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>
+  <!--startup dialogs-->
+  <string name="startup_battery_optimization">電池最佳化</string>
+  <string name="startup_battery_optimization_message">Android 在數日之後可能會關閉或減少 DAVdroid 的同步。為了避免這發生，請關閉電池最佳化。</string>
+  <string name="startup_battery_optimization_disable">關閉 DAVdroid 的電池最佳化</string>
+  <string name="startup_dont_show_again">不要再顯示此訊息</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商店數位權利管理錯誤訊息</string>
+  <string name="startup_google_play_accounts_removed_message">在某些情況下，Play商店 的數位權利管理可能導致在重開機後或更新 DAVdroid 後，DAVdroid 全部帳號消失。如果您遇到此問題 (且只有在遇到此問題時)，請到 Play商店 安裝 \"DAVdroid JB Workaround\"。</string>
+  <string name="startup_opentasks_not_installed">OpenTasks 未安裝</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_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">新聞 &amp; 更新</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>
+  <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>
+  <!--AddAccountActivity-->
+  <string name="login_title">新增帳號</string>
+  <string name="login_type_email">用 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">用網址和帳號登入</string>
+  <string name="login_url_must_be_http_or_https">網址開頭必須是 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">使用 Email 地址當作裝置上的帳號顯示名稱，因為當您在行事曆創建活動時，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 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_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>群組存成額外的 VCard 檔案</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">建立行事曆</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">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 adapters and DebugInfoActivity-->
+  <string name="debug_info_title">除錯訊息</string>
+  <string name="sync_error_permissions">DAVdroid 權限</string>
+  <string name="sync_error_permissions_text">需要額外的權限</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVdroid: 連線安全性</string>
+  <string name="trust_certificate_unknown_certificate_found">DAVdroid 發現未知的憑證，您要信任它嗎?</string>
+</resources>

app/src/davdroid/res/xml/sync_prefs.xml

@@ -0,0 +1,19 @@
+<?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
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+    
+    <PreferenceScreen android:title="@string/manage_accounts">
+        <intent
+            android:targetPackage="at.bitfire.davdroid"
+            android:targetClass="at.bitfire.davdroid.ui.AccountsActivity"
+            android:action="ACTION_VIEW" />
+    </PreferenceScreen>
+
+</PreferenceScreen>

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<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_beta_feedback"
+        android:icon="@drawable/ic_forum_dark"
+        android:title="@string/navigation_drawer_beta_feedback"
+        android:visible="false"/>
+
+    <item
+        android:id="@+id/nav_app_settings"
+        android:icon="@drawable/ic_settings_dark"
+        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_manual"
+                android:icon="@drawable/ic_info_dark"
+                android:title="@string/navigation_drawer_manual"/>
+            <item
+                android:id="@+id/nav_faq"
+                android:icon="@drawable/ic_help_dark"
+                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,18 +1,207 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
-  -->
+  ~ 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"
+          android:installLocation="internalOnly">
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:installLocation="internalOnly">
+    <!-- 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.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.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
 
-    <application android:name=".App">
+    <!-- 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"/>
 
-        <!-- Remove the node added by AppAuth (remove only from net.openid.appauth library, not from our flavor manifest files) -->
-        <activity android:name="net.openid.appauth.RedirectUriReceiverActivity"
-                tools:node="remove" tools:selector="net.openid.appauth"/>
+    <!--
+         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"/>
+    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+    <!-- android.permission-group.CALENDAR -->
+    <uses-permission android:name="android.permission.READ_CALENDAR"/>
+    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
+
+    <!-- android.permission-group.LOCATION -->
+    <!-- required since Android 8.1 to get the WiFi name (for "sync in Wifi only" feature) -->
+    <uses-permission-sdk-23 android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+
+    <!-- ical4android declares task access permissions -->
+
+    <application
+        android:name=".App"
+        android:allowBackup="true"
+        android:fullBackupContent="false"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppThemeExt"
+        tools:ignore="UnusedAttribute">
+
+        <service android:name=".DavService"/>
+        <service android:name=".settings.Settings"/>
+
+        <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.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:parentActivityName=".ui.AppSettingsActivity"
+            android:exported="true"
+            android:label="@string/debug_info_title">
+        </activity>
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="@string/authority_log_provider"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/log_paths" />
+        </provider>
+
+        <!-- account type "DAVdroid" -->
+        <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"/>
+        </service>
+        <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: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"/>
+        </service>
+
+        <!-- account type "DAVdroid Address book" -->
+        <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/account_authenticator_address_book"/>
+        </service>
+        <provider
+            android:authorities="@string/address_books_authority"
+            android:exported="false"
+            android:label="@string/address_books_authority_title"
+            android:name=".syncadapter.AddressBookProvider"
+            android:multiprocess="false"/>
+        <service
+            android:name=".syncadapter.AddressBooksSyncAdapterService"
+            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_address_books"/>
+        </service>
+        <service
+            android:name=".syncadapter.ContactsSyncAdapterService"
+            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_contacts"/>
+            <meta-data
+                android:name="android.provider.CONTACTS_STRUCTURE"
+                android:resource="@xml/contacts"/>
+        </service>
 
     </application>
 
-</manifest>
+</manifest>

app/src/main/aidl/at/bitfire/davdroid/settings/ISettings.aidl

@@ -0,0 +1,28 @@
+package at.bitfire.davdroid.settings;
+
+import at.bitfire.davdroid.settings.ISettingsObserver;
+
+interface ISettings {
+
+    void forceReload();
+
+    boolean has(String key);
+
+    boolean getBoolean(String key, boolean defaultValue);
+    int getInt(String key, int defaultValue);
+    long getLong(String key, long defaultValue);
+    String getString(String key, String defaultValue);
+
+    boolean isWritable(String key);
+
+    boolean putBoolean(String key, boolean value);
+    boolean putInt(String key, int value);
+    boolean putLong(String key, long value);
+    boolean putString(String key, String value);
+
+    boolean remove(String key);
+
+    void registerObserver(ISettingsObserver observer);
+    void unregisterObserver(ISettingsObserver observer);
+
+}

app/src/main/aidl/at/bitfire/davdroid/settings/ISettingsObserver.aidl

@@ -0,0 +1,7 @@
+package at.bitfire.davdroid.settings;
+
+interface ISettingsObserver {
+
+    void onSettingsChanged();
+
+}

app/src/main/assets/apache2.html

@@ -0,0 +1,153 @@
+<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

@@ -0,0 +1,28 @@
+<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

@@ -0,0 +1,23 @@
+<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/gpl-3.0-standalone.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/java/at/bitfire/davdroid/AccountSettings.kt

@@ -0,0 +1,540 @@
+/*
+ * 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.Credentials
+import at.bitfire.davdroid.model.ServiceDB
+import at.bitfire.davdroid.model.ServiceDB.*
+import at.bitfire.davdroid.model.ServiceDB.Collections
+import at.bitfire.davdroid.model.SyncState
+import at.bitfire.davdroid.resource.LocalAddressBook
+import at.bitfire.davdroid.resource.LocalCalendar
+import at.bitfire.davdroid.resource.LocalTaskList
+import at.bitfire.davdroid.settings.ISettings
+import at.bitfire.ical4android.AndroidCalendar
+import at.bitfire.ical4android.AndroidTaskList
+import at.bitfire.ical4android.CalendarStorageException
+import at.bitfire.ical4android.TaskProvider
+import at.bitfire.vcard4android.ContactsStorageException
+import at.bitfire.vcard4android.GroupMethod
+import okhttp3.HttpUrl
+import org.apache.commons.lang3.StringUtils
+import org.dmfs.tasks.contract.TaskContract
+import java.util.*
+import java.util.logging.Level
+
+/**
+ * Manages settings of an account.
+ *
+ * @throws InvalidAccountException on construction when the account doesn't exist (anymore)
+ */
+class AccountSettings(
+        val context: Context,
+        val settings: ISettings,
+        val account: Account
+) {
+
+    companion object {
+
+        const val CURRENT_VERSION = 8
+        const val KEY_SETTINGS_VERSION = "version"
+
+        const val KEY_USERNAME = "user_name"
+        const val KEY_CERTIFICATE_ALIAS = "certificate_alias"
+
+        const val KEY_WIFI_ONLY = "wifi_only"               // sync on WiFi only (default: false)
+        const val KEY_WIFI_ONLY_SSIDS = "wifi_only_ssids"   // restrict sync to specific WiFi SSIDs
+
+        /** 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
+         */
+        const val KEY_TIME_RANGE_PAST_DAYS = "time_range_past_days"
+        const 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 */
+        const val KEY_MANAGE_CALENDAR_COLORS = "manage_calendar_colors"
+
+        /* Whether DAVdroid populates and uses CalendarContract.Colors
+           value = null (not existing)     false (default)
+                   "1"                     true */
+        const val KEY_EVENT_COLORS = "event_colors"
+
+        /** Contact group method:
+        value = null (not existing)     groups as separate VCards (default)
+        "CATEGORIES"            groups are per-contact CATEGORIES
+         */
+        const val KEY_CONTACT_GROUP_METHOD = "contact_group_method"
+
+        const val SYNC_INTERVAL_MANUALLY = -1L
+
+        fun initialUserData(credentials: Credentials): Bundle {
+            val bundle = Bundle(2)
+            bundle.putString(KEY_SETTINGS_VERSION, CURRENT_VERSION.toString())
+
+            when (credentials.type) {
+                Credentials.Type.UsernamePassword ->
+                    bundle.putString(KEY_USERNAME, credentials.userName)
+                Credentials.Type.ClientCertificate ->
+                    bundle.putString(KEY_CERTIFICATE_ALIAS, credentials.certificateAlias)
+            }
+
+            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 credentials() = Credentials(
+            accountManager.getUserData(account, KEY_USERNAME),
+            accountManager.getPassword(account),
+            accountManager.getUserData(account, KEY_CERTIFICATE_ALIAS)
+    )
+
+    fun credentials(credentials: Credentials) {
+        accountManager.setUserData(account, KEY_USERNAME, credentials.userName)
+        accountManager.setPassword(account, credentials.password)
+        accountManager.setUserData(account, KEY_CERTIFICATE_ALIAS, credentials.certificateAlias)
+    }
+
+
+    // 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() = if (settings.has(KEY_WIFI_ONLY))
+            settings.getBoolean(KEY_WIFI_ONLY, false)
+                else
+            accountManager.getUserData(account, KEY_WIFI_ONLY) != null
+    fun setSyncWiFiOnly(wiFiOnly: Boolean) =
+            accountManager.setUserData(account, KEY_WIFI_ONLY, if (wiFiOnly) "1" else null)
+
+    fun getSyncWifiOnlySSIDs(): List<String>? = (if (settings.has(KEY_WIFI_ONLY_SSIDS))
+                settings.getString(KEY_WIFI_ONLY_SSIDS, null)
+            else
+                accountManager.getUserData(account, KEY_WIFI_ONLY_SSIDS))?.split(',')
+    fun setSyncWifiOnlySSIDs(ssids: List<String>?) =
+            accountManager.setUserData(account, KEY_WIFI_ONLY_SSIDS, StringUtils.trimToNull(ssids?.joinToString(",")))
+
+
+    // CalDAV settings
+
+    fun getTimeRangePastDays(): Int? {
+        val strDays = accountManager.getUserData(account, KEY_TIME_RANGE_PAST_DAYS)
+        return if (strDays != null) {
+            val days = Integer.valueOf(strDays)
+            if (days < 0) null else days
+        } else
+            DEFAULT_TIME_RANGE_PAST_DAYS
+    }
+
+    fun setTimeRangePastDays(days: Int?) =
+            accountManager.setUserData(account, KEY_TIME_RANGE_PAST_DAYS, (days ?: -1).toString())
+
+    fun getManageCalendarColors() = if (settings.has(KEY_MANAGE_CALENDAR_COLORS))
+        settings.getBoolean(KEY_MANAGE_CALENDAR_COLORS, false)
+    else
+        accountManager.getUserData(account, KEY_MANAGE_CALENDAR_COLORS) == null
+    fun setManageCalendarColors(manage: Boolean) =
+            accountManager.setUserData(account, KEY_MANAGE_CALENDAR_COLORS, if (manage) null else "0")
+
+    fun getEventColors() = if (settings.has(KEY_EVENT_COLORS))
+            settings.getBoolean(KEY_EVENT_COLORS, false)
+                else
+            accountManager.getUserData(account, KEY_EVENT_COLORS) != null
+    fun setEventColors(useColors: Boolean) =
+            accountManager.setUserData(account, KEY_EVENT_COLORS, if (useColors) "1" else null)
+
+    // CardDAV settings
+
+    fun getGroupMethod(): GroupMethod {
+        val name = settings.getString(KEY_CONTACT_GROUP_METHOD, null) ?:
+                accountManager.getUserData(account, KEY_CONTACT_GROUP_METHOD)
+        if (name != null)
+            try {
+                return GroupMethod.valueOf(name)
+            }
+            catch (e: IllegalArgumentException) {
+            }
+        return GroupMethod.GROUP_VCARDS
+    }
+
+    fun setGroupMethod(method: GroupMethod) {
+        accountManager.setUserData(account, KEY_CONTACT_GROUP_METHOD, method.name)
+    }
+
+
+    // 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)
+
+                Logger.log.info("Account version update successful")
+                accountManager.setUserData(account, KEY_SETTINGS_VERSION, toVersion.toString())
+            } catch (e: Exception) {
+                Logger.log.log(Level.SEVERE, "Couldn't update account settings", e)
+            }
+        }
+    }
+
+    @Suppress("unused")
+    /**
+     * There is a mistake in this method. [TaskContract.Tasks.SYNC_VERSION] is used to store the
+     * SEQUENCE and should not be used for the eTag.
+     */
+    private fun update_7_8() {
+        TaskProvider.acquire(context, TaskProvider.ProviderName.OpenTasks)?.let { provider ->
+            // ETag is now in sync_version instead of sync1
+            // UID  is now in _uid         instead of sync2
+            provider.client.query(TaskProvider.syncAdapterUri(provider.tasksUri(), account),
+                    arrayOf(TaskContract.Tasks._ID, TaskContract.Tasks.SYNC1, TaskContract.Tasks.SYNC2),
+                    "${TaskContract.Tasks.ACCOUNT_TYPE}=? AND ${TaskContract.Tasks.ACCOUNT_NAME}=?",
+                    arrayOf(account.type, account.name), null).use { cursor ->
+                while (cursor.moveToNext()) {
+                    val id = cursor.getLong(0)
+                    val eTag = cursor.getString(1)
+                    val uid = cursor.getString(2)
+                    val values = ContentValues(4)
+                    values.put(TaskContract.Tasks._UID, uid)
+                    values.put(TaskContract.Tasks.SYNC_VERSION, eTag)
+                    values.putNull(TaskContract.Tasks.SYNC1)
+                    values.putNull(TaskContract.Tasks.SYNC2)
+                    Logger.log.log(Level.FINER, "Updating task $id", values)
+                    provider.client.update(
+                            TaskProvider.syncAdapterUri(ContentUris.withAppendedId(provider.tasksUri(), id), account),
+                            values, null, null)
+                }
+            }
+        }
+    }
+
+    @Suppress("unused")
+    private fun update_6_7() {
+        // add calendar colors
+        context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)?.let { provider ->
+            try {
+                AndroidCalendar.insertColors(provider, account)
+            } finally {
+                if (Build.VERSION.SDK_INT >= 24)
+                    provider.close()
+                else
+                    provider.release()
+            }
+        }
+
+        // update allowed WiFi settings key
+        val onlySSID = accountManager.getUserData(account, "wifi_only_ssid")
+        accountManager.setUserData(account, KEY_WIFI_ONLY_SSIDS, onlySSID)
+        accountManager.setUserData(account, "wifi_only_ssid", null)
+    }
+
+    @Suppress("unused")
+    @SuppressLint("ParcelClassLoader")
+    private fun update_5_6() {
+        context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)?.let { provider ->
+            val parcel = Parcel.obtain()
+            try {
+                // don't run syncs during the migration
+                ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 0)
+                ContentResolver.setIsSyncable(account, context.getString(R.string.address_books_authority), 0)
+                ContentResolver.cancelSync(account, null)
+
+                // 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")?.let { HttpUrl.parse(it) }
+                    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), context.getString(R.string.account_type_address_book))
+                        if (!accountManager.addAccountExplicitly(addressBookAccount, null, LocalAddressBook.initialUserData(account, info.url.toString())))
+                            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()
+                if (Build.VERSION.SDK_INT >= 24)
+                    provider.close()
+                else
+                    provider.release()
+            }
+        }
+
+        // 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, context.getString(R.string.address_books_authority), 1)
+        setSyncInterval(context.getString(R.string.address_books_authority), Constants.DEFAULT_SYNC_INTERVAL)
+    }
+
+    /* 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_3_4() {
+        setGroupMethod(GroupMethod.CATEGORIES)
+    }
+
+    @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.url
+                    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)?.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")
+    @SuppressLint("Recycle")
+    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.settings = values
+
+            val url = accountManager.getUserData(account, "addressbook_url")
+            if (!url.isNullOrEmpty())
+                addr.url = url
+            accountManager.setUserData(account, "addressbook_url", null)
+
+            val cTag = accountManager.getUserData (account, "addressbook_ctag")
+            if (!cTag.isNullOrEmpty())
+                addr.lastSyncState = SyncState(SyncState.Type.CTAG, cTag)
+            accountManager.setUserData(account, "addressbook_ctag", null)
+        } finally {
+            if (Build.VERSION.SDK_INT >= 24)
+                provider.close()
+            else
+                @Suppress("deprecation")
+                provider.release()
+        }
+    }
+
+}

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

@@ -0,0 +1,89 @@
+/*
+ * 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.app.Application
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.graphics.Bitmap
+import android.graphics.drawable.BitmapDrawable
+import android.os.Build
+import android.support.v7.app.AppCompatDelegate
+import at.bitfire.davdroid.log.Logger
+import at.bitfire.davdroid.ui.NotificationUtils
+import kotlin.concurrent.thread
+
+class App: Application() {
+
+    companion object {
+
+        const val FLAVOR_GOOGLE_PLAY = "gplay"
+        const val FLAVOR_ICLOUD = "icloud"
+        const val FLAVOR_MANAGED = "managed"
+        const val FLAVOR_SOLDUPE = "soldupe"
+        const val FLAVOR_STANDARD = "standard"
+
+        const val ORGANIZATION = "organization"
+        const val ORGANIZATION_LOGO_URL = "logo_url"
+
+        const val SUPPORT_HOMEPAGE = "support_homepage_url"
+        const val SUPPORT_PHONE = "support_phone_number"
+        const val SUPPORT_EMAIL = "support_email_address"
+
+        const val MAX_ACCOUNTS = "max_accounts"
+
+        const val DISTRUST_SYSTEM_CERTIFICATES = "distrust_system_certs"
+        const val OVERRIDE_PROXY = "override_proxy"
+        const val OVERRIDE_PROXY_HOST = "override_proxy_host"
+        const val OVERRIDE_PROXY_PORT = "override_proxy_port"
+
+        const val OVERRIDE_PROXY_HOST_DEFAULT = "localhost"
+        const val OVERRIDE_PROXY_PORT_DEFAULT = 8118
+
+
+        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
+        }
+
+    }
+
+
+    override fun onCreate() {
+        super.onCreate()
+        Logger.initialize(this)
+
+        if (Build.VERSION.SDK_INT <= 21)
+            AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+
+        NotificationUtils.createChannels(this)
+
+        // don't block UI for some background checks
+        thread {
+            // watch installed/removed apps
+            val tasksFilter = IntentFilter()
+            tasksFilter.addAction(Intent.ACTION_PACKAGE_ADDED)
+            tasksFilter.addAction(Intent.ACTION_PACKAGE_FULLY_REMOVED)
+            tasksFilter.addDataScheme("package")
+            registerReceiver(PackageChangedReceiver(), tasksFilter)
+
+            // check whether a tasks app is currently installed
+            PackageChangedReceiver.updateTaskSync(this)
+        }
+    }
+
+}

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

@@ -0,0 +1,16 @@
+/*
+ * 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
+
+object Constants {
+
+    const val DAVDROID_GREEN_RGBA = 0xFF8bc34a.toInt()
+
+    const val DEFAULT_SYNC_INTERVAL = 4 * 3600L    // 4 hours
+
+}

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

@@ -0,0 +1,165 @@
+/*
+ * 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.*
+
+/**
+ * Custom TLS socket factory with support for
+ *   - enabling/disabling algorithms depending on the Android version,
+ *   - client certificate authentication
+ */
+class CustomTlsSocketFactory(
+        keyManager: KeyManager?,
+        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 {
+                (SSLSocketFactory.getDefault().createSocket() as? SSLSocket)?.use { socket ->
+                    try {
+                        /* 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(
+                                // 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")
+                    }
+                }
+            }
+        }
+    }
+
+
+    init {
+        try {
+            val sslContext = SSLContext.getInstance("TLS")
+            sslContext.init(
+                    if (keyManager != null) arrayOf(keyManager) else 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/DavService.kt

@@ -0,0 +1,385 @@
+/*
+ * 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.app.PendingIntent
+import android.app.Service
+import android.content.ContentResolver
+import android.content.ContentValues
+import android.content.Intent
+import android.database.DatabaseUtils
+import android.database.sqlite.SQLiteDatabase
+import android.os.Binder
+import android.os.Bundle
+import android.support.v4.app.NotificationCompat
+import android.support.v4.app.NotificationManagerCompat
+import at.bitfire.dav4android.DavResource
+import at.bitfire.dav4android.DavResponse
+import at.bitfire.dav4android.UrlUtils
+import at.bitfire.dav4android.exception.DavException
+import at.bitfire.dav4android.exception.HttpException
+import at.bitfire.dav4android.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.settings.Settings
+import at.bitfire.davdroid.ui.DebugInfoActivity
+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 java.lang.ref.WeakReference
+import java.util.*
+import java.util.logging.Level
+import kotlin.concurrent.thread
+
+class DavService: Service() {
+
+    companion object {
+        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"
+    }
+
+    private val runningRefresh = HashSet<Long>()
+    private val refreshingStatusListeners = LinkedList<WeakReference<RefreshingStatusListener>>()
+
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        intent?.let {
+            val id = intent.getLongExtra(EXTRA_DAV_SERVICE_ID, -1)
+
+            when (intent.action) {
+                ACTION_REFRESH_COLLECTIONS ->
+                    if (runningRefresh.add(id)) {
+                        thread { refreshCollections(id) }
+                        refreshingStatusListeners.forEach { it.get()?.onDavRefreshStatusChanged(id, true) }
+                    }
+
+                ACTION_FORCE_SYNC -> {
+                    val authority = intent.data.authority
+                    val account = Account(
+                            intent.data.pathSegments[1],
+                            intent.data.pathSegments[0]
+                    )
+                    forceSync(authority, account)
+                }
+            }
+        }
+
+        return START_NOT_STICKY
+    }
+
+
+    /* BOUND SERVICE PART
+       for communicating with the activities
+    */
+
+    interface RefreshingStatusListener {
+        fun onDavRefreshStatusChanged(id: Long, refreshing: Boolean)
+    }
+
+    private val binder = InfoBinder()
+
+    inner class InfoBinder: Binder() {
+        fun isRefreshing(id: Long) = runningRefresh.contains(id)
+
+        fun addRefreshingStatusListener(listener: RefreshingStatusListener, callImmediate: Boolean) {
+            refreshingStatusListeners += WeakReference<RefreshingStatusListener>(listener)
+            if (callImmediate)
+                runningRefresh.forEach { id -> listener.onDavRefreshStatusChanged(id, true) }
+        }
+
+        fun removeRefreshingStatusListener(listener: RefreshingStatusListener) {
+            val iter = refreshingStatusListeners.iterator()
+            while (iter.hasNext()) {
+                val item = iter.next().get()
+                if (listener == item)
+                    iter.remove()
+            }
+        }
+    }
+
+    override fun onBind(intent: Intent?) = binder
+
+
+
+    /* ACTION RUNNABLES
+       which actually do the work
+     */
+
+    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)
+    }
+
+    private fun refreshCollections(service: Long) {
+        OpenHelper(this@DavService).use { dbHelper ->
+            val db = dbHelper.writableDatabase
+
+            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 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 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
+            }
+
+            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)) }
+                        }
+                    }
+                }
+                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, recurse: Boolean = true) {
+                var response: DavResponse? = null
+                try {
+                    when (serviceType) {
+                        Services.SERVICE_CARDDAV -> {
+                            response = dav.propfind(0, AddressbookHomeSet.NAME, GroupMembership.NAME)
+                            for ((resource, addressbookHomeSet) in response.searchProperties(AddressbookHomeSet::class.java))
+                                for (href in addressbookHomeSet.hrefs)
+                                    resource.url.resolve(href)?.let { homeSets += UrlUtils.withTrailingSlash(it) }
+                        }
+                        Services.SERVICE_CALDAV -> {
+                            response = dav.propfind(0, CalendarHomeSet.NAME, CalendarProxyReadFor.NAME, CalendarProxyWriteFor.NAME, GroupMembership.NAME)
+                            for ((resource, calendarHomeSet) in response.searchProperties(CalendarHomeSet::class.java))
+                                for (href in calendarHomeSet.hrefs)
+                                    resource.url.resolve(href)?.let { homeSets.add(UrlUtils.withTrailingSlash(it)) }
+                        }
+                    }
+                    response = requireNotNull(response)
+
+                    if (recurse) {
+                        // refresh home sets: calendar-proxy-read/write-for
+                        for ((resource, proxyRead) in response.searchProperties(CalendarProxyReadFor::class.java))
+                            for (href in proxyRead.hrefs) {
+                                Logger.log.fine("Principal is a read-only proxy for $href, checking for home sets")
+                                resource.url.resolve(href)?.let {
+                                    queryHomeSets(DavResource(dav.httpClient, it), false)
+                                }
+                            }
+                        for ((resource, proxyWrite) in response.searchProperties(CalendarProxyWriteFor::class.java))
+                            for (href in proxyWrite.hrefs) {
+                                Logger.log.fine("Principal is a read/write proxy for $href, checking for home sets")
+                                resource.url.resolve(href)?.let {
+                                    queryHomeSets(DavResource(dav.httpClient, it), false)
+                                }
+                            }
+
+                        // refresh home sets: direct group memberships
+                        response[GroupMembership::class.java]?.let { groupMembership ->
+                            for (href in groupMembership.hrefs) {
+                                Logger.log.fine("Principal is member of group $href, checking for home sets")
+                                response.url.resolve(href)?.let { url ->
+                                    try {
+                                        queryHomeSets(DavResource(dav.httpClient, url), false)
+                                    } 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)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } finally {
+                    response?.close()
+                }
+            }
+
+            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)
+                }
+            }
+
+            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)
+                }
+            }
+
+
+            try {
+                Logger.log.info("Refreshing $serviceType collections of service #$service")
+
+                Settings.getInstance(this)?.use { settings ->
+                    // create authenticating OkHttpClient (credentials taken from account settings)
+                    HttpClient.Builder(this, settings, AccountSettings(this, settings, account))
+                            .setForeground(true)
+                            .build().use { client ->
+                        val httpClient = client.okHttpClient
+
+                        // refresh home set list (from principal)
+                        readPrincipal()?.let { principalUrl ->
+                            Logger.log.fine("Querying principal $principalUrl for home sets")
+                            queryHomeSets(DavResource(httpClient, principalUrl))
+                        }
+
+                        // remember selected collections
+                        val selectedCollections = HashSet<HttpUrl>()
+                        collections.values
+                                .filter { it.selected }
+                                .forEach { (url,_) -> selectedCollections.add(url) }
+
+                        // now refresh collections (taken from home sets)
+                        val itHomeSets = homeSets.iterator()
+                        while (itHomeSets.hasNext()) {
+                            val homeSetUrl = itHomeSets.next()
+                            Logger.log.fine("Listing home set $homeSetUrl")
+
+                            val homeSet = DavResource(httpClient, homeSetUrl)
+                            try {
+                                homeSet.propfind(1, *CollectionInfo.DAV_PROPERTIES).use { response ->
+                                    val itCollections = IteratorChain<DavResponse>(response.members.iterator(), response.related.iterator(), SingletonIterator(response))
+                                    while (itCollections.hasNext()) {
+                                        val member = itCollections.next()
+                                        val info = CollectionInfo(member)
+                                        info.confirmed = true
+                                        Logger.log.log(Level.FINE, "Found collection", info)
+
+                                        if ((serviceType == Services.SERVICE_CARDDAV && info.type == CollectionInfo.Type.ADDRESS_BOOK) ||
+                                                (serviceType == Services.SERVICE_CALDAV && arrayOf(CollectionInfo.Type.CALENDAR, CollectionInfo.Type.WEBCAL).contains(info.type)))
+                                            collections[member.url] = info
+                                    }
+                                }
+                            } catch(e: HttpException) {
+                                if (e.code in arrayOf(403, 404, 410))
+                                // delete home set only if it was not accessible (40x)
+                                    itHomeSets.remove()
+                            }
+                        }
+
+                        // check/refresh unconfirmed collections
+                        val itCollections = collections.entries.iterator()
+                        while (itCollections.hasNext()) {
+                            val (url, info) = itCollections.next()
+                            if (!info.confirmed)
+                                try {
+                                    val collection = DavResource(httpClient, url)
+                                    collection.propfind(0, *CollectionInfo.DAV_PROPERTIES).use { response ->
+                                        val info = CollectionInfo(response)
+                                        info.confirmed = true
+
+                                        // remove unusable collections
+                                        if ((serviceType == Services.SERVICE_CARDDAV && info.type != CollectionInfo.Type.ADDRESS_BOOK) ||
+                                                (serviceType == Services.SERVICE_CALDAV && !arrayOf(CollectionInfo.Type.CALENDAR, CollectionInfo.Type.WEBCAL).contains(info.type)) ||
+                                                (info.type == CollectionInfo.Type.WEBCAL && info.source == null))
+                                            itCollections.remove()
+                                    }
+                                } catch(e: HttpException) {
+                                    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.beginTransactionNonExclusive()
+                try {
+                    saveHomeSets()
+                    saveCollections()
+                    db.setTransactionSuccessful()
+                } finally {
+                    db.endTransaction()
+                }
+
+            } 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, DebugInfoActivity::class.java)
+                debugIntent.putExtra(DebugInfoActivity.KEY_THROWABLE, e)
+                debugIntent.putExtra(DebugInfoActivity.KEY_ACCOUNT, account)
+
+                val notify = NotificationUtils.newBuilder(this)
+                        .setSmallIcon(R.drawable.ic_sync_error_notification)
+                        .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(service.toString(), NotificationUtils.NOTIFY_REFRESH_COLLECTIONS, notify)
+            } finally {
+                runningRefresh.remove(service)
+                refreshingStatusListeners.forEach { it.get()?.onDavRefreshStatusChanged(service, false) }
+            }
+        }
+
+    }
+
+}

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

@@ -0,0 +1,82 @@
+/*
+ * 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.annotation.TargetApi
+import android.content.Context
+import android.net.ConnectivityManager
+import android.os.Build
+import at.bitfire.davdroid.log.Logger
+import okhttp3.HttpUrl
+import org.xbill.DNS.*
+import java.util.*
+
+/**
+ * Some WebDAV and related network utility methods
+ */
+object DavUtils {
+
+    fun ARGBtoCalDAVColor(colorWithAlpha: Int): String {
+        val alpha = (colorWithAlpha shr 24) and 0xFF
+        val color = colorWithAlpha and 0xFFFFFF
+        return String.format("#%06X%02X", color, alpha)
+    }
+
+    fun lastSegmentOfUrl(url: HttpUrl): String {
+        // the list returned by HttpUrl.pathSegments() is unmodifiable, so we have to create a copy
+        val segments = LinkedList<String>(url.pathSegments())
+        segments.reverse()
+
+        return segments.firstOrNull { it.isNotEmpty() } ?: "/"
+    }
+
+    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(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            val activeLink = connectivity.getLinkProperties(connectivity.activeNetwork)
+            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)
+        }
+    }
+
+    fun selectSRVRecord(records: Array<Record>?): SRVRecord? {
+        val srvRecords = records?.filterIsInstance(SRVRecord::class.java)
+        srvRecords?.let {
+            if (it.size > 1)
+                Logger.log.warning("Multiple SRV records not supported yet; using first one")
+            return it.firstOrNull()
+        }
+        return null
+    }
+
+    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
+    }
+
+}

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

@@ -0,0 +1,244 @@
+/*
+ * 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 android.security.KeyChain
+import at.bitfire.cert4android.CustomCertManager
+import at.bitfire.dav4android.BasicDigestAuthHandler
+import at.bitfire.dav4android.Constants
+import at.bitfire.dav4android.UrlUtils
+import at.bitfire.davdroid.log.Logger
+import at.bitfire.davdroid.model.Credentials
+import at.bitfire.davdroid.settings.ISettings
+import okhttp3.Cache
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Response
+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.KeyManager
+import javax.net.ssl.TrustManagerFactory
+import javax.net.ssl.X509ExtendedKeyManager
+import javax.net.ssl.X509TrustManager
+
+class HttpClient private constructor(
+        val okHttpClient: OkHttpClient,
+        private val certManager: CustomCertManager?
+): AutoCloseable {
+
+    companion object {
+        /** [OkHttpClient] singleton to build all clients from */
+        val sharedClient = OkHttpClient.Builder()
+                // set timeouts
+                .connectTimeout(30, TimeUnit.SECONDS)
+                .writeTimeout(30, TimeUnit.SECONDS)
+                .readTimeout(120, TimeUnit.SECONDS)
+
+                // don't allow redirects by default, because it would break PROPFIND handling
+                .followRedirects(false)
+
+                // add User-Agent to every request
+                .addNetworkInterceptor(UserAgentInterceptor)
+
+                .build()!!
+    }
+
+    override fun close() {
+        certManager?.close()
+    }
+
+    class Builder(
+            val context: Context? = null,
+            val settings: ISettings? = null,
+            accountSettings: AccountSettings? = null,
+            val logger: java.util.logging.Logger = Logger.log
+    ) {
+        private var certManager: CustomCertManager? = null
+        private var certificateAlias: String? = null
+
+        private val orig = sharedClient.newBuilder()
+
+        init {
+            // add cookie store for non-persistent cookies (some services like Horde use cookies for session tracking)
+            orig.cookieJar(MemoryCookieStore())
+
+            // add network logging, if requested
+            if (logger.isLoggable(Level.FINEST)) {
+                val loggingInterceptor = HttpLoggingInterceptor(HttpLoggingInterceptor.Logger {
+                    message -> logger.finest(message)
+                })
+                loggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
+                orig.addInterceptor(loggingInterceptor)
+            }
+
+            settings?.let {
+                // custom proxy support
+                try {
+                    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)
+                        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)
+                }
+
+                context?.let {
+                    if (BuildConfig.customCerts)
+                        customCertManager(CustomCertManager(context, BuildConfig.customCertsUI, !settings.getBoolean(App.DISTRUST_SYSTEM_CERTIFICATES, false)))
+
+                    // use account settings for authentication
+                    accountSettings?.let {
+                        addAuthentication(null, it.credentials())
+                    }
+                }
+            }
+        }
+
+        constructor(context: Context, host: String?, credentials: Credentials): this(context) {
+            addAuthentication(host, credentials)
+        }
+
+        fun withDiskCache(): Builder {
+            val context = context ?: throw IllegalArgumentException("Context is required to find the cache directory")
+            for (dir in arrayOf(context.externalCacheDir, context.cacheDir)) {
+                if (dir.exists() && dir.canWrite()) {
+                    val cacheDir = File(dir, "HttpClient")
+                    cacheDir.mkdir()
+                    Logger.log.fine("Using disk cache: $cacheDir")
+                    orig.cache(Cache(cacheDir, 10*1024*1024))
+                    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 {
+            when (credentials.type) {
+                Credentials.Type.UsernamePassword -> {
+                    val authHandler = BasicDigestAuthHandler(UrlUtils.hostToDomain(host), credentials.userName!!, credentials.password!!)
+                    orig    .addNetworkInterceptor(authHandler)
+                            .authenticator(authHandler)
+                }
+                Credentials.Type.ClientCertificate -> {
+                    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.INSTANCE)
+                    ?: OkHostnameVerifier.INSTANCE
+
+            var keyManager: KeyManager? = null
+            try {
+                certificateAlias?.let { alias ->
+                    // get client certificate and private key
+                    val certs = KeyChain.getCertificateChain(context, alias) ?: return@let
+                    val key = KeyChain.getPrivateKey(context, alias) ?: return@let
+                    logger.fine("Using client certificate $alias for authentication (chain length: ${certs.size})")
+
+                    // create Android KeyStore (performs key operations without revealing secret data to DAVdroid)
+                    val keyStore = KeyStore.getInstance("AndroidKeyStore")
+                    keyStore.load(null)
+
+                    // 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 }
+                    }
+                }
+            } catch (e: Exception) {
+                logger.log(Level.SEVERE, "Couldn't set up client certificate authentication", e)
+            }
+
+            orig.sslSocketFactory(CustomTlsSocketFactory(keyManager, trustManager), trustManager)
+            orig.hostnameVerifier(hostnameVerifier)
+
+            return HttpClient(orig.build(), certManager)
+        }
+
+    }
+
+
+    private object UserAgentInterceptor: Interceptor {
+
+        private val productName = when(BuildConfig.FLAVOR) {
+            App.FLAVOR_ICLOUD  -> "MultiSync for Cloud"
+            App.FLAVOR_SOLDUPE -> "Soldupe Sync"
+            else               -> "DAVdroid"
+        }
+
+        // use Locale.US because numbers may be encoded as non-ASCII characters in other locales
+        private val userAgentDateFormat = SimpleDateFormat("yyyy/MM/dd", Locale.US)
+        private val userAgentDate = userAgentDateFormat.format(Date(BuildConfig.buildTime))
+        private val userAgent = "$productName/${BuildConfig.VERSION_NAME} ($userAgentDate; dav4android; okhttp/${Constants.okHttpVersion}) Android/${Build.VERSION.RELEASE}"
+
+        override fun intercept(chain: Interceptor.Chain): Response {
+            val locale = Locale.getDefault()
+            val request = chain.request().newBuilder()
+                    .header("User-Agent", userAgent)
+                    .header("Accept-Language", "${locale.language}-${locale.country}, ${locale.language};q=0.7, *;q=0.5")
+                    .build()
+            return chain.proceed(request)
+        }
+
+    }
+
+}

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

@@ -0,0 +1,13 @@
+/*
+ * 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
+
+class InvalidAccountException(account: Account): Exception("Invalid account: $account")

app/src/main/java/at/bitfire/davdroid/MemoryCookieStore.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
+
+import okhttp3.Cookie
+import okhttp3.CookieJar
+import okhttp3.HttpUrl
+import org.apache.commons.collections4.keyvalue.MultiKey
+import org.apache.commons.collections4.map.HashedMap
+import org.apache.commons.collections4.map.MultiKeyMap
+import java.util.*
+
+/**
+ * Primitive cookie store that stores cookies in a (volatile) hash map.
+ * Will be sufficient for session cookies.
+ */
+class MemoryCookieStore: CookieJar {
+
+    /**
+     * Stored cookies. The multi-key consists of three parts: name, domain, and path.
+     * This ensures that cookies can be overwritten. [RFC 6265 5.3 Storage Model]
+     * Not thread-safe!
+     */
+    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)
+        }
+    }
+
+    override fun loadForRequest(url: HttpUrl): List<Cookie> {
+        val cookies = LinkedList<Cookie>()
+
+        synchronized(storage) {
+            val iter = storage.mapIterator()
+            while (iter.hasNext()) {
+                iter.next()
+                val cookie = iter.value
+
+                // remove expired cookies
+                if (cookie.expiresAt() <= System.currentTimeMillis()) {
+                    iter.remove()
+                    continue
+                }
+
+                // add applicable cookies
+                if (cookie.matches(url))
+                    cookies += cookie
+            }
+        }
+
+        return cookies
+    }
+
+}

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

@@ -0,0 +1,61 @@
+/*
+ * 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.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
+
+class PackageChangedReceiver: BroadcastReceiver() {
+
+    companion object {
+
+        fun updateTaskSync(context: Context) {
+            val tasksInstalled = LocalTaskList.tasksProviderAvailable(context)
+            Logger.log.info("Tasks provider 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)
+                            }
+                        } else
+                            ContentResolver.setIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority, 0)
+
+                    }
+                }
+            }
+        }
+
+    }
+
+
+    override fun onReceive(context: Context, intent: Intent) {
+        updateTaskSync(context)
+    }
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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.log
+
+import android.util.Log
+
+import org.apache.commons.lang3.math.NumberUtils
+
+import java.util.logging.Handler
+import java.util.logging.Level
+import java.util.logging.LogRecord
+
+object LogcatHandler: Handler() {
+
+    private const val MAX_LINE_LENGTH = 3000
+
+    init {
+        formatter = PlainTextFormatter.LOGCAT
+        level = Level.ALL
+    }
+
+    override fun publish(r: LogRecord) {
+        val text = formatter.format(r)
+        val level = r.level.intValue()
+
+        val end = text.length
+        var pos = 0
+        while (pos < end) {
+            val line = text.substring(pos, NumberUtils.min(pos + MAX_LINE_LENGTH, end))
+            when {
+                level >= Level.SEVERE.intValue()  -> Log.e(r.loggerName, line)
+                level >= Level.WARNING.intValue() -> Log.w(r.loggerName, line)
+                level >= Level.CONFIG.intValue()  -> Log.i(r.loggerName, line)
+                level >= Level.FINER.intValue()   -> Log.d(r.loggerName, line)
+                else                              -> Log.v(r.loggerName, line)
+            }
+            pos += MAX_LINE_LENGTH
+        }
+    }
+
+    override fun flush() {}
+    override fun close() {}
+
+}

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

@@ -0,0 +1,106 @@
+/*
+ * 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.log
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.os.Process
+import android.preference.PreferenceManager
+import android.support.v4.app.NotificationCompat
+import android.support.v4.app.NotificationManagerCompat
+import android.util.Log
+import at.bitfire.davdroid.R
+import at.bitfire.davdroid.ui.AppSettingsActivity
+import at.bitfire.davdroid.ui.NotificationUtils
+import org.apache.commons.lang3.time.DateFormatUtils
+import java.io.File
+import java.io.IOException
+import java.util.logging.FileHandler
+import java.util.logging.Level
+
+object Logger {
+
+    const val LOG_TO_EXTERNAL_STORAGE = "log_to_external_storage"
+
+    val log = java.util.logging.Logger.getLogger("davdroid")!!
+
+
+    private lateinit var preferences: SharedPreferences
+
+    fun initialize(context: Context) {
+        preferences = PreferenceManager.getDefaultSharedPreferences(context)
+        preferences.registerOnSharedPreferenceChangeListener { _, s ->
+            if (s == LOG_TO_EXTERNAL_STORAGE)
+                reinitialize(context.applicationContext)
+        }
+
+        reinitialize(context.applicationContext)
+    }
+
+    private fun reinitialize(context: Context) {
+        val logToFile = preferences.getBoolean(LOG_TO_EXTERNAL_STORAGE, false)
+        val logVerbose = logToFile || 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
+
+        // 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 = NotificationUtils.newBuilder(context, NotificationUtils.CHANNEL_DEBUG)
+            builder .setSmallIcon(R.drawable.ic_sd_storage_notification)
+                    .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
+                    rootLogger.addHandler(fileHandler)
+
+                    val prefIntent = Intent(context, AppSettingsActivity::class.java)
+                    prefIntent.putExtra(AppSettingsActivity.EXTRA_SCROLL_TO, LOG_TO_EXTERNAL_STORAGE)
+
+                    builder .setContentText(dir.path)
+                            .setCategory(NotificationCompat.CATEGORY_STATUS)
+                            .setPriority(NotificationCompat.PRIORITY_HIGH)
+                            .setContentIntent(PendingIntent.getActivity(context, 0, prefIntent, PendingIntent.FLAG_UPDATE_CURRENT))
+                            .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)
+                    val message = context.getString(R.string.logging_couldnt_create_file, e.localizedMessage)
+                    builder .setContentText(message)
+                            .setStyle(NotificationCompat.BigTextStyle().bigText(message))
+                            .setCategory(NotificationCompat.CATEGORY_ERROR)
+                }
+            else
+                builder.setContentText(context.getString(R.string.logging_no_external_storage))
+
+            nm.notify(NotificationUtils.NOTIFY_EXTERNAL_FILE_LOGGING, builder.build())
+        } else
+            nm.cancel(NotificationUtils.NOTIFY_EXTERNAL_FILE_LOGGING)
+    }
+
+}

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

@@ -0,0 +1,61 @@
+/*
+ * 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.log
+
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
+import org.apache.commons.lang3.time.DateFormatUtils
+import java.util.logging.Formatter
+import java.util.logging.LogRecord
+
+class PlainTextFormatter private constructor(
+        private val logcat: Boolean
+): Formatter() {
+
+    companion object {
+        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"))
+                    .append(" ").append(r.threadID).append(" ")
+
+        val className = shortClassName(r.sourceClassName)
+        if (className != r.loggerName)
+            builder.append("[").append(className).append("] ")
+
+        builder.append(StringUtils.abbreviate(r.message, MAX_MESSAGE_LENGTH))
+
+        r.thrown?.let {
+            builder .append("\nEXCEPTION ")
+                    .append(ExceptionUtils.getStackTrace(it))
+        }
+
+        r.parameters?.let {
+            for ((idx, param) in it.withIndex())
+                builder.append("\n\tPARAMETER #").append(idx).append(" = ").append(param)
+        }
+
+        if (!logcat)
+            builder.append("\n")
+
+        return builder.toString()
+    }
+
+    private fun shortClassName(className: String) = className
+            .replace(Regex("^at\\.bitfire\\.(dav|cert4an|dav4an|ical4an|vcard4an)droid\\."), "")
+            .replace(Regex("\\$.*$"), "")
+
+}

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

@@ -0,0 +1,31 @@
+/*
+ * 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.log
+
+import java.util.logging.Handler
+import java.util.logging.LogRecord
+
+class StringHandler: Handler() {
+
+    val builder = StringBuilder()
+
+    init {
+        formatter = PlainTextFormatter.DEFAULT
+    }
+
+    override fun publish(record: LogRecord) {
+        builder.append(formatter.format(record))
+    }
+
+    override fun flush() {}
+    override fun close() {}
+
+    override fun toString() = builder.toString()
+
+}

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

@@ -0,0 +1,249 @@
+/*
+ * 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.os.Parcel
+import android.os.Parcelable
+import at.bitfire.dav4android.DavResponse
+import at.bitfire.dav4android.UrlUtils
+import at.bitfire.dav4android.property.*
+import at.bitfire.davdroid.model.ServiceDB.Collections
+import okhttp3.HttpUrl
+
+/**
+ * Represents a WebDAV collection.
+ *
+ * @constructor always appends a trailing slash to the URL
+ */
+data class CollectionInfo(
+
+        /**
+         * URL of the collection (including trailing slash)
+         */
+        val url: HttpUrl,
+
+        var id: Long? = null,
+        var serviceID: Long? = null,
+
+        var type: Type? = null,
+
+        var readOnly: Boolean = false,
+        var forceReadOnly: 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,
+
+        // subscriptions
+        var source: String? = null,
+
+        // non-persistent properties
+        var confirmed: Boolean = false
+): Parcelable {
+
+    enum class Type {
+        ADDRESS_BOOK,
+        CALENDAR,
+        WEBCAL          // iCalendar subscription
+    }
+
+    companion object {
+
+        val DAV_PROPERTIES = arrayOf(
+            ResourceType.NAME,
+            CurrentUserPrivilegeSet.NAME,
+            DisplayName.NAME,
+            AddressbookDescription.NAME, SupportedAddressData.NAME,
+            CalendarDescription.NAME, CalendarColor.NAME, SupportedCalendarComponentSet.NAME,
+            Source.NAME
+        )
+
+    }
+
+
+    constructor(dav: DavResponse): this(UrlUtils.withTrailingSlash(dav.url)) {
+        dav[ResourceType::class.java]?.let { type ->
+            when {
+                type.types.contains(ResourceType.ADDRESSBOOK) -> this.type = Type.ADDRESS_BOOK
+                type.types.contains(ResourceType.CALENDAR)    -> this.type = Type.CALENDAR
+                type.types.contains(ResourceType.SUBSCRIBED)  -> this.type = Type.WEBCAL
+            }
+        }
+
+        dav[CurrentUserPrivilegeSet::class.java]?.let { privilegeSet ->
+            readOnly = !privilegeSet.mayWriteContent
+        }
+
+        dav[DisplayName::class.java]?.let {
+            if (!it.displayName.isNullOrEmpty())
+                displayName = it.displayName
+        }
+
+        when (type) {
+            Type.ADDRESS_BOOK -> {
+                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
+                    dav[SupportedCalendarComponentSet::class.java]?.let {
+                        supportsVEVENT = it.supportsEvents
+                        supportsVTODO = it.supportsTasks
+                    }
+                } else { // Type.WEBCAL
+                    dav[Source::class.java]?.let { source = it.hrefs.firstOrNull() }
+                    supportsVEVENT = true
+                }
+            }
+        }
+    }
+
+
+    constructor(values: ContentValues): this(UrlUtils.withTrailingSlash(HttpUrl.parse(values.getAsString(Collections.URL))!!)) {
+        id = values.getAsLong(Collections.ID)
+        serviceID = values.getAsLong(Collections.SERVICE_ID)
+        type = try {
+            Type.valueOf(values.getAsString(Collections.TYPE))
+        } catch (e: Exception) {
+            null
+        }
+
+        readOnly = values.getAsInteger(Collections.READ_ONLY) != 0
+        forceReadOnly = values.getAsInteger(Collections.FORCE_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
+
+        source = values.getAsString(Collections.SOURCE)
+
+        selected = values.getAsInteger(Collections.SYNC) != 0
+    }
+
+    fun toDB(): ContentValues {
+        val values = ContentValues()
+        // Collections.SERVICE_ID is never changed
+        type?.let { values.put(Collections.TYPE, it.name) }
+
+        values.put(Collections.URL, url.toString())
+        values.put(Collections.READ_ONLY, if (readOnly) 1 else 0)
+        values.put(Collections.FORCE_READ_ONLY, if (forceReadOnly) 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.SOURCE, source)
+
+        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)
+    }
+
+
+    override fun describeContents(): Int = 0
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        fun<T> writeOrNull(value: T?, write: (T) -> Unit) {
+            if (value == null)
+                dest.writeByte(0)
+            else {
+                dest.writeByte(1)
+                write(value)
+            }
+        }
+
+        dest.writeString(url.toString())
+
+        writeOrNull(id, { dest.writeLong(it) })
+        writeOrNull(serviceID, { dest.writeLong(it) })
+
+        dest.writeString(type?.name)
+
+        dest.writeByte(if (readOnly) 1 else 0)
+        dest.writeByte(if (forceReadOnly) 1 else 0)
+        dest.writeString(displayName)
+        dest.writeString(description)
+        writeOrNull(color, { dest.writeInt(it) })
+
+        dest.writeString(timeZone)
+        dest.writeByte(if (supportsVEVENT) 1 else 0)
+        dest.writeByte(if (supportsVTODO) 1 else 0)
+        dest.writeByte(if (selected) 1 else 0)
+
+        dest.writeString(source)
+
+        dest.writeByte(if (confirmed) 1 else 0)
+    }
+
+    @Suppress("unused")
+    @JvmField
+    val CREATOR = object: Parcelable.Creator<CollectionInfo> {
+        override fun createFromParcel(parcel: Parcel): CollectionInfo {
+            fun<T> readOrNull(parcel: Parcel, read: () -> T): T? {
+                return if (parcel.readByte() == 0.toByte())
+                    null
+                else
+                    read()
+            }
+
+            return CollectionInfo(
+                    HttpUrl.parse(parcel.readString())!!,
+
+                    readOrNull(parcel, { parcel.readLong() }),
+                    readOrNull(parcel, { parcel.readLong() }),
+
+                    parcel.readString()?.let { Type.valueOf(it) },
+
+                    parcel.readByte() != 0.toByte(),
+                    parcel.readByte() != 0.toByte(),
+                    parcel.readString(),
+                    parcel.readString(),
+                    readOrNull(parcel, { parcel.readInt() }),
+
+                    parcel.readString(),
+                    parcel.readByte() != 0.toByte(),
+                    parcel.readByte() != 0.toByte(),
+                    parcel.readByte() != 0.toByte(),
+
+                    parcel.readString(),
+
+                    parcel.readByte() != 0.toByte()
+            )
+        }
+
+        override fun newArray(size: Int) = arrayOfNulls<CollectionInfo>(size)
+
+    }
+
+}

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

@@ -0,0 +1,40 @@
+/*
+ * 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 java.io.Serializable
+
+class Credentials(
+        val userName: String? = null,
+        val password: String? = null,
+        val certificateAlias: String? = null
+): Serializable {
+
+    enum class Type {
+        UsernamePassword,
+        ClientCertificate
+    }
+
+    val type: Type
+
+    init {
+        type = when {
+            !certificateAlias.isNullOrEmpty() ->
+                Type.ClientCertificate
+            !userName.isNullOrEmpty() && !password.isNullOrEmpty() ->
+                Type.UsernamePassword
+            else ->
+                throw IllegalArgumentException("Either username/password or certificate alias must be set")
+        }
+    }
+
+    override fun toString() =
+            "Credentials(type=$type, userName=$userName, certificateAlias=$certificateAlias)"
+
+}

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

@@ -0,0 +1,223 @@
+/*
+ * 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 android.preference.PreferenceManager
+import at.bitfire.davdroid.App
+import at.bitfire.davdroid.log.Logger
+import at.bitfire.davdroid.ui.StartupDialogFragment
+import java.util.logging.Level
+
+class ServiceDB {
+
+    object Services {
+        const val _TABLE = "services"
+        const val ID = "_id"
+        const val ACCOUNT_NAME = "accountName"
+        const val SERVICE = "service"
+        const val PRINCIPAL = "principal"
+
+        // allowed values for SERVICE column
+        const val SERVICE_CALDAV = "caldav"
+        const val SERVICE_CARDDAV = "carddav"
+    }
+
+    object HomeSets {
+        const val _TABLE = "homesets"
+        const val ID = "_id"
+        const val SERVICE_ID = "serviceID"
+        const val URL = "url"
+    }
+
+    object Collections {
+        const val _TABLE = "collections"
+        const val ID = "_id"
+        const val TYPE = "type"
+        const val SERVICE_ID = "serviceID"
+        const val URL = "url"
+        const val READ_ONLY = "readOnly"
+        const val FORCE_READ_ONLY = "forceReadOnly"
+        const val DISPLAY_NAME = "displayName"
+        const val DESCRIPTION = "description"
+        const val COLOR = "color"
+        const val TIME_ZONE = "timezone"
+        const val SUPPORTS_VEVENT = "supportsVEVENT"
+        const val SUPPORTS_VTODO = "supportsVTODO"
+        const val SOURCE = "source"
+        const val SYNC = "sync"
+    }
+
+    companion object {
+
+        fun onRenameAccount(db: SQLiteDatabase, oldName: String, newName: String) {
+            val values = ContentValues(1)
+            values.put(Services.ACCOUNT_NAME, newName)
+            db.updateWithOnConflict(Services._TABLE, values, Services.ACCOUNT_NAME + "=?", arrayOf(oldName), SQLiteDatabase.CONFLICT_REPLACE)
+        }
+
+    }
+
+
+    class OpenHelper(
+            val context: Context
+    ): SQLiteOpenHelper(context, DATABASE_NAME, null, DATABASE_VERSION), AutoCloseable {
+
+        companion object {
+            const val DATABASE_NAME = "services.db"
+            const val DATABASE_VERSION = 4
+        }
+
+        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 ${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.TYPE} TEXT NOT NULL," +
+                    "${Collections.URL} TEXT NOT NULL," +
+                    "${Collections.READ_ONLY} INTEGER DEFAULT 0 NOT NULL," +
+                    "${Collections.FORCE_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.SOURCE} TEXT 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) {
+            for (upgradeFrom in oldVersion until newVersion) {
+                val upgradeTo = upgradeFrom + 1
+                Logger.log.info("Upgrading database from version $upgradeFrom to $upgradeTo")
+                try {
+                    val upgradeProc = this::class.java.getDeclaredMethod("upgrade_${upgradeFrom}_$upgradeTo", SQLiteDatabase::class.java)
+                    upgradeProc.invoke(this, db)
+                } catch(e: Exception) {
+                    Logger.log.log(Level.SEVERE, "Couldn't upgrade database", e)
+                }
+            }
+        }
+
+        @Suppress("unused")
+        private fun upgrade_3_4(db: SQLiteDatabase) {
+            db.execSQL("ALTER TABLE ${Collections._TABLE} ADD COLUMN ${Collections.FORCE_READ_ONLY} INTEGER DEFAULT 0 NOT NULL")
+        }
+
+        @Suppress("unused")
+        private fun upgrade_2_3(db: SQLiteDatabase) {
+            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()
+            }
+        }
+
+        @Suppress("unused")
+        private fun upgrade_1_2(db: SQLiteDatabase) {
+            db.execSQL("ALTER TABLE ${Collections._TABLE} ADD COLUMN ${Collections.TYPE} TEXT NOT NULL DEFAULT ''")
+            db.execSQL("ALTER TABLE ${Collections._TABLE} ADD COLUMN ${Collections.SOURCE} TEXT NULL")
+            db.execSQL("UPDATE ${Collections._TABLE} SET ${Collections.TYPE}=(" +
+                    "SELECT CASE ${Services.SERVICE} WHEN ? THEN ? ELSE ? END " +
+                    "FROM ${Services._TABLE} WHERE ${Services.ID}=${Collections._TABLE}.${Collections.SERVICE_ID}" +
+                    ")",
+                    arrayOf(Services.SERVICE_CALDAV, CollectionInfo.Type.CALENDAR, CollectionInfo.Type.ADDRESS_BOOK))
+        }
+
+
+        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 until cols)
+                            sb  .append(" ")
+                                .append(cursor.getColumnName(i))
+                                .append(" |")
+                        sb.append("\n")
+
+                        // print rows
+                        while (cursor.moveToNext()) {
+                            sb.append("\t| ")
+                            for (i in 0 until cols) {
+                                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/SyncState.kt

@@ -1,22 +1,26 @@
 /*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ * 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
+package at.bitfire.davdroid.model
 
-import at.bitfire.dav4jvm.property.webdav.SyncToken
+import at.bitfire.dav4android.property.SyncToken
 import org.json.JSONException
 import org.json.JSONObject
 
 data class SyncState(
-    val type: Type,
-    val value: String,
+        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
+        /**
+         * 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 {
@@ -41,8 +45,8 @@ data class SyncState(
             }
         }
 
-        fun fromSyncToken(token: SyncToken, initialSync: Boolean? = null) =
-                SyncState(Type.SYNC_TOKEN, requireNotNull(token.token), initialSync)
+        fun fromSyncToken(token: SyncToken) =
+                token.token?.let { SyncState(Type.SYNC_TOKEN, it) }
 
     }
 

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

@@ -1,8 +1,12 @@
 /*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ * 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.contactrow
+package at.bitfire.davdroid.model
 
 import android.provider.ContactsContract.RawContacts
 

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

@@ -0,0 +1,342 @@
+/*
+ * 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 android.accounts.Account
+import android.accounts.AccountManager
+import android.annotation.TargetApi
+import android.content.*
+import android.os.Build
+import android.os.Bundle
+import android.os.RemoteException
+import android.provider.ContactsContract
+import android.provider.ContactsContract.CommonDataKinds.GroupMembership
+import android.provider.ContactsContract.Groups
+import android.provider.ContactsContract.RawContacts
+import android.util.Base64
+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.SyncState
+import at.bitfire.vcard4android.*
+import java.io.ByteArrayOutputStream
+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, DAVdroid creates a "DAVdroid
+ * address book" account for every CardDAV address book. These accounts are bound to a
+ * DAVdroid main account.
+ */
+class LocalAddressBook(
+        private val context: Context,
+        account: Account,
+        provider: ContentProviderClient?
+): AndroidAddressBook<LocalContact, LocalGroup>(account, provider, LocalContact.Factory, LocalGroup.Factory), LocalCollection<LocalAddress> {
+
+    companion object {
+
+        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"
+
+        fun create(context: Context, provider: ContentProviderClient, mainAccount: Account, info: CollectionInfo): LocalAddressBook {
+            val accountManager = AccountManager.get(context)
+
+            val account = Account(accountName(mainAccount, info), context.getString(R.string.account_type_address_book))
+            if (!accountManager.addAccountExplicitly(account, null, initialUserData(mainAccount, info.url.toString())))
+                throw IllegalStateException("Couldn't create address book account")
+
+            val addressBook = LocalAddressBook(context, account, provider)
+            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
+
+            return addressBook
+        }
+
+        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 { mainAccount == null || it.mainAccount == mainAccount }
+                .toList()
+
+        fun accountName(mainAccount: Account, info: CollectionInfo): 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(" (${mainAccount.name} $hash)")
+            return sb.toString()
+        }
+
+        fun initialUserData(mainAccount: Account, url: String): Bundle {
+            val bundle = Bundle(3)
+            bundle.putString(USER_DATA_MAIN_ACCOUNT_NAME, mainAccount.name)
+            bundle.putString(USER_DATA_MAIN_ACCOUNT_TYPE, mainAccount.type)
+            bundle.putString(USER_DATA_URL, url)
+            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 title = account.name!!
+
+    /**
+     * 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
+    var mainAccount: Account
+        get() {
+            _mainAccount?.let { return it }
+
+            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 IllegalStateException("Address book doesn't exist anymore")
+        }
+        set(account) {
+            val accountManager = AccountManager.get(context)
+            accountManager.setUserData(account, USER_DATA_MAIN_ACCOUNT_NAME, account.name)
+            accountManager.setUserData(account, USER_DATA_MAIN_ACCOUNT_TYPE, account.type)
+
+            _mainAccount = account
+        }
+
+    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)
+
+    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 */
+
+    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, "${Groups.DIRTY}=0", null)
+        }
+
+        return number
+    }
+
+    override fun removeNotDirtyMarked(flags: Int): Int {
+        var number = provider!!.delete(rawContactsSyncUri(),
+                "${RawContacts.DIRTY}=0 AND ${LocalContact.COLUMN_FLAGS}=?", arrayOf(flags.toString()))
+
+        if (includeGroups)
+            number += provider.delete(groupsSyncUri(),
+                    "${Groups.DIRTY}=0 AND ${LocalGroup.COLUMN_FLAGS}=?", arrayOf(flags.toString()))
+
+        return number
+    }
+
+    fun update(info: CollectionInfo) {
+        val newAccountName = accountName(mainAccount, info)
+
+        @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+        if (account.name != newAccountName && Build.VERSION.SDK_INT >= 21) {
+            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)
+            account = future.result
+        }
+
+        Constants.log.info("Address book read-only? = ${info.readOnly}")
+        readOnly = info.readOnly || info.forceReadOnly
+
+        // make sure it will still be synchronized when contacts are updated
+        ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true)
+    }
+
+    fun delete() {
+        val accountManager = AccountManager.get(context)
+        if (Build.VERSION.SDK_INT >= 22)
+            accountManager.removeAccount(account, null, null, null)
+        else
+            accountManager.removeAccount(account, null, null)
+    }
+
+
+    /* operations on members (contacts/groups) */
+
+    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
+    }
+
+
+    /**
+     * Returns an array of local contacts/groups which have been deleted locally. (DELETED != 0).
+     * @throws RemoteException on content provider errors
+     */
+    override fun findDeleted() =
+            if (includeGroups)
+                findDeletedContacts() + findDeletedGroups()
+            else
+                findDeletedContacts()
+
+    fun findDeletedContacts() = queryContacts("${RawContacts.DELETED}!=0", null)
+    fun findDeletedGroups() = queryGroups("${Groups.DELETED}!=0", 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}!=0", null)
+    fun findDirtyGroups() = queryGroups("${Groups.DIRTY}!=0", null)
+
+    private fun queryContactsGroups(whereContacts: String?, whereArgsContacts: Array<String>?, whereGroups: String?, whereArgsGroups: Array<String>?): List<LocalAddress> {
+        val contacts = queryContacts(whereContacts, whereArgsContacts)
+        return if (includeGroups)
+            contacts + queryGroups(whereGroups, whereArgsGroups)
+        else
+            contacts
+    }
+
+
+    /**
+     * 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
+     */
+    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 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 += findDirtyGroups().size
+
+        return reallyDirty
+    }
+
+    fun getByGroupMembership(groupID: Long): List<LocalContact> {
+        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) }
+    }
+
+
+    /* special group operations */
+
+    /**
+     * 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 RemoteException on content provider errors
+     */
+    fun findOrCreateGroup(title: String): Long {
+        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)
+    }
+
+    fun removeEmptyGroups() {
+        // find groups without members
+        /** should be done using {@link Groups.SUMMARY_COUNT}, but it's not implemented in Android yet */
+        queryGroups(null, null).filter { it.getMembers().isEmpty() }.forEach { group ->
+            Logger.log.log(Level.FINE, "Deleting group", group)
+            group.delete()
+        }
+    }
+
+}

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

@@ -0,0 +1,226 @@
+/*
+ * 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 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.provider.CalendarContract
+import android.provider.CalendarContract.*
+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.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
+
+class LocalCalendar private constructor(
+        account: Account,
+        provider: ContentProviderClient,
+        id: Long
+): AndroidCalendar<LocalEvent>(account, provider, LocalEvent.Factory, id), LocalCollection<LocalEvent> {
+
+    companion object {
+
+        private const val COLUMN_SYNC_STATE = Calendars.CAL_SYNC1
+
+        fun create(account: Account, provider: ContentProviderClient, info: CollectionInfo): 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)
+            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 {
+            val values = ContentValues()
+            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 ?: Constants.DAVDROID_GREEN_RGBA)
+
+            if (info.readOnly || info.forceReadOnly)
+                values.put(Calendars.CALENDAR_ACCESS_LEVEL, Calendars.CAL_ACCESS_READ)
+            else {
+                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)
+            }
+
+            info.timeZone?.let { tzData ->
+                try {
+                    val timeZone = DateUtils.parseVTimeZone(tzData)
+                    timeZone.timeZoneId?.let { tzId ->
+                        values.put(Calendars.CALENDAR_TIME_ZONE, DateUtils.findAndroidTimezoneID(tzId.value))
+                    }
+                } catch(e: IllegalArgumentException) {
+                    Logger.log.log(Level.WARNING, "Couldn't parse calendar default time zone", e)
+                }
+            }
+            values.put(Calendars.ALLOWED_REMINDERS, "${Reminders.METHOD_ALERT},${Reminders.METHOD_EMAIL}")
+            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}")
+            return values
+        }
+    }
+
+    override val title: String
+        get() = displayName ?: id.toString()
+
+    override var lastSyncState: SyncState?
+        get() = provider.query(calendarSyncURI(), arrayOf(COLUMN_SYNC_STATE), null, null, null)?.let { 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)
+        }
+
+
+    fun update(info: CollectionInfo, updateColor: Boolean) =
+            update(valuesFromCollectionInfo(info, updateColor))
+
+
+    override fun findDeleted() =
+            queryEvents("${Events.DELETED}!=0 AND ${Events.ORIGINAL_ID} IS NULL", null)
+
+    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
+            dirty += localEvent
+        }
+
+        return dirty
+    }
+
+    override fun findByName(name: String) =
+            queryEvents("${Events._SYNC_ID}=?", arrayOf(name)).firstOrNull()
+
+
+    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 ${Events.DIRTY}=0 AND ${Events.ORIGINAL_ID} IS NULL",
+                arrayOf(id.toString()))
+    }
+
+    override fun removeNotDirtyMarked(flags: Int) =
+            provider.delete(eventsSyncURI(),
+                    "${Events.CALENDAR_ID}=? AND ${Events.DIRTY}=0 AND ${Events.ORIGINAL_ID} IS NULL AND ${LocalEvent.COLUMN_FLAGS}=?",
+                    arrayOf(id.toString(), flags.toString()))
+
+
+    fun processDirtyExceptions() {
+        // 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}!=0 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)
+
+                // 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)
+                        ))
+                    }
+                }
+
+                // completely remove deleted 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.CALENDAR_ID}=? AND ${Events.DIRTY}!=0 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.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()
+            }
+        }
+    }
+
+
+    object Factory: AndroidCalendarFactory<LocalCalendar> {
+
+        override fun newInstance(account: Account, provider: ContentProviderClient, id: Long) =
+            LocalCalendar(account, provider, id)
+
+    }
+
+}

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

@@ -0,0 +1,38 @@
+/*
+ * 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.davdroid.model.SyncState
+
+interface LocalCollection<out T: LocalResource<*>> {
+
+    /** collection title (used for user notifications etc.) **/
+    val title: String
+
+    var lastSyncState: SyncState?
+
+    fun findDeleted(): List<T>
+    fun findDirty(): List<T>
+
+    fun findByName(name: String): T?
+
+
+    /**
+     * Marks all entries which are not dirty with the given flags only.
+     * @return number of marked entries
+     **/
+    fun markNotDirty(flags: Int): Int
+
+    /**
+     * Removes all entries with are not dirty and are marked with exactly the given flags.
+     * @return number of removed entries
+     */
+    fun removeNotDirtyMarked(flags: Int): Int
+
+}

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

@@ -0,0 +1,253 @@
+/*
+ * 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 android.content.ContentProviderOperation
+import android.content.ContentValues
+import android.os.Build
+import android.os.RemoteException
+import android.provider.ContactsContract
+import android.provider.ContactsContract.CommonDataKinds.GroupMembership
+import android.provider.ContactsContract.RawContacts.Data
+import at.bitfire.davdroid.BuildConfig
+import at.bitfire.davdroid.log.Logger
+import at.bitfire.davdroid.model.UnknownProperties
+import at.bitfire.vcard4android.*
+import ezvcard.Ezvcard
+import java.io.FileNotFoundException
+import java.util.*
+
+class LocalContact: AndroidContact, LocalAddress {
+
+    companion object {
+        init {
+            Contact.productID = "+//IDN bitfire.at//DAVdroid/" + BuildConfig.VERSION_NAME + " ez-vcard/" + Ezvcard.VERSION
+        }
+
+        const val COLUMN_FLAGS = ContactsContract.RawContacts.SYNC4
+        const val COLUMN_HASHCODE = ContactsContract.RawContacts.SYNC3
+    }
+
+    private val cachedGroupMemberships = HashSet<Long>()
+    private val groupMemberships = HashSet<Long>()
+
+    override var flags: Int = 0
+
+    constructor(addressBook: AndroidAddressBook<LocalContact,*>, values: ContentValues)
+            : super(addressBook, values) {
+        flags = values.getAsInteger(COLUMN_FLAGS) ?: 0
+    }
+
+    constructor(addressBook: AndroidAddressBook<LocalContact,*>, contact: Contact, fileName: String?, eTag: String?, flags: Int)
+            : super(addressBook, contact, fileName, eTag) {
+        this.flags = flags
+    }
+
+
+    override fun assignNameAndUID() {
+        val uid = UUID.randomUUID().toString()
+        val newFileName = "$uid.vcf"
+
+        val values = ContentValues(2)
+        values.put(COLUMN_FILENAME, newFileName)
+        values.put(COLUMN_UID, uid)
+        addressBook.provider!!.update(rawContactSyncURI(), values, null, null)
+
+        fileName = newFileName
+    }
+
+    override fun clearDirty(eTag: String?) {
+        val values = ContentValues(3)
+        values.put(COLUMN_ETAG, eTag)
+        values.put(ContactsContract.RawContacts.DIRTY, 0)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            // workaround for Android 7 which sets DIRTY flag when only meta-data is changed
+            val hashCode = dataHashCode()
+            values.put(COLUMN_HASHCODE, hashCode)
+            Logger.log.finer("Clearing dirty flag with eTag = $eTag, contact hash = $hashCode")
+        }
+
+        addressBook.provider!!.update(rawContactSyncURI(), values, null, null)
+
+        this.eTag = eTag
+    }
+
+    override fun resetDeleted() {
+        val values = ContentValues(1)
+        values.put(ContactsContract.Groups.DELETED, 0)
+        addressBook.provider!!.update(rawContactSyncURI(), values, null, null)
+    }
+
+    fun resetDirty() {
+        val values = ContentValues(1)
+        values.put(ContactsContract.RawContacts.DIRTY, 0)
+        addressBook.provider!!.update(rawContactSyncURI(), values, null, null)
+    }
+
+    override fun updateFlags(flags: Int) {
+        val values = ContentValues(1)
+        values.put(LocalContact.COLUMN_FLAGS, flags)
+        addressBook.provider!!.update(rawContactSyncURI(), values, null, null)
+
+        this.flags = flags
+    }
+
+
+    override fun populateData(mimeType: String, row: ContentValues) {
+        when (mimeType) {
+            CachedGroupMembership.CONTENT_ITEM_TYPE ->
+                cachedGroupMemberships += row.getAsLong(CachedGroupMembership.GROUP_ID)
+            GroupMembership.CONTENT_ITEM_TYPE ->
+                groupMemberships += row.getAsLong(GroupMembership.GROUP_ROW_ID)
+            UnknownProperties.CONTENT_ITEM_TYPE ->
+                contact!!.unknownProperties = row.getAsString(UnknownProperties.UNKNOWN_PROPERTIES)
+        }
+    }
+
+    override fun insertDataRows(batch: BatchOperation) {
+        super.insertDataRows(batch)
+
+        contact!!.unknownProperties?.let { unknownProperties ->
+            val op: BatchOperation.Operation
+            val builder = ContentProviderOperation.newInsert(dataSyncURI())
+            if (id == null)
+                op = BatchOperation.Operation(builder, UnknownProperties.RAW_CONTACT_ID, 0)
+            else {
+                op = BatchOperation.Operation(builder)
+                builder.withValue(UnknownProperties.RAW_CONTACT_ID, id)
+            }
+            builder .withValue(UnknownProperties.MIMETYPE, UnknownProperties.CONTENT_ITEM_TYPE)
+                    .withValue(UnknownProperties.UNKNOWN_PROPERTIES, unknownProperties)
+            batch.enqueue(op)
+        }
+    }
+
+
+    /**
+     * Calculates a hash code from the contact's data (VCard) and group memberships.
+     * Attention: re-reads {@link #contact} from the database, discarding all changes in memory
+     * @return hash code of contact data (including group memberships)
+     */
+    internal fun dataHashCode(): Int {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N || Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+            throw IllegalStateException("dataHashCode() should not be called on Android != 7")
+
+        // reset contact so that getContact() reads from database
+        contact = null
+
+        // groupMemberships is filled by getContact()
+        val dataHash = contact!!.hashCode()
+        val groupHash = groupMemberships.hashCode()
+        Logger.log.finest("Calculated data hash = $dataHash, group memberships hash = $groupHash")
+        return dataHash xor groupHash
+    }
+
+    fun updateHashCode(batch: BatchOperation?) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N || Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+            throw IllegalStateException("updateHashCode() should not be called on Android != 7")
+
+        val values = ContentValues(1)
+        val hashCode = dataHashCode()
+        Logger.log.fine("Storing contact hash = $hashCode")
+        values.put(COLUMN_HASHCODE, hashCode)
+
+        if (batch == null)
+            addressBook.provider!!.update(rawContactSyncURI(), values, null, null)
+        else {
+            val builder = ContentProviderOperation
+                    .newUpdate(rawContactSyncURI())
+                    .withValues(values)
+            batch.enqueue(BatchOperation.Operation(builder))
+        }
+    }
+
+    fun getLastHashCode(): Int {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N || Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+            throw IllegalStateException("getLastHashCode() should not be called on Android != 7")
+
+        addressBook.provider!!.query(rawContactSyncURI(), arrayOf(COLUMN_HASHCODE), null, null, null)?.use { c ->
+            if (c.moveToNext() && !c.isNull(0))
+                return c.getInt(0)
+        }
+        return 0
+    }
+
+
+    fun addToGroup(batch: BatchOperation, groupID: Long) {
+        batch.enqueue(BatchOperation.Operation(
+                ContentProviderOperation.newInsert(dataSyncURI())
+                        .withValue(GroupMembership.MIMETYPE, GroupMembership.CONTENT_ITEM_TYPE)
+                        .withValue(GroupMembership.RAW_CONTACT_ID, id)
+                        .withValue(GroupMembership.GROUP_ROW_ID, groupID)
+        ))
+        groupMemberships += groupID
+
+        batch.enqueue(BatchOperation.Operation(
+                ContentProviderOperation.newInsert(dataSyncURI())
+                        .withValue(CachedGroupMembership.MIMETYPE, CachedGroupMembership.CONTENT_ITEM_TYPE)
+                        .withValue(CachedGroupMembership.RAW_CONTACT_ID, id)
+                        .withValue(CachedGroupMembership.GROUP_ID, groupID)
+                        .withYieldAllowed(true)
+        ))
+        cachedGroupMemberships += groupID
+    }
+
+    fun removeGroupMemberships(batch: BatchOperation) {
+        batch.enqueue(BatchOperation.Operation(
+                ContentProviderOperation.newDelete(dataSyncURI())
+                        .withSelection(
+                                Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + " IN (?,?)",
+                                arrayOf(id.toString(), GroupMembership.CONTENT_ITEM_TYPE, CachedGroupMembership.CONTENT_ITEM_TYPE)
+                        )
+                        .withYieldAllowed(true)
+        ))
+        groupMemberships.clear()
+        cachedGroupMemberships.clear()
+    }
+
+    /**
+     * Returns the IDs of all groups the contact was member of (cached memberships).
+     * Cached memberships are kept in sync with memberships by DAVdroid and are used to determine
+     * whether a membership has been deleted/added when a raw contact is dirty.
+     * @return set of {@link GroupMembership#GROUP_ROW_ID} (may be empty)
+     * @throws FileNotFoundException if the current contact can't be found
+     * @throws RemoteException on contacts provider errors
+     */
+    fun getCachedGroupMemberships(): Set<Long> {
+        contact
+        return cachedGroupMemberships
+    }
+
+    /**
+     * Returns the IDs of all groups the contact is member of.
+     * @return set of {@link GroupMembership#GROUP_ROW_ID}s (may be empty)
+     * @throws FileNotFoundException if the current contact can't be found
+     * @throws RemoteException on contacts provider errors
+     */
+    fun getGroupMemberships(): Set<Long> {
+        contact
+        return groupMemberships
+    }
+
+
+    // data rows
+    override fun buildContact(builder: ContentProviderOperation.Builder, update: Boolean) {
+        builder.withValue(COLUMN_FLAGS, flags)
+        super.buildContact(builder, update)
+    }
+
+    // factory
+
+    object Factory: AndroidContactFactory<LocalContact> {
+        override fun fromProvider(addressBook: AndroidAddressBook<LocalContact, *>, values: ContentValues) =
+                LocalContact(addressBook, values)
+    }
+
+}

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

@@ -0,0 +1,131 @@
+/*
+ * 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 android.content.ContentProviderOperation
+import android.content.ContentValues
+import android.provider.CalendarContract
+import android.provider.CalendarContract.Events
+import at.bitfire.davdroid.BuildConfig
+import at.bitfire.ical4android.*
+import net.fortuna.ical4j.model.property.ProdId
+import java.util.*
+
+class LocalEvent: AndroidEvent, LocalResource<Event> {
+
+    companion object {
+        init {
+            ICalendar.prodId = ProdId("+//IDN bitfire.at//DAVdroid/" + BuildConfig.VERSION_NAME + " ical4j/" + Constants.ical4jVersion)
+        }
+
+        const val COLUMN_ETAG = CalendarContract.Events.SYNC_DATA1
+        const val COLUMN_FLAGS = CalendarContract.Events.SYNC_DATA2
+        const val COLUMN_SEQUENCE = CalendarContract.Events.SYNC_DATA3
+    }
+
+    override var fileName: String? = null
+        private set
+
+    override var eTag: String? = null
+
+    override var flags: Int = 0
+        private set
+
+    var weAreOrganizer = true
+
+
+    constructor(calendar: AndroidCalendar<*>, event: Event, fileName: String?, eTag: String?, flags: Int): super(calendar, event) {
+        this.fileName = fileName
+        this.eTag = eTag
+        this.flags = flags
+    }
+
+    private constructor(calendar: AndroidCalendar<*>, values: ContentValues): super(calendar, values) {
+        fileName = values.getAsString(Events._SYNC_ID)
+        eTag = values.getAsString(COLUMN_ETAG)
+        flags = values.getAsInteger(COLUMN_FLAGS) ?: 0
+    }
+
+    override fun populateEvent(row: ContentValues) {
+        super.populateEvent(row)
+        val event = requireNotNull(event)
+
+        event.uid = row.getAsString(Events.UID_2445)
+        event.sequence = row.getAsInteger(COLUMN_SEQUENCE)
+
+        val isOrganizer = row.getAsInteger(Events.IS_ORGANIZER)
+        weAreOrganizer = isOrganizer != null && isOrganizer != 0
+    }
+
+    override fun buildEvent(recurrence: Event?, builder: ContentProviderOperation.Builder) {
+        super.buildEvent(recurrence, builder)
+        val event = requireNotNull(event)
+
+        val buildException = recurrence != null
+        val eventToBuild = recurrence ?: event
+
+        builder .withValue(Events.UID_2445, event.uid)
+                .withValue(COLUMN_SEQUENCE, eventToBuild.sequence)
+                .withValue(CalendarContract.Events.DIRTY, 0)
+                .withValue(CalendarContract.Events.DELETED, 0)
+                .withValue(LocalEvent.COLUMN_FLAGS, flags)
+
+        if (buildException)
+            builder .withValue(Events.ORIGINAL_SYNC_ID, fileName)
+        else
+            builder .withValue(Events._SYNC_ID, fileName)
+                    .withValue(COLUMN_ETAG, eTag)
+    }
+
+
+    override fun assignNameAndUID() {
+        var uid: String? = null
+        calendar.provider.query(eventSyncURI(), arrayOf(Events.UID_2445), null, null, null)?.use { cursor ->
+            if (cursor.moveToNext())
+                uid = cursor.getString(0)
+        }
+        if (uid == null)
+            uid = UUID.randomUUID().toString()
+
+        val newFileName = "$uid.ics"
+
+        val values = ContentValues(2)
+        values.put(Events._SYNC_ID, newFileName)
+        values.put(Events.UID_2445, uid)
+        calendar.provider.update(eventSyncURI(), values, null, null)
+
+        fileName = newFileName
+        event!!.uid = uid
+    }
+
+    override fun clearDirty(eTag: String?) {
+        val values = ContentValues(2)
+        values.put(CalendarContract.Events.DIRTY, 0)
+        values.put(COLUMN_ETAG, eTag)
+        values.put(COLUMN_SEQUENCE, event!!.sequence)
+        calendar.provider.update(eventSyncURI(), values, null, null)
+
+        this.eTag = eTag
+    }
+
+    override fun updateFlags(flags: Int) {
+        val values = ContentValues(1)
+        values.put(COLUMN_FLAGS, flags)
+        calendar.provider.update(eventSyncURI(), values, null, null)
+
+        this.flags = flags
+    }
+
+
+    object Factory: AndroidEventFactory<LocalEvent> {
+        override fun fromProvider(calendar: AndroidCalendar<*>, values: ContentValues) =
+                LocalEvent(calendar, values)
+    }
+
+}

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

@@ -0,0 +1,246 @@
+/*
+ * 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 android.content.ContentProviderOperation
+import android.content.ContentUris
+import android.content.ContentValues
+import android.net.Uri
+import android.os.Build
+import android.os.Parcel
+import android.os.RemoteException
+import android.provider.ContactsContract
+import android.provider.ContactsContract.CommonDataKinds.GroupMembership
+import android.provider.ContactsContract.Groups
+import android.provider.ContactsContract.RawContacts
+import android.provider.ContactsContract.RawContacts.Data
+import at.bitfire.dav4android.Constants
+import at.bitfire.vcard4android.*
+import java.util.*
+
+class LocalGroup: AndroidGroup, LocalAddress {
+
+    companion object {
+
+        const val COLUMN_FLAGS = Groups.SYNC4
+
+        /** marshaled list of member UIDs, as sent by server */
+        const val COLUMN_PENDING_MEMBERS = Groups.SYNC3
+
+        /**
+         * Processes all groups with non-null {@link #COLUMN_PENDING_MEMBERS}: the pending memberships
+         * are (if possible) applied, keeping cached memberships in sync.
+         * @param addressBook    address book to take groups from
+         */
+        fun applyPendingMemberships(addressBook: LocalAddressBook) {
+            addressBook.provider!!.query(
+                    addressBook.groupsSyncUri(),
+                    arrayOf(Groups._ID, COLUMN_PENDING_MEMBERS),
+                    "$COLUMN_PENDING_MEMBERS IS NOT NULL", null,
+                    null
+            )?.use { cursor ->
+                val batch = BatchOperation(addressBook.provider)
+                while (cursor.moveToNext()) {
+                    val id = cursor.getLong(0)
+                    Constants.log.fine("Assigning members to group $id")
+
+                    // required for workaround for Android 7 which sets DIRTY flag when only meta-data is changed
+                    val changeContactIDs = HashSet<Long>()
+
+                    // delete all memberships and cached memberships for this group
+                    for (contact in addressBook.getByGroupMembership(id)) {
+                        contact.removeGroupMemberships(batch)
+                        changeContactIDs += contact.id!!
+                    }
+
+                    // extract list of member UIDs
+                    val members = LinkedList<String>()
+                    val raw = cursor.getBlob(1)
+                    val parcel = Parcel.obtain()
+                    try {
+                        parcel.unmarshall(raw, 0, raw.size)
+                        parcel.setDataPosition(0)
+                        parcel.readStringList(members)
+                    } finally {
+                        parcel.recycle()
+                    }
+
+                    // insert memberships
+                    for (uid in members) {
+                        Constants.log.fine("Assigning member: $uid")
+                        addressBook.findContactByUID(uid)?.let { member ->
+                            member.addToGroup(batch, id)
+                            changeContactIDs += member.id!!
+                        } ?: Constants.log.warning("Group member not found: $uid")
+                    }
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
+                        // workaround for Android 7 which sets DIRTY flag when only meta-data is changed
+                        changeContactIDs
+                                .map { addressBook.findContactByID(it) }
+                                .forEach { it.updateHashCode(batch) }
+
+                    // remove pending memberships
+                    batch.enqueue(BatchOperation.Operation(
+                            ContentProviderOperation.newUpdate(addressBook.syncAdapterURI(ContentUris.withAppendedId(Groups.CONTENT_URI, id)))
+                                    .withValue(COLUMN_PENDING_MEMBERS, null)
+                                    .withYieldAllowed(true)
+                            ))
+
+                    batch.commit()
+                }
+            }
+        }
+
+    }
+
+
+    override var flags: Int = 0
+
+
+    constructor(addressBook: AndroidAddressBook<out AndroidContact, LocalGroup>, values: ContentValues)
+        : super(addressBook, values) {
+        flags = values.getAsInteger(COLUMN_FLAGS) ?: 0
+    }
+
+    constructor(addressBook: AndroidAddressBook<out AndroidContact, LocalGroup>, contact: Contact, fileName: String?, eTag: String?, flags: Int)
+        : super(addressBook, contact, fileName, eTag) {
+        this.flags = flags
+    }
+
+
+    override fun contentValues(): ContentValues  {
+        val values = super.contentValues()
+        values.put(COLUMN_FLAGS, flags)
+
+        val members = Parcel.obtain()
+        try {
+            members.writeStringList(contact!!.members)
+            values.put(COLUMN_PENDING_MEMBERS, members.marshall())
+        } finally {
+            members.recycle()
+        }
+        return values
+    }
+
+
+    override fun assignNameAndUID() {
+        val uid = UUID.randomUUID().toString()
+        val newFileName = "$uid.vcf"
+
+        val values = ContentValues(2)
+        values.put(COLUMN_FILENAME, newFileName)
+        values.put(COLUMN_UID, uid)
+        update(values)
+
+        fileName = newFileName
+    }
+
+    override fun clearDirty(eTag: String?) {
+        val id = requireNotNull(id)
+
+        val values = ContentValues(2)
+        values.put(Groups.DIRTY, 0)
+        values.put(COLUMN_ETAG, eTag)
+        this.eTag = eTag
+        update(values)
+
+        // update cached group memberships
+        val batch = BatchOperation(addressBook.provider!!)
+
+        // delete cached group memberships
+        batch.enqueue(BatchOperation.Operation(
+                ContentProviderOperation.newDelete(addressBook.syncAdapterURI(ContactsContract.Data.CONTENT_URI))
+                        .withSelection(
+                                CachedGroupMembership.MIMETYPE + "=? AND " + CachedGroupMembership.GROUP_ID + "=?",
+                                arrayOf(CachedGroupMembership.CONTENT_ITEM_TYPE, id.toString())
+                        )
+        ))
+
+        // insert updated cached group memberships
+        for (member in getMembers())
+            batch.enqueue(BatchOperation.Operation(
+                    ContentProviderOperation.newInsert(addressBook.syncAdapterURI(ContactsContract.Data.CONTENT_URI))
+                            .withValue(CachedGroupMembership.MIMETYPE, CachedGroupMembership.CONTENT_ITEM_TYPE)
+                            .withValue(CachedGroupMembership.RAW_CONTACT_ID, member)
+                            .withValue(CachedGroupMembership.GROUP_ID, id)
+                            .withYieldAllowed(true)
+            ))
+
+        batch.commit()
+    }
+
+    /**
+     * Marks all members of the current group as dirty.
+     */
+    fun markMembersDirty() {
+        val batch = BatchOperation(addressBook.provider!!)
+
+        for (member in getMembers())
+            batch.enqueue(BatchOperation.Operation(
+                    ContentProviderOperation.newUpdate(addressBook.syncAdapterURI(ContentUris.withAppendedId(RawContacts.CONTENT_URI, member)))
+                            .withValue(RawContacts.DIRTY, 1)
+                            .withYieldAllowed(true)
+            ))
+
+        batch.commit()
+    }
+
+    override fun resetDeleted() {
+        val values = ContentValues(1)
+        values.put(Groups.DELETED, 0)
+        addressBook.provider!!.update(groupSyncUri(), values, null, null)
+    }
+
+    override fun updateFlags(flags: Int) {
+        val values = ContentValues(1)
+        values.put(LocalGroup.COLUMN_FLAGS, flags)
+        addressBook.provider!!.update(groupSyncUri(), values, null, null)
+
+        this.flags = flags
+    }
+
+
+    // helpers
+
+    private fun groupSyncUri(): Uri {
+        val id = requireNotNull(id)
+        return ContentUris.withAppendedId(addressBook.groupsSyncUri(), id)
+    }
+
+    /**
+     * Lists all members of this group.
+     * @return list of all members' raw contact IDs
+     * @throws RemoteException on contact provider errors
+     */
+    internal fun getMembers(): List<Long> {
+        val id = requireNotNull(id)
+        val members = LinkedList<Long>()
+        addressBook.provider!!.query(
+                addressBook.syncAdapterURI(ContactsContract.Data.CONTENT_URI),
+                arrayOf(Data.RAW_CONTACT_ID),
+                "${GroupMembership.MIMETYPE}=? AND ${GroupMembership.GROUP_ROW_ID}=?",
+                arrayOf(GroupMembership.CONTENT_ITEM_TYPE, id.toString()),
+                null
+        )?.use { cursor ->
+            while (cursor.moveToNext())
+                members += cursor.getLong(0)
+        }
+        return members
+    }
+
+
+    // factory
+
+    object Factory: AndroidGroupFactory<LocalGroup> {
+        override fun fromProvider(addressBook: AndroidAddressBook<out AndroidContact, LocalGroup>, values: ContentValues) =
+                LocalGroup(addressBook, values)
+    }
+
+}

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

@@ -0,0 +1,57 @@
+/*
+ * 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 android.net.Uri
+
+interface LocalResource<in TData: Any> {
+
+    companion object {
+        /**
+         * Resource is present on remote server. This flag is used to identify resources
+         * which are not present on the remote server anymore and can be deleted at the end
+         * of the synchronization.
+         */
+        const val FLAG_REMOTELY_PRESENT = 1
+    }
+
+
+    /**
+     * Unique ID which identifies the resource in the local storage. May be null if the
+     * resource has not been saved yet.
+     */
+    val id: Long?
+
+    val fileName: String?
+    var eTag: String?
+    val flags: Int
+
+    fun assignNameAndUID()
+    fun clearDirty(eTag: String?)
+    fun updateFlags(flags: Int)
+
+    /**
+     * Adds the data object to the content provider and ensures that the dirty flag is clear.
+     * @return content URI of the created row (e.g. event URI)
+     */
+    fun add(): Uri
+
+    /**
+     * Updates the data object in the content provider and ensures that the dirty flag is clear.
+     * @return content URI of the updated row (e.g. event URI)
+     */
+    fun update(data: TData): Uri
+
+    /**
+     * Deletes the data object from the content provider.
+     * @return number of affected rows
+     */
+    fun delete(): Int
+
+}

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

@@ -0,0 +1,102 @@
+/*
+ * 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 android.content.ContentProviderOperation
+import android.content.ContentValues
+import at.bitfire.ical4android.AndroidTask
+import at.bitfire.ical4android.AndroidTaskFactory
+import at.bitfire.ical4android.AndroidTaskList
+import at.bitfire.ical4android.Task
+import org.dmfs.tasks.contract.TaskContract.Tasks
+import java.util.*
+
+class LocalTask: AndroidTask, LocalResource<Task> {
+
+    companion object {
+        const val COLUMN_ETAG = Tasks.SYNC1
+        const val COLUMN_FLAGS = Tasks.SYNC2
+    }
+
+    override var fileName: String? = null
+    override var eTag: String? = null
+
+    override var flags = 0
+        private set
+
+
+    constructor(taskList: AndroidTaskList<*>, task: Task, fileName: String?, eTag: String?, flags: Int)
+            : super(taskList, task) {
+        this.fileName = fileName
+        this.eTag = eTag
+        this.flags = flags
+    }
+
+    private constructor(taskList: AndroidTaskList<*>, values: ContentValues): super(taskList) {
+        id = values.getAsLong(Tasks._ID)
+        fileName = values.getAsString(Tasks._SYNC_ID)
+        eTag = values.getAsString(COLUMN_ETAG)
+        flags = values.getAsInteger(COLUMN_FLAGS) ?: 0
+    }
+
+
+    /* process LocalTask-specific fields */
+
+    override fun buildTask(builder: ContentProviderOperation.Builder, update: Boolean) {
+        super.buildTask(builder, update)
+        val task = requireNotNull(task)
+
+        builder .withValue(Tasks._SYNC_ID, fileName)
+                .withValue(COLUMN_ETAG, eTag)
+                .withValue(COLUMN_FLAGS, flags)
+    }
+
+
+    /* custom queries */
+
+    override fun assignNameAndUID() {
+        val uid = UUID.randomUUID().toString()
+        val newFileName = "$uid.ics"
+
+        val values = ContentValues(2)
+        values.put(Tasks._SYNC_ID, newFileName)
+        values.put(Tasks._UID, uid)
+        taskList.provider.client.update(taskSyncURI(), values, null, null)
+
+        fileName = newFileName
+
+        task!!.uid = uid
+    }
+
+    override fun clearDirty(eTag: String?) {
+        val values = ContentValues(3)
+        values.put(Tasks._DIRTY, 0)
+        values.put(COLUMN_ETAG, eTag)
+        values.put(Tasks.SYNC_VERSION, task!!.sequence)
+        taskList.provider.client.update(taskSyncURI(), values, null, null)
+
+        this.eTag = eTag
+    }
+
+    override fun updateFlags(flags: Int) {
+        if (id != null) {
+            val values = ContentValues(1)
+            values.put(COLUMN_FLAGS, flags)
+            taskList.provider.client.update(taskSyncURI(), values, null, null)
+        }
+
+        this.flags = flags
+    }
+
+
+    object Factory: AndroidTaskFactory<LocalTask> {
+        override fun fromProvider(taskList: AndroidTaskList<*>, values: ContentValues) =
+                LocalTask(taskList, values)
+    }
+}

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

@@ -0,0 +1,160 @@
+/*
+ * 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 android.accounts.Account
+import android.content.ContentProviderClient
+import android.content.ContentResolver
+import android.content.ContentValues
+import android.content.Context
+import android.net.Uri
+import android.os.Build
+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.davdroid.model.SyncState
+import at.bitfire.ical4android.AndroidTaskList
+import at.bitfire.ical4android.AndroidTaskListFactory
+import at.bitfire.ical4android.TaskProvider
+import org.dmfs.tasks.contract.TaskContract.TaskLists
+import org.dmfs.tasks.contract.TaskContract.Tasks
+import java.util.logging.Level
+
+class LocalTaskList private constructor(
+        account: Account,
+        provider: TaskProvider,
+        id: Long
+): AndroidTaskList<LocalTask>(account, provider, LocalTask.Factory, id), LocalCollection<LocalTask> {
+
+    companion object {
+
+        fun tasksProviderAvailable(context: Context): Boolean {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+                return context.packageManager.resolveContentProvider(TaskProvider.ProviderName.OpenTasks.authority, 0) != null
+            else
+                try {
+                    TaskProvider.acquire(context, TaskProvider.ProviderName.OpenTasks)?.use {
+                        return true
+                    }
+                } catch (e: Exception) {
+                    // couldn't acquire task provider
+                }
+                return false
+        }
+
+        fun create(account: Account, provider: TaskProvider, info: CollectionInfo): Uri {
+            val values = valuesFromCollectionInfo(info, true)
+            values.put(TaskLists.OWNER, account.name)
+            values.put(TaskLists.SYNC_ENABLED, 1)
+            values.put(TaskLists.VISIBLE, 1)
+            return create(account, provider, values)
+        }
+
+        @Throws(Exception::class)
+        fun onRenameAccount(resolver: ContentResolver, oldName: String, newName: String) {
+            var client: ContentProviderClient? = null
+            try {
+                client = resolver.acquireContentProviderClient(TaskProvider.ProviderName.OpenTasks.authority)
+                client?.use {
+                    val values = ContentValues(1)
+                    values.put(Tasks.ACCOUNT_NAME, newName)
+                    it.update(Tasks.getContentUri(TaskProvider.ProviderName.OpenTasks.authority), values, "${Tasks.ACCOUNT_NAME}=?", arrayOf(oldName))
+                }
+            } finally {
+                if (Build.VERSION.SDK_INT >= 24)
+                    client?.close()
+                else
+                    client?.release()
+            }
+        }
+
+        private fun valuesFromCollectionInfo(info: CollectionInfo, withColor: Boolean): ContentValues {
+            val values = ContentValues(3)
+            values.put(TaskLists._SYNC_ID, info.url.toString())
+            values.put(TaskLists.LIST_NAME, if (info.displayName.isNullOrBlank()) DavUtils.lastSegmentOfUrl(info.url) else info.displayName)
+
+            if (withColor)
+                values.put(TaskLists.LIST_COLOR, info.color ?: Constants.DAVDROID_GREEN_RGBA)
+
+            return values
+        }
+
+    }
+
+    override val title: String
+        get() = name ?: id.toString()
+
+    override var lastSyncState: SyncState?
+        get() {
+            try {
+                provider.client.query(taskListSyncUri(), arrayOf(TaskLists.SYNC_VERSION),
+                        null, null, null)?.use { cursor ->
+                    if (cursor.moveToNext())
+                        cursor.getString(0)?.let {
+                            return SyncState.fromString(it)
+                        }
+                }
+            } catch (e: Exception) {
+                Logger.log.log(Level.WARNING, "Couldn't read sync state", e)
+            }
+            return null
+        }
+        set(state) {
+            val values = ContentValues(1)
+            values.put(TaskLists.SYNC_VERSION, state?.toString())
+            provider.client.update(taskListSyncUri(), values, null, null)
+        }
+
+
+    fun update(info: CollectionInfo, updateColor: Boolean) =
+            update(valuesFromCollectionInfo(info, updateColor))
+
+
+    override fun findDeleted() = queryTasks("${Tasks._DELETED}!=0", null)
+
+    override fun findDirty(): List<LocalTask> {
+        val tasks = queryTasks("${Tasks._DIRTY}!=0", null)
+        for (localTask in tasks) {
+            val task = requireNotNull(localTask.task)
+            val sequence = task.sequence
+            if (sequence == null)    // sequence has not been assigned yet (i.e. this task was just locally created)
+                task.sequence = 0
+            else
+                task.sequence = sequence + 1
+        }
+        return tasks
+    }
+
+    override fun findByName(name: String) =
+            queryTasks("${Tasks._SYNC_ID}=?", arrayOf(name)).firstOrNull()
+
+
+    override fun markNotDirty(flags: Int): Int {
+        val values = ContentValues(1)
+        values.put(LocalTask.COLUMN_FLAGS, flags)
+        return provider.client.update(tasksSyncUri(), values,
+                "${Tasks.LIST_ID}=? AND ${Tasks._DIRTY}=0",
+                arrayOf(id.toString()))
+    }
+
+    override fun removeNotDirtyMarked(flags: Int) =
+            provider.client.delete(tasksSyncUri(),
+                    "${Tasks.LIST_ID}=? AND ${Tasks._DIRTY}=0 AND ${LocalTask.COLUMN_FLAGS}=?",
+                    arrayOf(id.toString(), flags.toString()))
+
+
+    object Factory: AndroidTaskListFactory<LocalTaskList> {
+
+        override fun newInstance(account: Account, provider: TaskProvider, id: Long) =
+                LocalTaskList(account, provider, id)
+
+    }
+
+}

app/src/main/java/at/bitfire/davdroid/settings/DefaultsProvider.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.settings
+
+import at.bitfire.davdroid.App
+
+open class DefaultsProvider(
+        private val allowOverride: Boolean = true
+): Provider {
+
+    open val booleanDefaults = mapOf(
+            Pair(App.DISTRUST_SYSTEM_CERTIFICATES, false),
+            Pair(App.OVERRIDE_PROXY, false)
+    )
+
+    open val intDefaults = mapOf(
+            Pair(App.OVERRIDE_PROXY_PORT, App.OVERRIDE_PROXY_PORT_DEFAULT)
+    )
+
+    open val longDefaults = mapOf<String, Long>()
+
+    open val stringDefaults = mapOf(
+            Pair(App.OVERRIDE_PROXY_HOST, App.OVERRIDE_PROXY_HOST_DEFAULT)
+    )
+
+
+    override fun close() {
+    }
+
+    override fun forceReload() {
+    }
+
+
+    private fun hasKey(key: String) =
+            booleanDefaults.containsKey(key) ||
+            intDefaults.containsKey(key) ||
+            longDefaults.containsKey(key) ||
+            stringDefaults.containsKey(key)
+
+    override fun has(key: String): Pair<Boolean, Boolean> {
+        val has = hasKey(key)
+        return Pair(has, allowOverride || !has)
+    }
+
+
+    override fun getBoolean(key: String) =
+            Pair(booleanDefaults[key], allowOverride || !booleanDefaults.containsKey(key))
+
+    override fun getInt(key: String) =
+            Pair(intDefaults[key], allowOverride || !intDefaults.containsKey(key))
+
+    override fun getLong(key: String) =
+            Pair(longDefaults[key], allowOverride || !longDefaults.containsKey(key))
+
+    override fun getString(key: String) =
+            Pair(stringDefaults[key], allowOverride || !stringDefaults.containsKey(key))
+
+
+    override fun isWritable(key: String) = Pair(false, allowOverride || !hasKey(key))
+
+    override fun putBoolean(key: String, value: Boolean?) = false
+    override fun putInt(key: String, value: Int?) = false
+    override fun putLong(key: String, value: Long?) = false
+    override fun putString(key: String, value: String?) = false
+
+    override fun remove(key: String) = false
+
+}