Version bump to 3.1-beta7

Clear all errors when a different login method is chosen

See merge request bitfireAT/davx5-ose!31

.github/CODEOWNERS

@@ -1,4 +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:
-*      @bitfireAT/app-dev

.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
 

.gitlab-ci.yml

@@ -0,0 +1,31 @@
+image: registry.gitlab.com/bitfireat/docker-android-emulator:latest
+
+before_script:
+  - git submodule update --init --recursive
+  - export GRADLE_USER_HOME=`pwd`/.gradle; chmod +x gradlew
+
+cache:
+  paths:
+     - .gradle/
+
+test:
+  tags:
+    - privileged
+  script:
+   - start-emulator.sh
+   - ./gradlew app:check app:connectedCheck
+  artifacts:
+    paths:
+      - app/build/outputs/lint-results-debug.html
+      - app/build/reports
+      - build/reports
+
+pages:
+  script:
+    - ./gradlew app:dokka
+    - mkdir public && mv app/build/dokka public
+  artifacts:
+    paths:
+      - public
+  only:
+    - master-ose

.gitmodules

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

README.md

@@ -1,47 +1,37 @@
-
-[![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.
+Please see the [DAVx⁵ Web site](https://www.davx5.com) for
+comprehensive information about DAVx⁵.
 
 DAVx⁵ is licensed under the [GPLv3 License](LICENSE).
 
-News and updates: 
+News and updates: [@davx5app](https://twitter.com/davx5app) on Twitter
 
-* [@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
+Help, discussion, feature requests, bug reports and "issues": [DAVx⁵ forums](https://www.davx5.com/forums)
 
 **If you want to support DAVx⁵, please consider [donating to DAVx⁵](https://www.davx5.com/donate)
 or [purchasing it](https://www.davx5.com/download).**
 
+Generated KDoc: https://bitfireAT.gitlab.io/davx5-ose/dokka/app/
+
+Parts of DAVx⁵ have been outsourced into these libraries:
+
+* [cert4android](https://gitlab.com/bitfireAT/cert4android) – custom certificate management
+* [dav4jvm](https://gitlab.com/bitfireAT/dav4jvm) – WebDAV/CalDav/CardDAV framework
+* [ical4android](https://gitlab.com/bitfireAT/ical4android) – iCalendar processing and Calendar Provider access
+* [vcard4android](https://gitlab.com/bitfireAT/vcard4android) – vCard processing and Contacts Provider access
+
 
 USED THIRD-PARTY LIBRARIES
 ==========================
 
-The most important libraries which are used by DAVx⁵ (alphabetically):
+Those libraries 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)
+* [Color Picker](https://github.com/jaredrummler/ColorPicker) – [Apache License, Version 2.0](https://github.com/jaredrummler/ColorPicker/LICENSE)
+* [dnsjava](http://www.xbill.org/dnsjava/) – [BSD License](http://www.xbill.org/dnsjava/dnsjava-current/LICENSE)
+* [ez-vcard](https://github.com/mangstadt/ez-vcard) – [New BSD License](http://opensource.org/licenses/BSD-3-Clause)
+* [iCal4j](https://github.com/ical4j/ical4j) – [New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE)
 * [okhttp](https://square.github.io/okhttp) – [Apache License, Version 2.0](https://square.github.io/okhttp/#license)
-
-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/build.gradle

@@ -0,0 +1,155 @@
+/*
+ * 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: 'com.mikepenz.aboutlibraries.plugin'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'org.jetbrains.dokka'
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
+
+    defaultConfig {
+        applicationId "at.bitfire.davdroid"
+
+        versionCode 301000006
+        buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
+        buildConfigField "boolean", "customCerts", "true"
+
+        minSdkVersion 21        // Android 5.0
+        targetSdkVersion 29     // Android 10.0
+
+        buildConfigField "String", "userAgent", "\"DAVx5\""
+    }
+
+    compileOptions {
+        // enable because ical4android requires desugaring
+        coreLibraryDesugaringEnabled true
+
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    buildFeatures.dataBinding = true
+
+    flavorDimensions "distribution"
+    productFlavors {
+        standard {
+            versionName "3.1-beta7-ose"
+        }
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled false
+        }
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+
+    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 'RtlEnabled'
+        disable 'RtlHardcoded'
+        disable 'Typos'
+    }
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/LICENSE'
+    }
+
+    defaultConfig {
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    dokka.configuration {
+        sourceLink {
+            url = "https://gitlab.com/bitfireAT/davx5-ose/tree/master-ose/"
+            lineSuffix = "#L"
+        }
+        jdkVersion = 7
+
+        externalDocumentationLink {
+            url = new URL("https://bitfireat.gitlab.io/cert4android/dokka/cert4android/")
+            packageListUrl = new URL("https://bitfireat.gitlab.io/cert4android/dokka/cert4android/package-list")
+        }
+        externalDocumentationLink {
+            url = new URL("https://bitfireat.gitlab.io/dav4jvm/dokka/dav4jvm/")
+            packageListUrl = new URL("https://bitfireat.gitlab.io/dav4jvm/dokka/dav4jvm/package-list")
+        }
+        externalDocumentationLink {
+            url = new URL("https://bitfireat.gitlab.io/ical4android/dokka/ical4android/")
+            packageListUrl = new URL("https://bitfireat.gitlab.io/ical4android/dokka/ical4android/package-list")
+        }
+        externalDocumentationLink {
+            url = new URL("https://bitfireat.gitlab.io/vcard4android/dokka/vcard4android/")
+            packageListUrl = new URL("https://bitfireat.gitlab.io/vcard4android/dokka/vcard4android/package-list")
+        }
+    }
+}
+
+dependencies {
+    implementation project(':cert4android')
+    implementation project(':ical4android')
+    implementation project(':vcard4android')
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.5'
+
+    implementation 'androidx.appcompat:appcompat:1.2.0-rc01'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta6'
+    implementation 'androidx.fragment:fragment-ktx:1.2.4'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
+    implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01'
+    implementation 'com.google.android:flexbox:1.1.0'
+    implementation 'com.google.android.material:material:1.2.0-alpha06'
+
+    def room_version = '2.2.5'
+    implementation "androidx.room:room-runtime:$room_version"
+    implementation "androidx.room:room-ktx:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+
+    implementation 'com.jaredrummler:colorpicker:1.1.0'
+    implementation "com.github.AppIntro:AppIntro:${versions.appIntro}"
+    implementation "com.gitlab.bitfireAT:dav4jvm:${versions.dav4jvm}"
+    implementation "com.mikepenz:aboutlibraries:${versions.aboutLibraries}"
+    implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
+    implementation "com.squareup.okhttp3:okhttp-brotli:${versions.okhttp}"
+    implementation "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}"
+    implementation 'commons-io:commons-io:2.6'
+    //noinspection GradleDependency - dnsjava 3+ needs Java 8/Android 7
+    implementation 'dnsjava:dnsjava:2.1.9'
+    implementation 'org.apache.commons:commons-collections4:4.4'
+    //noinspection GradleDependency - commons-lang 3.10+ needs Java 8/Android 7
+    implementation 'org.apache.commons:commons-lang3:3.9'
+    implementation 'org.apache.commons:commons-text:1.8'
+
+    // for tests
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'junit:junit:4.13'
+    androidTestImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"
+
+    testImplementation 'junit:junit:4.13'
+    testImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"
+}

app/build.gradle.kts

@@ -1,232 +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 = 405080003
-        versionName = "4.5.8"
-
-        base.archivesName = "davx5-ose-$versionName"
-
-        minSdk = 24        // Android 7.0
-        targetSdk = 36     // Android 16
-
-        // whether the build supports and allows to use custom certificates
-        buildConfigField("boolean", "allowCustomCerts", "true")
-
-        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 = "at.bitfire.davdroid"
-
-    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 {
-    // core
-    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.materialIconsExtended)
-    debugImplementation(libs.androidx.compose.ui.tooling)
-    implementation(libs.androidx.compose.ui.toolingPreview)
-
-    // Glance Widgets
-    implementation(libs.androidx.glance.base)
-    implementation(libs.androidx.glance.material)
-
-    // 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-release.pro

@@ -1,31 +0,0 @@
-
-# R8 usage for DAVx⁵:
-#    shrinking        yes (only in release builds)
-#    optimization     yes (on by R8 defaults)
-#      full-mode      no (see gradle.properties)
-#    obfuscation      no (open-source)
-
--dontobfuscate
--printusage build/reports/r8-usage.txt
-
-# keep rules
--keep class at.bitfire.** { *; }        # all DAVx5 code is required
--keep class org.xmlpull.** { *; }
-
-# Additional rules which are now required since missing classes can't be ignored in R8 anymore.
-# [https://developer.android.com/build/releases/past-releases/agp-7-0-0-release-notes#r8-missing-class-warning]
--dontwarn org.xmlpull.**
-
-# dnsjava
--dontwarn com.sun.jna.**
--dontwarn lombok.**
--dontwarn javax.naming.NamingException
--dontwarn javax.naming.directory.**
--dontwarn sun.net.spi.nameservice.NameService
--dontwarn sun.net.spi.nameservice.NameServiceDescriptor
--dontwarn org.xbill.DNS.spi.DnsjavaInetAddressResolverProvider
-
-# okhttp
-# https://github.com/bitfireAT/davx5/issues/711 / https://github.com/square/okhttp/issues/8574
--keep class okhttp3.internal.idn.IdnaMappingTable { *; }
--keep class okhttp3.internal.idn.IdnaMappingTableInstanceKt{ *; }

app/proguard-rules.txt

@@ -0,0 +1,26 @@
+
+# ProGuard/R8 usage for DAVx⁵:
+#       shrinking        yes
+#       optimization     yes
+#       obfuscation      no (open-source)
+
+-dontobfuscate
+
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+-optimizationpasses 5
+-allowaccessmodification
+
+# ez-vcard
+-keep class ezvcard.property.** { *; }  # keep all vCard properties (created at runtime)
+
+# ical4j
+-keep class net.fortuna.ical4j.** { *; }  # keep all model classes (properties/factories, created at runtime)
+
+# DAVx⁵ + libs
+-keep class at.bitfire.** { *; }       # all DAVx⁵ code is required
+
+# we use enum classes (https://www.guardsquare.com/en/products/proguard/manual/examples#enumerations)
+-keepclassmembers,allowoptimization enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}

app/schemas/at.bitfire.davdroid.db.AppDatabase/10.json

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

app/schemas/at.bitfire.davdroid.db.AppDatabase/11.json

@@ -1,536 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 11,
-    "identityHash": "223aa7f0fd53730921ca212a663585d8",
-    "entities": [
-      {
-        "tableName": "service",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `accountName` TEXT NOT NULL, `type` TEXT NOT NULL, `principal` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accountName",
-            "columnName": "accountName",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "principal",
-            "columnName": "principal",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_service_accountName_type",
-            "unique": true,
-            "columnNames": [
-              "accountName",
-              "type"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_service_accountName_type` ON `${TABLE_NAME}` (`accountName`, `type`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "homeset",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `personal` INTEGER NOT NULL, `url` TEXT NOT NULL, `privBind` INTEGER NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "personal",
-            "columnName": "personal",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privBind",
-            "columnName": "privBind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_homeset_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_homeset_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "collection",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `homeSetId` INTEGER, `type` TEXT NOT NULL, `url` TEXT NOT NULL, `privWriteContent` INTEGER NOT NULL, `privUnbind` INTEGER NOT NULL, `forceReadOnly` INTEGER NOT NULL, `displayName` TEXT, `description` TEXT, `owner` TEXT, `color` INTEGER, `timezone` TEXT, `supportsVEVENT` INTEGER, `supportsVTODO` INTEGER, `supportsVJOURNAL` INTEGER, `source` TEXT, `sync` INTEGER NOT NULL, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`homeSetId`) REFERENCES `homeset`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "homeSetId",
-            "columnName": "homeSetId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privWriteContent",
-            "columnName": "privWriteContent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privUnbind",
-            "columnName": "privUnbind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "forceReadOnly",
-            "columnName": "forceReadOnly",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "owner",
-            "columnName": "owner",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timezone",
-            "columnName": "timezone",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVEVENT",
-            "columnName": "supportsVEVENT",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVTODO",
-            "columnName": "supportsVTODO",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVJOURNAL",
-            "columnName": "supportsVJOURNAL",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "source",
-            "columnName": "source",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "sync",
-            "columnName": "sync",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_collection_serviceId_type",
-            "unique": false,
-            "columnNames": [
-              "serviceId",
-              "type"
-            ],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_serviceId_type` ON `${TABLE_NAME}` (`serviceId`, `type`)"
-          },
-          {
-            "name": "index_collection_homeSetId_type",
-            "unique": false,
-            "columnNames": [
-              "homeSetId",
-              "type"
-            ],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_homeSetId_type` ON `${TABLE_NAME}` (`homeSetId`, `type`)"
-          },
-          {
-            "name": "index_collection_url",
-            "unique": false,
-            "columnNames": [
-              "url"
-            ],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "homeset",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "homeSetId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "syncstats",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `collectionId` INTEGER NOT NULL, `authority` TEXT NOT NULL, `lastSync` INTEGER NOT NULL, FOREIGN KEY(`collectionId`) REFERENCES `collection`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "collectionId",
-            "columnName": "collectionId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authority",
-            "columnName": "authority",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lastSync",
-            "columnName": "lastSync",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_syncstats_collectionId_authority",
-            "unique": true,
-            "columnNames": [
-              "collectionId",
-              "authority"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_syncstats_collectionId_authority` ON `${TABLE_NAME}` (`collectionId`, `authority`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "collection",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "collectionId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_document",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `mountId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT NOT NULL, `isDirectory` INTEGER NOT NULL, `displayName` TEXT, `mimeType` TEXT, `eTag` TEXT, `lastModified` INTEGER, `size` INTEGER, `mayBind` INTEGER, `mayUnbind` INTEGER, `mayWriteContent` INTEGER, `quotaAvailable` INTEGER, `quotaUsed` INTEGER, FOREIGN KEY(`mountId`) REFERENCES `webdav_mount`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`parentId`) REFERENCES `webdav_document`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mountId",
-            "columnName": "mountId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentId",
-            "columnName": "parentId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDirectory",
-            "columnName": "isDirectory",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mimeType",
-            "columnName": "mimeType",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "eTag",
-            "columnName": "eTag",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastModified",
-            "columnName": "lastModified",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "size",
-            "columnName": "size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayBind",
-            "columnName": "mayBind",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayUnbind",
-            "columnName": "mayUnbind",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayWriteContent",
-            "columnName": "mayWriteContent",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "quotaAvailable",
-            "columnName": "quotaAvailable",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "quotaUsed",
-            "columnName": "quotaUsed",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_webdav_document_mountId_parentId_name",
-            "unique": true,
-            "columnNames": [
-              "mountId",
-              "parentId",
-              "name"
-            ],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_webdav_document_mountId_parentId_name` ON `${TABLE_NAME}` (`mountId`, `parentId`, `name`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "webdav_mount",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "mountId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "webdav_document",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "parentId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_mount",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '223aa7f0fd53730921ca212a663585d8')"
-    ]
-  }
-}

app/schemas/at.bitfire.davdroid.db.AppDatabase/12.json

@@ -1,615 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 12,
-    "identityHash": "67fafceecee2d97cac6a62d46fa2c3e2",
-    "entities": [
-      {
-        "tableName": "service",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `accountName` TEXT NOT NULL, `type` TEXT NOT NULL, `principal` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accountName",
-            "columnName": "accountName",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "principal",
-            "columnName": "principal",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_service_accountName_type",
-            "unique": true,
-            "columnNames": [
-              "accountName",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_service_accountName_type` ON `${TABLE_NAME}` (`accountName`, `type`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "homeset",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `personal` INTEGER NOT NULL, `url` TEXT NOT NULL, `privBind` INTEGER NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "personal",
-            "columnName": "personal",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privBind",
-            "columnName": "privBind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_homeset_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_homeset_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "collection",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `homeSetId` INTEGER, `ownerId` INTEGER, `type` TEXT NOT NULL, `url` TEXT NOT NULL, `privWriteContent` INTEGER NOT NULL, `privUnbind` INTEGER NOT NULL, `forceReadOnly` INTEGER NOT NULL, `displayName` TEXT, `description` TEXT, `color` INTEGER, `timezone` TEXT, `supportsVEVENT` INTEGER, `supportsVTODO` INTEGER, `supportsVJOURNAL` INTEGER, `source` TEXT, `sync` INTEGER NOT NULL, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`homeSetId`) REFERENCES `homeset`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`ownerId`) REFERENCES `principal`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "homeSetId",
-            "columnName": "homeSetId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privWriteContent",
-            "columnName": "privWriteContent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privUnbind",
-            "columnName": "privUnbind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "forceReadOnly",
-            "columnName": "forceReadOnly",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timezone",
-            "columnName": "timezone",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVEVENT",
-            "columnName": "supportsVEVENT",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVTODO",
-            "columnName": "supportsVTODO",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVJOURNAL",
-            "columnName": "supportsVJOURNAL",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "source",
-            "columnName": "source",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "sync",
-            "columnName": "sync",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_collection_serviceId_type",
-            "unique": false,
-            "columnNames": [
-              "serviceId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_serviceId_type` ON `${TABLE_NAME}` (`serviceId`, `type`)"
-          },
-          {
-            "name": "index_collection_homeSetId_type",
-            "unique": false,
-            "columnNames": [
-              "homeSetId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_homeSetId_type` ON `${TABLE_NAME}` (`homeSetId`, `type`)"
-          },
-          {
-            "name": "index_collection_url",
-            "unique": false,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "homeset",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "homeSetId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "principal",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "principal",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `url` TEXT NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_principal_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_principal_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "syncstats",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `collectionId` INTEGER NOT NULL, `authority` TEXT NOT NULL, `lastSync` INTEGER NOT NULL, FOREIGN KEY(`collectionId`) REFERENCES `collection`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "collectionId",
-            "columnName": "collectionId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authority",
-            "columnName": "authority",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lastSync",
-            "columnName": "lastSync",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_syncstats_collectionId_authority",
-            "unique": true,
-            "columnNames": [
-              "collectionId",
-              "authority"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_syncstats_collectionId_authority` ON `${TABLE_NAME}` (`collectionId`, `authority`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "collection",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "collectionId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_document",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `mountId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT NOT NULL, `isDirectory` INTEGER NOT NULL, `displayName` TEXT, `mimeType` TEXT, `eTag` TEXT, `lastModified` INTEGER, `size` INTEGER, `mayBind` INTEGER, `mayUnbind` INTEGER, `mayWriteContent` INTEGER, `quotaAvailable` INTEGER, `quotaUsed` INTEGER, FOREIGN KEY(`mountId`) REFERENCES `webdav_mount`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`parentId`) REFERENCES `webdav_document`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mountId",
-            "columnName": "mountId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentId",
-            "columnName": "parentId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDirectory",
-            "columnName": "isDirectory",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mimeType",
-            "columnName": "mimeType",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "eTag",
-            "columnName": "eTag",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastModified",
-            "columnName": "lastModified",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "size",
-            "columnName": "size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayBind",
-            "columnName": "mayBind",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayUnbind",
-            "columnName": "mayUnbind",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayWriteContent",
-            "columnName": "mayWriteContent",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "quotaAvailable",
-            "columnName": "quotaAvailable",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "quotaUsed",
-            "columnName": "quotaUsed",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_webdav_document_mountId_parentId_name",
-            "unique": true,
-            "columnNames": [
-              "mountId",
-              "parentId",
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_webdav_document_mountId_parentId_name` ON `${TABLE_NAME}` (`mountId`, `parentId`, `name`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "webdav_mount",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "mountId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "webdav_document",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "parentId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_mount",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '67fafceecee2d97cac6a62d46fa2c3e2')"
-    ]
-  }
-}

app/schemas/at.bitfire.davdroid.db.AppDatabase/13.json

@@ -1,640 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 13,
-    "identityHash": "0a6a9705ff471acd766ab96e3edf8ac3",
-    "entities": [
-      {
-        "tableName": "service",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `accountName` TEXT NOT NULL, `type` TEXT NOT NULL, `principal` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accountName",
-            "columnName": "accountName",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "principal",
-            "columnName": "principal",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_service_accountName_type",
-            "unique": true,
-            "columnNames": [
-              "accountName",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_service_accountName_type` ON `${TABLE_NAME}` (`accountName`, `type`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "homeset",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `personal` INTEGER NOT NULL, `url` TEXT NOT NULL, `privBind` INTEGER NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "personal",
-            "columnName": "personal",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privBind",
-            "columnName": "privBind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_homeset_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_homeset_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "collection",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `homeSetId` INTEGER, `ownerId` INTEGER, `type` TEXT NOT NULL, `url` TEXT NOT NULL, `privWriteContent` INTEGER NOT NULL, `privUnbind` INTEGER NOT NULL, `forceReadOnly` INTEGER NOT NULL, `displayName` TEXT, `description` TEXT, `color` INTEGER, `timezone` TEXT, `supportsVEVENT` INTEGER, `supportsVTODO` INTEGER, `supportsVJOURNAL` INTEGER, `source` TEXT, `sync` INTEGER NOT NULL, `pushTopic` TEXT, `supportsWebPush` INTEGER NOT NULL DEFAULT 0, `pushSubscription` TEXT, `pushSubscriptionCreated` INTEGER, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`homeSetId`) REFERENCES `homeset`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`ownerId`) REFERENCES `principal`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "homeSetId",
-            "columnName": "homeSetId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privWriteContent",
-            "columnName": "privWriteContent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privUnbind",
-            "columnName": "privUnbind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "forceReadOnly",
-            "columnName": "forceReadOnly",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timezone",
-            "columnName": "timezone",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVEVENT",
-            "columnName": "supportsVEVENT",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVTODO",
-            "columnName": "supportsVTODO",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVJOURNAL",
-            "columnName": "supportsVJOURNAL",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "source",
-            "columnName": "source",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "sync",
-            "columnName": "sync",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pushTopic",
-            "columnName": "pushTopic",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsWebPush",
-            "columnName": "supportsWebPush",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "pushSubscription",
-            "columnName": "pushSubscription",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "pushSubscriptionCreated",
-            "columnName": "pushSubscriptionCreated",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_collection_serviceId_type",
-            "unique": false,
-            "columnNames": [
-              "serviceId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_serviceId_type` ON `${TABLE_NAME}` (`serviceId`, `type`)"
-          },
-          {
-            "name": "index_collection_homeSetId_type",
-            "unique": false,
-            "columnNames": [
-              "homeSetId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_homeSetId_type` ON `${TABLE_NAME}` (`homeSetId`, `type`)"
-          },
-          {
-            "name": "index_collection_url",
-            "unique": false,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "homeset",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "homeSetId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "principal",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "principal",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `url` TEXT NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_principal_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_principal_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "syncstats",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `collectionId` INTEGER NOT NULL, `authority` TEXT NOT NULL, `lastSync` INTEGER NOT NULL, FOREIGN KEY(`collectionId`) REFERENCES `collection`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "collectionId",
-            "columnName": "collectionId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authority",
-            "columnName": "authority",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lastSync",
-            "columnName": "lastSync",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_syncstats_collectionId_authority",
-            "unique": true,
-            "columnNames": [
-              "collectionId",
-              "authority"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_syncstats_collectionId_authority` ON `${TABLE_NAME}` (`collectionId`, `authority`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "collection",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "collectionId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_document",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `mountId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT NOT NULL, `isDirectory` INTEGER NOT NULL, `displayName` TEXT, `mimeType` TEXT, `eTag` TEXT, `lastModified` INTEGER, `size` INTEGER, `mayBind` INTEGER, `mayUnbind` INTEGER, `mayWriteContent` INTEGER, `quotaAvailable` INTEGER, `quotaUsed` INTEGER, FOREIGN KEY(`mountId`) REFERENCES `webdav_mount`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`parentId`) REFERENCES `webdav_document`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mountId",
-            "columnName": "mountId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentId",
-            "columnName": "parentId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDirectory",
-            "columnName": "isDirectory",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mimeType",
-            "columnName": "mimeType",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "eTag",
-            "columnName": "eTag",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastModified",
-            "columnName": "lastModified",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "size",
-            "columnName": "size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayBind",
-            "columnName": "mayBind",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayUnbind",
-            "columnName": "mayUnbind",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayWriteContent",
-            "columnName": "mayWriteContent",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "quotaAvailable",
-            "columnName": "quotaAvailable",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "quotaUsed",
-            "columnName": "quotaUsed",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_webdav_document_mountId_parentId_name",
-            "unique": true,
-            "columnNames": [
-              "mountId",
-              "parentId",
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_webdav_document_mountId_parentId_name` ON `${TABLE_NAME}` (`mountId`, `parentId`, `name`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "webdav_mount",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "mountId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "webdav_document",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "parentId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_mount",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '0a6a9705ff471acd766ab96e3edf8ac3')"
-    ]
-  }
-}

app/schemas/at.bitfire.davdroid.db.AppDatabase/14.json

@@ -1,669 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 14,
-    "identityHash": "9a0eb47f27473eab254db568081a4585",
-    "entities": [
-      {
-        "tableName": "service",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `accountName` TEXT NOT NULL, `type` TEXT NOT NULL, `principal` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accountName",
-            "columnName": "accountName",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "principal",
-            "columnName": "principal",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_service_accountName_type",
-            "unique": true,
-            "columnNames": [
-              "accountName",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_service_accountName_type` ON `${TABLE_NAME}` (`accountName`, `type`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "homeset",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `personal` INTEGER NOT NULL, `url` TEXT NOT NULL, `privBind` INTEGER NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "personal",
-            "columnName": "personal",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privBind",
-            "columnName": "privBind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_homeset_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_homeset_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "collection",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `homeSetId` INTEGER, `ownerId` INTEGER, `type` TEXT NOT NULL, `url` TEXT NOT NULL, `privWriteContent` INTEGER NOT NULL, `privUnbind` INTEGER NOT NULL, `forceReadOnly` INTEGER NOT NULL, `displayName` TEXT, `description` TEXT, `color` INTEGER, `timezone` TEXT, `supportsVEVENT` INTEGER, `supportsVTODO` INTEGER, `supportsVJOURNAL` INTEGER, `source` TEXT, `sync` INTEGER NOT NULL, `pushTopic` TEXT, `supportsWebPush` INTEGER NOT NULL DEFAULT 0, `pushSubscription` TEXT, `pushSubscriptionCreated` INTEGER, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`homeSetId`) REFERENCES `homeset`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`ownerId`) REFERENCES `principal`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "homeSetId",
-            "columnName": "homeSetId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privWriteContent",
-            "columnName": "privWriteContent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privUnbind",
-            "columnName": "privUnbind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "forceReadOnly",
-            "columnName": "forceReadOnly",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timezone",
-            "columnName": "timezone",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVEVENT",
-            "columnName": "supportsVEVENT",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVTODO",
-            "columnName": "supportsVTODO",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVJOURNAL",
-            "columnName": "supportsVJOURNAL",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "source",
-            "columnName": "source",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "sync",
-            "columnName": "sync",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pushTopic",
-            "columnName": "pushTopic",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsWebPush",
-            "columnName": "supportsWebPush",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "pushSubscription",
-            "columnName": "pushSubscription",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "pushSubscriptionCreated",
-            "columnName": "pushSubscriptionCreated",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_collection_serviceId_type",
-            "unique": false,
-            "columnNames": [
-              "serviceId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_serviceId_type` ON `${TABLE_NAME}` (`serviceId`, `type`)"
-          },
-          {
-            "name": "index_collection_homeSetId_type",
-            "unique": false,
-            "columnNames": [
-              "homeSetId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_homeSetId_type` ON `${TABLE_NAME}` (`homeSetId`, `type`)"
-          },
-          {
-            "name": "index_collection_ownerId_type",
-            "unique": false,
-            "columnNames": [
-              "ownerId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_ownerId_type` ON `${TABLE_NAME}` (`ownerId`, `type`)"
-          },
-          {
-            "name": "index_collection_pushTopic_type",
-            "unique": false,
-            "columnNames": [
-              "pushTopic",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_pushTopic_type` ON `${TABLE_NAME}` (`pushTopic`, `type`)"
-          },
-          {
-            "name": "index_collection_url",
-            "unique": false,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "homeset",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "homeSetId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "principal",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "principal",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `url` TEXT NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_principal_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_principal_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "syncstats",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `collectionId` INTEGER NOT NULL, `authority` TEXT NOT NULL, `lastSync` INTEGER NOT NULL, FOREIGN KEY(`collectionId`) REFERENCES `collection`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "collectionId",
-            "columnName": "collectionId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authority",
-            "columnName": "authority",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lastSync",
-            "columnName": "lastSync",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_syncstats_collectionId_authority",
-            "unique": true,
-            "columnNames": [
-              "collectionId",
-              "authority"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_syncstats_collectionId_authority` ON `${TABLE_NAME}` (`collectionId`, `authority`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "collection",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "collectionId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_document",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `mountId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT NOT NULL, `isDirectory` INTEGER NOT NULL, `displayName` TEXT, `mimeType` TEXT, `eTag` TEXT, `lastModified` INTEGER, `size` INTEGER, `mayBind` INTEGER, `mayUnbind` INTEGER, `mayWriteContent` INTEGER, `quotaAvailable` INTEGER, `quotaUsed` INTEGER, FOREIGN KEY(`mountId`) REFERENCES `webdav_mount`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`parentId`) REFERENCES `webdav_document`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mountId",
-            "columnName": "mountId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentId",
-            "columnName": "parentId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDirectory",
-            "columnName": "isDirectory",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mimeType",
-            "columnName": "mimeType",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "eTag",
-            "columnName": "eTag",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastModified",
-            "columnName": "lastModified",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "size",
-            "columnName": "size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayBind",
-            "columnName": "mayBind",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayUnbind",
-            "columnName": "mayUnbind",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayWriteContent",
-            "columnName": "mayWriteContent",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "quotaAvailable",
-            "columnName": "quotaAvailable",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "quotaUsed",
-            "columnName": "quotaUsed",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_webdav_document_mountId_parentId_name",
-            "unique": true,
-            "columnNames": [
-              "mountId",
-              "parentId",
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_webdav_document_mountId_parentId_name` ON `${TABLE_NAME}` (`mountId`, `parentId`, `name`)"
-          },
-          {
-            "name": "index_webdav_document_parentId",
-            "unique": false,
-            "columnNames": [
-              "parentId"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_webdav_document_parentId` ON `${TABLE_NAME}` (`parentId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "webdav_mount",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "mountId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "webdav_document",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "parentId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_mount",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9a0eb47f27473eab254db568081a4585')"
-    ]
-  }
-}

app/schemas/at.bitfire.davdroid.db.AppDatabase/15.json

@@ -1,675 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 15,
-    "identityHash": "ab1cb6057d8e050f6648bea46ae0943d",
-    "entities": [
-      {
-        "tableName": "service",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `accountName` TEXT NOT NULL, `type` TEXT NOT NULL, `principal` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accountName",
-            "columnName": "accountName",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "principal",
-            "columnName": "principal",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_service_accountName_type",
-            "unique": true,
-            "columnNames": [
-              "accountName",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_service_accountName_type` ON `${TABLE_NAME}` (`accountName`, `type`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "homeset",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `personal` INTEGER NOT NULL, `url` TEXT NOT NULL, `privBind` INTEGER NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "personal",
-            "columnName": "personal",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privBind",
-            "columnName": "privBind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_homeset_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_homeset_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "collection",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `homeSetId` INTEGER, `ownerId` INTEGER, `type` TEXT NOT NULL, `url` TEXT NOT NULL, `privWriteContent` INTEGER NOT NULL, `privUnbind` INTEGER NOT NULL, `forceReadOnly` INTEGER NOT NULL, `displayName` TEXT, `description` TEXT, `color` INTEGER, `timezone` TEXT, `supportsVEVENT` INTEGER, `supportsVTODO` INTEGER, `supportsVJOURNAL` INTEGER, `source` TEXT, `sync` INTEGER NOT NULL, `pushTopic` TEXT, `supportsWebPush` INTEGER NOT NULL DEFAULT 0, `pushSubscription` TEXT, `pushSubscriptionExpires` INTEGER, `pushSubscriptionCreated` INTEGER, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`homeSetId`) REFERENCES `homeset`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`ownerId`) REFERENCES `principal`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "homeSetId",
-            "columnName": "homeSetId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privWriteContent",
-            "columnName": "privWriteContent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privUnbind",
-            "columnName": "privUnbind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "forceReadOnly",
-            "columnName": "forceReadOnly",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timezone",
-            "columnName": "timezone",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVEVENT",
-            "columnName": "supportsVEVENT",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVTODO",
-            "columnName": "supportsVTODO",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVJOURNAL",
-            "columnName": "supportsVJOURNAL",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "source",
-            "columnName": "source",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "sync",
-            "columnName": "sync",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pushTopic",
-            "columnName": "pushTopic",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsWebPush",
-            "columnName": "supportsWebPush",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "pushSubscription",
-            "columnName": "pushSubscription",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "pushSubscriptionExpires",
-            "columnName": "pushSubscriptionExpires",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "pushSubscriptionCreated",
-            "columnName": "pushSubscriptionCreated",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_collection_serviceId_type",
-            "unique": false,
-            "columnNames": [
-              "serviceId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_serviceId_type` ON `${TABLE_NAME}` (`serviceId`, `type`)"
-          },
-          {
-            "name": "index_collection_homeSetId_type",
-            "unique": false,
-            "columnNames": [
-              "homeSetId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_homeSetId_type` ON `${TABLE_NAME}` (`homeSetId`, `type`)"
-          },
-          {
-            "name": "index_collection_ownerId_type",
-            "unique": false,
-            "columnNames": [
-              "ownerId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_ownerId_type` ON `${TABLE_NAME}` (`ownerId`, `type`)"
-          },
-          {
-            "name": "index_collection_pushTopic_type",
-            "unique": false,
-            "columnNames": [
-              "pushTopic",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_pushTopic_type` ON `${TABLE_NAME}` (`pushTopic`, `type`)"
-          },
-          {
-            "name": "index_collection_url",
-            "unique": false,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "homeset",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "homeSetId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "principal",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "principal",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `url` TEXT NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_principal_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_principal_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "syncstats",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `collectionId` INTEGER NOT NULL, `authority` TEXT NOT NULL, `lastSync` INTEGER NOT NULL, FOREIGN KEY(`collectionId`) REFERENCES `collection`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "collectionId",
-            "columnName": "collectionId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authority",
-            "columnName": "authority",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lastSync",
-            "columnName": "lastSync",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_syncstats_collectionId_authority",
-            "unique": true,
-            "columnNames": [
-              "collectionId",
-              "authority"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_syncstats_collectionId_authority` ON `${TABLE_NAME}` (`collectionId`, `authority`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "collection",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "collectionId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_document",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `mountId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT NOT NULL, `isDirectory` INTEGER NOT NULL, `displayName` TEXT, `mimeType` TEXT, `eTag` TEXT, `lastModified` INTEGER, `size` INTEGER, `mayBind` INTEGER, `mayUnbind` INTEGER, `mayWriteContent` INTEGER, `quotaAvailable` INTEGER, `quotaUsed` INTEGER, FOREIGN KEY(`mountId`) REFERENCES `webdav_mount`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`parentId`) REFERENCES `webdav_document`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mountId",
-            "columnName": "mountId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentId",
-            "columnName": "parentId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDirectory",
-            "columnName": "isDirectory",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mimeType",
-            "columnName": "mimeType",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "eTag",
-            "columnName": "eTag",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastModified",
-            "columnName": "lastModified",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "size",
-            "columnName": "size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayBind",
-            "columnName": "mayBind",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayUnbind",
-            "columnName": "mayUnbind",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayWriteContent",
-            "columnName": "mayWriteContent",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "quotaAvailable",
-            "columnName": "quotaAvailable",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "quotaUsed",
-            "columnName": "quotaUsed",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_webdav_document_mountId_parentId_name",
-            "unique": true,
-            "columnNames": [
-              "mountId",
-              "parentId",
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_webdav_document_mountId_parentId_name` ON `${TABLE_NAME}` (`mountId`, `parentId`, `name`)"
-          },
-          {
-            "name": "index_webdav_document_parentId",
-            "unique": false,
-            "columnNames": [
-              "parentId"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_webdav_document_parentId` ON `${TABLE_NAME}` (`parentId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "webdav_mount",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "mountId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "webdav_document",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "parentId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_mount",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ab1cb6057d8e050f6648bea46ae0943d')"
-    ]
-  }
-}

app/schemas/at.bitfire.davdroid.db.AppDatabase/16.json

@@ -1,675 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 16,
-    "identityHash": "2ff7560d957e03a78b4b7de88aa9593b",
-    "entities": [
-      {
-        "tableName": "service",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `accountName` TEXT NOT NULL, `type` TEXT NOT NULL, `principal` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accountName",
-            "columnName": "accountName",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "principal",
-            "columnName": "principal",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_service_accountName_type",
-            "unique": true,
-            "columnNames": [
-              "accountName",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_service_accountName_type` ON `${TABLE_NAME}` (`accountName`, `type`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "homeset",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `personal` INTEGER NOT NULL, `url` TEXT NOT NULL, `privBind` INTEGER NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "personal",
-            "columnName": "personal",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privBind",
-            "columnName": "privBind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_homeset_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_homeset_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "collection",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `homeSetId` INTEGER, `ownerId` INTEGER, `type` TEXT NOT NULL, `url` TEXT NOT NULL, `privWriteContent` INTEGER NOT NULL, `privUnbind` INTEGER NOT NULL, `forceReadOnly` INTEGER NOT NULL, `displayName` TEXT, `description` TEXT, `color` INTEGER, `timezoneId` TEXT, `supportsVEVENT` INTEGER, `supportsVTODO` INTEGER, `supportsVJOURNAL` INTEGER, `source` TEXT, `sync` INTEGER NOT NULL, `pushTopic` TEXT, `supportsWebPush` INTEGER NOT NULL DEFAULT 0, `pushSubscription` TEXT, `pushSubscriptionExpires` INTEGER, `pushSubscriptionCreated` INTEGER, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`homeSetId`) REFERENCES `homeset`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`ownerId`) REFERENCES `principal`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "homeSetId",
-            "columnName": "homeSetId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privWriteContent",
-            "columnName": "privWriteContent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privUnbind",
-            "columnName": "privUnbind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "forceReadOnly",
-            "columnName": "forceReadOnly",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timezoneId",
-            "columnName": "timezoneId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVEVENT",
-            "columnName": "supportsVEVENT",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVTODO",
-            "columnName": "supportsVTODO",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsVJOURNAL",
-            "columnName": "supportsVJOURNAL",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "source",
-            "columnName": "source",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "sync",
-            "columnName": "sync",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pushTopic",
-            "columnName": "pushTopic",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "supportsWebPush",
-            "columnName": "supportsWebPush",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "pushSubscription",
-            "columnName": "pushSubscription",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "pushSubscriptionExpires",
-            "columnName": "pushSubscriptionExpires",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "pushSubscriptionCreated",
-            "columnName": "pushSubscriptionCreated",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_collection_serviceId_type",
-            "unique": false,
-            "columnNames": [
-              "serviceId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_serviceId_type` ON `${TABLE_NAME}` (`serviceId`, `type`)"
-          },
-          {
-            "name": "index_collection_homeSetId_type",
-            "unique": false,
-            "columnNames": [
-              "homeSetId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_homeSetId_type` ON `${TABLE_NAME}` (`homeSetId`, `type`)"
-          },
-          {
-            "name": "index_collection_ownerId_type",
-            "unique": false,
-            "columnNames": [
-              "ownerId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_ownerId_type` ON `${TABLE_NAME}` (`ownerId`, `type`)"
-          },
-          {
-            "name": "index_collection_pushTopic_type",
-            "unique": false,
-            "columnNames": [
-              "pushTopic",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_pushTopic_type` ON `${TABLE_NAME}` (`pushTopic`, `type`)"
-          },
-          {
-            "name": "index_collection_url",
-            "unique": false,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "homeset",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "homeSetId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "principal",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "principal",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `url` TEXT NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_principal_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_principal_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "syncstats",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `collectionId` INTEGER NOT NULL, `authority` TEXT NOT NULL, `lastSync` INTEGER NOT NULL, FOREIGN KEY(`collectionId`) REFERENCES `collection`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "collectionId",
-            "columnName": "collectionId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authority",
-            "columnName": "authority",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lastSync",
-            "columnName": "lastSync",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_syncstats_collectionId_authority",
-            "unique": true,
-            "columnNames": [
-              "collectionId",
-              "authority"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_syncstats_collectionId_authority` ON `${TABLE_NAME}` (`collectionId`, `authority`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "collection",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "collectionId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_document",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `mountId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT NOT NULL, `isDirectory` INTEGER NOT NULL, `displayName` TEXT, `mimeType` TEXT, `eTag` TEXT, `lastModified` INTEGER, `size` INTEGER, `mayBind` INTEGER, `mayUnbind` INTEGER, `mayWriteContent` INTEGER, `quotaAvailable` INTEGER, `quotaUsed` INTEGER, FOREIGN KEY(`mountId`) REFERENCES `webdav_mount`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`parentId`) REFERENCES `webdav_document`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mountId",
-            "columnName": "mountId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentId",
-            "columnName": "parentId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDirectory",
-            "columnName": "isDirectory",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mimeType",
-            "columnName": "mimeType",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "eTag",
-            "columnName": "eTag",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastModified",
-            "columnName": "lastModified",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "size",
-            "columnName": "size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayBind",
-            "columnName": "mayBind",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayUnbind",
-            "columnName": "mayUnbind",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mayWriteContent",
-            "columnName": "mayWriteContent",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "quotaAvailable",
-            "columnName": "quotaAvailable",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "quotaUsed",
-            "columnName": "quotaUsed",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_webdav_document_mountId_parentId_name",
-            "unique": true,
-            "columnNames": [
-              "mountId",
-              "parentId",
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_webdav_document_mountId_parentId_name` ON `${TABLE_NAME}` (`mountId`, `parentId`, `name`)"
-          },
-          {
-            "name": "index_webdav_document_parentId",
-            "unique": false,
-            "columnNames": [
-              "parentId"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_webdav_document_parentId` ON `${TABLE_NAME}` (`parentId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "webdav_mount",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "mountId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "webdav_document",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "parentId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_mount",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '2ff7560d957e03a78b4b7de88aa9593b')"
-    ]
-  }
-}

app/schemas/at.bitfire.davdroid.db.AppDatabase/17.json

@@ -1,648 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 17,
-    "identityHash": "cd15d368408570cc2e57252816869de2",
-    "entities": [
-      {
-        "tableName": "service",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `accountName` TEXT NOT NULL, `type` TEXT NOT NULL, `principal` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accountName",
-            "columnName": "accountName",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "principal",
-            "columnName": "principal",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_service_accountName_type",
-            "unique": true,
-            "columnNames": [
-              "accountName",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_service_accountName_type` ON `${TABLE_NAME}` (`accountName`, `type`)"
-          }
-        ]
-      },
-      {
-        "tableName": "homeset",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `personal` INTEGER NOT NULL, `url` TEXT NOT NULL, `privBind` INTEGER NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "personal",
-            "columnName": "personal",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privBind",
-            "columnName": "privBind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_homeset_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_homeset_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "collection",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `homeSetId` INTEGER, `ownerId` INTEGER, `type` TEXT NOT NULL, `url` TEXT NOT NULL, `privWriteContent` INTEGER NOT NULL, `privUnbind` INTEGER NOT NULL, `forceReadOnly` INTEGER NOT NULL, `displayName` TEXT, `description` TEXT, `color` INTEGER, `timezoneId` TEXT, `supportsVEVENT` INTEGER, `supportsVTODO` INTEGER, `supportsVJOURNAL` INTEGER, `source` TEXT, `sync` INTEGER NOT NULL, `pushTopic` TEXT, `supportsWebPush` INTEGER NOT NULL DEFAULT 0, `pushVapidKey` TEXT, `pushSubscription` TEXT, `pushSubscriptionExpires` INTEGER, `pushSubscriptionCreated` INTEGER, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`homeSetId`) REFERENCES `homeset`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`ownerId`) REFERENCES `principal`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "homeSetId",
-            "columnName": "homeSetId",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privWriteContent",
-            "columnName": "privWriteContent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privUnbind",
-            "columnName": "privUnbind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "forceReadOnly",
-            "columnName": "forceReadOnly",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "timezoneId",
-            "columnName": "timezoneId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "supportsVEVENT",
-            "columnName": "supportsVEVENT",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "supportsVTODO",
-            "columnName": "supportsVTODO",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "supportsVJOURNAL",
-            "columnName": "supportsVJOURNAL",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "source",
-            "columnName": "source",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "sync",
-            "columnName": "sync",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pushTopic",
-            "columnName": "pushTopic",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "supportsWebPush",
-            "columnName": "supportsWebPush",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "pushVapidKey",
-            "columnName": "pushVapidKey",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "pushSubscription",
-            "columnName": "pushSubscription",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "pushSubscriptionExpires",
-            "columnName": "pushSubscriptionExpires",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "pushSubscriptionCreated",
-            "columnName": "pushSubscriptionCreated",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_collection_serviceId_type",
-            "unique": false,
-            "columnNames": [
-              "serviceId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_serviceId_type` ON `${TABLE_NAME}` (`serviceId`, `type`)"
-          },
-          {
-            "name": "index_collection_homeSetId_type",
-            "unique": false,
-            "columnNames": [
-              "homeSetId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_homeSetId_type` ON `${TABLE_NAME}` (`homeSetId`, `type`)"
-          },
-          {
-            "name": "index_collection_ownerId_type",
-            "unique": false,
-            "columnNames": [
-              "ownerId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_ownerId_type` ON `${TABLE_NAME}` (`ownerId`, `type`)"
-          },
-          {
-            "name": "index_collection_pushTopic_type",
-            "unique": false,
-            "columnNames": [
-              "pushTopic",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_pushTopic_type` ON `${TABLE_NAME}` (`pushTopic`, `type`)"
-          },
-          {
-            "name": "index_collection_url",
-            "unique": false,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "homeset",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "homeSetId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "principal",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "principal",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `url` TEXT NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_principal_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_principal_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "syncstats",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `collectionId` INTEGER NOT NULL, `authority` TEXT NOT NULL, `lastSync` INTEGER NOT NULL, FOREIGN KEY(`collectionId`) REFERENCES `collection`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "collectionId",
-            "columnName": "collectionId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authority",
-            "columnName": "authority",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lastSync",
-            "columnName": "lastSync",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_syncstats_collectionId_authority",
-            "unique": true,
-            "columnNames": [
-              "collectionId",
-              "authority"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_syncstats_collectionId_authority` ON `${TABLE_NAME}` (`collectionId`, `authority`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "collection",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "collectionId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_document",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `mountId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT NOT NULL, `isDirectory` INTEGER NOT NULL, `displayName` TEXT, `mimeType` TEXT, `eTag` TEXT, `lastModified` INTEGER, `size` INTEGER, `mayBind` INTEGER, `mayUnbind` INTEGER, `mayWriteContent` INTEGER, `quotaAvailable` INTEGER, `quotaUsed` INTEGER, FOREIGN KEY(`mountId`) REFERENCES `webdav_mount`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`parentId`) REFERENCES `webdav_document`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mountId",
-            "columnName": "mountId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentId",
-            "columnName": "parentId",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDirectory",
-            "columnName": "isDirectory",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "mimeType",
-            "columnName": "mimeType",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "eTag",
-            "columnName": "eTag",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "lastModified",
-            "columnName": "lastModified",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "size",
-            "columnName": "size",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "mayBind",
-            "columnName": "mayBind",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "mayUnbind",
-            "columnName": "mayUnbind",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "mayWriteContent",
-            "columnName": "mayWriteContent",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "quotaAvailable",
-            "columnName": "quotaAvailable",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "quotaUsed",
-            "columnName": "quotaUsed",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_webdav_document_mountId_parentId_name",
-            "unique": true,
-            "columnNames": [
-              "mountId",
-              "parentId",
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_webdav_document_mountId_parentId_name` ON `${TABLE_NAME}` (`mountId`, `parentId`, `name`)"
-          },
-          {
-            "name": "index_webdav_document_parentId",
-            "unique": false,
-            "columnNames": [
-              "parentId"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_webdav_document_parentId` ON `${TABLE_NAME}` (`parentId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "webdav_mount",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "mountId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "webdav_document",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "parentId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_mount",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        }
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'cd15d368408570cc2e57252816869de2')"
-    ]
-  }
-}

app/schemas/at.bitfire.davdroid.db.AppDatabase/18.json

@@ -1,648 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 18,
-    "identityHash": "6a0f7e1553e1f621ae7913ea14370fd0",
-    "entities": [
-      {
-        "tableName": "service",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `accountName` TEXT NOT NULL, `type` TEXT NOT NULL, `principal` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accountName",
-            "columnName": "accountName",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "principal",
-            "columnName": "principal",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_service_accountName_type",
-            "unique": true,
-            "columnNames": [
-              "accountName",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_service_accountName_type` ON `${TABLE_NAME}` (`accountName`, `type`)"
-          }
-        ]
-      },
-      {
-        "tableName": "homeset",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `personal` INTEGER NOT NULL, `url` TEXT NOT NULL, `privBind` INTEGER NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "personal",
-            "columnName": "personal",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privBind",
-            "columnName": "privBind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_homeset_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_homeset_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "collection",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `homeSetId` INTEGER, `ownerId` INTEGER, `type` TEXT NOT NULL, `url` TEXT NOT NULL, `privWriteContent` INTEGER NOT NULL, `privUnbind` INTEGER NOT NULL, `forceReadOnly` INTEGER NOT NULL, `displayName` TEXT, `description` TEXT, `color` INTEGER, `timezoneId` TEXT, `supportsVEVENT` INTEGER, `supportsVTODO` INTEGER, `supportsVJOURNAL` INTEGER, `source` TEXT, `sync` INTEGER NOT NULL, `pushTopic` TEXT, `supportsWebPush` INTEGER NOT NULL DEFAULT 0, `pushVapidKey` TEXT, `pushSubscription` TEXT, `pushSubscriptionExpires` INTEGER, `pushSubscriptionCreated` INTEGER, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`homeSetId`) REFERENCES `homeset`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`ownerId`) REFERENCES `principal`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "homeSetId",
-            "columnName": "homeSetId",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privWriteContent",
-            "columnName": "privWriteContent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "privUnbind",
-            "columnName": "privUnbind",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "forceReadOnly",
-            "columnName": "forceReadOnly",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "timezoneId",
-            "columnName": "timezoneId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "supportsVEVENT",
-            "columnName": "supportsVEVENT",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "supportsVTODO",
-            "columnName": "supportsVTODO",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "supportsVJOURNAL",
-            "columnName": "supportsVJOURNAL",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "source",
-            "columnName": "source",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "sync",
-            "columnName": "sync",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pushTopic",
-            "columnName": "pushTopic",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "supportsWebPush",
-            "columnName": "supportsWebPush",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "pushVapidKey",
-            "columnName": "pushVapidKey",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "pushSubscription",
-            "columnName": "pushSubscription",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "pushSubscriptionExpires",
-            "columnName": "pushSubscriptionExpires",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "pushSubscriptionCreated",
-            "columnName": "pushSubscriptionCreated",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_collection_serviceId_type",
-            "unique": false,
-            "columnNames": [
-              "serviceId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_serviceId_type` ON `${TABLE_NAME}` (`serviceId`, `type`)"
-          },
-          {
-            "name": "index_collection_homeSetId_type",
-            "unique": false,
-            "columnNames": [
-              "homeSetId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_homeSetId_type` ON `${TABLE_NAME}` (`homeSetId`, `type`)"
-          },
-          {
-            "name": "index_collection_ownerId_type",
-            "unique": false,
-            "columnNames": [
-              "ownerId",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_ownerId_type` ON `${TABLE_NAME}` (`ownerId`, `type`)"
-          },
-          {
-            "name": "index_collection_pushTopic_type",
-            "unique": false,
-            "columnNames": [
-              "pushTopic",
-              "type"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_pushTopic_type` ON `${TABLE_NAME}` (`pushTopic`, `type`)"
-          },
-          {
-            "name": "index_collection_url",
-            "unique": false,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_collection_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "homeset",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "homeSetId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "principal",
-            "onDelete": "SET NULL",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "principal",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `serviceId` INTEGER NOT NULL, `url` TEXT NOT NULL, `displayName` TEXT, FOREIGN KEY(`serviceId`) REFERENCES `service`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "serviceId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_principal_serviceId_url",
-            "unique": true,
-            "columnNames": [
-              "serviceId",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_principal_serviceId_url` ON `${TABLE_NAME}` (`serviceId`, `url`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "service",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serviceId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "syncstats",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `collectionId` INTEGER NOT NULL, `dataType` TEXT NOT NULL, `lastSync` INTEGER NOT NULL, FOREIGN KEY(`collectionId`) REFERENCES `collection`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "collectionId",
-            "columnName": "collectionId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataType",
-            "columnName": "dataType",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lastSync",
-            "columnName": "lastSync",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_syncstats_collectionId_dataType",
-            "unique": true,
-            "columnNames": [
-              "collectionId",
-              "dataType"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_syncstats_collectionId_dataType` ON `${TABLE_NAME}` (`collectionId`, `dataType`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "collection",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "collectionId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_document",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `mountId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT NOT NULL, `isDirectory` INTEGER NOT NULL, `displayName` TEXT, `mimeType` TEXT, `eTag` TEXT, `lastModified` INTEGER, `size` INTEGER, `mayBind` INTEGER, `mayUnbind` INTEGER, `mayWriteContent` INTEGER, `quotaAvailable` INTEGER, `quotaUsed` INTEGER, FOREIGN KEY(`mountId`) REFERENCES `webdav_mount`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`parentId`) REFERENCES `webdav_document`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mountId",
-            "columnName": "mountId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentId",
-            "columnName": "parentId",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDirectory",
-            "columnName": "isDirectory",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "displayName",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "mimeType",
-            "columnName": "mimeType",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "eTag",
-            "columnName": "eTag",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "lastModified",
-            "columnName": "lastModified",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "size",
-            "columnName": "size",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "mayBind",
-            "columnName": "mayBind",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "mayUnbind",
-            "columnName": "mayUnbind",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "mayWriteContent",
-            "columnName": "mayWriteContent",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "quotaAvailable",
-            "columnName": "quotaAvailable",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "quotaUsed",
-            "columnName": "quotaUsed",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_webdav_document_mountId_parentId_name",
-            "unique": true,
-            "columnNames": [
-              "mountId",
-              "parentId",
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_webdav_document_mountId_parentId_name` ON `${TABLE_NAME}` (`mountId`, `parentId`, `name`)"
-          },
-          {
-            "name": "index_webdav_document_parentId",
-            "unique": false,
-            "columnNames": [
-              "parentId"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_webdav_document_parentId` ON `${TABLE_NAME}` (`parentId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "webdav_mount",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "mountId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "webdav_document",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "parentId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "webdav_mount",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        }
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '6a0f7e1553e1f621ae7913ea14370fd0')"
-    ]
-  }
-}

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

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

app/schemas/at.bitfire.davdroid.db.AppDatabase/9.json

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

app/src/androidTest/AndroidManifest.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:installLocation="internalOnly">
-
-    <!-- account management permissions not required for own accounts since API level 22 -->
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" android:maxSdkVersion="22"/>
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" android:maxSdkVersion="22"/>
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" android:maxSdkVersion="22"/>
-
-    <!--
-    Since Mockk 1.14.7 it's required to use minSdk 26. We use 24, so override for tests.
-    -->
-    <uses-sdk tools:overrideLibrary="io.mockk.android,io.mockk.proxy.android" />
-
-</manifest>

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

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

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

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

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

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

app/src/androidTest/java/at/bitfire/davdroid/settings/DefaultsSettingsProviderTest.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.settings
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Test
+
+class DefaultsSettingsProviderTest {
+
+    private val provider: SettingsProvider = DefaultsProvider()
+
+    @Test
+    fun testHas() {
+        assertEquals(Pair(false, true), provider.has("notExisting"))
+        assertEquals(Pair(true, true), provider.has(Settings.OVERRIDE_PROXY))
+    }
+
+    @Test
+    fun testGet() {
+        assertEquals(Pair("localhost", true), provider.getString(Settings.OVERRIDE_PROXY_HOST))
+        assertEquals(Pair(8118, true), provider.getInt(Settings.OVERRIDE_PROXY_PORT))
+    }
+
+    @Test
+    fun testPutRemove() {
+        assertEquals(Pair(false, true), provider.isWritable(Settings.OVERRIDE_PROXY))
+        assertFalse(provider.putBoolean(Settings.OVERRIDE_PROXY, true))
+        assertFalse(provider.remove(Settings.OVERRIDE_PROXY))
+    }
+
+}

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

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

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

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

app/src/androidTest/java/at/bitfire/davdroid/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 androidx.test.filters.SmallTest
+import androidx.test.platform.app.InstrumentationRegistry
+import at.bitfire.dav4jvm.DavResource
+import at.bitfire.dav4jvm.property.AddressbookHomeSet
+import at.bitfire.dav4jvm.property.ResourceType
+import at.bitfire.davdroid.HttpClient
+import at.bitfire.davdroid.log.Logger
+import at.bitfire.davdroid.model.Credentials
+import at.bitfire.davdroid.ui.setup.DavResourceFinder.Configuration.ServiceInfo
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.RecordedRequest
 import org.junit.After
-import org.junit.Assert.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,53 +40,41 @@ 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 loginModel: LoginModel
 
     @Before
-    fun setUp() {
-        hiltRule.inject()
+    fun initServerAndClient() {
+        server.dispatcher = TestDispatcher()
+        server.start()
 
-        server = MockWebServer().apply {
-            dispatcher = TestDispatcher(logger)
-            start()
-        }
+        loginModel = LoginModel()
+        loginModel.baseURI = URI.create("/")
+        loginModel.credentials = Credentials("mock", "12345")
 
-        val credentials = Credentials(username = "mock", password = "12345".toSensitiveString())
-        client = httpClientBuilder
-                .authenticate(domain = null, getCredentials = { credentials })
+        finder = DavResourceFinder(InstrumentationRegistry.getInstrumentation().targetContext, loginModel)
+        client = HttpClient.Builder()
+                .addAuthentication(null, loginModel.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) { response, _ ->
+            finder.scanCardDavResponse(response, info)
         }
         assertEquals(0, info.collections.size)
         assertEquals(1, info.homeSets.size)
@@ -99,9 +82,9 @@ class DavResourceFinderTest {
 
         // 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) { response, _ ->
+            finder.scanCardDavResponse(response, info)
         }
         assertEquals(1, info.collections.size)
         assertEquals(server.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"), info.collections.keys.first())
@@ -141,22 +124,10 @@ 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)) {
@@ -196,19 +167,12 @@ 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>" +
                                 "   <propstat><prop>$props</prop></propstat>" +

app/src/androidTest/kotlin/at/bitfire/davdroid/ExternalLibrariesTest.kt

@@ -1,30 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid
-
-import android.util.Xml
-import at.bitfire.dav4jvm.XmlUtils
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-class ExternalLibrariesTest {
-
-    @Test
-    fun test_Dav4jvm_XmlUtils_NewPullParser_RelaxedParsing() {
-        val parser = XmlUtils.newPullParser()
-        assertTrue(parser.getFeature(Xml.FEATURE_RELAXED))
-    }
-
-    @Test
-    fun testOkhttpHttpUrl_PublicSuffixList() {
-        // HttpUrl.topPrivateDomain() requires okhttp's internal PublicSuffixList.
-        // In Android, loading the PublicSuffixList is done over AndroidX startup.
-        // This test verifies that everything is working.
-        assertEquals("example.com", "http://example.com".toHttpUrl().topPrivateDomain())
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/HiltTestRunner.kt

@@ -1,42 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid
-
-import android.app.Application
-import android.content.Context
-import android.os.Build
-import android.os.Bundle
-import androidx.test.runner.AndroidJUnitRunner
-import at.bitfire.davdroid.di.TestCoroutineDispatchersModule
-import at.bitfire.davdroid.test.BuildConfig
-import at.bitfire.synctools.log.LogcatHandler
-import dagger.hilt.android.testing.HiltTestApplication
-import java.util.logging.Level
-import java.util.logging.Logger
-
-@Suppress("unused")
-class HiltTestRunner : AndroidJUnitRunner() {
-
-    override fun newApplication(cl: ClassLoader, name: String, context: Context): Application =
-        super.newApplication(cl, HiltTestApplication::class.java.name, context)
-
-    override fun onCreate(arguments: Bundle?) {
-        super.onCreate(arguments)
-
-        // set root logger to adb Logcat
-        val rootLogger = Logger.getLogger("")
-        rootLogger.level = Level.ALL
-        rootLogger.handlers.forEach { rootLogger.removeHandler(it) }
-        rootLogger.addHandler(LogcatHandler(BuildConfig.APPLICATION_ID))
-
-        // MockK requirements
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P)
-            throw AssertionError("MockK requires Android P [https://mockk.io/ANDROID.html]")
-
-        // set main dispatcher for tests (especially runTest)
-        TestCoroutineDispatchersModule.initMainDispatcher()
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/TestUtils.kt

@@ -1,58 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid
-
-import android.content.Context
-import android.util.Log
-import androidx.work.Configuration
-import androidx.work.WorkInfo
-import androidx.work.WorkManager
-import androidx.work.WorkQuery
-import androidx.work.WorkerFactory
-import androidx.work.testing.WorkManagerTestInitHelper
-import org.junit.Assert.assertTrue
-import kotlin.math.abs
-
-object TestUtils {
-
-    fun assertWithin(expected: Long, actual: Long, tolerance: Long) {
-        val absDifference = abs(expected - actual)
-        assertTrue(
-            "$actual not within ($expected ± $tolerance)",
-            absDifference <= tolerance
-        )
-    }
-
-    /**
-     * Initializes WorkManager for instrumentation tests.
-     */
-    fun setUpWorkManager(context: Context, workerFactory: WorkerFactory? = null) {
-        val config = Configuration.Builder().setMinimumLoggingLevel(Log.DEBUG)
-        if (workerFactory != null)
-            config.setWorkerFactory(workerFactory)
-        WorkManagerTestInitHelper.initializeTestWorkManager(context, config.build())
-    }
-
-    fun workInStates(context: Context, workerName: String, states: List<WorkInfo.State>): Boolean =
-        WorkManager.getInstance(context).getWorkInfos(WorkQuery.Builder
-            .fromUniqueWorkNames(listOf(workerName))
-            .addStates(states)
-            .build()
-        ).get().isNotEmpty()
-
-    fun workScheduledOrRunning(context: Context, workerName: String): Boolean =
-        workInStates(context, workerName, listOf(
-            WorkInfo.State.ENQUEUED,
-            WorkInfo.State.RUNNING
-        ))
-
-    fun workScheduledOrRunningOrSuccessful(context: Context, workerName: String): Boolean =
-        workInStates(context, workerName, listOf(
-            WorkInfo.State.ENQUEUED,
-            WorkInfo.State.RUNNING,
-            WorkInfo.State.SUCCEEDED
-        ))
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/db/AppDatabaseTest.kt

@@ -1,79 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.db
-
-import android.content.Context
-import androidx.room.Room
-import androidx.room.migration.AutoMigrationSpec
-import androidx.room.migration.Migration
-import androidx.room.testing.MigrationTestHelper
-import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
-import androidx.test.platform.app.InstrumentationRegistry
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import java.util.logging.Logger
-import javax.inject.Inject
-
-@HiltAndroidTest
-class AppDatabaseTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var autoMigrations: Set<@JvmSuppressWildcards AutoMigrationSpec>
-
-    @Inject
-    lateinit var logger: Logger
-
-    @Inject
-    lateinit var manualMigrations: Set<@JvmSuppressWildcards Migration>
-
-    @Before
-    fun setup() {
-        hiltRule.inject()
-    }
-
-
-    /**
-     * Creates a database with schema version 8 (the first exported one) and then migrates it to the latest version.
-     */
-    @Test
-    fun testAllMigrations() {
-        // Create DB with v8
-        MigrationTestHelper(
-            InstrumentationRegistry.getInstrumentation(),
-            AppDatabase::class.java,
-            listOf(), // no auto migrations until v8
-            FrameworkSQLiteOpenHelperFactory()
-        ).createDatabase(TEST_DB, 8).close()
-
-        // open and migrate (to current version) database
-        Room.databaseBuilder(context, AppDatabase::class.java, TEST_DB)
-            // manual migrations
-            .addMigrations(*manualMigrations.toTypedArray())
-            // auto-migrations that need to be specified explicitly
-            .apply {
-                for (spec in autoMigrations)
-                    addAutoMigrationSpec(spec)
-            }
-            .build()
-            .openHelper.writableDatabase    // this will run all migrations
-            .close()
-    }
-
-
-    companion object {
-        const val TEST_DB = "test"
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/db/CollectionTest.kt

@@ -1,199 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.db
-
-import androidx.test.filters.SmallTest
-import at.bitfire.dav4jvm.okhttp.DavResource
-import at.bitfire.dav4jvm.property.webdav.WebDAV
-import at.bitfire.davdroid.network.HttpClientBuilder
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class CollectionTest {
-
-    @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    private lateinit var httpClient: OkHttpClient
-    private val server = MockWebServer()
-
-    @Before
-    fun setup() {
-        hiltRule.inject()
-
-        httpClient = httpClientBuilder.build()
-    }
-
-
-    @Test
-    @SmallTest
-    fun testFromDavResponseAddressBook() {
-        // r/w address book
-        server.enqueue(MockResponse()
-                .setResponseCode(207)
-                .setBody("<multistatus xmlns='DAV:' xmlns:CARD='urn:ietf:params:xml:ns:carddav'>" +
-                        "<response>" +
-                        "   <href>/</href>" +
-                        "   <propstat><prop>" +
-                        "       <resourcetype><collection/><CARD:addressbook/></resourcetype>" +
-                        "       <displayname>My Contacts</displayname>" +
-                        "       <CARD:addressbook-description>My Contacts Description</CARD:addressbook-description>" +
-                        "   </prop></propstat>" +
-                        "</response>" +
-                        "</multistatus>"))
-
-        lateinit var info: Collection
-        DavResource(httpClient, server.url("/"))
-                .propfind(0, WebDAV.ResourceType) { response, _ ->
-            info = Collection.fromDavResponse(response) ?: throw IllegalArgumentException()
-        }
-        assertEquals(Collection.TYPE_ADDRESSBOOK, info.type)
-        assertTrue(info.privWriteContent)
-        assertTrue(info.privUnbind)
-        assertNull(info.supportsVEVENT)
-        assertNull(info.supportsVTODO)
-        assertNull(info.supportsVJOURNAL)
-        assertEquals("My Contacts", info.displayName)
-        assertEquals("My Contacts Description", info.description)
-    }
-
-    @Test
-    @SmallTest
-    fun testFromDavResponseCalendar_FullTimezone() {
-        // 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>BEGIN:VCALENDAR\n" +
-                    "PRODID:-//Example Corp.//CalDAV Client//EN\n" +
-                    "VERSION:2.0\n" +
-                    "BEGIN:VTIMEZONE\n" +
-                    "TZID:US-Eastern\n" +
-                    "LAST-MODIFIED:19870101T000000Z\n" +
-                    "BEGIN:STANDARD\n" +
-                    "DTSTART:19671029T020000\n" +
-                    "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10\n" +
-                    "TZOFFSETFROM:-0400\n" +
-                    "TZOFFSETTO:-0500\n" +
-                    "TZNAME:Eastern Standard Time (US & Canada)\n" +
-                    "END:STANDARD\n" +
-                    "BEGIN:DAYLIGHT\n" +
-                    "DTSTART:19870405T020000\n" +
-                    "RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4\n" +
-                    "TZOFFSETFROM:-0500\n" +
-                    "TZOFFSETTO:-0400\n" +
-                    "TZNAME:Eastern Daylight Time (US & Canada)\n" +
-                    "END:DAYLIGHT\n" +
-                    "END:VTIMEZONE\n" +
-                    "END:VCALENDAR\n" +
-                    "</CAL:calendar-timezone>" +
-                    "       <ICAL:calendar-color>#ff0000</ICAL:calendar-color>" +
-                    "   </prop></propstat>" +
-                    "</response>" +
-                    "</multistatus>"))
-
-        lateinit var info: Collection
-        DavResource(httpClient, server.url("/"))
-            .propfind(0, WebDAV.ResourceType) { response, _ ->
-                info = Collection.fromDavResponse(response)!!
-            }
-        assertEquals(Collection.TYPE_CALENDAR, info.type)
-        assertFalse(info.privWriteContent)
-        assertFalse(info.privUnbind)
-        assertNull(info.displayName)
-        assertEquals("My Calendar", info.description)
-        assertEquals(0xFFFF0000.toInt(), info.color)
-        assertEquals("US-Eastern", info.timezoneId)
-        assertTrue(info.supportsVEVENT!!)
-        assertTrue(info.supportsVTODO!!)
-        assertTrue(info.supportsVJOURNAL!!)
-    }
-
-    @Test
-    @SmallTest
-    fun testFromDavResponseCalendar_OnlyTzId() {
-        // 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-id>US-Eastern</CAL:calendar-timezone-id>" +
-                    "       <ICAL:calendar-color>#ff0000</ICAL:calendar-color>" +
-                    "   </prop></propstat>" +
-                    "</response>" +
-                    "</multistatus>"))
-
-        lateinit var info: Collection
-        DavResource(httpClient, server.url("/"))
-            .propfind(0, WebDAV.ResourceType) { response, _ ->
-                info = Collection.fromDavResponse(response)!!
-            }
-        assertEquals(Collection.TYPE_CALENDAR, info.type)
-        assertFalse(info.privWriteContent)
-        assertFalse(info.privUnbind)
-        assertNull(info.displayName)
-        assertEquals("My Calendar", info.description)
-        assertEquals(0xFFFF0000.toInt(), info.color)
-        assertEquals("US-Eastern", info.timezoneId)
-        assertTrue(info.supportsVEVENT!!)
-        assertTrue(info.supportsVTODO!!)
-        assertTrue(info.supportsVJOURNAL!!)
-    }
-
-    @Test
-    @SmallTest
-    fun testFromDavResponseWebcal() {
-        // Webcal subscription
-        server.enqueue(MockResponse()
-                .setResponseCode(207)
-                .setBody("<multistatus xmlns='DAV:' xmlns:CS='http://calendarserver.org/ns/'>" +
-                        "<response>" +
-                        "   <href>/webcal1</href>" +
-                        "   <propstat><prop>" +
-                        "       <displayname>Sample Subscription</displayname>" +
-                        "       <resourcetype><collection/><CS:subscribed/></resourcetype>" +
-                        "       <CS:source><href>webcals://example.com/1.ics</href></CS:source>" +
-                        "   </prop></propstat>" +
-                        "</response>" +
-                        "</multistatus>"))
-
-        lateinit var info: Collection
-        DavResource(httpClient, server.url("/"))
-                .propfind(0, WebDAV.ResourceType) { response, _ ->
-                    info = Collection.fromDavResponse(response) ?: throw IllegalArgumentException()
-                }
-        assertEquals(Collection.TYPE_WEBCAL, info.type)
-        assertEquals("Sample Subscription", info.displayName)
-        assertEquals("https://example.com/1.ics".toHttpUrl(), info.source)
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/db/HomeSetDaoTest.kt

@@ -1,97 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.db
-
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class HomeSetDaoTest {
-
-    @get:Rule
-    var hiltRule = HiltAndroidRule(this)
-
-    @Inject
-    lateinit var db: AppDatabase
-    lateinit var dao: HomeSetDao
-    var serviceId: Long = 0
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-        dao = db.homeSetDao()
-
-        serviceId = db.serviceDao().insertOrReplace(
-            Service(id=0, accountName="test", type= Service.TYPE_CALDAV, principal = null)
-        )
-    }
-
-    @After
-    fun tearDown() {
-        db.serviceDao().deleteAll()
-    }
-
-
-    @Test
-    fun testInsertOrUpdate() {
-        // should insert new row or update (upsert) existing row - without changing its key!
-        val entry1 = HomeSet(id=0, serviceId=serviceId, personal=true, url="https://example.com/1".toHttpUrl())
-        val insertId1 = dao.insertOrUpdateByUrlBlocking(entry1)
-        assertEquals(1L, insertId1)
-        assertEquals(entry1.copy(id = 1L), dao.getById(1))
-
-        val updatedEntry1 = HomeSet(id=0, serviceId=serviceId, personal=true, url="https://example.com/1".toHttpUrl(), displayName="Updated Entry")
-        val updateId1 = dao.insertOrUpdateByUrlBlocking(updatedEntry1)
-        assertEquals(1L, updateId1)
-        assertEquals(updatedEntry1.copy(id = 1L), dao.getById(1))
-
-        val entry2 = HomeSet(id=0, serviceId=serviceId, personal=true, url= "https://example.com/2".toHttpUrl())
-        val insertId2 = dao.insertOrUpdateByUrlBlocking(entry2)
-        assertEquals(2L, insertId2)
-        assertEquals(entry2.copy(id = 2L), dao.getById(2))
-    }
-
-    @Test
-    fun testInsertOrUpdate_TransactionSafe() {
-        runBlocking(Dispatchers.IO) {
-            for (i in 0..9999)
-                launch {
-                    dao.insertOrUpdateByUrlBlocking(
-                        HomeSet(
-                            id = 0,
-                            serviceId = serviceId,
-                            url = "https://example.com/".toHttpUrl(),
-                            personal = true
-                        )
-                    )
-                }
-        }
-        assertEquals(1, dao.getByService(serviceId).size)
-    }
-
-    @Test
-    fun testDelete() {
-        // should delete row with given primary key (id)
-        val entry1 = HomeSet(id=1, serviceId=serviceId, personal=true, url= "https://example.com/1".toHttpUrl())
-
-        val insertId1 = dao.insertOrUpdateByUrlBlocking(entry1)
-        assertEquals(1L, insertId1)
-        assertEquals(entry1, dao.getById(1L))
-
-        dao.delete(entry1)
-        assertEquals(null, dao.getById(1L))
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/db/MemoryDbModule.kt

@@ -1,41 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.db
-
-import android.content.Context
-import androidx.room.Room
-import androidx.room.migration.AutoMigrationSpec
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import dagger.hilt.testing.TestInstallIn
-import javax.inject.Singleton
-
-@Module
-@TestInstallIn(
-    components = [ SingletonComponent::class ],
-    replaces = [
-        AppDatabase.AppDatabaseModule::class
-    ]
-)
-class MemoryDbModule {
-
-    @Provides
-    @Singleton
-    fun inMemoryDatabase(
-        autoMigrations: Set<@JvmSuppressWildcards AutoMigrationSpec>,
-        @ApplicationContext context: Context
-    ): AppDatabase =
-        Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
-            // auto-migration specs that need to be specified explicitly
-            .apply {
-                for (spec in autoMigrations) {
-                    addAutoMigrationSpec(spec)
-                }
-            }
-            .build()
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/db/PrincipalDaoTest.kt

@@ -1,96 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.db
-
-import android.database.sqlite.SQLiteConstraintException
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.junit4.MockKRule
-import io.mockk.spyk
-import io.mockk.verify
-import kotlinx.coroutines.test.runTest
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-
-@HiltAndroidTest
-class PrincipalDaoTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val mockKRule = MockKRule(this)
-
-    @Inject
-    lateinit var db: AppDatabase
-
-    private lateinit var principalDao: PrincipalDao
-    private lateinit var service: Service
-    private val url = "https://example.com/dav/principal".toHttpUrl()
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-        principalDao = spyk(db.principalDao())
-
-        service = Service(id = 1, accountName = "account", type = "webdav")
-        db.serviceDao().insertOrReplace(service)
-    }
-
-    @Test
-    fun insertOrUpdate_insertsIfNotExisting() = runTest {
-        val principal = Principal(serviceId = service.id, url = url, displayName = "principal")
-        val id = principalDao.insertOrUpdate(service.id, principal)
-        assertTrue(id > 0)
-
-        val stored = principalDao.get(id)
-        assertEquals("principal", stored.displayName)
-        verify(exactly = 0) { principalDao.update(any()) }
-    }
-
-    @Test
-    fun insertOrUpdate_doesNotUpdateIfDisplayNameIsEqual() = runTest {
-        val principalOld = Principal(serviceId = service.id, url = url, displayName = "principalOld")
-        val idOld = principalDao.insertOrUpdate(service.id, principalOld)
-
-        val principalNew = Principal(serviceId = service.id, url = url, displayName = "principalOld")
-        val idNew = principalDao.insertOrUpdate(service.id, principalNew)
-
-        assertEquals(idOld, idNew)
-        val stored = principalDao.get(idOld)
-        assertEquals("principalOld", stored.displayName)
-        verify(exactly = 0) { principalDao.update(any()) }
-    }
-
-    @Test
-    fun insertOrUpdate_updatesIfDisplayNameIsDifferent() = runTest {
-        val principalOld = Principal(serviceId = service.id, url = url, displayName = "principalOld")
-        val idOld = principalDao.insertOrUpdate(service.id, principalOld)
-
-        val principalNew = Principal(serviceId = service.id, url = url, displayName = "principalNew")
-        val idNew = principalDao.insertOrUpdate(service.id, principalNew)
-
-        assertEquals(idOld, idNew)
-
-        val updated = principalDao.get(idOld)
-        assertEquals("principalNew", updated.displayName)
-        verify(exactly = 1) { principalDao.update(any()) }
-    }
-
-    @Test(expected = SQLiteConstraintException::class)
-    fun insertOrUpdate_throwsForeignKeyConstraintViolationException() = runTest {
-        // throws on non-existing service
-        val url = "https://example.com/dav/principal".toHttpUrl()
-        val principal1 = Principal(serviceId = 999, url = url, displayName = "p1")
-        principalDao.insertOrUpdate(999, principal1)
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/db/SyncStatsDaoTest.kt

@@ -1,77 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.db
-
-import androidx.sqlite.SQLiteException
-import at.bitfire.davdroid.sync.SyncDataType
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import kotlinx.coroutines.test.runTest
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.junit.After
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class SyncStatsDaoTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @Inject
-    lateinit var db: AppDatabase
-    var collectionId: Long = 0
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        val serviceId = db.serviceDao().insertOrReplace(Service(
-            id = 0,
-            accountName = "test@example.com",
-            type = Service.TYPE_CALDAV
-        ))
-        collectionId = db.collectionDao().insert(Collection(
-            id = 0,
-            serviceId = serviceId,
-            type = Collection.TYPE_CALENDAR,
-            url = "https://example.com".toHttpUrl()
-        ))
-    }
-
-    @After
-    fun tearDown() {
-        db.serviceDao().deleteAll()
-    }
-
-    @Test
-    fun testInsertOrReplace_ExistingForeignKey() = runTest {
-        val dao = db.syncStatsDao()
-        dao.insertOrReplace(
-            SyncStats(
-                id = 0,
-                collectionId = collectionId,
-                dataType = SyncDataType.CONTACTS.toString(),
-                lastSync = System.currentTimeMillis()
-            )
-        )
-    }
-
-    @Test(expected = SQLiteException::class)
-    fun testInsertOrReplace_MissingForeignKey() = runTest {
-        val dao = db.syncStatsDao()
-        dao.insertOrReplace(
-            SyncStats(
-                id = 0,
-                collectionId = 12345,
-                dataType = SyncDataType.CONTACTS.toString(),
-                lastSync = System.currentTimeMillis()
-            )
-        )
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/db/WebDavDocumentDaoTest.kt

@@ -1,80 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.db
-
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import kotlinx.coroutines.test.runTest
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import java.util.logging.Level
-import java.util.logging.Logger
-import javax.inject.Inject
-
-@HiltAndroidTest
-class WebDavDocumentDaoTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @Inject
-    lateinit var db: AppDatabase
-
-    @Inject
-    lateinit var logger: Logger
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-    }
-
-
-    @Test
-    fun testGetChildren() = runTest {
-        val mountDao = db.webDavMountDao()
-        val dao = db.webDavDocumentDao()
-
-        val mount = WebDavMount(id = 1, name = "Test", url = "https://example.com/".toHttpUrl())
-        db.webDavMountDao().insert(mount)
-
-        val root = WebDavDocument(
-            id = 1,
-            mountId = mount.id,
-            parentId = null,
-            name = "Root Document"
-        )
-        dao.insertOrReplace(root)
-        dao.insertOrReplace(WebDavDocument(id = 0, mountId = mount.id, parentId = root.id, name = "Name 1", displayName = "DisplayName 2"))
-        dao.insertOrReplace(WebDavDocument(id = 0, mountId = mount.id, parentId = root.id, name = "Name 2", displayName = "DisplayName 1"))
-        dao.insertOrReplace(WebDavDocument(id = 0, mountId = mount.id, parentId = root.id, name = "Name 3", displayName = "Directory 1", isDirectory = true))
-        try {
-            dao.getChildren(root.id, orderBy = "name DESC").let { result ->
-                logger.log(Level.INFO, "getChildren single sort Result", result)
-
-                assertEquals(listOf(
-                    "Name 3",
-                    "Name 2",
-                    "Name 1"
-                ), result.map { it.name })
-            }
-
-            dao.getChildren(root.id, orderBy = "isDirectory DESC, name ASC").let { result ->
-                logger.log(Level.INFO, "getChildren multiple sort Result", result)
-
-                assertEquals(listOf(
-                    "Name 3",
-                    "Name 1",
-                    "Name 2"
-                ), result.map { it.name })
-            }
-        } finally {
-            mountDao.deleteAsync(mount)
-        }
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/db/migration/AutoMigration16Test.kt

@@ -1,83 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.db.migration
-
-import at.bitfire.davdroid.db.Collection.Companion.TYPE_CALENDAR
-import at.bitfire.davdroid.db.Service
-import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Test
-
-@HiltAndroidTest
-class AutoMigration16Test: DatabaseMigrationTest(toVersion = 16) {
-
-    @Test
-    fun testMigrate_WithTimeZone() = testMigration(
-        prepare = { db ->
-            val minimalVTimezone = """
-                BEGIN:VCALENDAR
-                VERSION:2.0
-                PRODID:DAVx5
-                BEGIN:VTIMEZONE
-                TZID:America/New_York
-                END:VTIMEZONE
-                END:VCALENDAR
-            """.trimIndent()
-            db.execSQL(
-                "INSERT INTO service (id, accountName, type) VALUES (?, ?, ?)",
-                arrayOf(1, "test", Service.Companion.TYPE_CALDAV)
-            )
-            db.execSQL(
-                "INSERT INTO collection (id, serviceId, type, url, privWriteContent, privUnbind, forceReadOnly, sync, timezone) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
-                arrayOf(1, 1, TYPE_CALENDAR, "https://example.com", true, true, false, false, minimalVTimezone)
-            )
-        }
-    ) { db ->
-        db.query("SELECT timezoneId FROM collection WHERE id=1").use { cursor ->
-            cursor.moveToFirst()
-            assertEquals("America/New_York", cursor.getString(0))
-        }
-    }
-
-    @Test
-    fun testMigrate_WithTimeZone_Unparseable() = testMigration(
-        prepare = { db ->
-            db.execSQL(
-                "INSERT INTO service (id, accountName, type) VALUES (?, ?, ?)",
-                arrayOf(1, "test", Service.Companion.TYPE_CALDAV)
-            )
-            db.execSQL(
-                "INSERT INTO collection (id, serviceId, type, url, privWriteContent, privUnbind, forceReadOnly, sync, timezone) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
-                arrayOf(1, 1, TYPE_CALENDAR, "https://example.com", true, true, false, false, "Some Garbage Content")
-            )
-        }
-    ) { db ->
-        db.query("SELECT timezoneId FROM collection WHERE id=1").use { cursor ->
-            cursor.moveToFirst()
-            assertNull(cursor.getString(0))
-        }
-    }
-
-    @Test
-    fun testMigrate_WithoutTimezone() = testMigration(
-        prepare = { db ->
-            db.execSQL(
-                "INSERT INTO service (id, accountName, type) VALUES (?, ?, ?)",
-                arrayOf(1, "test", Service.Companion.TYPE_CALDAV)
-            )
-            db.execSQL(
-                "INSERT INTO collection (id, serviceId, type, url, privWriteContent, privUnbind, forceReadOnly, sync) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
-                arrayOf(1, 1, TYPE_CALENDAR, "https://example.com", true, true, false, false)
-            )
-        }
-    ) { db ->
-        db.query("SELECT timezoneId FROM collection WHERE id=1").use { cursor ->
-            cursor.moveToFirst()
-            assertNull(cursor.getString(0))
-        }
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/db/migration/AutoMigration18Test.kt

@@ -1,79 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.db.migration
-
-import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-@HiltAndroidTest
-class AutoMigration18Test : DatabaseMigrationTest(toVersion = 18) {
-
-    @Test
-    fun testMigration_AllAuthorities() = testMigration(
-        prepare = { db ->
-            // Insert service and collection to respect relation constraints
-            db.execSQL("INSERT INTO service (id, accountName, type) VALUES (?, ?, ?)", arrayOf<Any?>(1, "test", 1))
-            listOf(1L, 2L, 3L).forEach { id ->
-                db.execSQL(
-                    "INSERT INTO collection (id, serviceId, url, type, privWriteContent, privUnbind, forceReadOnly, sync) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
-                    arrayOf<Any?>(id, 1, "https://example.com/$id", 1, 1, 1, 0, 1)
-                )
-            }
-            // Insert some syncstats with authorities and lastSync times
-            val syncstats = listOf(
-                Entry(1, 1, "com.android.contacts", 1000),
-                Entry(2, 1, "com.android.calendar", 1000),
-                Entry(3, 1, "org.dmfs.tasks", 1000),
-                Entry(4, 1, "org.tasks.opentasks", 2000),
-                Entry(5, 1, "at.techbee.jtx.provider", 3000), // highest lastSync for collection 1
-                Entry(6, 1, "unknown.authority", 1000),  // ignored
-
-                Entry(7, 2, "org.dmfs.tasks", 1000),
-                Entry(8, 2, "org.tasks.opentasks", 2000), // highest lastSync for collection 2
-
-                Entry(9, 3, "org.tasks.opentasks", 1000),
-            )
-            syncstats.forEach { (id, collectionId, authority, lastSync) ->
-                db.execSQL(
-                    "INSERT INTO syncstats (id, collectionId, authority, lastSync) VALUES (?, ?, ?, ?)",
-                    arrayOf<Any?>(id, collectionId, authority, lastSync)
-                )
-            }
-        },
-        validate = { db ->
-            db.query("SELECT id, collectionId, dataType FROM syncstats ORDER BY id").use { cursor ->
-                val found = mutableListOf<Entry>()
-                db.query("SELECT id, collectionId, dataType FROM syncstats ORDER BY id").use { cursor ->
-                    val idIdx = cursor.getColumnIndex("id")
-                    val colIdx = cursor.getColumnIndex("collectionId")
-                    val typeIdx = cursor.getColumnIndex("dataType")
-                    while (cursor.moveToNext())
-                        found.add(
-                            Entry(cursor.getInt(idIdx), cursor.getLong(colIdx), cursor.getString(typeIdx))
-                        )
-                }
-
-                // Expect one TASKS row per collection (collections 1, 2, 3)
-                assertEquals(
-                    listOf(
-                        Entry(1, 1, "CONTACTS"),
-                        Entry(2, 1, "EVENTS"),
-                        Entry(5, 1, "TASKS"),   // highest lastSync TASK for collection 1 is JTX Board
-                        Entry(8, 2, "TASKS"),   // highest lastSync TASK for collection 2
-                        Entry(9, 3, "TASKS"),   // only TASK for collection 3
-                    ), found
-                )
-            }
-        }
-    )
-
-    data class Entry(
-        val id: Int,
-        val collectionId: Long,
-        val dataType: String? = null,
-        val lastSync: Long? = null
-    )
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/db/migration/DatabaseMigrationTest.kt

@@ -1,86 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.db.migration
-
-import androidx.room.migration.AutoMigrationSpec
-import androidx.room.migration.Migration
-import androidx.room.testing.MigrationTestHelper
-import androidx.sqlite.db.SupportSQLiteDatabase
-import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
-import androidx.test.platform.app.InstrumentationRegistry
-import at.bitfire.davdroid.db.AppDatabase
-import dagger.hilt.android.testing.HiltAndroidRule
-import org.junit.Before
-import org.junit.Rule
-import javax.inject.Inject
-
-/**
- * Helper for testing the database migration from [toVersion] - 1 to [toVersion].
- *
- * @param toVersion     The target version to migrate to.
- */
-abstract class DatabaseMigrationTest(
-    private val toVersion: Int
-) {
-
-    @Inject
-    lateinit var autoMigrations: Set<@JvmSuppressWildcards AutoMigrationSpec>
-
-    @Inject
-    lateinit var manualMigrations: Set<@JvmSuppressWildcards Migration>
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-
-    @Before
-    fun setup() {
-        hiltRule.inject()
-    }
-
-
-    /**
-     * Used for testing the migration process from [toVersion]-1 to [toVersion].
-     *
-     * Note: SQLite's foreign key constraint enforcement is not enabled in tests. We need
-     * to enable it ourselves using setting "PRAGMA foreign_keys=ON" directly after opening
-     * a new database connection (works per connection). In tests it's usually more practical
-     * not to do so, however. In production database connections room enables it for us.
-     *
-     * @param prepare      Callback to prepare the database. Will be run with database schema in version [toVersion] - 1.
-     * @param validate     Callback to validate the migration result. Will be run with database schema in version [toVersion].
-     */
-    protected fun testMigration(
-        prepare: (SupportSQLiteDatabase) -> Unit,
-        validate: (SupportSQLiteDatabase) -> Unit
-    ) {
-        val helper = MigrationTestHelper(
-            InstrumentationRegistry.getInstrumentation(),
-            AppDatabase::class.java,
-            autoMigrations.toList(),
-            FrameworkSQLiteOpenHelperFactory()
-        )
-
-        // Prepare the database with the initial version.
-        val dbName = "test"
-        helper.createDatabase(dbName, version = toVersion - 1).apply {
-            // We could enable foreign key constraint enforcement here
-            // by setting "PRAGMA foreign_keys=ON".
-            prepare(this)
-            close()
-        }
-
-        // Re-open the database with the new version and provide all the migrations.
-        val db = helper.runMigrationsAndValidate(
-            name = dbName,
-            version = toVersion,
-            validateDroppedTables = true,
-            migrations = manualMigrations.toTypedArray()
-        )
-
-        validate(db)
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/di/FakeSyncAdapterModule.kt

@@ -1,20 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.di
-
-import at.bitfire.davdroid.sync.FakeSyncAdapter
-import at.bitfire.davdroid.sync.adapter.SyncAdapter
-import at.bitfire.davdroid.sync.adapter.SyncAdapterImpl
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.components.SingletonComponent
-import dagger.hilt.testing.TestInstallIn
-
-@Module
-@TestInstallIn(components = [SingletonComponent::class], replaces = [SyncAdapterImpl.RealSyncAdapterModule::class])
-abstract class FakeSyncAdapterModule {
-    @Binds
-    abstract fun provide(impl: FakeSyncAdapter): SyncAdapter
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/di/TestCoroutineDispatchersModule.kt

@@ -1,59 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.di
-
-import at.bitfire.davdroid.di.TestCoroutineDispatchersModule.standardTestDispatcher
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.components.SingletonComponent
-import dagger.hilt.testing.TestInstallIn
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.StandardTestDispatcher
-import kotlinx.coroutines.test.setMain
-
-/**
- * Provides test dispatchers to be injected instead of the normal ones.
- *
- * The [standardTestDispatcher] is set as main dispatcher in [at.bitfire.davdroid.HiltTestRunner],
- * so that tests can just use [kotlinx.coroutines.test.runTest] without providing [standardTestDispatcher].
- */
-@Module
-@TestInstallIn(
-    components = [SingletonComponent::class],
-    replaces = [CoroutineDispatchersModule::class]
-)
-object TestCoroutineDispatchersModule {
-
-    private val standardTestDispatcher = StandardTestDispatcher()
-
-    @Provides
-    @DefaultDispatcher
-    fun defaultDispatcher(): CoroutineDispatcher = standardTestDispatcher
-
-    @Provides
-    @IoDispatcher
-    fun ioDispatcher(): CoroutineDispatcher = standardTestDispatcher
-
-    @Provides
-    @MainDispatcher
-    fun mainDispatcher(): CoroutineDispatcher = standardTestDispatcher
-
-    @Provides
-    @SyncDispatcher
-    fun syncDispatcher(): CoroutineDispatcher = standardTestDispatcher
-
-   /**
-     * Sets the [standardTestDispatcher] as [Dispatchers.Main] so that test dispatchers
-     * created in the future use the same scheduler. See [StandardTestDispatcher] docs
-     * for more information.
-     */
-    @OptIn(ExperimentalCoroutinesApi::class)
-    fun initMainDispatcher() {
-        Dispatchers.setMain(standardTestDispatcher)
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/di/TestTasksAppWatcherModule.kt

@@ -1,24 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.di
-
-import at.bitfire.davdroid.startup.StartupPlugin
-import at.bitfire.davdroid.startup.TasksAppWatcher
-import dagger.Module
-import dagger.hilt.components.SingletonComponent
-import dagger.hilt.testing.TestInstallIn
-import dagger.multibindings.Multibinds
-
-// remove TasksAppWatcherModule from Android tests
-@Module
-@TestInstallIn(
-    components = [SingletonComponent::class],
-    replaces = [TasksAppWatcher.TasksAppWatcherModule::class]
-)
-abstract class TestTasksAppWatcherModule {
-    // provides empty set of plugins
-    @Multibinds
-    abstract fun empty(): Set<StartupPlugin>
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/network/Android10ResolverTest.kt

@@ -1,35 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.network
-
-import android.os.Build
-import androidx.test.filters.SdkSuppress
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.xbill.DNS.ARecord
-import org.xbill.DNS.Lookup
-import org.xbill.DNS.Type
-import java.net.Inet4Address
-import java.net.InetAddress
-
-class Android10ResolverTest {
-
-    val FQDN_DAVX5 = "www.davx5.com"
-
-    @Test
-    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q, maxSdkVersion = 34)
-    fun testResolveA() {
-        val www = InetAddress.getAllByName(FQDN_DAVX5).filterIsInstance<Inet4Address>().first()
-
-        val srvLookup = Lookup(FQDN_DAVX5, Type.A)
-        srvLookup.setResolver(Android10Resolver())
-        val resultGeneric = srvLookup.run()
-        assertEquals(1, resultGeneric.size)
-
-        val result = resultGeneric.first() as ARecord
-        assertEquals(www, result.address)
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/network/ConscryptIntegrationTest.kt

@@ -1,31 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.network
-
-import org.conscrypt.Conscrypt
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import java.security.Security
-
-class ConscryptIntegrationTest {
-
-    val integration = ConscryptIntegration()
-
-    @Test
-    fun testInitialize_InstallsConscrypt() {
-        uninstallConscrypt()
-        assertFalse(integration.conscryptInstalled())
-
-        integration.initialize()
-        assertTrue(integration.conscryptInstalled())
-    }
-
-    private fun uninstallConscrypt() {
-        for (conscrypt in Security.getProviders().filter { Conscrypt.isConscrypt(it) })
-            Security.removeProvider(conscrypt.name)
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/network/DnsRecordResolverTest.kt

@@ -1,122 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.network
-
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.every
-import io.mockk.mockk
-import org.junit.Assert.assertArrayEquals
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.xbill.DNS.DClass
-import org.xbill.DNS.Name
-import org.xbill.DNS.SRVRecord
-import org.xbill.DNS.TXTRecord
-import javax.inject.Inject
-import kotlin.random.Random
-
-@HiltAndroidTest
-class DnsRecordResolverTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @Inject
-    lateinit var dnsRecordResolver: DnsRecordResolver
-
-    @Before
-    fun setup() {
-        hiltRule.inject()
-    }
-
-
-    @Test
-    fun testBestSRVRecord_Empty() {
-        assertNull(dnsRecordResolver.bestSRVRecord(emptyArray()))
-    }
-
-    @Test
-    fun testBestSRVRecord_MultipleRecords_Priority_Different() {
-        val dns1010 = SRVRecord(
-            Name.fromString("_caldavs._tcp.example.com."),
-            DClass.IN, 3600, 10, 10, 8443, Name.fromString("dav1010.example.com.")
-        )
-        val dns2010 = SRVRecord(
-            Name.fromString("_caldavs._tcp.example.com."),
-            DClass.IN, 3600, 20, 20, 8443, Name.fromString("dav2010.example.com.")
-        )
-
-        // lowest priority first
-        val result = dnsRecordResolver.bestSRVRecord(arrayOf(dns1010, dns2010))
-        assertEquals(dns1010, result)
-    }
-
-    @Test
-    fun testBestSRVRecord_MultipleRecords_Priority_Same() {
-        val dns1010 = SRVRecord(
-            Name.fromString("_caldavs._tcp.example.com."),
-            DClass.IN, 3600, 10, 10, 8443, Name.fromString("dav1010.example.com.")
-        )
-        val dns1020 = SRVRecord(
-            Name.fromString("_caldavs._tcp.example.com."),
-            DClass.IN, 3600, 10, 20, 8443, Name.fromString("dav1020.example.com.")
-        )
-        val dns1030 = SRVRecord(
-            Name.fromString("_caldavs._tcp.example.com."),
-            DClass.IN, 3600, 10, 30, 8443, Name.fromString("dav1030.example.com.")
-        )
-        val records = arrayOf(dns1010, dns1020, dns1030)
-
-        val randomNumberGenerator = mockk<Random>()
-        for (i in 0..60) {
-            every { randomNumberGenerator.nextInt(0, 61) } returns i
-            val expected = when (i) {
-                in 0..10 -> dns1010
-                in 11..30 -> dns1020
-                else -> dns1030
-            }
-            assertEquals(expected, dnsRecordResolver.bestSRVRecord(records, randomNumberGenerator))
-        }
-    }
-
-    @Test
-    fun testBestSRVRecord_OneRecord() {
-        val dns1010 = SRVRecord(
-            Name.fromString("_caldavs._tcp.example.com."),
-            DClass.IN, 3600, 10, 10, 8443, Name.fromString("dav1010.example.com.")
-        )
-        val result = dnsRecordResolver.bestSRVRecord(arrayOf(dns1010))
-        assertEquals(dns1010, result)
-    }
-
-
-    @Test
-    fun testPathsFromTXTRecords_Empty() {
-        assertTrue(dnsRecordResolver.pathsFromTXTRecords(arrayOf()).isEmpty())
-    }
-
-    @Test
-    fun testPathsFromTXTRecords_OnePath() {
-        val result = dnsRecordResolver.pathsFromTXTRecords(arrayOf(
-            TXTRecord(Name.fromString("example.com."), 0, 0L, listOf("something=else", "path=/path1"))
-        )).toTypedArray()
-        assertArrayEquals(arrayOf("/path1"), result)
-    }
-
-    @Test
-    fun testPathsFromTXTRecords_TwoPaths() {
-        val result = dnsRecordResolver.pathsFromTXTRecords(arrayOf(
-            TXTRecord(Name.fromString("example.com."), 0, 0L, listOf("path=/path1", "something-else", "path=/path2"))
-        )).toTypedArray()
-        result.sort()
-        assertArrayEquals(arrayOf("/path1", "/path2"), result)
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/network/HttpClientBuilderTest.kt

@@ -1,108 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.network
-
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.ktor.client.request.get
-import io.ktor.client.statement.bodyAsText
-import kotlinx.coroutines.test.runTest
-import okhttp3.Request
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-import javax.inject.Provider
-
-@HiltAndroidTest
-class HttpClientBuilderTest {
-
-    @get:Rule
-    var hiltRule = HiltAndroidRule(this)
-
-    @Inject
-    lateinit var httpClientBuilder: Provider<HttpClientBuilder>
-
-    lateinit var server: MockWebServer
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        server = MockWebServer()
-        server.start(30000)
-    }
-
-    @After
-    fun tearDown() {
-        server.shutdown()
-    }
-
-
-    @Test
-    fun testBuild_SharesConnectionPoolAndDispatcher() {
-        val client1 = httpClientBuilder.get().build()
-        val client2 = httpClientBuilder.get().build()
-        assertEquals(client1.connectionPool, client2.connectionPool)
-        assertEquals(client1.dispatcher, client2.dispatcher)
-    }
-
-    @Test
-    fun testBuildKtor_CreatesWorkingClient() = runTest {
-        server.enqueue(MockResponse()
-            .setResponseCode(200)
-            .setBody("Some Content"))
-
-        httpClientBuilder.get().buildKtor().use { client ->
-            val response = client.get(server.url("/").toString())
-            assertEquals(200, response.status.value)
-            assertEquals("Some Content", response.bodyAsText())
-        }
-    }
-
-    @Test
-    fun testCookies() {
-        val url = server.url("/test")
-
-        // set cookie for root path (/) and /test path in first response
-        server.enqueue(MockResponse()
-                .setResponseCode(200)
-                .addHeader("Set-Cookie", "cookie1=1; path=/")
-                .addHeader("Set-Cookie", "cookie2=2")
-                .setBody("Cookie set"))
-
-        val httpClient = httpClientBuilder.get().build()
-        httpClient.newCall(Request.Builder()
-                .get().url(url)
-                .build()).execute()
-        assertNull(server.takeRequest().getHeader("Cookie"))
-
-        // cookie should be sent with second request
-        // second response lets first cookie expire and overwrites second cookie
-        server.enqueue(MockResponse()
-                .addHeader("Set-Cookie", "cookie1=1a; path=/; Max-Age=0")
-                .addHeader("Set-Cookie", "cookie2=2a")
-                .setResponseCode(200))
-        httpClient.newCall(Request.Builder()
-                .get().url(url)
-                .build()).execute()
-        val header = server.takeRequest().getHeader("Cookie")
-        assertTrue(header == "cookie1=1; cookie2=2" || header == "cookie2=2; cookie1=1")
-
-        server.enqueue(MockResponse()
-                .setResponseCode(200))
-        httpClient.newCall(Request.Builder()
-                .get().url(url)
-                .build()).execute()
-        assertEquals("cookie2=2a", server.takeRequest().getHeader("Cookie"))
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/network/OkhttpClientTest.kt

@@ -1,45 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.network
-
-import androidx.test.filters.SdkSuppress
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import okhttp3.Request
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class OkhttpClientTest {
-
-    @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @Before
-    fun inject() {
-        hiltRule.inject()
-    }
-
-
-    @Test
-    @SdkSuppress(maxSdkVersion = 34)
-    fun testIcloudWithSettings() {
-        val client = httpClientBuilder.build()
-        client
-            .newCall(
-                Request.Builder()
-                    .get()
-                    .url("https://icloud.com")
-                    .build()
-            )
-            .execute()
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/push/PushMessageHandlerTest.kt

@@ -1,46 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.push
-
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class PushMessageHandlerTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @Inject
-    lateinit var handler: PushMessageHandler
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-    }
-
-
-    @Test
-    fun testParse_InvalidXml() {
-        Assert.assertNull(handler.parse("Non-XML content"))
-    }
-
-    @Test
-    fun testParse_WithXmlDeclAndTopic() {
-        val topic = handler.parse(
-            "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" +
-            "<P:push-message xmlns:D=\"DAV:\" xmlns:P=\"https://bitfire.at/webdav-push\">" +
-            "  <P:topic>O7M1nQ7cKkKTKsoS_j6Z3w</P:topic>" +
-            "</P:push-message>"
-        )
-        Assert.assertEquals("O7M1nQ7cKkKTKsoS_j6Z3w", topic)
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/push/UnifiedPushServiceTest.kt

@@ -1,102 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.push
-
-import android.content.Context
-import android.content.Intent
-import android.os.IBinder
-import androidx.test.rule.ServiceTestRule
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.BindValue
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.coVerify
-import io.mockk.confirmVerified
-import io.mockk.every
-import io.mockk.impl.annotations.RelaxedMockK
-import io.mockk.junit4.MockKRule
-import io.mockk.mockk
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.advanceUntilIdle
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.unifiedpush.android.connector.FailedReason
-import org.unifiedpush.android.connector.PushService
-import org.unifiedpush.android.connector.data.PushEndpoint
-import javax.inject.Inject
-
-@OptIn(ExperimentalCoroutinesApi::class)
-@HiltAndroidTest
-class UnifiedPushServiceTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val mockKRule = MockKRule(this)
-
-    @get:Rule
-    val serviceTestRule = ServiceTestRule()
-
-    @Inject
-    @ApplicationContext
-    lateinit var context: Context
-
-    @RelaxedMockK
-    @BindValue
-    lateinit var pushRegistrationManager: PushRegistrationManager
-
-    lateinit var binder: IBinder
-    lateinit var unifiedPushService: UnifiedPushService
-
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        binder = serviceTestRule.bindService(Intent(context, UnifiedPushService::class.java))!!
-        unifiedPushService = (binder as PushService.PushBinder).getService() as UnifiedPushService
-    }
-
-
-    @Test
-    fun testOnNewEndpoint() = runTest {
-        val endpoint = mockk<PushEndpoint> {
-            every { url } returns "https://example.com/12"
-        }
-        unifiedPushService.onNewEndpoint(endpoint, "12")
-
-        advanceUntilIdle()
-        coVerify {
-            pushRegistrationManager.processSubscription(12, endpoint)
-        }
-        confirmVerified(pushRegistrationManager)
-    }
-
-    @Test
-    fun testOnRegistrationFailed() = runTest {
-        unifiedPushService.onRegistrationFailed(FailedReason.INTERNAL_ERROR, "34")
-
-        advanceUntilIdle()
-        coVerify {
-            pushRegistrationManager.removeSubscription(34)
-        }
-        confirmVerified(pushRegistrationManager)
-    }
-
-    @Test
-    fun testOnUnregistered() = runTest {
-        unifiedPushService.onUnregistered("45")
-
-        advanceUntilIdle()
-        coVerify {
-            pushRegistrationManager.removeSubscription(45)
-        }
-        confirmVerified(pushRegistrationManager)
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/repository/AccountRepositoryTest.kt

@@ -1,214 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.repository
-
-import android.accounts.Account
-import android.accounts.AccountManager
-import android.content.Context
-import androidx.hilt.work.HiltWorkerFactory
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.TestUtils
-import at.bitfire.davdroid.resource.LocalAddressBookStore
-import at.bitfire.davdroid.resource.LocalCalendarStore
-import at.bitfire.davdroid.resource.LocalDataStore
-import at.bitfire.davdroid.settings.AccountSettings
-import at.bitfire.davdroid.sync.AutomaticSyncManager
-import at.bitfire.davdroid.sync.SyncDataType
-import at.bitfire.davdroid.sync.TasksAppManager
-import at.bitfire.davdroid.sync.account.AccountsCleanupWorker
-import at.bitfire.davdroid.sync.account.TestAccount
-import at.bitfire.davdroid.sync.worker.SyncWorkerManager
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.BindValue
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.clearAllMocks
-import io.mockk.coVerify
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.junit4.MockKRule
-import io.mockk.mockk
-import io.mockk.mockkObject
-import io.mockk.unmockkObject
-import io.mockk.verify
-import junit.framework.TestCase.assertTrue
-import kotlinx.coroutines.test.runTest
-import org.junit.After
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class AccountRepositoryTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val mockKRule = MockKRule(this)
-
-    // System under test
-
-    @Inject
-    lateinit var accountRepository: AccountRepository
-
-    // Real injections
-
-    @Inject
-    @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var accountSettingsFactory: AccountSettings.Factory
-
-    @Inject
-    lateinit var workerFactory: HiltWorkerFactory
-
-    // Dependency overrides
-
-    @BindValue @MockK(relaxed = true)
-    lateinit var automaticSyncManager: AutomaticSyncManager
-
-    @BindValue @MockK(relaxed = true)
-    lateinit var localAddressBookStore: LocalAddressBookStore
-
-    @BindValue @MockK(relaxed = true)
-    lateinit var localCalendarStore: LocalCalendarStore
-
-    @BindValue @MockK(relaxed = true)
-    lateinit var serviceRepository: DavServiceRepository
-
-    @BindValue @MockK(relaxed = true)
-    lateinit var syncWorkerManager: SyncWorkerManager
-
-    @BindValue @MockK(relaxed = true)
-    lateinit var tasksAppManager: TasksAppManager
-
-
-    // Account setup
-    private val newName = "Renamed Account"
-    lateinit var am: AccountManager
-    lateinit var accountType: String
-    lateinit var account: Account
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-        TestUtils.setUpWorkManager(context, workerFactory)
-
-        // Account setup
-        am = AccountManager.get(context)
-        accountType = context.getString(R.string.account_type)
-        account = TestAccount.create()
-
-        // AccountsCleanupWorker static mocking
-        mockkObject(AccountsCleanupWorker)
-        every { AccountsCleanupWorker.lockAccountsCleanup() } returns Unit
-    }
-
-    @After
-    fun tearDown() {
-        am.getAccountsByType(accountType).forEach { account ->
-            am.removeAccountExplicitly(account)
-        }
-
-        unmockkObject(AccountsCleanupWorker)
-        clearAllMocks()
-    }
-
-
-    // testRename
-
-    @Test(expected = IllegalArgumentException::class)
-    fun testRename_checksForAlreadyExisting() = runTest {
-        val existing = Account("Existing Account", accountType)
-        am.addAccountExplicitly(existing, null, null)
-
-        accountRepository.rename(account.name, existing.name)
-    }
-
-    @Test
-    fun testRename_locksAccountsCleanup() = runTest {
-        accountRepository.rename(account.name, newName)
-
-        verify { AccountsCleanupWorker.lockAccountsCleanup() }
-    }
-
-    @Test
-    fun testRename_renamesAccountInAndroid() = runTest {
-        accountRepository.rename(account.name, newName)
-
-        val accountsAfter = am.getAccountsByType(accountType)
-        assertTrue(accountsAfter.any { it.name == newName })
-    }
-
-    @Test
-    fun testRename_cancelsRunningSynchronizationOfOldAccount() = runTest {
-        accountRepository.rename(account.name, newName)
-
-        coVerify { syncWorkerManager.cancelAllWork(account) }
-    }
-
-    @Test
-    fun testRename_disablesPeriodicSyncsForOldAccount() = runTest {
-        accountRepository.rename(account.name, newName)
-
-        for (dataType in SyncDataType.entries)
-            coVerify(exactly = 1) {
-                syncWorkerManager.disablePeriodic(account, dataType)
-            }
-    }
-
-    @Test
-    fun testRename_updatesAccountNameReferencesInDatabase() = runTest {
-        accountRepository.rename(account.name, newName)
-
-        coVerify { serviceRepository.renameAccount(account.name, newName) }
-    }
-
-    @Test
-    fun testRename_updatesAddressBooks() = runTest {
-        accountRepository.rename(account.name, newName)
-
-        val newAccount = accountRepository.fromName(newName)
-        coVerify { localAddressBookStore.updateAccount(account, newAccount, any()) }
-    }
-
-    @Test
-    fun testRename_updatesCalendarEvents() = runTest {
-        accountRepository.rename(account.name, newName)
-
-        val newAccount = accountRepository.fromName(newName)
-        coVerify { localCalendarStore.updateAccount(account, newAccount, any()) }
-    }
-
-    @Test
-    fun testRename_updatesAccountNameOfLocalTasks() = runTest {
-        val mockDataStore = mockk<LocalDataStore<*>>(relaxed = true)
-        every { tasksAppManager.getDataStore() } returns mockDataStore
-        accountRepository.rename(account.name, newName)
-
-        val newAccount = accountRepository.fromName(newName)
-        coVerify { mockDataStore.updateAccount(account, newAccount, any()) }
-    }
-
-    @Test
-    fun testRename_updatesAutomaticSync() = runTest {
-        accountRepository.rename(account.name, newName)
-
-        val newAccount = accountRepository.fromName(newName)
-        coVerify { automaticSyncManager.updateAutomaticSync(newAccount) }
-    }
-
-    @Test
-    fun testRename_releasesAccountsCleanupWorkerMutex() = runTest {
-        accountRepository.rename(account.name, newName)
-
-        verify { AccountsCleanupWorker.lockAccountsCleanup() }
-        coVerify { serviceRepository.renameAccount(account.name, newName) }
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalAddressBookStoreTest.kt

@@ -1,225 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.resource
-
-import android.accounts.Account
-import android.accounts.AccountManager
-import android.content.ContentProviderClient
-import android.content.Context
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.db.AppDatabase
-import at.bitfire.davdroid.db.Collection
-import at.bitfire.davdroid.db.Service
-import at.bitfire.davdroid.sync.account.TestAccount
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.every
-import io.mockk.impl.annotations.RelaxedMockK
-import io.mockk.junit4.MockKRule
-import io.mockk.mockk
-import io.mockk.mockkObject
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class LocalAddressBookStoreTest {
-
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var db: AppDatabase
-
-    @Inject
-    lateinit var localAddressBookStore: LocalAddressBookStore
-
-    @RelaxedMockK
-    lateinit var provider: ContentProviderClient
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val mockkRule = MockKRule(this)
-
-    lateinit var addressBookAccountType: String
-
-    lateinit var addressBookAccount: Account
-    lateinit var account: Account
-    lateinit var service: Service
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        addressBookAccountType = context.getString(R.string.account_type_address_book)
-
-        account = TestAccount.create()
-        service = Service(
-            id = 200,
-            accountName = account.name,
-            type = Service.Companion.TYPE_CARDDAV,
-            principal = null
-        )
-        db.serviceDao().insertOrReplace(service)
-        addressBookAccount = Account(
-            "MrRobert@example.com",
-            addressBookAccountType
-        )
-    }
-
-    @After
-    fun tearDown() {
-        TestAccount.remove(account)
-        removeAddressBooks()
-    }
-
-
-    @Test
-    fun test_accountName_removesSpecialChars() {
-        // Should remove iso control characters and `, ", ',
-        val collection = mockk<Collection> {
-            every { id } returns 1
-            every { url } returns "https://example.com/addressbook/funnyfriends".toHttpUrl()
-            every { displayName } returns "手 M's_\"F-e\"\\(´д`)/;æøå% äöü #42"
-            every { serviceId } returns service.id
-        }
-        assertEquals("手 Ms_F-e\\(´д)/;æøå% äöü #42 (Test Account) #1", localAddressBookStore.accountName(collection))
-    }
-
-    @Test
-    fun test_accountName_missingService() {
-        val collection = mockk<Collection> {
-            every { id } returns 42
-            every { url } returns "https://example.com/addressbook/funnyfriends".toHttpUrl()
-            every { displayName } returns null
-            every { serviceId } returns 404     // missing service
-        }
-        assertEquals("funnyfriends #42", localAddressBookStore.accountName(collection))
-    }
-
-    @Test
-    fun test_accountName_missingDisplayName() {
-        val collection = mockk<Collection> {
-            every { id } returns 42
-            every { url } returns "https://example.com/addressbook/funnyfriends".toHttpUrl()
-            every { displayName } returns null
-            every { serviceId } returns service.id
-        }
-        val accountName = localAddressBookStore.accountName(collection)
-        assertEquals("funnyfriends (${account.name}) #42", accountName)
-    }
-
-    @Test
-    fun test_accountName_missingDisplayNameAndService() {
-        val collection = mockk<Collection> {
-            every { id } returns 1
-            every { url } returns "https://example.com/addressbook/funnyfriends".toHttpUrl()
-            every { displayName } returns null
-            every { serviceId } returns 404     // missing service
-        }
-        assertEquals("funnyfriends #1", localAddressBookStore.accountName(collection))
-    }
-
-
-    @Test
-    fun test_create_createAccountReturnsNull() {
-        val collection = mockk<Collection>(relaxed = true) {
-            every { serviceId } returns service.id
-            every { id } returns 1
-            every { url } returns "https://example.com/addressbook/funnyfriends".toHttpUrl()
-        }
-
-        mockkObject(localAddressBookStore)
-        every { localAddressBookStore.createAddressBookAccount(any(), any(), any()) } returns null
-
-        assertEquals(null, localAddressBookStore.create(provider, collection))
-    }
-
-    @Test
-    fun test_create_ReadOnly() {
-        val collection = mockk<Collection>(relaxed = true) {
-            every { serviceId } returns service.id
-            every { id } returns 1
-            every { url } returns "https://example.com/addressbook/funnyfriends".toHttpUrl()
-            every { readOnly() } returns true
-        }
-        val addrBook = localAddressBookStore.create(provider, collection)!!
-        assertEquals(Account("funnyfriends (Test Account) #1", addressBookAccountType), addrBook.addressBookAccount)
-        assertTrue(addrBook.readOnly)
-    }
-
-    @Test
-    fun test_create_ReadWrite() {
-        val collection = mockk<Collection>(relaxed = true) {
-            every { serviceId } returns service.id
-            every { id } returns 1
-            every { url } returns "https://example.com/addressbook/funnyfriends".toHttpUrl()
-            every { readOnly() } returns false
-        }
-
-        val addrBook = localAddressBookStore.create(provider, collection)!!
-        assertEquals(Account("funnyfriends (Test Account) #1", addressBookAccountType), addrBook.addressBookAccount)
-        assertFalse(addrBook.readOnly)
-    }
-
-
-    @Test
-    fun test_getAll_differentAccount() {
-        val accountManager = AccountManager.get(context)
-        mockkObject(accountManager)
-        every { accountManager.getAccountsByType(any()) } returns arrayOf(addressBookAccount)
-        every { accountManager.getUserData(addressBookAccount, LocalAddressBook.USER_DATA_ACCOUNT_NAME) } returns "Another Unrelated Account"
-        every { accountManager.getUserData(addressBookAccount, LocalAddressBook.USER_DATA_ACCOUNT_TYPE) } returns account.type
-        val result = localAddressBookStore.getAll(account, provider)
-        assertTrue(result.isEmpty())
-    }
-
-    @Test
-    fun test_getAll_sameAccount() {
-        val accountManager = AccountManager.get(context)
-        mockkObject(accountManager)
-        every { accountManager.getAccountsByType(any()) } returns arrayOf(addressBookAccount)
-        every { accountManager.getUserData(addressBookAccount, LocalAddressBook.USER_DATA_ACCOUNT_NAME) } returns account.name
-        every { accountManager.getUserData(addressBookAccount, LocalAddressBook.USER_DATA_ACCOUNT_TYPE) } returns account.type
-        val result = localAddressBookStore.getAll(account, provider)
-        assertEquals(1, result.size)
-        assertEquals(addressBookAccount, result.first().addressBookAccount)
-    }
-
-
-    /**
-     * Tests the calculation of read only state is correct
-     */
-    @Test
-    fun test_shouldBeReadOnly() {
-        val collectionReadOnly = mockk<Collection> { every { readOnly() } returns true }
-        assertTrue(LocalAddressBookStore.shouldBeReadOnly(collectionReadOnly, false))
-        assertTrue(LocalAddressBookStore.shouldBeReadOnly(collectionReadOnly, true))
-
-        val collectionNotReadOnly = mockk<Collection> { every { readOnly() } returns false }
-        assertFalse(LocalAddressBookStore.shouldBeReadOnly(collectionNotReadOnly, false))
-        assertTrue(LocalAddressBookStore.shouldBeReadOnly(collectionNotReadOnly, true))
-    }
-
-
-    // helpers
-
-    private fun removeAddressBooks() {
-        val accountManager = AccountManager.get(context)
-        accountManager.getAccountsByType(addressBookAccountType).forEach {
-            accountManager.removeAccountExplicitly(it)
-        }
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalAddressBookTest.kt

@@ -1,177 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.resource
-
-import android.Manifest
-import android.accounts.Account
-import android.content.ContentProviderClient
-import android.content.ContentUris
-import android.content.Context
-import android.provider.ContactsContract
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.GrantPermissionRule
-import at.bitfire.vcard4android.Contact
-import at.bitfire.vcard4android.LabeledProperty
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import ezvcard.property.Telephone
-import org.junit.AfterClass
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.BeforeClass
-import org.junit.ClassRule
-import org.junit.Rule
-import org.junit.Test
-import java.io.FileNotFoundException
-import java.util.LinkedList
-import java.util.Optional
-import javax.inject.Inject
-
-@HiltAndroidTest
-class LocalAddressBookTest {
-
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var localTestAddressBookProvider: LocalTestAddressBookProvider
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    val account = Account("Test Account", "Test Account Type")
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-    }
-
-
-    /**
-     * Tests whether contacts are moved (and not lost) when an address book is renamed.
-     */
-    @Test
-    fun test_renameAccount_retainsContacts() {
-        localTestAddressBookProvider.provide(account, provider) { addressBook ->
-            // insert contact with data row
-            val uid = "12345"
-            val contact = Contact(
-                uid = uid,
-                displayName = "Test Contact",
-                phoneNumbers = LinkedList(listOf(LabeledProperty(Telephone("1234567890"))))
-            )
-            val uri = LocalContact(addressBook, contact, null, null, 0).add()
-            val id = ContentUris.parseId(uri)
-            val localContact = addressBook.findContactById(id)
-            localContact.resetDirty()
-            assertFalse("Contact is dirty before moving", isContactDirty(addressBook, id))
-
-            // rename address book
-            val newName = "New Name"
-            addressBook.renameAccount(newName)
-            assertEquals(newName, addressBook.addressBookAccount.name)
-
-            // check whether contact is still here (including data rows) and not dirty
-            val result = addressBook.findContactById(id)
-            assertFalse("Contact is dirty after moving", isContactDirty(addressBook, id))
-
-            val contact2 = result.getContact()
-            assertEquals(uid, contact2.uid)
-            assertEquals("Test Contact", contact2.displayName)
-            assertEquals("1234567890", contact2.phoneNumbers.first().component1().text)
-        }
-    }
-
-    /**
-     * Tests whether groups are moved (and not lost) when an address book is renamed.
-     */
-    @Test
-    fun test_renameAccount_retainsGroups() {
-        localTestAddressBookProvider.provide(account, provider) { addressBook ->
-            // insert group
-            val localGroup = LocalGroup(addressBook, Contact(displayName = "Test Group"), null, null, 0)
-            val uri = localGroup.add()
-            val id = ContentUris.parseId(uri)
-
-            // make sure it's not dirty
-            localGroup.clearDirty(Optional.empty(), null, null)
-            assertFalse("Group is dirty before moving", isGroupDirty(addressBook, id))
-
-            // rename address book
-            val newName = "New Name"
-            assertTrue(addressBook.renameAccount(newName))
-            assertEquals(newName, addressBook.addressBookAccount.name)
-
-            // check whether group is still here and not dirty
-            val result = addressBook.findGroupById(id)
-            assertFalse("Group is dirty after moving", isGroupDirty(addressBook, id))
-
-            val group = result.getContact()
-            assertEquals("Test Group", group.displayName)
-        }
-    }
-
-
-    // helpers
-
-    /**
-     * Returns the dirty flag of the given contact.
-     *
-     * @return true if the contact is dirty, false otherwise
-     *
-     * @throws FileNotFoundException if the contact can't be found
-     */
-    fun isContactDirty(adddressBook: LocalAddressBook, id: Long): Boolean {
-        val uri = ContentUris.withAppendedId(adddressBook.rawContactsSyncUri(), id)
-        provider.query(uri, arrayOf(ContactsContract.RawContacts.DIRTY), null, null, null)?.use { cursor ->
-            if (cursor.moveToFirst())
-                return cursor.getInt(0) != 0
-        }
-        throw FileNotFoundException()
-    }
-
-    /**
-     * Returns the dirty flag of the given contact group.
-     *
-     * @return true if the group is dirty, false otherwise
-     *
-     * @throws FileNotFoundException if the group can't be found
-     */
-    fun isGroupDirty(adddressBook: LocalAddressBook, id: Long): Boolean {
-        val uri = ContentUris.withAppendedId(adddressBook.groupsSyncUri(), id)
-        provider.query(uri, arrayOf(ContactsContract.Groups.DIRTY), null, null, null)?.use { cursor ->
-            if (cursor.moveToFirst())
-                return cursor.getInt(0) != 0
-        }
-        throw FileNotFoundException()
-    }
-
-
-    companion object {
-
-        @JvmField
-        @ClassRule
-        val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!
-
-        private lateinit var provider: ContentProviderClient
-
-        @BeforeClass
-        @JvmStatic
-        fun connect() {
-            val context = InstrumentationRegistry.getInstrumentation().context
-            provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!
-        }
-
-        @AfterClass
-        @JvmStatic
-        fun disconnect() {
-            provider.close()
-        }
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalCalendarStoreTest.kt

@@ -1,114 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.resource
-
-import android.accounts.Account
-import android.content.ContentProviderClient
-import android.content.Context
-import android.net.Uri
-import android.provider.CalendarContract
-import android.provider.CalendarContract.Calendars
-import androidx.core.content.contentValuesOf
-import at.bitfire.davdroid.sync.account.TestAccount
-import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
-import at.bitfire.synctools.test.InitCalendarProviderRule
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Assume
-import org.junit.Before
-import org.junit.Ignore
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TestRule
-import javax.inject.Inject
-
-@HiltAndroidTest
-class LocalCalendarStoreTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val initCalendarProviderRule: TestRule = InitCalendarProviderRule.initialize()
-
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var localCalendarStore: LocalCalendarStore
-
-    private lateinit var provider: ContentProviderClient
-    private lateinit var account: Account
-    private lateinit var calendarUri: Uri
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-        provider = context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)!!
-        account = TestAccount.create(accountName = "InitialAccountName")
-        calendarUri = createCalendarForAccount(account)
-    }
-
-    @After
-    fun tearDown() {
-        provider.delete(calendarUri, null, null)
-        TestAccount.remove(account)
-        provider.closeCompat()
-    }
-
-
-    @Ignore("Flaky in CI")
-    @Test
-    fun testUpdateAccount_updatesOwnerAccount() {
-        // Verify initial state (assume to skip and prevent flaky test failures)
-        Assume.assumeTrue("InitialAccountName" == getOwnerAccount())
-
-        // Rename account
-        val oldAccount = account
-        account = TestAccount.rename(account, "ChangedAccountName")
-
-        // Update account name in local calendar
-        localCalendarStore.updateAccount(oldAccount, account, provider)
-
-        // Verify [Calendar.OWNER_ACCOUNT] of local calendar was updated
-        assertEquals("ChangedAccountName", getOwnerAccount())
-    }
-
-
-    // helpers
-
-    private fun createCalendarForAccount(account: Account): Uri =
-         provider.insert(
-            Calendars.CONTENT_URI.asSyncAdapter(account),
-            contentValuesOf(
-                Calendars.ACCOUNT_NAME to account.name,
-                Calendars.ACCOUNT_TYPE to account.type,
-                Calendars.OWNER_ACCOUNT to account.name,
-                Calendars.VISIBLE to 1,
-                Calendars.SYNC_EVENTS to 1,
-                Calendars._SYNC_ID to 999,
-                Calendars.CALENDAR_DISPLAY_NAME to "displayName",
-            )
-        )!!.asSyncAdapter(account)
-
-    private fun getOwnerAccount(): String? {
-        provider.query(
-            calendarUri,
-            arrayOf(Calendars.OWNER_ACCOUNT),
-            "${Calendars.ACCOUNT_NAME}=?",
-            arrayOf(account.name),
-            null
-        )!!.use { cursor ->
-            if (!cursor.moveToNext())
-                return null
-            return cursor.getString(0)
-        }
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalCalendarTest.kt

@@ -1,142 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.resource
-
-import android.accounts.Account
-import android.content.ContentProviderClient
-import android.content.ContentValues
-import android.content.Entity
-import android.provider.CalendarContract
-import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL
-import android.provider.CalendarContract.Events
-import androidx.core.content.contentValuesOf
-import androidx.test.platform.app.InstrumentationRegistry
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
-import at.bitfire.synctools.storage.calendar.AndroidCalendar
-import at.bitfire.synctools.storage.calendar.AndroidCalendarProvider
-import at.bitfire.synctools.storage.calendar.EventsContract
-import at.bitfire.synctools.test.InitCalendarProviderRule
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TestRule
-import javax.inject.Inject
-
-@HiltAndroidTest
-class LocalCalendarTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val initCalendarProviderRule: TestRule = InitCalendarProviderRule.initialize()
-
-    @Inject
-    lateinit var localCalendarFactory: LocalCalendar.Factory
-
-    private val account = Account("LocalCalendarTest", ACCOUNT_TYPE_LOCAL)
-    private lateinit var androidCalendar: AndroidCalendar
-    private lateinit var client: ContentProviderClient
-    private lateinit var calendar: LocalCalendar
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-        client = context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)!!
-
-        val provider = AndroidCalendarProvider(account, client)
-        androidCalendar = provider.createAndGetCalendar(ContentValues())
-        calendar = localCalendarFactory.create(androidCalendar)
-    }
-
-    @After
-    fun tearDown() {
-        androidCalendar.delete()
-        client.closeCompat()
-    }
-
-
-    /**
-     * Verifies that [LocalCalendar.removeNotDirtyMarked] works as expected.
-     * @param contentValues values to set on the event. Required:
-     * - [Events._ID]
-     * - [Events.DIRTY]
-     */
-    private fun testRemoveNotDirtyMarked(contentValues: ContentValues) {
-        val entity = Entity(
-            contentValuesOf(
-                Events.CALENDAR_ID to androidCalendar.id,
-                Events.DTSTART to System.currentTimeMillis(),
-                Events.DTEND to System.currentTimeMillis(),
-                Events.TITLE to "Some Event",
-                EventsContract.COLUMN_FLAGS to 123
-            ).apply { putAll(contentValues) }
-        )
-        val id = androidCalendar.addEvent(entity)
-
-        calendar.removeNotDirtyMarked(123)
-
-        assertNull(androidCalendar.getEvent(id))
-    }
-
-    @Test
-    fun testRemoveNotDirtyMarked_IdLargerThanIntMaxValue() = testRemoveNotDirtyMarked(
-        contentValuesOf(Events._ID to Int.MAX_VALUE.toLong() + 10, Events.DIRTY to 0)
-    )
-
-    @Test
-    fun testRemoveNotDirtyMarked_DirtyIs0() = testRemoveNotDirtyMarked(
-        contentValuesOf(Events._ID to 1, Events.DIRTY to 0)
-    )
-
-    @Test
-    fun testRemoveNotDirtyMarked_DirtyNull() = testRemoveNotDirtyMarked(
-        contentValuesOf(Events._ID to 1, Events.DIRTY to null)
-    )
-
-    /**
-     * Verifies that [LocalCalendar.markNotDirty] works as expected.
-     * @param contentValues values to set on the event. Required:
-     * - [Events.DIRTY]
-     */
-    private fun testMarkNotDirty(contentValues: ContentValues) {
-        val id = androidCalendar.addEvent(Entity(
-            contentValuesOf(
-                Events.CALENDAR_ID to androidCalendar.id,
-                Events._ID to 1,
-                Events.DTSTART to System.currentTimeMillis(),
-                Events.DTEND to System.currentTimeMillis(),
-                Events.TITLE to "Some Event",
-                EventsContract.COLUMN_FLAGS to 123
-            ).apply { putAll(contentValues) }
-        ))
-
-        val updated = calendar.markNotDirty(321)
-        assertEquals(1, updated)
-        assertEquals(321, androidCalendar.getEvent(id)?.entityValues?.getAsInteger(EventsContract.COLUMN_FLAGS))
-    }
-
-    @Test
-    fun test_markNotDirty_DirtyIs0() = testMarkNotDirty(
-        contentValuesOf(
-            Events.DIRTY to 0
-        )
-    )
-
-    @Test
-    fun test_markNotDirty_DirtyIsNull() = testMarkNotDirty(
-        contentValuesOf(
-            Events.DIRTY to null
-        )
-    )
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalGroupTest.kt

@@ -1,263 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.resource
-
-import android.Manifest
-import android.accounts.Account
-import android.content.ContentProviderClient
-import android.content.ContentUris
-import android.content.ContentValues
-import android.content.Context
-import android.provider.ContactsContract
-import android.provider.ContactsContract.CommonDataKinds.GroupMembership
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.GrantPermissionRule
-import at.bitfire.synctools.storage.ContactsBatchOperation
-import at.bitfire.vcard4android.CachedGroupMembership
-import at.bitfire.vcard4android.Contact
-import at.bitfire.vcard4android.GroupMethod
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import java.util.Optional
-import javax.inject.Inject
-
-@HiltAndroidTest
-class LocalGroupTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!
-
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var localTestAddressBookProvider: LocalTestAddressBookProvider
-
-    lateinit var provider: ContentProviderClient
-
-    val account = Account("Test Account", "Test Account Type")
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        val context = InstrumentationRegistry.getInstrumentation().context
-        provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!
-    }
-
-    @After
-    fun tearDown() {
-        provider.close()
-    }
-
-    @Test
-    fun testApplyPendingMemberships_addPendingMembership() {
-        localTestAddressBookProvider.provide(account, provider, GroupMethod.GROUP_VCARDS) { ab ->
-            val contact1 = LocalContact(ab, Contact().apply {
-                uid = "test1"
-                displayName = "Test"
-            }, "test1.vcf", null, 0)
-            contact1.add()
-
-            val group = newGroup(ab)
-            // set pending membership of contact1
-            ab.provider!!.update(
-                ContentUris.withAppendedId(ab.groupsSyncUri(), group.id!!),
-                ContentValues().apply {
-                    put(LocalGroup.COLUMN_PENDING_MEMBERS, LocalGroup.PendingMemberships(setOf("test1")).toString())
-                },
-                null, null
-            )
-
-            // pending membership -> contact1 should be added to group
-            LocalGroup.applyPendingMemberships(ab)
-
-            // check group membership
-            ab.provider!!.query(
-                ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI), arrayOf(GroupMembership.GROUP_ROW_ID, GroupMembership.RAW_CONTACT_ID),
-                "${GroupMembership.MIMETYPE}=?", arrayOf(GroupMembership.CONTENT_ITEM_TYPE),
-                null
-            )!!.use { cursor ->
-                assertTrue(cursor.moveToNext())
-                assertEquals(group.id, cursor.getLong(0))
-                assertEquals(contact1.id, cursor.getLong(1))
-
-                assertFalse(cursor.moveToNext())
-            }
-            // check cached group membership
-            ab.provider!!.query(
-                ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI), arrayOf(CachedGroupMembership.GROUP_ID, CachedGroupMembership.RAW_CONTACT_ID),
-                "${CachedGroupMembership.MIMETYPE}=?", arrayOf(CachedGroupMembership.CONTENT_ITEM_TYPE),
-                null
-            )!!.use { cursor ->
-                assertTrue(cursor.moveToNext())
-                assertEquals(group.id, cursor.getLong(0))
-                assertEquals(contact1.id, cursor.getLong(1))
-
-                assertFalse(cursor.moveToNext())
-            }
-        }
-    }
-
-    @Test
-    fun testApplyPendingMemberships_removeMembership() {
-        localTestAddressBookProvider.provide(account, provider, GroupMethod.GROUP_VCARDS) { ab ->
-            val contact1 = LocalContact(ab, Contact().apply {
-                uid = "test1"
-                displayName = "Test"
-            }, "test1.vcf", null, 0)
-            contact1.add()
-
-            val group = newGroup(ab)
-
-            // add contact1 to group
-            val batch = ContactsBatchOperation(ab.provider!!)
-            contact1.addToGroup(batch, group.id!!)
-            batch.commit()
-
-            // no pending memberships -> membership should be removed
-            LocalGroup.applyPendingMemberships(ab)
-
-            // check group membership
-            ab.provider!!.query(
-                ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI),
-                arrayOf(GroupMembership.GROUP_ROW_ID, GroupMembership.RAW_CONTACT_ID),
-                "${GroupMembership.MIMETYPE}=?",
-                arrayOf(GroupMembership.CONTENT_ITEM_TYPE),
-                null
-            )!!.use { cursor ->
-                assertFalse(cursor.moveToNext())
-            }
-            // check cached group membership
-            ab.provider!!.query(
-                ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI),
-                arrayOf(CachedGroupMembership.GROUP_ID, CachedGroupMembership.RAW_CONTACT_ID),
-                "${CachedGroupMembership.MIMETYPE}=?",
-                arrayOf(CachedGroupMembership.CONTENT_ITEM_TYPE),
-                null
-            )!!.use { cursor ->
-                assertFalse(cursor.moveToNext())
-            }
-        }
-    }
-
-    @Test
-    fun testClearDirty_addCachedGroupMembership() {
-        localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
-            val group = newGroup(ab)
-
-            val contact1 =
-                LocalContact(ab, Contact().apply { displayName = "Test" }, "fn.vcf", null, 0)
-            contact1.add()
-
-            // insert group membership, but no cached group membership
-            ab.provider!!.insert(
-                ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI), ContentValues().apply {
-                    put(GroupMembership.MIMETYPE, GroupMembership.CONTENT_ITEM_TYPE)
-                    put(GroupMembership.RAW_CONTACT_ID, contact1.id)
-                    put(GroupMembership.GROUP_ROW_ID, group.id)
-                }
-            )
-
-            group.clearDirty(Optional.empty(), null)
-
-            // check cached group membership
-            ab.provider!!.query(
-                ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI),
-                arrayOf(CachedGroupMembership.GROUP_ID, CachedGroupMembership.RAW_CONTACT_ID),
-                "${CachedGroupMembership.MIMETYPE}=?",
-                arrayOf(CachedGroupMembership.CONTENT_ITEM_TYPE),
-                null
-            )!!.use { cursor ->
-                assertTrue(cursor.moveToNext())
-                assertEquals(group.id, cursor.getLong(0))
-                assertEquals(contact1.id, cursor.getLong(1))
-
-                assertFalse(cursor.moveToNext())
-            }
-        }
-    }
-
-    @Test
-    fun testClearDirty_removeCachedGroupMembership() {
-        localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
-            val group = newGroup(ab)
-
-            val contact1 = LocalContact(ab, Contact().apply { displayName = "Test" }, "fn.vcf", null, 0)
-            contact1.add()
-
-            // insert cached group membership, but no group membership
-            ab.provider!!.insert(
-                ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI), ContentValues().apply {
-                    put(CachedGroupMembership.MIMETYPE, CachedGroupMembership.CONTENT_ITEM_TYPE)
-                    put(CachedGroupMembership.RAW_CONTACT_ID, contact1.id)
-                    put(CachedGroupMembership.GROUP_ID, group.id)
-                }
-            )
-
-            group.clearDirty(Optional.empty(), null)
-
-            // cached group membership should be gone
-            ab.provider!!.query(
-                ab.syncAdapterURI(ContactsContract.Data.CONTENT_URI), arrayOf(CachedGroupMembership.GROUP_ID, CachedGroupMembership.RAW_CONTACT_ID),
-                "${CachedGroupMembership.MIMETYPE}=?", arrayOf(CachedGroupMembership.CONTENT_ITEM_TYPE),
-                null
-            )!!.use { cursor ->
-                assertFalse(cursor.moveToNext())
-            }
-            }
-    }
-
-    @Test
-    fun testMarkMembersDirty() {
-        localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
-            val group = newGroup(ab)
-
-            val contact1 =
-                LocalContact(ab, Contact().apply { displayName = "Test" }, "fn.vcf", null, 0)
-            contact1.add()
-
-            val batch = ContactsBatchOperation(ab.provider!!)
-            contact1.addToGroup(batch, group.id!!)
-            batch.commit()
-
-            assertEquals(0, ab.findDirty().size)
-            group.markMembersDirty()
-            assertEquals(contact1.id, ab.findDirty().first().id)
-        }
-    }
-
-    @Test
-    fun testUpdate() {
-        localTestAddressBookProvider.provide(account, provider) { ab ->
-            val group = newGroup(ab)
-            group.update(Contact(displayName = "New Group Name"), null, null, null, 0)
-        }
-    }
-
-
-    // helpers
-
-    private fun newGroup(addressBook: LocalAddressBook): LocalGroup =
-        LocalGroup(addressBook,
-            Contact().apply {
-                displayName = "Test Group"
-            }, null, null, 0
-        ).apply {
-            add()
-        }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalTestAddressBook.kt

@@ -1,59 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.resource
-
-import android.accounts.Account
-import android.content.ContentProviderClient
-import android.content.Context
-import at.bitfire.davdroid.repository.DavCollectionRepository
-import at.bitfire.davdroid.repository.DavServiceRepository
-import at.bitfire.davdroid.settings.AccountSettings
-import at.bitfire.davdroid.sync.adapter.SyncFrameworkIntegration
-import at.bitfire.vcard4android.GroupMethod
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import dagger.hilt.android.qualifiers.ApplicationContext
-import java.util.Optional
-import java.util.logging.Logger
-
-/**
- * A local address book that provides an easy way to set the group method in tests.
- */
-class LocalTestAddressBook @AssistedInject constructor(
-    @Assisted account: Account,
-    @Assisted("addressBook") addressBookAccount: Account,
-    @Assisted provider: ContentProviderClient,
-    @Assisted override val groupMethod: GroupMethod,
-    accountSettingsFactory: AccountSettings.Factory,
-    collectionRepository: DavCollectionRepository,
-    @ApplicationContext context: Context,
-    logger: Logger,
-    serviceRepository: DavServiceRepository,
-    syncFramework: SyncFrameworkIntegration
-): LocalAddressBook(
-    account = account,
-    _addressBookAccount = addressBookAccount,
-    provider = provider,
-    accountSettingsFactory = accountSettingsFactory,
-    collectionRepository = collectionRepository,
-    context = context,
-    dirtyVerifier = Optional.empty(),
-    logger = logger,
-    serviceRepository = serviceRepository,
-    syncFramework = syncFramework
-) {
-
-    @AssistedFactory
-    interface Factory {
-        fun create(
-            account: Account,
-            @Assisted("addressBook") addressBookAccount: Account,
-            provider: ContentProviderClient,
-            groupMethod: GroupMethod
-        ): LocalTestAddressBook
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalTestAddressBookProvider.kt

@@ -1,72 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.resource
-
-import android.accounts.Account
-import android.accounts.AccountManager
-import android.content.ContentProviderClient
-import android.content.Context
-import at.bitfire.davdroid.R
-import at.bitfire.vcard4android.GroupMethod
-import dagger.hilt.android.qualifiers.ApplicationContext
-import org.junit.Assert.assertTrue
-import java.util.concurrent.atomic.AtomicInteger
-import javax.inject.Inject
-
-/**
- * Provides [LocalTestAddressBook]s in tests.
- */
-class LocalTestAddressBookProvider @Inject constructor(
-    @ApplicationContext context: Context,
-    private val localTestAddressBookFactory: LocalTestAddressBook.Factory
-) {
-
-    /**
-     * Counter for creating unique address book names.
-     */
-    val counter = AtomicInteger()
-
-    val accountManager = AccountManager.get(context)
-    val accountType = context.getString(R.string.account_type_address_book)
-
-    /**
-     * Creates and provides a new temporary [LocalTestAddressBook] for the given [account] and
-     * removes it again.
-     *
-     * @param account       The DAVx5 account to use for the address book
-     * @param provider      Content provider needed to access and modify the address book
-     * @param groupMethod   The group method the address book should use
-     * @param block         Function to execute with the temporary available address book
-     */
-    fun provide(
-        account: Account,
-        provider: ContentProviderClient,
-        groupMethod: GroupMethod = GroupMethod.GROUP_VCARDS,
-        block: (LocalTestAddressBook) -> Unit
-    ) {
-        // create new address book account
-        val addressBookAccount = Account("Test Address Book ${counter.incrementAndGet()}", accountType)
-        assertTrue(accountManager.addAccountExplicitly(addressBookAccount, null, null))
-        val addressBook = localTestAddressBookFactory.create(account, addressBookAccount, provider, groupMethod)
-
-        // Empty the address book (Needed by LocalGroupTest)
-        for (contact in addressBook.queryContacts(null, null))
-            contact.delete()
-        for (group in addressBook.queryGroups(null, null))
-            group.delete()
-
-        try {
-            // provide address book
-            block(addressBook)
-        } finally {
-            // recreate account of provided address book, since the account might have been renamed
-            val renamedAccount = Account(addressBook.addressBookAccount.name, addressBook.addressBookAccount.type)
-
-            // remove address book account / address book
-            assertTrue(accountManager.removeAccountExplicitly(renamedAccount))
-        }
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/CachedGroupMembershipHandlerTest.kt

@@ -1,90 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.resource.contactrow
-
-import android.Manifest
-import android.accounts.Account
-import android.content.ContentProviderClient
-import android.content.ContentValues
-import android.content.Context
-import android.provider.ContactsContract
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.GrantPermissionRule
-import at.bitfire.davdroid.resource.LocalContact
-import at.bitfire.davdroid.resource.LocalTestAddressBookProvider
-import at.bitfire.vcard4android.CachedGroupMembership
-import at.bitfire.vcard4android.Contact
-import at.bitfire.vcard4android.GroupMethod
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.AfterClass
-import org.junit.Assert.assertArrayEquals
-import org.junit.Before
-import org.junit.BeforeClass
-import org.junit.ClassRule
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class CachedGroupMembershipHandlerTest {
-
-    @Inject
-    @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var localTestAddressBookProvider: LocalTestAddressBookProvider
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    val account = Account("Test Account", "Test Account Type")
-
-    @Before
-    fun inject() {
-        hiltRule.inject()
-    }
-
-
-    @Test
-    fun testMembership() {
-        localTestAddressBookProvider.provide(account, provider, GroupMethod.GROUP_VCARDS) { addressBook ->
-            val contact = Contact()
-            val localContact = LocalContact(addressBook, contact, null, null, 0)
-            CachedGroupMembershipHandler(localContact).handle(ContentValues().apply {
-                put(CachedGroupMembership.GROUP_ID, 123456)
-                put(CachedGroupMembership.RAW_CONTACT_ID, 789)
-            }, contact)
-            assertArrayEquals(arrayOf(123456L), localContact.cachedGroupMemberships.toArray())
-        }
-    }
-
-
-    companion object {
-
-        @JvmField
-        @ClassRule
-        val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!
-
-        private lateinit var provider: ContentProviderClient
-
-        @BeforeClass
-        @JvmStatic
-        fun connect() {
-            val context = InstrumentationRegistry.getInstrumentation().context
-            provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!
-        }
-
-        @AfterClass
-        @JvmStatic
-        fun disconnect() {
-            provider.close()
-        }
-
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/GroupMembershipBuilderTest.kt

@@ -1,103 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.resource.contactrow
-
-import android.Manifest
-import android.accounts.Account
-import android.content.ContentProviderClient
-import android.content.Context
-import android.net.Uri
-import android.provider.ContactsContract
-import android.provider.ContactsContract.CommonDataKinds.GroupMembership
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.GrantPermissionRule
-import at.bitfire.davdroid.resource.LocalTestAddressBookProvider
-import at.bitfire.vcard4android.Contact
-import at.bitfire.vcard4android.GroupMethod
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.AfterClass
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.BeforeClass
-import org.junit.ClassRule
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class GroupMembershipBuilderTest {
-
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var localTestAddressBookProvider: LocalTestAddressBookProvider
-    
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    val account = Account("Test Account", "Test Account Type")
-
-
-    @Before
-    fun inject() {
-        hiltRule.inject()
-    }
-
-
-    @Test
-    fun testCategories_GroupsAsCategories() {
-        val contact = Contact().apply {
-            categories += "TEST GROUP"
-        }
-        localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { addressBookGroupsAsCategories ->
-            GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsCategories, false).build().also { result ->
-                assertEquals(1, result.size)
-                assertEquals(GroupMembership.CONTENT_ITEM_TYPE, result[0].values[GroupMembership.MIMETYPE])
-                assertEquals(addressBookGroupsAsCategories.findOrCreateGroup("TEST GROUP"), result[0].values[GroupMembership.GROUP_ROW_ID])
-            }
-        }
-    }
-
-    @Test
-    fun testCategories_GroupsAsVCards() {
-        val contact = Contact().apply {
-            categories += "TEST GROUP"
-        }
-        localTestAddressBookProvider.provide(account, provider, GroupMethod.GROUP_VCARDS) { addressBookGroupsAsVCards ->
-            GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsVCards, false).build().also { result ->
-                // group membership is constructed during post-processing
-                assertEquals(0, result.size)
-            }
-        }
-    }
-
-
-    companion object {
-
-        @JvmField
-        @ClassRule
-        val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!
-
-        private lateinit var provider: ContentProviderClient
-
-        @BeforeClass
-        @JvmStatic
-        fun connect() {
-            val context: Context = InstrumentationRegistry.getInstrumentation().context
-            provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!
-        }
-
-        @AfterClass
-        @JvmStatic
-        fun disconnect() {
-            provider.close()
-        }
-
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/GroupMembershipHandlerTest.kt

@@ -1,110 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.resource.contactrow
-
-import android.Manifest
-import android.accounts.Account
-import android.content.ContentProviderClient
-import android.content.ContentValues
-import android.content.Context
-import android.provider.ContactsContract
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.GrantPermissionRule
-import at.bitfire.davdroid.resource.LocalContact
-import at.bitfire.davdroid.resource.LocalTestAddressBookProvider
-import at.bitfire.vcard4android.CachedGroupMembership
-import at.bitfire.vcard4android.Contact
-import at.bitfire.vcard4android.GroupMethod
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.AfterClass
-import org.junit.Assert
-import org.junit.Assert.assertArrayEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.BeforeClass
-import org.junit.ClassRule
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class GroupMembershipHandlerTest {
-
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var localTestAddressBookProvider: LocalTestAddressBookProvider
-
-    @get:Rule
-    var hiltRule = HiltAndroidRule(this)
-
-    val account = Account("Test Account", "Test Account Type")
-
-    @Before
-    fun inject() {
-        hiltRule.inject()
-    }
-
-
-    @Test
-    fun testMembership_GroupsAsCategories() {
-        localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { addressBookGroupsAsCategories ->
-            val addressBookGroupsAsCategoriesGroup = addressBookGroupsAsCategories.findOrCreateGroup("TEST GROUP")
-
-            val contact = Contact()
-            val localContact = LocalContact(addressBookGroupsAsCategories, contact, null, null, 0)
-            GroupMembershipHandler(localContact).handle(ContentValues().apply {
-                put(CachedGroupMembership.GROUP_ID, addressBookGroupsAsCategoriesGroup)
-                put(CachedGroupMembership.RAW_CONTACT_ID, -1)
-            }, contact)
-            assertArrayEquals(arrayOf(addressBookGroupsAsCategoriesGroup), localContact.groupMemberships.toArray())
-            assertArrayEquals(arrayOf("TEST GROUP"), contact.categories.toArray())
-        }
-    }
-
-
-    @Test
-    fun testMembership_GroupsAsVCards() {
-        localTestAddressBookProvider.provide(account, provider, GroupMethod.GROUP_VCARDS) { addressBookGroupsAsVCards ->
-            val contact = Contact()
-            val localContact = LocalContact(addressBookGroupsAsVCards, contact, null, null, 0)
-            GroupMembershipHandler(localContact).handle(ContentValues().apply {
-                put(CachedGroupMembership.GROUP_ID, 12345)    // because the group name is not queried and put into CATEGORIES, the group doesn't have to really exist
-                put(CachedGroupMembership.RAW_CONTACT_ID, -1)
-            }, contact)
-            assertArrayEquals(arrayOf(12345L), localContact.groupMemberships.toArray())
-            assertTrue(contact.categories.isEmpty())
-        }
-    }
-
-
-    companion object {
-
-        @JvmField
-        @ClassRule
-        val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!
-
-        private lateinit var provider: ContentProviderClient
-
-        @BeforeClass
-        @JvmStatic
-        fun connect() {
-            val context: Context = InstrumentationRegistry.getInstrumentation().context
-            provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!
-            Assert.assertNotNull(provider)
-        }
-
-        @AfterClass
-        @JvmStatic
-        fun disconnect() {
-            provider.close()
-        }
-
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/UnknownPropertiesBuilderTest.kt

@@ -1,32 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.resource.contactrow
-
-import android.net.Uri
-import at.bitfire.vcard4android.Contact
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class UnknownPropertiesBuilderTest {
-
-    @Test
-    fun testUnknownProperties_None() {
-        UnknownPropertiesBuilder(Uri.EMPTY, null, Contact(), false).build().also { result ->
-            assertEquals(0, result.size)
-        }
-    }
-
-    @Test
-    fun testUnknownProperties_Properties() {
-        UnknownPropertiesBuilder(Uri.EMPTY, null, Contact().apply {
-            unknownProperties = "X-TEST:12345"
-        }, false).build().also { result ->
-            assertEquals(1, result.size)
-            assertEquals(UnknownProperties.CONTENT_ITEM_TYPE, result[0].values[UnknownProperties.MIMETYPE])
-            assertEquals("X-TEST:12345", result[0].values[UnknownProperties.UNKNOWN_PROPERTIES])
-        }
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/UnknownPropertiesHandlerTest.kt

@@ -1,33 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.resource.contactrow
-
-import android.content.ContentValues
-import at.bitfire.vcard4android.Contact
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Test
-
-class UnknownPropertiesHandlerTest {
-
-    @Test
-    fun testUnknownProperties_Empty() {
-        val contact = Contact()
-        UnknownPropertiesHandler.handle(ContentValues().apply {
-            putNull(UnknownProperties.UNKNOWN_PROPERTIES)
-        }, contact)
-        assertNull(contact.unknownProperties)
-    }
-
-    @Test
-    fun testUnknownProperties_Values() {
-        val contact = Contact()
-        UnknownPropertiesHandler.handle(ContentValues().apply {
-            put(UnknownProperties.UNKNOWN_PROPERTIES, "X-TEST:12345")
-        }, contact)
-        assertEquals("X-TEST:12345", contact.unknownProperties)
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/servicedetection/CollectionsWithoutHomeSetRefresherTest.kt

@@ -1,219 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.servicedetection
-
-import at.bitfire.davdroid.db.AppDatabase
-import at.bitfire.davdroid.db.Collection
-import at.bitfire.davdroid.db.Service
-import at.bitfire.davdroid.network.HttpClientBuilder
-import at.bitfire.davdroid.settings.SettingsManager
-import dagger.hilt.android.testing.BindValue
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.impl.annotations.MockK
-import io.mockk.junit4.MockKRule
-import okhttp3.OkHttpClient
-import okhttp3.mockwebserver.Dispatcher
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
-import okhttp3.mockwebserver.RecordedRequest
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import java.util.logging.Logger
-import javax.inject.Inject
-
-@HiltAndroidTest
-class CollectionsWithoutHomeSetRefresherTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val mockKRule = MockKRule(this)
-
-    @Inject
-    lateinit var db: AppDatabase
-
-    @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
-
-    @Inject
-    lateinit var logger: Logger
-
-    @Inject
-    lateinit var refresherFactory: CollectionsWithoutHomeSetRefresher.Factory
-
-    @BindValue
-    @MockK(relaxed = true)
-    lateinit var settings: SettingsManager
-
-    private lateinit var client: OkHttpClient
-    private lateinit var mockServer: MockWebServer
-    private lateinit var service: Service
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        // Start mock web server
-        mockServer = MockWebServer().apply {
-            dispatcher = TestDispatcher(logger)
-            start()
-        }
-
-        // build HTTP client
-        client = httpClientBuilder.build()
-
-        // insert test service
-        val serviceId = db.serviceDao().insertOrReplace(
-            Service(id = 0, accountName = "test", type = Service.TYPE_CARDDAV, principal = null)
-        )
-        service = db.serviceDao().get(serviceId)!!
-    }
-
-    @After
-    fun tearDown() {
-        mockServer.shutdown()
-    }
-
-
-    // refreshCollectionsWithoutHomeSet
-
-    @Test
-    fun refreshCollectionsWithoutHomeSet_updatesExistingCollection() {
-        // place homeless collection in DB
-        val collectionId = db.collectionDao().insertOrUpdateByUrl(
-            Collection(
-                0,
-                service.id,
-                null,
-                null,
-                Collection.TYPE_ADDRESSBOOK,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"),
-            )
-        )
-
-        // Refresh
-        refresherFactory.create(service, client).refreshCollectionsWithoutHomeSet()
-
-        // Check the collection got updated - with display name and description
-        assertEquals(
-            Collection(
-                collectionId,
-                service.id,
-                null,
-                1, // will have gotten an owner too
-                Collection.TYPE_ADDRESSBOOK,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"),
-                displayName = "My Contacts",
-                description = "My Contacts Description"
-            ),
-            db.collectionDao().get(collectionId)
-        )
-    }
-
-    @Test
-    fun refreshCollectionsWithoutHomeSet_deletesInaccessibleCollectionsWithoutHomeSet() {
-        // place homeless collection in DB - it is also inaccessible
-        val collectionId = db.collectionDao().insertOrUpdateByUrl(
-            Collection(
-                0,
-                service.id,
-                null,
-                null,
-                Collection.TYPE_ADDRESSBOOK,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK_INACCESSIBLE")
-            )
-        )
-
-        // Refresh - should delete collection
-        refresherFactory.create(service, client).refreshCollectionsWithoutHomeSet()
-
-        // Check the collection got deleted
-        assertEquals(null, db.collectionDao().get(collectionId))
-    }
-
-    @Test
-    fun refreshCollectionsWithoutHomeSet_addsOwnerUrls() {
-        // place homeless collection in DB
-        val collectionId = db.collectionDao().insertOrUpdateByUrl(
-            Collection(
-                0,
-                service.id,
-                null,
-                null,
-                Collection.TYPE_ADDRESSBOOK,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"),
-            )
-        )
-
-        // Refresh homeless collections
-        assertEquals(0, db.principalDao().getByService(service.id).size)
-        refresherFactory.create(service, client).refreshCollectionsWithoutHomeSet()
-
-        // Check principal saved and the collection was updated with its reference
-        val principals = db.principalDao().getByService(service.id)
-        assertEquals(1, principals.size)
-        assertEquals(mockServer.url("$PATH_CARDDAV$SUBPATH_PRINCIPAL"), principals[0].url)
-        assertEquals(null, principals[0].displayName)
-        assertEquals(
-            principals[0].id,
-            db.collectionDao().get(collectionId)!!.ownerId
-        )
-    }
-
-
-    companion object {
-        private const val PATH_CARDDAV = "/carddav"
-        private const val SUBPATH_PRINCIPAL = "/principal"
-        private const val SUBPATH_ADDRESSBOOK = "/addressbooks/my-contacts"
-        private const val SUBPATH_ADDRESSBOOK_INACCESSIBLE = "/addressbooks/inaccessible-contacts"
-    }
-
-    class TestDispatcher(
-        private val logger: Logger
-    ): Dispatcher() {
-
-        override fun dispatch(request: RecordedRequest): MockResponse {
-            val path = request.path!!.trimEnd('/')
-            logger.info("${request.method} on $path")
-
-            if (request.method.equals("PROPFIND", true)) {
-                val properties = when (path) {
-                    PATH_CARDDAV + SUBPATH_ADDRESSBOOK ->
-                        "<resourcetype>" +
-                        "   <collection/>" +
-                        "   <CARD:addressbook/>" +
-                        "</resourcetype>" +
-                        "<displayname>My Contacts</displayname>" +
-                        "<CARD:addressbook-description>My Contacts Description</CARD:addressbook-description>" +
-                        "<owner>" +
-                        "   <href>${PATH_CARDDAV + SUBPATH_PRINCIPAL}</href>" +
-                        "</owner>"
-
-                    else -> ""
-                }
-
-                return MockResponse()
-                    .setResponseCode(207)
-                    .setBody("<multistatus xmlns='DAV:' xmlns:CARD='urn:ietf:params:xml:ns:carddav' xmlns:CAL='urn:ietf:params:xml:ns:caldav'>" +
-                            "<response>" +
-                            "   <href>$path</href>" +
-                            "   <propstat><prop>"+
-                            properties +
-                            "   </prop></propstat>" +
-                            "</response>" +
-                            "</multistatus>")
-            }
-
-            return MockResponse().setResponseCode(404)
-        }
-
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/servicedetection/HomeSetRefresherTest.kt

@@ -1,470 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.servicedetection
-
-import at.bitfire.davdroid.db.AppDatabase
-import at.bitfire.davdroid.db.Collection
-import at.bitfire.davdroid.db.HomeSet
-import at.bitfire.davdroid.db.Service
-import at.bitfire.davdroid.network.HttpClientBuilder
-import at.bitfire.davdroid.settings.Settings
-import at.bitfire.davdroid.settings.SettingsManager
-import dagger.hilt.android.testing.BindValue
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.junit4.MockKRule
-import junit.framework.TestCase.assertFalse
-import junit.framework.TestCase.assertTrue
-import kotlinx.coroutines.test.runTest
-import okhttp3.OkHttpClient
-import okhttp3.mockwebserver.Dispatcher
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
-import okhttp3.mockwebserver.RecordedRequest
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import java.util.logging.Logger
-import javax.inject.Inject
-
-@HiltAndroidTest
-class HomeSetRefresherTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val mockKRule = MockKRule(this)
-
-    @Inject
-    lateinit var db: AppDatabase
-
-    @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
-
-    @Inject
-    lateinit var logger: Logger
-
-    @Inject
-    lateinit var homeSetRefresherFactory: HomeSetRefresher.Factory
-
-    @BindValue
-    @MockK(relaxed = true)
-    lateinit var settings: SettingsManager
-
-    private lateinit var client: OkHttpClient
-    private lateinit var mockServer: MockWebServer
-    private lateinit var service: Service
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        // Start mock web server
-        mockServer = MockWebServer().apply {
-            dispatcher = TestDispatcher(logger)
-            start()
-        }
-
-        // build HTTP client
-        client = httpClientBuilder.build()
-
-        // insert test service
-        val serviceId = db.serviceDao().insertOrReplace(
-            Service(id = 0, accountName = "test", type = Service.TYPE_CARDDAV, principal = null)
-        )
-        service = db.serviceDao().get(serviceId)!!
-    }
-
-    @After
-    fun tearDown() {
-        mockServer.shutdown()
-    }
-
-
-    // refreshHomesetsAndTheirCollections
-
-    @Test
-    fun refreshHomesetsAndTheirCollections_addsNewCollection() = runTest {
-        // save homeset in DB
-        val homesetId = db.homeSetDao().insert(
-            HomeSet(id = 0, service.id, true, mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK_HOMESET_PERSONAL"))
-        )
-
-        // Refresh
-        homeSetRefresherFactory.create(service, client)
-            .refreshHomesetsAndTheirCollections()
-
-        // Check the collection defined in homeset is now in the database
-        assertEquals(
-            Collection(
-                1,
-                service.id,
-                homesetId,
-                1, // will have gotten an owner too
-                Collection.TYPE_ADDRESSBOOK,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"),
-                displayName = "My Contacts",
-                description = "My Contacts Description"
-            ),
-            db.collectionDao().getByService(service.id).first()
-        )
-    }
-
-    @Test
-    fun refreshHomesetsAndTheirCollections_updatesExistingCollection() {
-        // save "old" collection in DB
-        val collectionId = db.collectionDao().insertOrUpdateByUrl(
-            Collection(
-                0,
-                service.id,
-                null,
-                null,
-                Collection.TYPE_ADDRESSBOOK,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"),
-                displayName = "My Contacts",
-                description = "My Contacts Description"
-            )
-        )
-
-        // Refresh
-        homeSetRefresherFactory.create(service, client).refreshHomesetsAndTheirCollections()
-
-        // Check the collection got updated
-        assertEquals(
-            Collection(
-                collectionId,
-                service.id,
-                null,
-                null,
-                Collection.TYPE_ADDRESSBOOK,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"),
-                displayName = "My Contacts",
-                description = "My Contacts Description"
-            ),
-            db.collectionDao().get(collectionId)
-        )
-    }
-
-    @Test
-    fun refreshHomesetsAndTheirCollections_preservesCollectionFlags() {
-        // save "old" collection in DB - with set flags
-        val collectionId = db.collectionDao().insertOrUpdateByUrl(
-            Collection(
-                0,
-                service.id,
-                null,
-                null,
-                Collection.TYPE_ADDRESSBOOK,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"),
-                displayName = "My Contacts",
-                description = "My Contacts Description",
-                forceReadOnly = true,
-                sync = true
-            )
-        )
-
-        // Refresh
-        homeSetRefresherFactory.create(service, client).refreshHomesetsAndTheirCollections()
-
-        // Check the collection got updated
-        assertEquals(
-            Collection(
-                collectionId,
-                service.id,
-                null,
-                null,
-                Collection.TYPE_ADDRESSBOOK,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"),
-                displayName = "My Contacts",
-                description = "My Contacts Description",
-                forceReadOnly = true,
-                sync = true
-            ),
-            db.collectionDao().get(collectionId)
-        )
-    }
-
-    @Test
-    fun refreshHomesetsAndTheirCollections_marksRemovedCollectionsAsHomeless() {
-        // save homeset in DB - which is empty (zero address books) on the serverside
-        val homesetId = db.homeSetDao().insert(
-            HomeSet(id = 0, service.id, true, mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK_HOMESET_EMPTY"))
-        )
-
-        // place collection in DB - as part of the homeset
-        val collectionId = db.collectionDao().insertOrUpdateByUrl(
-            Collection(
-                0,
-                service.id,
-                homesetId,
-                null,
-                Collection.TYPE_ADDRESSBOOK,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/")
-            )
-        )
-
-        // Refresh - should mark collection as homeless, because serverside homeset is empty.
-        homeSetRefresherFactory.create(service, client).refreshHomesetsAndTheirCollections()
-
-        // Check the collection, is now marked as homeless
-        assertEquals(null, db.collectionDao().get(collectionId)!!.homeSetId)
-    }
-
-    @Test
-    fun refreshHomesetsAndTheirCollections_addsOwnerUrls() {
-        // save a homeset in DB
-        val homesetId = db.homeSetDao().insert(
-            HomeSet(id = 0, service.id, true, mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK_HOMESET_PERSONAL"))
-        )
-
-        // place collection in DB - as part of the homeset
-        val collectionId = db.collectionDao().insertOrUpdateByUrl(
-            Collection(
-                0,
-                service.id,
-                homesetId, // part of above home set
-                null,
-                Collection.TYPE_ADDRESSBOOK,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/")
-            )
-        )
-
-        // Refresh - homesets and their collections
-        assertEquals(0, db.principalDao().getByService(service.id).size)
-        homeSetRefresherFactory.create(service, client).refreshHomesetsAndTheirCollections()
-
-        // Check principal saved and the collection was updated with its reference
-        val principals = db.principalDao().getByService(service.id)
-        assertEquals(1, principals.size)
-        assertEquals(mockServer.url("$PATH_CARDDAV$SUBPATH_PRINCIPAL"), principals[0].url)
-        assertEquals(null, principals[0].displayName)
-        assertEquals(
-            principals[0].id,
-            db.collectionDao().get(collectionId)!!.ownerId
-        )
-    }
-
-
-    // other
-
-    @Test
-    fun shouldPreselect_none() {
-        every { settings.getIntOrNull(Settings.PRESELECT_COLLECTIONS) } returns Settings.PRESELECT_COLLECTIONS_NONE
-        every { settings.getString(Settings.PRESELECT_COLLECTIONS_EXCLUDED) } returns ""
-
-        val collection = Collection(
-            0,
-            service.id,
-            0,
-            type = Collection.TYPE_ADDRESSBOOK,
-            url = mockServer.url("/addressbook-homeset/addressbook/")
-        )
-        val homesets = listOf(
-            HomeSet(
-                id = 0,
-                serviceId = service.id,
-                personal = true,
-                url = mockServer.url("/addressbook-homeset/")
-            )
-        )
-
-        val refresher = homeSetRefresherFactory.create(service, client)
-        assertFalse(refresher.shouldPreselect(collection, homesets))
-    }
-
-    @Test
-    fun shouldPreselect_all() {
-        every { settings.getIntOrNull(Settings.PRESELECT_COLLECTIONS) } returns Settings.PRESELECT_COLLECTIONS_ALL
-        every { settings.getString(Settings.PRESELECT_COLLECTIONS_EXCLUDED) } returns ""
-
-        val collection = Collection(
-            0,
-            service.id,
-            0,
-            type = Collection.TYPE_ADDRESSBOOK,
-            url = mockServer.url("/addressbook-homeset/addressbook/")
-        )
-        val homesets = listOf(
-            HomeSet(
-                id = 0,
-                serviceId = service.id,
-                personal = false,
-                url = mockServer.url("/addressbook-homeset/")
-            )
-        )
-
-        val refresher = homeSetRefresherFactory.create(service, client)
-        assertTrue(refresher.shouldPreselect(collection, homesets))
-    }
-
-    @Test
-    fun shouldPreselect_all_blacklisted() {
-        val url = mockServer.url("/addressbook-homeset/addressbook/")
-
-        every { settings.getIntOrNull(Settings.PRESELECT_COLLECTIONS) } returns Settings.PRESELECT_COLLECTIONS_ALL
-        every { settings.getString(Settings.PRESELECT_COLLECTIONS_EXCLUDED) } returns url.toString()
-
-        val collection = Collection(
-            id = 0,
-            serviceId = service.id,
-            homeSetId = 0,
-            type = Collection.TYPE_ADDRESSBOOK,
-            url = url
-        )
-        val homesets = listOf(
-            HomeSet(
-                id = 0,
-                serviceId = service.id,
-                personal = false,
-                url = mockServer.url("/addressbook-homeset/")
-            )
-        )
-
-        val refresher = homeSetRefresherFactory.create(service, client)
-        assertFalse(refresher.shouldPreselect(collection, homesets))
-    }
-
-    @Test
-    fun shouldPreselect_personal_notPersonal() {
-        every { settings.getIntOrNull(Settings.PRESELECT_COLLECTIONS) } returns Settings.PRESELECT_COLLECTIONS_PERSONAL
-        every { settings.getString(Settings.PRESELECT_COLLECTIONS_EXCLUDED) } returns ""
-
-        val collection = Collection(
-            id = 0,
-            serviceId = service.id,
-            homeSetId = 0,
-            type = Collection.TYPE_ADDRESSBOOK,
-            url = mockServer.url("/addressbook-homeset/addressbook/")
-        )
-        val homesets = listOf(
-            HomeSet(
-                id = 0,
-                serviceId = service.id,
-                personal = false,
-                url = mockServer.url("/addressbook-homeset/")
-            )
-        )
-
-        val refresher = homeSetRefresherFactory.create(service, client)
-        assertFalse(refresher.shouldPreselect(collection, homesets))
-    }
-
-    @Test
-    fun shouldPreselect_personal_isPersonal() {
-        every { settings.getIntOrNull(Settings.PRESELECT_COLLECTIONS) } returns Settings.PRESELECT_COLLECTIONS_PERSONAL
-        every { settings.getString(Settings.PRESELECT_COLLECTIONS_EXCLUDED) } returns ""
-
-        val collection = Collection(
-            0,
-            service.id,
-            0,
-            type = Collection.TYPE_ADDRESSBOOK,
-            url = mockServer.url("/addressbook-homeset/addressbook/")
-        )
-        val homesets = listOf(
-            HomeSet(
-                id = 0,
-                serviceId = service.id,
-                personal = true,
-                url = mockServer.url("/addressbook-homeset/")
-            )
-        )
-
-        val refresher = homeSetRefresherFactory.create(service, client)
-        assertTrue(refresher.shouldPreselect(collection, homesets))
-    }
-
-    @Test
-    fun shouldPreselect_personal_isPersonalButBlacklisted() {
-        val collectionUrl = mockServer.url("/addressbook-homeset/addressbook/")
-
-        every { settings.getIntOrNull(Settings.PRESELECT_COLLECTIONS) } returns Settings.PRESELECT_COLLECTIONS_PERSONAL
-        every { settings.getString(Settings.PRESELECT_COLLECTIONS_EXCLUDED) } returns collectionUrl.toString()
-
-        val collection = Collection(
-            id = 0,
-            serviceId = service.id,
-            homeSetId = 0,
-            type = Collection.TYPE_ADDRESSBOOK,
-            url = collectionUrl
-        )
-        val homesets = listOf(
-            HomeSet(
-                id = 0,
-                serviceId = service.id,
-                personal = true,
-                url = mockServer.url("/addressbook-homeset/")
-            )
-        )
-
-        val refresher = homeSetRefresherFactory.create(service, client)
-        assertFalse(refresher.shouldPreselect(collection, homesets))
-    }
-
-
-    companion object {
-
-        private const val PATH_CARDDAV = "/carddav"
-
-        private const val SUBPATH_PRINCIPAL = "/principal"
-        private const val SUBPATH_ADDRESSBOOK_HOMESET_PERSONAL = "/addressbooks-homeset"
-        private const val SUBPATH_ADDRESSBOOK_HOMESET_EMPTY = "/addressbooks-homeset-empty"
-        private const val SUBPATH_ADDRESSBOOK = "/addressbooks/my-contacts"
-
-    }
-
-    class TestDispatcher(
-        private val logger: Logger
-    ) : Dispatcher() {
-
-        override fun dispatch(request: RecordedRequest): MockResponse {
-            val path = request.path!!.trimEnd('/')
-
-            if (request.method.equals("PROPFIND", true)) {
-                val properties = when (path) {
-
-                    PATH_CARDDAV + SUBPATH_ADDRESSBOOK_HOMESET_PERSONAL ->
-                        "<resourcetype>" +
-                                "   <collection/>" +
-                                "   <CARD:addressbook/>" +
-                                "</resourcetype>" +
-                                "<displayname>My Contacts</displayname>" +
-                                "<CARD:addressbook-description>My Contacts Description</CARD:addressbook-description>" +
-                                "<owner>" +
-                                "   <href>${PATH_CARDDAV + SUBPATH_PRINCIPAL}</href>" +
-                                "</owner>"
-
-                    SUBPATH_ADDRESSBOOK_HOMESET_EMPTY -> ""
-
-                    else -> ""
-                }
-
-                logger.info("Queried: $path")
-                return MockResponse()
-                    .setResponseCode(207)
-                    .setBody(
-                        "<multistatus xmlns='DAV:' xmlns:CARD='urn:ietf:params:xml:ns:carddav' xmlns:CAL='urn:ietf:params:xml:ns:caldav'>" +
-                                "<response>" +
-                                "   <href>${PATH_CARDDAV + SUBPATH_ADDRESSBOOK}</href>" +
-                                "   <propstat><prop>" +
-                                properties +
-                                "   </prop></propstat>" +
-                                "   <status>HTTP/1.1 200 OK</status>" +
-                                "</response>" +
-                                "</multistatus>"
-                    )
-            }
-
-            return MockResponse().setResponseCode(404)
-        }
-
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/servicedetection/PrincipalsRefresherTest.kt

@@ -1,233 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.servicedetection
-
-import at.bitfire.davdroid.db.AppDatabase
-import at.bitfire.davdroid.db.Collection
-import at.bitfire.davdroid.db.Principal
-import at.bitfire.davdroid.db.Service
-import at.bitfire.davdroid.network.HttpClientBuilder
-import at.bitfire.davdroid.settings.SettingsManager
-import dagger.hilt.android.testing.BindValue
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.impl.annotations.MockK
-import io.mockk.junit4.MockKRule
-import junit.framework.TestCase.assertEquals
-import okhttp3.OkHttpClient
-import okhttp3.mockwebserver.Dispatcher
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
-import okhttp3.mockwebserver.RecordedRequest
-import org.junit.After
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import java.util.logging.Logger
-import javax.inject.Inject
-
-@HiltAndroidTest
-class PrincipalsRefresherTest {
-
-    @Inject
-    lateinit var db: AppDatabase
-
-    @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
-
-    @Inject
-    lateinit var logger: Logger
-
-    @Inject
-    lateinit var principalsRefresher: PrincipalsRefresher.Factory
-
-    @BindValue
-    @MockK(relaxed = true)
-    lateinit var settings: SettingsManager
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val mockKRule = MockKRule(this)
-
-    private lateinit var client: OkHttpClient
-    private lateinit var mockServer: MockWebServer
-    private lateinit var service: Service
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        // Start mock web server
-        mockServer = MockWebServer().apply {
-            dispatcher = TestDispatcher(logger)
-            start()
-        }
-
-        // build HTTP client
-        client = httpClientBuilder.build()
-
-        // insert test service
-        val serviceId = db.serviceDao().insertOrReplace(
-            Service(id = 0, accountName = "test", type = Service.TYPE_CARDDAV, principal = null)
-        )
-        service = db.serviceDao().get(serviceId)!!
-    }
-
-    @After
-    fun tearDown() {
-        mockServer.shutdown()
-    }
-
-
-    @Test
-    fun refreshPrincipals_inaccessiblePrincipal() {
-        // place principal without display name in db
-        val principalId = db.principalDao().insert(
-            Principal(
-                0,
-                service.id,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_PRINCIPAL_INACCESSIBLE"), // no trailing slash
-                null // no display name for now
-            )
-        )
-        // add an associated collection - as the principal is rightfully removed otherwise
-        db.collectionDao().insertOrUpdateByUrl(
-            Collection(
-                0,
-                service.id,
-                null,
-                principalId, // create association with principal
-                Collection.TYPE_ADDRESSBOOK,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"), // with trailing slash
-            )
-        )
-
-        // Refresh principals
-        principalsRefresher.create(service, client).refreshPrincipals()
-
-        // Check principal was not updated
-        val principals = db.principalDao().getByService(service.id)
-        assertEquals(1, principals.size)
-        assertEquals(mockServer.url("$PATH_CARDDAV$SUBPATH_PRINCIPAL_INACCESSIBLE"), principals[0].url)
-        assertEquals(null, principals[0].displayName)
-    }
-
-    @Test
-    fun refreshPrincipals_updatesPrincipal() {
-        // place principal without display name in db
-        val principalId = db.principalDao().insert(
-            Principal(
-                0,
-                service.id,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_PRINCIPAL"), // no trailing slash
-                null // no display name for now
-            )
-        )
-        // add an associated collection - as the principal is rightfully removed otherwise
-        db.collectionDao().insertOrUpdateByUrl(
-            Collection(
-                0,
-                service.id,
-                null,
-                principalId, // create association with principal
-                Collection.TYPE_ADDRESSBOOK,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"), // with trailing slash
-            )
-        )
-
-        // Refresh principals
-        principalsRefresher.create(service, client).refreshPrincipals()
-
-        // Check principal now got a display name
-        val principals = db.principalDao().getByService(service.id)
-        assertEquals(1, principals.size)
-        assertEquals(mockServer.url("$PATH_CARDDAV$SUBPATH_PRINCIPAL"), principals[0].url)
-        assertEquals("Mr. Wobbles", principals[0].displayName)
-    }
-
-    @Test
-    fun refreshPrincipals_deletesPrincipalsWithoutCollections() {
-        // place principal without collections in DB
-        db.principalDao().insert(
-            Principal(
-                0,
-                service.id,
-                mockServer.url("$PATH_CARDDAV$SUBPATH_PRINCIPAL_WITHOUT_COLLECTIONS/")
-            )
-        )
-
-        // Refresh principals - detecting it does not own collections
-        principalsRefresher.create(service, client).refreshPrincipals()
-
-        // Check principal was deleted
-        val principals = db.principalDao().getByService(service.id)
-        assertEquals(0, principals.size)
-    }
-
-
-    companion object {
-
-        private const val PATH_CARDDAV = "/carddav"
-
-        private const val SUBPATH_PRINCIPAL = "/principal"
-        private const val SUBPATH_PRINCIPAL_INACCESSIBLE = "/inaccessible-principal"
-        private const val SUBPATH_PRINCIPAL_WITHOUT_COLLECTIONS = "/principal2"
-        private const val SUBPATH_GROUPPRINCIPAL_0 = "/groups/0"
-        private const val SUBPATH_ADDRESSBOOK_HOMESET_PERSONAL = "/addressbooks-homeset"
-        private const val SUBPATH_ADDRESSBOOK_HOMESET_EMPTY = "/addressbooks-homeset-empty"
-        private const val SUBPATH_ADDRESSBOOK = "/addressbooks/my-contacts"
-
-    }
-
-    class TestDispatcher(
-        private val logger: Logger
-    ) : Dispatcher() {
-
-        override fun dispatch(request: RecordedRequest): MockResponse {
-            val path = request.path!!.trimEnd('/')
-
-            if (request.method.equals("PROPFIND", true)) {
-                val properties = when (path) {
-
-                    PATH_CARDDAV + SUBPATH_PRINCIPAL ->
-                        "<resourcetype><principal/></resourcetype>" +
-                                "<displayname>Mr. Wobbles</displayname>" + "<CARD:addressbook-home-set>" + "   <href>${PATH_CARDDAV}${SUBPATH_ADDRESSBOOK_HOMESET_PERSONAL}</href>" + "</CARD:addressbook-home-set>" + "<group-membership>" + "   <href>${PATH_CARDDAV}${SUBPATH_GROUPPRINCIPAL_0}</href>" +
-                                "</group-membership>"
-
-                    PATH_CARDDAV + SUBPATH_PRINCIPAL_WITHOUT_COLLECTIONS ->
-                        "<CARD:addressbook-home-set>" +
-                                "   <href>${PATH_CARDDAV}${SUBPATH_ADDRESSBOOK_HOMESET_EMPTY}</href>" +
-                                "</CARD:addressbook-home-set>" +
-                                "<displayname>Mr. Wobbles Jr.</displayname>"
-
-
-                    SUBPATH_ADDRESSBOOK_HOMESET_EMPTY -> ""
-
-                    else -> ""
-                }
-
-                logger.info("Queried: $path")
-                return MockResponse()
-                    .setResponseCode(207)
-                    .setBody(
-                        "<multistatus xmlns='DAV:' xmlns:CARD='urn:ietf:params:xml:ns:carddav' xmlns:CAL='urn:ietf:params:xml:ns:caldav'>" +
-                                "<response>" +
-                                "   <href>$path</href>" +
-                                "   <propstat><prop>" +
-                                properties +
-                                "   </prop></propstat>" +
-                                "</response>" +
-                                "</multistatus>"
-                    )
-            }
-
-            return MockResponse().setResponseCode(404)
-        }
-
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/servicedetection/ServiceRefresherTest.kt

@@ -1,160 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.servicedetection
-
-import at.bitfire.davdroid.db.AppDatabase
-import at.bitfire.davdroid.db.Service
-import at.bitfire.davdroid.network.HttpClientBuilder
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import okhttp3.OkHttpClient
-import okhttp3.mockwebserver.Dispatcher
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
-import okhttp3.mockwebserver.RecordedRequest
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import java.util.logging.Logger
-import javax.inject.Inject
-
-@HiltAndroidTest
-class ServiceRefresherTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @Inject
-    lateinit var db: AppDatabase
-
-    @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
-
-    @Inject
-    lateinit var logger: Logger
-
-    @Inject
-    lateinit var serviceRefresherFactory: ServiceRefresher.Factory
-
-    private lateinit var client: OkHttpClient
-    private lateinit var mockServer: MockWebServer
-    private lateinit var service: Service
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        // Start mock web server
-        mockServer = MockWebServer().apply {
-            dispatcher = TestDispatcher(logger)
-            start()
-        }
-
-        // build HTTP client
-        client = httpClientBuilder.build()
-
-        // insert test service
-        val serviceId = db.serviceDao().insertOrReplace(
-            Service(id = 0, accountName = "test", type = Service.TYPE_CARDDAV, principal = null)
-        )
-        service = db.serviceDao().get(serviceId)!!
-    }
-
-    @After
-    fun tearDown() {
-        mockServer.shutdown()
-    }
-
-
-    @Test
-    fun testDiscoverHomesets() {
-        val baseUrl = mockServer.url(PATH_CARDDAV + SUBPATH_PRINCIPAL)
-
-        // Query home sets
-        serviceRefresherFactory.create(service, client)
-            .discoverHomesets(baseUrl)
-
-        // Check home set has been saved correctly to database
-        val savedHomesets = db.homeSetDao().getByService(service.id)
-        assertEquals(2, savedHomesets.size)
-
-        // Home set from current-user-principal
-        val personalHomeset = savedHomesets[1]
-        assertEquals(mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK_HOMESET_PERSONAL/"), personalHomeset.url)
-        assertEquals(service.id, personalHomeset.serviceId)
-        // personal should be true for homesets detected at first query of current-user-principal (Even if they occur in a group principal as well!!!)
-        assertEquals(true, personalHomeset.personal)
-
-        // Home set found in a group principal
-        val groupHomeset = savedHomesets[0]
-        assertEquals(mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK_HOMESET_NON_PERSONAL/"), groupHomeset.url)
-        assertEquals(service.id, groupHomeset.serviceId)
-        // personal should be false for homesets not detected at the first query of current-user-principal (IE. in groups)
-        assertEquals(false, groupHomeset.personal)
-    }
-
-
-    companion object {
-        private const val PATH_CARDDAV = "/carddav"
-
-        private const val SUBPATH_PRINCIPAL = "/principal"
-        private const val SUBPATH_GROUPPRINCIPAL_0 = "/groups/0"
-        private const val SUBPATH_ADDRESSBOOK_HOMESET_PERSONAL = "/addressbooks-homeset"
-        private const val SUBPATH_ADDRESSBOOK_HOMESET_NON_PERSONAL = "/addressbooks-homeset-non-personal"
-
-    }
-
-    class TestDispatcher(
-        private val logger: Logger
-    ) : Dispatcher() {
-
-        override fun dispatch(request: RecordedRequest): MockResponse {
-            val path = request.path!!.trimEnd('/')
-            logger.info("Query: ${request.method} on $path ")
-
-            if (request.method.equals("PROPFIND", true)) {
-                val properties = when (path) {
-                    PATH_CARDDAV + SUBPATH_PRINCIPAL ->
-                        "<resourcetype><principal/></resourcetype>" +
-                                "<displayname>Mr. Wobbles</displayname>" +
-                                "<CARD:addressbook-home-set>" +
-                                "   <href>${PATH_CARDDAV}${SUBPATH_ADDRESSBOOK_HOMESET_PERSONAL}</href>" +
-                                "</CARD:addressbook-home-set>" +
-                                "<group-membership>" +
-                                "   <href>${PATH_CARDDAV}${SUBPATH_GROUPPRINCIPAL_0}</href>" +
-                                "</group-membership>"
-
-                    PATH_CARDDAV + SUBPATH_GROUPPRINCIPAL_0 ->
-                        "<resourcetype><principal/></resourcetype>" +
-                                "<displayname>All address books</displayname>" +
-                                "<CARD:addressbook-home-set>" +
-                                "   <href>${PATH_CARDDAV}${SUBPATH_ADDRESSBOOK_HOMESET_PERSONAL}</href>" +
-                                "   <href>${PATH_CARDDAV}${SUBPATH_ADDRESSBOOK_HOMESET_NON_PERSONAL}</href>" +
-                                "</CARD:addressbook-home-set>"
-
-                    else -> ""
-                }
-                return MockResponse()
-                    .setResponseCode(207)
-                    .setBody(
-                        "<multistatus xmlns='DAV:' xmlns:CARD='urn:ietf:params:xml:ns:carddav' xmlns:CAL='urn:ietf:params:xml:ns:caldav'>" +
-                                "<response>" +
-                                "   <href>$path</href>" +
-                                "   <propstat><prop>" +
-                                properties +
-                                "   </prop></propstat>" +
-                                "</response>" +
-                                "</multistatus>"
-                    )
-            }
-
-            return MockResponse().setResponseCode(404)
-        }
-
-    }
-
-}

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

@@ -1,60 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.settings
-
-import android.accounts.AccountManager
-import android.content.Context
-import at.bitfire.davdroid.TestUtils
-import at.bitfire.davdroid.sync.account.TestAccount
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class AccountSettingsTest {
-
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var accountSettingsFactory: AccountSettings.Factory
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-        TestUtils.setUpWorkManager(context)
-    }
-
-
-    @Test(expected = IllegalArgumentException::class)
-    fun testUpdate_MissingMigrations() {
-        TestAccount.provide(version = 1) { account ->
-            // will run AccountSettings.update
-            accountSettingsFactory.create(account, abortOnMissingMigration = true)
-        }
-    }
-
-    @Test
-    fun testUpdate_RunAllMigrations() {
-        TestAccount.provide(version = 6) { account ->
-            // will run AccountSettings.update
-            accountSettingsFactory.create(account, abortOnMissingMigration = true)
-
-            val accountManager = AccountManager.get(context)
-            val version = accountManager.getUserData(account, AccountSettings.KEY_SETTINGS_VERSION).toInt()
-            assertEquals(AccountSettings.CURRENT_VERSION, version)
-        }
-    }
-
-}

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

@@ -1,93 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.settings
-
-import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.take
-import kotlinx.coroutines.flow.toSet
-import kotlinx.coroutines.test.runTest
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class SettingsManagerTest {
-
-    companion object {
-        /** Use this setting to test SettingsManager methods. Will be removed after every test run. */
-        const val SETTING_TEST = "test"
-    }
-
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-    @get:Rule
-    val instantTaskExecutorRule = InstantTaskExecutorRule()
-
-    @Inject lateinit var settingsManager: SettingsManager
-
-    @Before
-    fun inject() {
-        hiltRule.inject()
-    }
-
-    @After
-    fun removeTestSetting() {
-        settingsManager.remove(SETTING_TEST)
-    }
-
-
-    @Test
-    fun test_containsKey_NotExisting() {
-        assertFalse(settingsManager.containsKey("notExisting"))
-    }
-
-    @Test
-    fun test_containsKey_Existing() {
-        // provided by DefaultsProvider
-        assertEquals(Settings.PROXY_TYPE_SYSTEM, settingsManager.getInt(Settings.PROXY_TYPE))
-    }
-
-
-    @Test
-    fun test_observerFlow_initialValue() = runTest {
-        var counter = 0
-        val live = settingsManager.observerFlow {
-            if (counter++ == 0)
-                23
-            else
-                throw AssertionError("A second value was requested")
-        }
-        assertEquals(23, live.first())
-    }
-
-    @Test
-    fun test_observerFlow_updatedValue() = runTest {
-        var counter = 0
-        val live = settingsManager.observerFlow {
-            when (counter++) {
-                0 -> {
-                    // update some setting so that we will be called a second time
-                    settingsManager.putBoolean(SETTING_TEST, true)
-                    // and emit initial value
-                    23
-                }
-                1 -> 42     // updated value
-                else -> throw AssertionError()
-            }
-        }
-
-        val result = live.take(2).toSet()
-        assertEquals(setOf(23, 42), result)
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/settings/migration/AccountSettingsMigration17Test.kt

@@ -1,102 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.settings.migration
-
-import android.accounts.Account
-import android.accounts.AccountManager
-import android.content.Context
-import androidx.test.rule.GrantPermissionRule
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.db.AppDatabase
-import at.bitfire.davdroid.db.Collection
-import at.bitfire.davdroid.db.Service
-import at.bitfire.davdroid.resource.LocalAddressBook
-import at.bitfire.davdroid.sync.account.TestAccount
-import at.bitfire.davdroid.sync.account.setAndVerifyUserData
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class AccountSettingsMigration17Test {
-
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var db: AppDatabase
-
-    @Inject
-    lateinit var migration: AccountSettingsMigration17
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val permissionRule = GrantPermissionRule.grant(android.Manifest.permission.READ_CONTACTS, android.Manifest.permission.WRITE_CONTACTS)
-
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-    }
-
-
-    @Test
-    fun testMigrate_OldAddressBook_CollectionInDB() {
-        val localAddressBookUserDataUrl = "url"
-        TestAccount.provide(version = 16) { account ->
-            val accountManager = AccountManager.get(context)
-            val addressBookAccountType = context.getString(R.string.account_type_address_book)
-            var addressBookAccount = Account("Address Book", addressBookAccountType)
-            assertTrue(accountManager.addAccountExplicitly(addressBookAccount, null, null))
-
-            try {
-                // address book has account + URL
-                val url = "https://example.com/address-book"
-                accountManager.setAndVerifyUserData(addressBookAccount, "real_account_name", account.name)
-                accountManager.setAndVerifyUserData(addressBookAccount, localAddressBookUserDataUrl, url)
-
-                // and is known in database
-                db.serviceDao().insertOrReplace(
-                    Service(
-                        id = 1, accountName = account.name, type = Service.TYPE_CARDDAV, principal = null
-                    )
-                )
-                db.collectionDao().insert(
-                    Collection(
-                        id = 100,
-                        serviceId = 1,
-                        url = url.toHttpUrl(),
-                        type = Collection.TYPE_ADDRESSBOOK,
-                        displayName = "Some Address Book"
-                    )
-                )
-
-                // run migration
-                migration.migrate(account)
-
-                // migration renames address book, update account
-                addressBookAccount = accountManager.getAccountsByType(addressBookAccountType).filter {
-                    accountManager.getUserData(it, localAddressBookUserDataUrl) == url
-                }.first()
-                assertEquals("Some Address Book (${account.name}) #100", addressBookAccount.name)
-
-                // ID is now assigned
-                assertEquals(100L, accountManager.getUserData(addressBookAccount, LocalAddressBook.USER_DATA_COLLECTION_ID)?.toLong())
-            } finally {
-                accountManager.removeAccountExplicitly(addressBookAccount)
-            }
-        }
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/settings/migration/AccountSettingsMigration18Test.kt

@@ -1,122 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.settings.migration
-
-import android.accounts.Account
-import android.accounts.AccountManager
-import android.content.Context
-import at.bitfire.davdroid.R
-import at.bitfire.davdroid.db.AppDatabase
-import at.bitfire.davdroid.db.Collection
-import at.bitfire.davdroid.db.Service
-import at.bitfire.davdroid.resource.LocalAddressBook
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.every
-import io.mockk.junit4.MockKRule
-import io.mockk.mockkObject
-import io.mockk.verify
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class AccountSettingsMigration18Test {
-
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var db: AppDatabase
-
-    @Inject
-    lateinit var migration: AccountSettingsMigration18
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val mockkRule = MockKRule(this)
-
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-    }
-
-
-    @Test
-    fun testMigrate_AddressBook_InvalidCollection() {
-        val addressBookAccountType = context.getString(R.string.account_type_address_book)
-        var addressBookAccount = Account("Address Book", addressBookAccountType)
-
-        val accountManager = AccountManager.get(context)
-        mockkObject(accountManager)
-        every { accountManager.getAccountsByType(addressBookAccountType) } returns arrayOf(addressBookAccount)
-        every { accountManager.getUserData(addressBookAccount, LocalAddressBook.USER_DATA_COLLECTION_ID) } returns "123"
-
-        val account = Account("test", "test")
-        migration.migrate(account)
-
-        verify(exactly = 0) {
-            accountManager.setUserData(addressBookAccount, any(), any())
-        }
-    }
-
-    @Test
-    fun testMigrate_AddressBook_NoCollection() {
-        val addressBookAccountType = context.getString(R.string.account_type_address_book)
-        var addressBookAccount = Account("Address Book", addressBookAccountType)
-
-        val accountManager = AccountManager.get(context)
-        mockkObject(accountManager)
-        every { accountManager.getAccountsByType(addressBookAccountType) } returns arrayOf(addressBookAccount)
-        every { accountManager.getUserData(addressBookAccount, LocalAddressBook.USER_DATA_COLLECTION_ID) } returns "123"
-
-        val account = Account("test", "test")
-        migration.migrate(account)
-
-        verify(exactly = 0) {
-            accountManager.setUserData(addressBookAccount, any(), any())
-        }
-    }
-
-    @Test
-    fun testMigrate_AddressBook_ValidCollection() {
-        val account = Account("test", "test")
-
-        db.serviceDao().insertOrReplace(Service(
-            id = 10,
-            accountName = account.name,
-            type = Service.TYPE_CARDDAV,
-            principal = null
-        ))
-        db.collectionDao().insertOrUpdateByUrl(Collection(
-            id = 100,
-            serviceId = 10,
-            url = "http://example.com".toHttpUrl(),
-            type = Collection.TYPE_ADDRESSBOOK
-        ))
-
-        val addressBookAccountType = context.getString(R.string.account_type_address_book)
-        var addressBookAccount = Account("Address Book", addressBookAccountType)
-
-        val accountManager = AccountManager.get(context)
-        mockkObject(accountManager)
-        every { accountManager.getAccountsByType(addressBookAccountType) } returns arrayOf(addressBookAccount)
-        every { accountManager.getUserData(addressBookAccount, LocalAddressBook.USER_DATA_COLLECTION_ID) } returns "100"
-
-        migration.migrate(account)
-
-        verify {
-            accountManager.setUserData(addressBookAccount, LocalAddressBook.USER_DATA_ACCOUNT_NAME, account.name)
-            accountManager.setUserData(addressBookAccount, LocalAddressBook.USER_DATA_ACCOUNT_TYPE, account.type)
-        }
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/settings/migration/AccountSettingsMigration19Test.kt

@@ -1,83 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.settings.migration
-
-import android.accounts.Account
-import android.content.Context
-import android.util.Log
-import androidx.hilt.work.HiltWorkerFactory
-import androidx.work.Configuration
-import androidx.work.WorkManager
-import androidx.work.testing.WorkManagerTestInitHelper
-import at.bitfire.davdroid.sync.AutomaticSyncManager
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.BindValue
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.impl.annotations.RelaxedMockK
-import io.mockk.junit4.MockKRule
-import io.mockk.mockkObject
-import io.mockk.verify
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class AccountSettingsMigration19Test {
-
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @BindValue
-    @RelaxedMockK
-    lateinit var automaticSyncManager: AutomaticSyncManager
-
-    @Inject
-    lateinit var migration: AccountSettingsMigration19
-
-    @Inject
-    lateinit var workerFactory: HiltWorkerFactory
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val mockkRule = MockKRule(this)
-
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        // Initialize WorkManager for instrumentation tests.
-        val config = Configuration.Builder()
-            .setMinimumLoggingLevel(Log.DEBUG)
-            .setWorkerFactory(workerFactory)
-            .build()
-        WorkManagerTestInitHelper.initializeTestWorkManager(context, config)
-    }
-
-
-    @Test
-    fun testMigrate_CancelsOldWorkersAndUpdatesAutomaticSync() {
-        val workManager = WorkManager.getInstance(context)
-        mockkObject(workManager)
-
-        val account = Account("Some", "Test")
-        migration.migrate(account)
-
-        verify {
-            workManager.cancelUniqueWork("periodic-sync at.bitfire.davdroid.addressbooks Test/Some")
-            workManager.cancelUniqueWork("periodic-sync com.android.calendar Test/Some")
-            workManager.cancelUniqueWork("periodic-sync at.techbee.jtx.provider Test/Some")
-            workManager.cancelUniqueWork("periodic-sync org.dmfs.tasks Test/Some")
-            workManager.cancelUniqueWork("periodic-sync org.tasks.opentasks Test/Some")
-
-            automaticSyncManager.updateAutomaticSync(account)
-        }
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/settings/migration/AccountSettingsMigration20Test.kt

@@ -1,144 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.settings.migration
-
-import android.Manifest
-import android.accounts.Account
-import android.accounts.AccountManager
-import android.content.Context
-import android.provider.CalendarContract
-import android.provider.CalendarContract.Calendars
-import androidx.core.content.contentValuesOf
-import androidx.core.database.getLongOrNull
-import androidx.test.rule.GrantPermissionRule
-import at.bitfire.davdroid.db.AppDatabase
-import at.bitfire.davdroid.db.Collection
-import at.bitfire.davdroid.db.Service
-import at.bitfire.davdroid.resource.LocalAddressBook
-import at.bitfire.davdroid.resource.LocalCalendarStore
-import at.bitfire.davdroid.resource.LocalTestAddressBookProvider
-import at.bitfire.davdroid.sync.account.setAndVerifyUserData
-import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
-import at.bitfire.vcard4android.GroupMethod
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.junit4.MockKRule
-import io.mockk.mockk
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class AccountSettingsMigration20Test {
-
-    @Inject
-    lateinit var calendarStore: LocalCalendarStore
-
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var db: AppDatabase
-
-    @Inject
-    lateinit var migration: AccountSettingsMigration20
-
-    @Inject
-    lateinit var localTestAddressBookProvider: LocalTestAddressBookProvider
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val mockkRule = MockKRule(this)
-
-    @get:Rule
-    val permissionsRule = GrantPermissionRule.grant(
-        Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS,
-        Manifest.permission.READ_CALENDAR, Manifest.permission.WRITE_CALENDAR
-    )
-
-    val accountManager by lazy { AccountManager.get(context) }
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-    }
-
-
-    @Test
-    fun testMigrateAddressBooks_UrlMatchesCollection() {
-        // set up legacy address-book with URL, but without collection ID
-        val account = Account("test", "test")
-        val url = "https://example.com/"
-
-        db.serviceDao().insertOrReplace(Service(id = 1, accountName = account.name, type = Service.TYPE_CARDDAV, principal = null))
-        val collectionId = db.collectionDao().insert(Collection(
-            serviceId = 1,
-            type = Collection.Companion.TYPE_ADDRESSBOOK,
-            url = url.toHttpUrl()
-        ))
-
-        localTestAddressBookProvider.provide(account, mockk(relaxed = true), GroupMethod.GROUP_VCARDS) { addressBook ->
-
-            accountManager.setAndVerifyUserData(addressBook.addressBookAccount, LocalAddressBook.USER_DATA_ACCOUNT_NAME, account.name)
-            accountManager.setAndVerifyUserData(addressBook.addressBookAccount, LocalAddressBook.USER_DATA_ACCOUNT_TYPE, account.type)
-            accountManager.setAndVerifyUserData(addressBook.addressBookAccount, AccountSettingsMigration20.ADDRESS_BOOK_USER_DATA_URL, url)
-            accountManager.setAndVerifyUserData(addressBook.addressBookAccount, LocalAddressBook.USER_DATA_COLLECTION_ID, null)
-
-            migration.migrateAddressBooks(account, cardDavServiceId = 1)
-
-            assertEquals(
-                collectionId,
-                accountManager.getUserData(addressBook.addressBookAccount, LocalAddressBook.USER_DATA_COLLECTION_ID).toLongOrNull()
-            )
-        }
-    }
-
-
-    @Test
-    fun testMigrateCalendars_UrlMatchesCollection() {
-        // set up legacy calendar with URL, but without collection ID
-        val account = Account("test", CalendarContract.ACCOUNT_TYPE_LOCAL)
-        val url = "https://example.com/"
-
-        db.serviceDao().insertOrReplace(Service(id = 1, accountName = account.name, type = Service.TYPE_CALDAV, principal = null))
-        val collectionId = db.collectionDao().insert(
-            Collection(
-                serviceId = 1,
-                type = Collection.Companion.TYPE_CALENDAR,
-                url = url.toHttpUrl()
-            )
-        )
-
-        context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)!!.use { provider ->
-            val uri = provider.insert(
-                Calendars.CONTENT_URI.asSyncAdapter(account),
-                contentValuesOf(
-                    Calendars.ACCOUNT_NAME to account.name,
-                    Calendars.ACCOUNT_TYPE to account.type,
-                    Calendars.CALENDAR_DISPLAY_NAME to "Test",
-                    Calendars.NAME to url,
-                    Calendars.SYNC_EVENTS to 1
-                )
-            )!!.asSyncAdapter(account)
-            try {
-                migration.migrateCalendars(account, 1)
-
-                provider.query(uri, arrayOf(Calendars._SYNC_ID), null, null, null)!!.use { cursor ->
-                    cursor.moveToNext()
-                    assertEquals(collectionId, cursor.getLongOrNull(0))
-                }
-            } finally {
-                provider.delete(uri, null, null)
-            }
-        }
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/settings/migration/AccountSettingsMigration21Test.kt

@@ -1,149 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.settings.migration
-
-import android.accounts.Account
-import android.content.ContentResolver
-import android.content.Context
-import android.content.SyncRequest
-import android.os.Bundle
-import android.provider.CalendarContract
-import androidx.test.filters.SdkSuppress
-import at.bitfire.davdroid.sync.account.TestAccount
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withTimeout
-import org.junit.After
-import org.junit.AfterClass
-import org.junit.Assert.assertFalse
-import org.junit.Assume
-import org.junit.Before
-import org.junit.BeforeClass
-import org.junit.Rule
-import org.junit.Test
-import java.util.logging.Logger
-import javax.inject.Inject
-
-@HiltAndroidTest
-class AccountSettingsMigration21Test {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @Inject
-    lateinit var migration: AccountSettingsMigration21
-
-    @Inject
-    @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var logger: Logger
-
-    lateinit var account: Account
-    val authority = CalendarContract.AUTHORITY
-
-    private val inPendingState = MutableStateFlow(false)
-    private var statusChangeListener: Any? = null
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        account = TestAccount.create()
-
-        // Enable sync globally and for the test account
-        ContentResolver.setIsSyncable(account, authority, 1)
-
-        // Start hot flow
-        registerSyncStateObserver()
-    }
-
-    @After
-    fun tearDown() {
-        unregisterSyncStateObserver()
-        TestAccount.remove(account)
-    }
-
-
-    @SdkSuppress(minSdkVersion = 34)
-    @Test
-    fun testCancelsSyncAndClearsPendingState() = runBlocking {
-        // Move into forever pending state
-        ContentResolver.requestSync(syncRequest())
-
-        // Wait until we are in forever pending state (with timeout)
-        withTimeout(10_000) {
-            inPendingState.first { it }
-        }
-
-        // Assume that we are now in the forever pending state (Skips test otherwise)
-        Assume.assumeTrue(ContentResolver.isSyncPending(account, authority))
-
-        // Run the migration which should cancel the forever pending sync for all accounts
-        migration.migrate(account)
-
-        // Wait for the state to change (with timeout)
-        withTimeout(10_000) {
-            inPendingState.first { !it }
-        }
-
-        // Check the sync is now not pending anymore
-        assertFalse(ContentResolver.isSyncPending(account, authority))
-    }
-
-
-    // helpers
-
-    private fun syncRequest() = SyncRequest.Builder()
-        .setSyncAdapter(account, authority)
-        .syncOnce()
-        .setExtras(Bundle())    // needed for Android 9
-        .setExpedited(true)     // sync request will be scheduled at the front of the sync request queue
-        .setManual(true)        // equivalent of setting both SYNC_EXTRAS_IGNORE_SETTINGS and SYNC_EXTRAS_IGNORE_BACKOFF
-        .build()
-
-    private fun registerSyncStateObserver() {
-        // listener pushes updates immediately when sync status changes
-        statusChangeListener = ContentResolver.addStatusChangeListener(
-            ContentResolver.SYNC_OBSERVER_TYPE_PENDING or ContentResolver.SYNC_OBSERVER_TYPE_ACTIVE
-        ) {
-            inPendingState.tryEmit(ContentResolver.isSyncPending(account, authority))
-        }
-
-        // Emit initial state
-        inPendingState.tryEmit(ContentResolver.isSyncPending(account, authority))
-    }
-
-    private fun unregisterSyncStateObserver() {
-        statusChangeListener?.let { ContentResolver.removeStatusChangeListener(it) }
-    }
-
-    companion object {
-
-        var globalAutoSyncBeforeTest = false
-
-        @BeforeClass
-        @JvmStatic
-        fun before() {
-            globalAutoSyncBeforeTest = ContentResolver.getMasterSyncAutomatically()
-
-            // We'll request syncs explicitly and with SYNC_EXTRAS_IGNORE_SETTINGS
-            ContentResolver.setMasterSyncAutomatically(false)
-        }
-
-        @AfterClass
-        @JvmStatic
-        fun after() {
-            ContentResolver.setMasterSyncAutomatically(globalAutoSyncBeforeTest)
-        }
-
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/sync/AndroidSyncFrameworkTest.kt

@@ -1,238 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.sync
-
-import android.accounts.Account
-import android.content.ContentResolver
-import android.content.SyncRequest
-import android.content.SyncStatusObserver
-import android.os.Bundle
-import android.provider.CalendarContract
-import androidx.test.filters.SdkSuppress
-import at.bitfire.davdroid.sync.account.TestAccount
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withTimeout
-import org.junit.After
-import org.junit.AfterClass
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.BeforeClass
-import org.junit.Rule
-import org.junit.Test
-import java.util.Collections
-import java.util.LinkedList
-import java.util.logging.Logger
-import javax.inject.Inject
-import kotlin.time.Duration.Companion.seconds
-
-@HiltAndroidTest
-class AndroidSyncFrameworkTest: SyncStatusObserver {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @Inject
-    lateinit var logger: Logger
-
-    lateinit var account: Account
-    val authority = CalendarContract.AUTHORITY
-
-    private lateinit var stateChangeListener: Any
-    private val recordedStates = Collections.synchronizedList(LinkedList<State>())
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        account = TestAccount.create()
-
-        // Enable sync globally and for the test account
-        ContentResolver.setIsSyncable(account, authority, 1)
-
-        // Remember states the sync framework reports as pairs of (sync pending, sync active).
-        recordedStates.clear()
-        onStatusChanged(0)      // record first entry (pending = false, active = false)
-        stateChangeListener = ContentResolver.addStatusChangeListener(
-            ContentResolver.SYNC_OBSERVER_TYPE_PENDING or ContentResolver.SYNC_OBSERVER_TYPE_ACTIVE,
-            this
-        )
-    }
-
-    @After
-    fun tearDown() {
-        ContentResolver.removeStatusChangeListener(stateChangeListener)
-        TestAccount.remove(account)
-    }
-
-
-    /**
-     * Correct behaviour of the sync framework on Android 13 and below.
-     * Pending state is correctly reflected
-     */
-    @SdkSuppress(maxSdkVersion = 33)
-    @Test
-    fun testVerifySyncAlwaysPending_correctBehaviour_android13() {
-        verifySyncStates(
-            listOf(
-                State(pending = false, active = false),                 // no sync pending or active
-                State(pending = true, active = false, optional = true), // sync becomes pending
-                State(pending = true, active = true),                   // ... and pending and active at the same time
-                State(pending = false, active = true),                  // ... and then only active
-                State(pending = false, active = false)                  // sync finished
-            )
-        )
-    }
-
-    /* SHOULD BE FIXED WITH https://github.com/bitfireAT/davx5-ose/issues/1748
-     * Wrong behaviour of the sync framework on Android 14+.
-     * Pending state stays true forever (after initial run), active state behaves correctly
-     */
-    /*@SdkSuppress(minSdkVersion = 34 /*, maxSdkVersion = 36 */)
-    @Test
-    fun testVerifySyncAlwaysPending_wrongBehaviour_android14() {
-        verifySyncStates(
-            listOf(
-                State(pending = false, active = false),                 // no sync pending or active
-                State(pending = true, active = false, optional = true), // sync becomes pending
-                State(pending = true, active = true),                   // ... and pending and active at the same time
-                State(pending = true, active = false)                   // ... and finishes, but stays pending
-            )
-        )
-    }*/
-
-
-    // helpers
-
-    private fun syncRequest() = SyncRequest.Builder()
-        .setSyncAdapter(account, authority)
-        .syncOnce()
-        .setExtras(Bundle())    // needed for Android 9
-        .setExpedited(true)     // sync request will be scheduled at the front of the sync request queue
-        .setManual(true)        // equivalent of setting both SYNC_EXTRAS_IGNORE_SETTINGS and SYNC_EXTRAS_IGNORE_BACKOFF
-        .build()
-
-    /**
-     * Verifies that the given expected states match the recorded states.
-     */
-    private fun verifySyncStates(expectedStates: List<State>) = runBlocking {
-        // Verify that last state is non-optional.
-        if (expectedStates.last().optional)
-            throw IllegalArgumentException("Last expected state must not be optional")
-
-        // We use runBlocking for these tests because it uses the default dispatcher
-        // which does not auto-advance virtual time and we need real system time to
-        // test the sync framework behavior.
-
-        ContentResolver.requestSync(syncRequest())
-
-        // Even though the always-pending-bug is present on Android 14+, the sync active
-        // state behaves correctly, so we can record the state changes as pairs (pending,
-        // active) and expect a certain sequence of state pairs to verify the presence or
-        // absence of the bug on different Android versions.
-        withTimeout(60.seconds) { // Usually takes less than 30 seconds
-            while (recordedStates.size < expectedStates.size) {
-                // verify already known states
-                if (recordedStates.isNotEmpty())
-                    assertStatesEqual(expectedStates, recordedStates, fullMatch = false)
-
-                delay(500) // avoid busy-waiting
-            }
-
-            assertStatesEqual(expectedStates, recordedStates, fullMatch = true)
-        }
-    }
-
-    private fun assertStatesEqual(expectedStates: List<State>, actualStates: List<State>, fullMatch: Boolean) {
-        assertTrue("Expected states=$expectedStates, actual=$actualStates", statesMatch(expectedStates, actualStates, fullMatch))
-    }
-
-    /**
-     * Checks whether [actualStates] have matching [expectedStates], under the condition
-     * that expected states with the [State.optional] flag can be skipped.
-     *
-     * Note: When [fullMatch] is not set, this method can return _true_ even if not all expected states are used.
-     *
-     * @param expectedStates    expected states (can include optional states which don't have to be present in actual states)
-     * @param actualStates      actual states
-     * @param fullMatch         whether all non-optional expected states must be present in actual states
-     */
-    private fun statesMatch(expectedStates: List<State>, actualStates: List<State>, fullMatch: Boolean): Boolean {
-        // iterate through entries
-        val expectedIterator = expectedStates.iterator()
-        for (actual in actualStates) {
-            if (!expectedIterator.hasNext())
-                return false
-            var expected = expectedIterator.next()
-
-            // skip optional expected entries if they don't match the actual entry
-            while (!actual.stateEquals(expected) && expected.optional) {
-                if (!expectedIterator.hasNext())
-                    return false
-                expected = expectedIterator.next()
-            }
-
-            // we now have a non-optional expected state and it must match
-            if (!actual.stateEquals(expected))
-                return false
-        }
-
-        // full match: all expected states must have been used
-        if (fullMatch && expectedIterator.hasNext())
-            return false
-
-        return true
-    }
-
-
-    // SyncStatusObserver implementation and data class
-
-    override fun onStatusChanged(which: Int) {
-        val state = State(
-            pending = ContentResolver.isSyncPending(account, authority),
-            active = ContentResolver.isSyncActive(account, authority)
-        )
-        synchronized(recordedStates) {
-            if (recordedStates.lastOrNull() != state) {
-                logger.info("$account syncState = $state")
-                recordedStates += state
-            }
-        }
-    }
-
-    data class State(
-        val pending: Boolean,
-        val active: Boolean,
-        val optional: Boolean = false
-    ) {
-        fun stateEquals(other: State) =
-            pending == other.pending && active == other.active
-    }
-
-
-    companion object {
-
-        var globalAutoSyncBeforeTest = false
-
-        @BeforeClass
-        @JvmStatic
-        fun before() {
-            globalAutoSyncBeforeTest = ContentResolver.getMasterSyncAutomatically()
-
-            // We'll request syncs explicitly and with SYNC_EXTRAS_IGNORE_SETTINGS
-            ContentResolver.setMasterSyncAutomatically(false)
-        }
-
-        @AfterClass
-        @JvmStatic
-        fun after() {
-            ContentResolver.setMasterSyncAutomatically(globalAutoSyncBeforeTest)
-        }
-
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/sync/CalendarSyncManagerTest.kt

@@ -1,151 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.sync
-
-import android.Manifest
-import android.accounts.Account
-import android.content.ContentProviderClient
-import android.content.Context
-import android.content.Entity
-import android.provider.CalendarContract
-import android.provider.CalendarContract.Calendars
-import android.provider.CalendarContract.Events
-import androidx.core.content.contentValuesOf
-import androidx.test.rule.GrantPermissionRule
-import at.bitfire.davdroid.resource.LocalCalendar
-import at.bitfire.davdroid.resource.LocalEvent
-import at.bitfire.davdroid.sync.account.TestAccount
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
-import at.bitfire.synctools.storage.calendar.AndroidCalendar
-import at.bitfire.synctools.storage.calendar.AndroidCalendarProvider
-import at.bitfire.synctools.storage.calendar.EventAndExceptions
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.mockk
-import okio.Buffer
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import javax.inject.Inject
-
-@HiltAndroidTest
-class CalendarSyncManagerTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val permissionsRule = GrantPermissionRule.grant(
-        Manifest.permission.READ_CALENDAR, Manifest.permission.WRITE_CALENDAR
-    )
-
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var localCalendarFactory: LocalCalendar.Factory
-
-    @Inject
-    lateinit var syncManagerFactory: CalendarSyncManager.Factory
-
-    lateinit var account: Account
-    lateinit var providerClient: ContentProviderClient
-    lateinit var androidCalendar: AndroidCalendar
-    lateinit var localCalendar: LocalCalendar
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        account = TestAccount.create()
-        providerClient = context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)!!
-
-        // create LocalCalendar
-        val androidCalendarProvider = AndroidCalendarProvider(account, providerClient)
-        androidCalendar = androidCalendarProvider.createAndGetCalendar(contentValuesOf(
-            Calendars.NAME to "Sample Calendar"
-        ))
-        localCalendar = localCalendarFactory.create(androidCalendar)
-    }
-
-    @After
-    fun tearDown() {
-        localCalendar.androidCalendar.delete()
-        providerClient.closeCompat()
-        TestAccount.remove(account)
-    }
-
-
-    @Test
-    fun test_generateUpload_existingUid() {
-        val result = syncManager().generateUpload(LocalEvent(
-            localCalendar.recurringCalendar,
-            EventAndExceptions(
-                main = Entity(contentValuesOf(
-                    Events._ID to 1,
-                    Events.CALENDAR_ID to androidCalendar.id,
-                    Events.DTSTART to System.currentTimeMillis(),
-                    Events.UID_2445 to "existing-uid"
-                )),
-                exceptions = emptyList()
-            )
-        ))
-
-        assertEquals("existing-uid.ics", result.suggestedFileName)
-
-        val iCal = Buffer().also {
-            result.requestBody.writeTo(it)
-        }.readString(Charsets.UTF_8)
-        assertTrue(iCal.contains("UID:existing-uid\r\n"))
-    }
-
-    @Test
-    fun generateUpload_noUid() {
-        val result = syncManager().generateUpload(LocalEvent(
-            localCalendar.recurringCalendar,
-            EventAndExceptions(
-                main = Entity(contentValuesOf(
-                    Events._ID to 2,
-                    Events.CALENDAR_ID to androidCalendar.id,
-                    Events.DTSTART to System.currentTimeMillis()
-                )),
-                exceptions = emptyList()
-            )
-        ))
-
-        assertTrue(result.suggestedFileName.matches(UUID_FILENAME_REGEX))
-        val uuid = result.suggestedFileName.removeSuffix(".ics")
-
-        val iCal = Buffer().also {
-            result.requestBody.writeTo(it)
-        }.readString(Charsets.UTF_8)
-        assertTrue(iCal.contains("UID:$uuid\r\n"))
-
-    }
-
-
-    // helpers
-
-    private fun syncManager() = syncManagerFactory.calendarSyncManager(
-        account = account,
-        httpClient = mockk(),
-        syncResult = mockk(),
-        localCalendar = mockk(),
-        collection = mockk(),
-        resync = mockk()
-    )
-
-
-    companion object {
-
-        val UUID_FILENAME_REGEX = "^[0-9a-fA-F]{8}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{12}\\.ics$".toRegex()
-
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/sync/FakeSyncAdapter.kt

@@ -1,51 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.sync
-
-import android.accounts.Account
-import android.content.AbstractThreadedSyncAdapter
-import android.content.ContentProviderClient
-import android.content.Context
-import android.content.SyncResult
-import android.os.Bundle
-import android.os.IBinder
-import at.bitfire.davdroid.sync.adapter.SyncAdapter
-import dagger.hilt.android.qualifiers.ApplicationContext
-import java.util.logging.Level
-import java.util.logging.Logger
-import javax.inject.Inject
-
-class FakeSyncAdapter @Inject constructor(
-    @ApplicationContext context: Context,
-    private val logger: Logger
-): AbstractThreadedSyncAdapter(context, true), SyncAdapter {
-
-    init {
-        logger.info("FakeSyncAdapter created")
-    }
-
-    override fun onPerformSync(account: Account, extras: Bundle, authority: String, provider: ContentProviderClient, syncResult: SyncResult) {
-        logger.log(
-            Level.INFO,
-            "onPerformSync(account=$account, extras=$extras, authority=$authority, syncResult=$syncResult)",
-            extras.keySet().map { key -> "extras[$key] = ${extras[key]}" }
-        )
-
-        // fake 5 sec sync
-        try {
-            Thread.sleep(5000)
-        } catch (_: InterruptedException) {
-            logger.info("onPerformSync($account) cancelled")
-        }
-
-        logger.info("onPerformSync($account) finished")
-    }
-
-
-    // SyncAdapter implementation and Hilt module
-
-    override fun getBinder(): IBinder = syncAdapterBinder
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/sync/JtxSyncManagerTest.kt

@@ -1,187 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.sync
-
-import android.accounts.Account
-import android.content.ContentProviderClient
-import android.content.Context
-import at.bitfire.davdroid.db.Collection
-import at.bitfire.davdroid.db.Service
-import at.bitfire.davdroid.network.HttpClientBuilder
-import at.bitfire.davdroid.repository.DavServiceRepository
-import at.bitfire.davdroid.resource.LocalJtxCollection
-import at.bitfire.davdroid.resource.LocalJtxCollectionStore
-import at.bitfire.davdroid.sync.account.TestAccount
-import at.bitfire.davdroid.util.PermissionUtils
-import at.bitfire.ical4android.TaskProvider
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
-import at.bitfire.synctools.test.GrantPermissionOrSkipRule
-import at.techbee.jtx.JtxContract
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Assume.assumeNotNull
-import org.junit.Assume.assumeTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import java.io.StringReader
-import javax.inject.Inject
-
-
-/**
- * Ensure you have jtxBoard installed on the emulator, before running these tests. Otherwise they
- * will be skipped.
- */
-@HiltAndroidTest
-class JtxSyncManagerTest {
-
-    @Inject
-    @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
-
-    @Inject
-    lateinit var serviceRepository: DavServiceRepository
-
-    @Inject
-    lateinit var localJtxCollectionStore: LocalJtxCollectionStore
-
-    @Inject
-    lateinit var jtxSyncManagerFactory: JtxSyncManager.Factory
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @get:Rule
-    val permissionRule = GrantPermissionOrSkipRule(TaskProvider.PERMISSIONS_JTX.toSet())
-
-    lateinit var account: Account
-
-    private lateinit var provider: ContentProviderClient
-    private lateinit var syncManager: JtxSyncManager
-    private lateinit var localJtxCollection: LocalJtxCollection
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-
-        // Check jtxBoard permissions were granted (+jtxBoard is installed); skip test otherwise
-        assumeTrue(PermissionUtils.havePermissions(context, TaskProvider.PERMISSIONS_JTX))
-
-        // Acquire the jtx content provider
-        val providerOrNull = context.contentResolver.acquireContentProviderClient(JtxContract.AUTHORITY)
-        assumeNotNull(providerOrNull)
-        provider = providerOrNull!!
-
-        account = TestAccount.create()
-
-        // Create dummy dependencies
-        val service = Service(0, account.name, Service.TYPE_CALDAV, null)
-        val serviceId = serviceRepository.insertOrReplaceBlocking(service)
-        val dbCollection = Collection(
-            0,
-            serviceId,
-            type = Collection.TYPE_CALENDAR,
-            url = "https://example.com".toHttpUrl()
-        )
-        localJtxCollection = localJtxCollectionStore.create(provider, dbCollection)!!
-        syncManager = jtxSyncManagerFactory.jtxSyncManager(
-            account = account,
-            httpClient = httpClientBuilder.build(),
-            syncResult = SyncResult(),
-            localCollection = localJtxCollection,
-            collection = dbCollection,
-            resync = null
-        )
-    }
-
-    @After
-    fun tearDown() {
-        if (this::localJtxCollection.isInitialized)
-            localJtxCollectionStore.delete(localJtxCollection)
-        serviceRepository.deleteAllBlocking()
-
-        if (this::provider.isInitialized)
-            provider.closeCompat()
-
-        if (this::account.isInitialized)
-            TestAccount.remove(account)
-    }
-
-
-    @Test
-    fun testProcessICalObject_addsVtodo() {
-        val calendar = "BEGIN:VCALENDAR\n" +
-                "PRODID:-Vivaldi Calendar V1.0//EN\n" +
-                "VERSION:2.0\n" +
-                "BEGIN:VTODO\n" +
-                "SUMMARY:Test Task (Main VTODO)\n" +
-                "DTSTAMP;VALUE=DATE-TIME:20250228T032800Z\n" +
-                "UID:47a23c66-8c1a-4b44-bbe8-ebf33f8cf80f\n" +
-                "END:VTODO\n" +
-                "END:VCALENDAR"
-
-        // Should create "demo-calendar"
-        syncManager.processICalObject("demo-calendar", "abc123", StringReader(calendar))
-
-        // Verify main VTODO is created
-        val localJtxIcalObject = localJtxCollection.findByName("demo-calendar")!!
-        assertEquals("47a23c66-8c1a-4b44-bbe8-ebf33f8cf80f", localJtxIcalObject.uid)
-        assertEquals("abc123", localJtxIcalObject.eTag)
-        assertEquals("Test Task (Main VTODO)", localJtxIcalObject.summary)
-    }
-
-    @Test
-    fun testProcessICalObject_addsRecurringVtodo_withoutDtStart() {
-        // Valid calendar example (See bitfireAT/davx5-ose#1265)
-        // Note: We don't support starting a recurrence from DUE (RFC 5545  leaves it open to interpretation)
-        val calendar = "BEGIN:VCALENDAR\n" +
-                "PRODID:-Vivaldi Calendar V1.0//EN\n" +
-                "VERSION:2.0\n" +
-                "BEGIN:VTODO\n" +
-
-                "SUMMARY:Test Task (Exception)\n" +
-                "DTSTAMP;VALUE=DATE-TIME:20250228T032800Z\n" +
-                "DUE;TZID=America/New_York:20250228T130000\n" +
-                "RECURRENCE-ID;TZID=America/New_York:20250228T130000\n" +
-                "UID:47a23c66-8c1a-4b44-bbe8-ebf33f8cf80f\n" +
-
-                "END:VTODO\n" +
-                "BEGIN:VTODO\n" +
-
-                "SUMMARY:Test Task (Main VTODO)\n" +
-                "DTSTAMP;VALUE=DATE-TIME:20250228T032800Z\n" +
-                "DUE;TZID=America/New_York:20250228T130000\n" + // Due date will NOT be assumed as start for recurrence
-                "SEQUENCE:1\n" +
-                "UID:47a23c66-8c1a-4b44-bbe8-ebf33f8cf80f\n" +
-                "RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=FR;UNTIL=20250505T235959Z\n" +
-
-                "END:VTODO\n" +
-                "END:VCALENDAR"
-
-        // Create and store calendar
-        syncManager.processICalObject("demo-calendar", "abc123", StringReader(calendar))
-
-        // Verify main VTODO was created with RRULE present
-        val mainVtodo = localJtxCollection.findByName("demo-calendar")!!
-        assertEquals("Test Task (Main VTODO)", mainVtodo.summary)
-        assertEquals("FREQ=WEEKLY;UNTIL=20250505T235959Z;INTERVAL=1;BYDAY=FR", mainVtodo.rrule)
-
-        // Verify the RRULE exception instance was created with correct recurrence-id timezone
-        val vtodoException = localJtxCollection.findRecurInstance(
-            uid = "47a23c66-8c1a-4b44-bbe8-ebf33f8cf80f",
-            recurid = "20250228T130000"
-        )!!
-        assertEquals("Test Task (Exception)", vtodoException.summary)
-        assertEquals("America/New_York", vtodoException.recuridTimezone)
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/sync/LocalTestCollection.kt

@@ -1,47 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.sync
-
-import at.bitfire.davdroid.resource.LocalCollection
-import at.bitfire.davdroid.resource.SyncState
-
-class LocalTestCollection(
-    override val dbCollectionId: Long = 0L
-): LocalCollection<LocalTestResource> {
-
-    override val tag = "LocalTestCollection"
-    override val title = "Local Test Collection"
-
-    override var lastSyncState: SyncState? = null
-
-    val entries = mutableListOf<LocalTestResource>()
-
-    override val readOnly: Boolean
-        get() = throw NotImplementedError()
-
-    override fun findDeleted() = entries.filter { it.deleted }
-    override fun findDirty() = entries.filter { it.dirty }
-
-    override fun findByName(name: String) = entries.firstOrNull { it.fileName == name }
-
-    override fun markNotDirty(flags: Int): Int {
-        var updated = 0
-        for (dirty in findDirty()) {
-            dirty.flags = flags
-            updated++
-        }
-        return updated
-    }
-
-    override fun removeNotDirtyMarked(flags: Int): Int {
-        val numBefore = entries.size
-        entries.removeIf { !it.dirty && it.flags == flags }
-        return numBefore - entries.size
-    }
-
-    override fun forgetETags() {
-    }
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/sync/LocalTestResource.kt

@@ -1,44 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.sync
-
-import android.content.Context
-import at.bitfire.davdroid.resource.LocalResource
-import java.util.Optional
-
-class LocalTestResource: LocalResource {
-
-    override val id: Long? = null
-    override var fileName: String? = null
-    override var eTag: String? = null
-    override var scheduleTag: String? = null
-    override var flags: Int = 0
-
-    var deleted = false
-    var dirty = false
-
-    override fun clearDirty(fileName: Optional<String>, eTag: String?, scheduleTag: String?) {
-        dirty = false
-        if (fileName.isPresent)
-            this.fileName = fileName.get()
-        this.eTag = eTag
-        this.scheduleTag = scheduleTag
-    }
-
-    override fun updateFlags(flags: Int) {
-        this.flags = flags
-    }
-
-    override fun updateUid(uid: String) { /* no-op */ }
-    override fun updateSequence(sequence: Int) = throw NotImplementedError()
-
-    override fun deleteLocal() = throw NotImplementedError()
-    override fun resetDeleted() = throw NotImplementedError()
-
-    override fun getDebugSummary() = "Test Resource"
-
-    override fun getViewUri(context: Context) = null
-
-}

app/src/androidTest/kotlin/at/bitfire/davdroid/sync/ResourceRetrieverTest.kt

@@ -1,135 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.sync
-
-import android.accounts.Account
-import at.bitfire.davdroid.settings.AccountSettings
-import at.bitfire.davdroid.settings.Credentials
-import at.bitfire.davdroid.sync.account.TestAccount
-import at.bitfire.davdroid.util.SensitiveString.Companion.toSensitiveString
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.ktor.http.HttpHeaders
-import kotlinx.coroutines.test.runTest
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.After
-import org.junit.Assert.assertArrayEquals
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import java.net.InetAddress
-import javax.inject.Inject
-
-@HiltAndroidTest
-class ResourceRetrieverTest {
-
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
-
-    @Inject
-    lateinit var accountSettingsFactory: AccountSettings.Factory
-
-    @Inject
-    lateinit var resourceRetrieverFactory: ResourceRetriever.Factory
-
-    lateinit var account: Account
-    lateinit var server: MockWebServer
-
-    @Before
-    fun setUp() {
-        hiltRule.inject()
-        server = MockWebServer().apply {
-            start()
-        }
-
-        account = TestAccount.create()
-
-        // add credentials to test account so that we can check whether they have been sent
-        val settings = accountSettingsFactory.create(account)
-        settings.credentials(Credentials("test", "test".toSensitiveString()))
-    }
-
-    @After
-    fun tearDown() {
-        TestAccount.remove(account)
-        server.close()
-    }
-
-
-    @Test
-    fun testRetrieve_DataUri() = runTest {
-        val downloader = resourceRetrieverFactory.create(account, "example.com")
-        val result = downloader.retrieve("data:image/png;base64,dGVzdA==")
-        assertArrayEquals("test".toByteArray(), result)
-    }
-
-    @Test
-    fun testRetrieve_DataUri_Invalid() = runTest {
-        val downloader = resourceRetrieverFactory.create(account, "example.com")
-        val result = downloader.retrieve("data:;INVALID,INVALID")
-        assertNull(result)
-    }
-
-    @Test
-    fun testRetrieve_ExternalDomain() = runTest {
-        val baseUrl = server.url("/")
-        val localhostIp = InetAddress.getByName(baseUrl.host).hostAddress!!
-
-        // URL should be http://localhost, replace with http://127.0.0.1 to have other domain
-        val baseUrlIp = baseUrl.newBuilder()
-            .host(localhostIp)
-            .build()
-
-        server.enqueue(MockResponse()
-            .setResponseCode(200)
-            .setBody("TEST"))
-
-        val downloader = resourceRetrieverFactory.create(account, baseUrl.host)
-        val result = downloader.retrieve(baseUrlIp.toString())
-
-        // authentication was NOT sent because request is not for original domain
-        val sentAuth = server.takeRequest().getHeader(HttpHeaders.Authorization)
-        assertNull(sentAuth)
-
-        // and result is OK
-        assertArrayEquals("TEST".toByteArray(), result)
-    }
-
-    @Test
-    fun testRetrieve_FtpUrl() = runTest {
-        val downloader = resourceRetrieverFactory.create(account, "example.com")
-        val result = downloader.retrieve("ftp://example.com/photo.jpg")
-        assertNull(result)
-    }
-
-    @Test
-    fun testRetrieve_RelativeHttpsUrl() = runTest {
-        val downloader = resourceRetrieverFactory.create(account, "example.com")
-        val result = downloader.retrieve("https:photo.jpg")
-        assertNull(result)
-    }
-
-    @Test
-    fun testRetrieve_SameDomain() = runTest {
-        server.enqueue(MockResponse()
-            .setResponseCode(200)
-            .setBody("TEST"))
-
-        val baseUrl = server.url("/")
-        val downloader = resourceRetrieverFactory.create(account, baseUrl.host)
-        val result = downloader.retrieve(baseUrl.toString())
-
-        // authentication was sent
-        val sentAuth = server.takeRequest().getHeader(HttpHeaders.Authorization)
-        assertEquals("Basic dGVzdDp0ZXN0", sentAuth)
-
-        // and result is OK
-        assertArrayEquals("TEST".toByteArray(), result)
-    }
-
-}