Upgrade dependencies

Signed-off-by: Arnau Mora <arnyminerz@proton.me>

.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/dependabot.yml

@@ -8,25 +8,4 @@ updates:
     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"
+      prefix: "[CI] "

.github/workflows/codeql.yml

@@ -8,7 +8,6 @@ on:
     branches: [ main-ose ]
   schedule:
     - cron: '22 10 * * 1'
-
 concurrency:
   group: codeql-${{ github.ref }}
   cancel-in-progress: true
@@ -22,29 +21,38 @@ jobs:
       contents: read
       security-events: write
 
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
-    - uses: actions/setup-java@v5
+      uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 21
-    - uses: gradle/actions/setup-gradle@v5
+    - uses: gradle/actions/setup-gradle@v4
       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
+      uses: github/codeql-action/init@v3
       with:
-        languages: java-kotlin
-        build-mode: manual            # autobuild uses older JDK
+        languages: ${{ matrix.language }}
 
-    - name: Build                     # we must not use build cache here
-      run: ./gradlew --no-daemon --configuration-cache app:assembleDebug
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    #- name: Autobuild
+    #  uses: github/codeql-action/autobuild@v2
+
+    - name: Build
+      run: ./gradlew --build-cache --configuration-cache --configuration-cache-problems=warn --no-daemon app:assembleOseDebug
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
+      uses: github/codeql-action/analyze@v3
       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/dependent-issues.yml

@@ -0,0 +1,55 @@
+name: Dependent Issues
+
+on:
+  issues:
+    types:
+      - opened
+      - edited
+      - closed
+      - reopened
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - closed
+      - reopened
+      # Makes sure we always add status check for PRs. Useful only if
+      # this action is required to pass before merging. Otherwise, it
+      # can be removed.
+      - synchronize
+
+  # Schedule a daily check. Useful if you reference cross-repository
+  # issues or pull requests. Otherwise, it can be removed.
+  schedule:
+    - cron: '19 9 * * *'
+
+permissions: write-all
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: z0al/dependent-issues@v1
+        env:
+          # (Required) The token to use to make API calls to GitHub.
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # (Optional) The token to use to make API calls to GitHub for remote repos.
+          GITHUB_READ_TOKEN: ${{ secrets.DEPENDENT_ISSUES_READ_TOKEN }}
+
+        with:
+          # (Optional) The label to use to mark dependent issues
+          # label: dependent
+
+          # (Optional) Enable checking for dependencies in issues.
+          # Enable by setting the value to "on". Default "off"
+          check_issues: on
+
+          # (Optional) A comma-separated list of keywords. Default
+          # "depends on, blocked by"
+          keywords: depends on, blocked by
+
+          # (Optional) A custom comment body. It supports `{{ dependencies }}` token.
+          comment: >
+            This PR/issue depends on:
+
+            {{ dependencies }}

.github/workflows/release.yml

@@ -19,19 +19,19 @@ jobs:
       discussions: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-java@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 21
-      - uses: gradle/actions/setup-gradle@v5
+      - uses: gradle/actions/setup-gradle@v4
 
       - 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
+        # Make sure that caches are disabled to generate reproducible release builds
+        run: ./gradlew --no-build-cache --no-configuration-cache --no-daemon app:assembleRelease
         env:
           ANDROID_KEYSTORE: ${{ github.workspace }}/keystore.jks
           ANDROID_KEYSTORE_PASSWORD: ${{ secrets.android_keystore_password }}
@@ -45,3 +45,4 @@ jobs:
           files: app/build/outputs/apk/ose/release/*.apk
           fail_on_unmatched_files: true
           generate_release_notes: true
+          discussion_category_name: Announcements

.github/workflows/test-dev.yml

@@ -9,128 +9,74 @@ 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
+    name: Compile for build cache
+    if: ${{ github.ref == 'refs/heads/main-ose' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-java@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         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
+      - uses: gradle/actions/setup-gradle@v4            # creates build cache when on main branch
         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
+          dependency-graph: generate-and-submit         # submit Github Dependency Graph info
 
-      - 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') }}
+      - run: ./gradlew --build-cache --configuration-cache --configuration-cache-problems=warn app:compileOseDebugSource
 
-      - 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:
+  test:
     needs: compile
+    if: ${{ !cancelled() }}     # even if compile didn't run (because not on main branch)
     name: Lint and unit tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-java@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 21
-      - uses: gradle/actions/setup-gradle@v5
+      - uses: gradle/actions/setup-gradle@v4
         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: Run lint
+        run: ./gradlew --build-cache --configuration-cache --configuration-cache-problems=warn app:lintOseDebug
+      - name: Run unit tests
+        run: ./gradlew --build-cache --configuration-cache --configuration-cache-problems=warn app:testOseDebugUnitTest
 
-      - name: Lint checks
-        run: ./gradlew app:lintOseDebug
-
-      - name: Unit tests
-        run: ./gradlew app:testOseDebugUnitTest
-
-  instrumented_tests:
+  test_on_emulator:
     needs: compile
+    if: ${{ !cancelled() }}     # even if compile didn't run (because not on main branch)
     name: Instrumented tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-java@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 21
-      - uses: gradle/actions/setup-gradle@v5
+      - uses: gradle/actions/setup-gradle@v4
         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'
+        uses: actions/cache@v4
         with:
-          path: ~/.config/.android/avd                        # where AVD is stored
+          path: ~/.config/.android/avd
           key: avd-${{ hashFiles('app/build.gradle.kts') }}   # gradle-managed devices are defined there
+
+      - name: Run device tests
+        run: ./gradlew --build-cache --configuration-cache --configuration-cache-problems=warn app:virtualCheck

.gitignore

@@ -16,6 +16,10 @@
 bin/
 gen/
 
+# Gradle files
+.gradle/
+build/
+
 # Local configuration file (sdk path, etc)
 local.properties
 

.tx/config

@@ -0,0 +1,30 @@
+[main]
+host     = https://www.transifex.com
+lang_map = ar_SA: ar, en_GB: en-rGB, fa_IR: fa-rIR, fi_FI: fi, nb_NO: nb, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-rTW
+
+[o:bitfireAT:p:davx5:r:app]
+file_filter   = app/src/main/res/values-<lang>/strings.xml
+source_file   = app/src/main/res/values/strings.xml
+source_lang   = en
+type          = ANDROID
+minimum_perc  = 20
+resource_name = App strings (all flavors)
+
+
+# Attention: fastlane directories are like "en-us", not "en-rUS"!
+
+[o:bitfireAT:p:davx5:r:metadata-short-description]
+file_filter   = fastlane/metadata/android/<lang>/short_description.txt
+source_file   = fastlane/metadata/android/en-US/short_description.txt
+source_lang   = en
+type          = TXT
+minimum_perc  = 100
+resource_name = Metadata: short description
+
+[o:bitfireAT:p:davx5:r:metadata-full-description]
+file_filter   = fastlane/metadata/android/<lang>/full_description.txt
+source_file   = fastlane/metadata/android/en-US/full_description.txt
+source_lang   = en
+type          = TXT
+minimum_perc  = 100
+resource_name = Metadata: full description

CONTRIBUTING.md

@@ -14,11 +14,24 @@ If you send us a pull request, our CLA bot will ask you to sign the
 Contributor's License Agreement so that we can use your contribution.
 
 
-# Copyright notice
+# Copyright
 
 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`).
+starts with the copyright header:
+
+```
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+```
+
+You can set this in Android Studio:
+
+1. Settings / Editor / Copyright / Copyright Profiles
+2. Paste the text above (without the stars).
+3. Set Formatting so that the preview exactly looks like above; one blank line after the block.
+4. Set this copyright profile as the default profile for the project.
+5. Apply copyright: right-click in file tree / Update copyright.
 
 
 # Style guide
@@ -97,3 +110,8 @@ Test classes should be in the appropriate directory (see existing tests) and in
 tested class. Tests are usually be named like `methodToBeTested_Condition()`, see
 [Test apps on Android](https://developer.android.com/training/testing/).
 
+
+# Authors
+
+If you make significant contributions, feel free to add yourself to the [AUTHORS file](AUTHORS).
+

README.md

@@ -1,9 +1,9 @@
 
-[![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)
+[![License](https://img.shields.io/github/license/bitfireAT/davx5-ose?style=flat-square)](https://github.com/bitfireAT/davx5-ose/blob/main/LICENSE)
+[![Follow @davx5app@fosstodon.org](https://img.shields.io/mastodon/follow/109598783742737223?domain=https%3A%2F%2Ffosstodon.org&style=flat-square)](https://fosstodon.org/@davx5app)
+[![Development tests](https://github.com/bitfireAT/davx5-ose/actions/workflows/test-dev.yml/badge.svg)](https://github.com/bitfireAT/davx5-ose/actions/workflows/test-dev.yml)
 
 ![DAVx⁵ logo](app/src/main/res/mipmap-xxxhdpi/ic_launcher.png)
 
@@ -11,10 +11,8 @@
 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⁵, including a list of services it has been tested with.
 
 DAVx⁵ is licensed under the [GPLv3 License](LICENSE).
 
@@ -28,7 +26,8 @@ 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
+* [ical4android](https://github.com/bitfireAT/ical4android) – iCalendar processing and Calendar Provider access
+* [vcard4android](https://github.com/bitfireAT/vcard4android) – vCard processing and Contacts Provider access
 
 **If you want to support DAVx⁵, please consider [donating to DAVx⁵](https://www.davx5.com/donate)
 or [purchasing it](https://www.davx5.com/download).**

app/build.gradle.kts

@@ -9,7 +9,8 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
-    alias(libs.plugins.mikepenz.aboutLibraries.android)
+
+    alias(libs.plugins.mikepenz.aboutLibraries)
 }
 
 // Android configuration
@@ -19,17 +20,14 @@ android {
     defaultConfig {
         applicationId = "at.bitfire.davdroid"
 
-        versionCode = 405080003
-        versionName = "4.5.8"
+        versionCode = 404110004
+        versionName = "4.4.11"
 
-        base.archivesName = "davx5-ose-$versionName"
+        setProperty("archivesBaseName", "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"
     }
 
@@ -109,9 +107,7 @@ android {
             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
+                    apiLevel = 35
                     systemImageSource = "aosp-atd"
                 }
             }
@@ -124,10 +120,8 @@ ksp {
 }
 
 aboutLibraries {
-    export {
-        // exclude timestamps for reproducible builds [https://github.com/bitfireAT/davx5-ose/issues/994]
-        excludeFields.add("generated")
-    }
+    // exclude timestamps for reproducible builds [https://github.com/bitfireAT/davx5-ose/issues/994]
+    excludeFields = arrayOf("generated")
 }
 
 dependencies {
@@ -151,6 +145,9 @@ dependencies {
     implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.lifecycle.viewmodel.base)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.lifecycle.viewmodel.navigation3)
+    implementation(libs.androidx.navigation3.runtime)
+    implementation(libs.androidx.navigation3.ui)
     implementation(libs.androidx.paging)
     implementation(libs.androidx.paging.compose)
     implementation(libs.androidx.preference)
@@ -159,21 +156,22 @@ dependencies {
 
     // 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)
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.material3)
+    implementation(libs.compose.material3.navigation3)
+    implementation(libs.compose.materialIconsExtended)
+    debugImplementation(libs.compose.ui.tooling)
+    implementation(libs.compose.ui.toolingPreview)
 
     // Glance Widgets
-    implementation(libs.androidx.glance.base)
-    implementation(libs.androidx.glance.material)
+    implementation(libs.glance.base)
+    implementation(libs.glance.material)
 
     // Jetpack Room
-    implementation(libs.androidx.room.runtime)
-    implementation(libs.androidx.room.base)
-    implementation(libs.androidx.room.paging)
-    ksp(libs.androidx.room.compiler)
+    implementation(libs.room.runtime)
+    implementation(libs.room.base)
+    implementation(libs.room.paging)
+    ksp(libs.room.compiler)
 
     // own libraries
     implementation(libs.bitfire.cert4android)
@@ -181,20 +179,19 @@ dependencies {
         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")
-    }
+    implementation(libs.bitfire.ical4android)
+    implementation(libs.bitfire.vcard4android)
+
+    // Serialization (for navigation)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 
     // third-party libs
-    implementation(libs.conscrypt)
+    @Suppress("RedundantSuppression")
     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.mikepenz.aboutLibraries)
+    implementation(libs.nsk90.kstatemachine)
     implementation(libs.okhttp.base)
     implementation(libs.okhttp.brotli)
     implementation(libs.okhttp.logging)
@@ -213,7 +210,6 @@ dependencies {
 
     // 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)
@@ -224,10 +220,10 @@ dependencies {
     androidTestImplementation(libs.kotlinx.coroutines.test)
     androidTestImplementation(libs.mockk.android)
     androidTestImplementation(libs.okhttp.mockwebserver)
+    androidTestImplementation(libs.room.testing)
 
     testImplementation(libs.bitfire.dav4jvm)
     testImplementation(libs.junit)
     testImplementation(libs.mockk)
     testImplementation(libs.okhttp.mockwebserver)
-    testImplementation(libs.robolectric)
 }

app/proguard-rules-release.pro

@@ -24,8 +24,3 @@
 -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/src/androidTest/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?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 -->
@@ -8,9 +7,4 @@
     <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/kotlin/at/bitfire/davdroid/CatchExceptionsRule.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid
+
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+import kotlin.reflect.KClass
+
+/**
+ * Use this custom rule to ignore exceptions thrown by another rule.
+ *
+ * @param innerRule The rule to wrap.
+ * @param exceptionsToIgnore The exceptions to ignore.
+ */
+class CatchExceptionsRule(
+    private val innerRule: TestRule,
+    private vararg val exceptionsToIgnore: KClass<out Throwable>
+) : TestRule {
+    override fun apply(base: Statement, description: Description): Statement {
+        return object : Statement() {
+            override fun evaluate() {
+                try {
+                    innerRule.apply(base, description).evaluate()
+                } catch (e: Throwable) {
+                    val shouldIgnore = exceptionsToIgnore.any { it.isInstance(e) }
+                    if (shouldIgnore)
+                        base.evaluate()
+                    else
+                        throw e
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+/*
+ * 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 org.junit.Assert.assertTrue
+import org.junit.Test
+
+class Dav4jvm {
+
+    @Test
+    fun test_Dav4jvm_XmlUtils_NewPullParser_RelaxedParsing() {
+        val parser = XmlUtils.newPullParser()
+        assertTrue(parser.getFeature(Xml.FEATURE_RELAXED))
+    }
+
+}

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

@@ -10,11 +10,8 @@ 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 at.bitfire.davdroid.sync.SyncAdapterService
 import dagger.hilt.android.testing.HiltTestApplication
-import java.util.logging.Level
-import java.util.logging.Logger
 
 @Suppress("unused")
 class HiltTestRunner : AndroidJUnitRunner() {
@@ -25,16 +22,13 @@ class HiltTestRunner : AndroidJUnitRunner() {
     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]")
 
+        // disable sync adapters
+        SyncAdapterService.syncActive.set(false)
+
         // set main dispatcher for tests (especially runTest)
         TestCoroutineDispatchersModule.initMainDispatcher()
     }

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

@@ -0,0 +1,123 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid
+
+import android.Manifest
+import android.accounts.Account
+import android.content.ContentProviderClient
+import android.content.ContentUris
+import android.content.ContentValues
+import android.os.Build
+import android.provider.CalendarContract
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.GrantPermissionRule
+import at.bitfire.davdroid.resource.LocalCalendar
+import at.bitfire.davdroid.resource.LocalEvent
+import at.bitfire.ical4android.AndroidCalendar
+import at.bitfire.ical4android.Event
+import net.fortuna.ical4j.model.property.DtStart
+import net.fortuna.ical4j.model.property.RRule
+import org.junit.Assert.assertNotNull
+import org.junit.rules.ExternalResource
+import org.junit.rules.RuleChain
+import java.util.logging.Logger
+
+/**
+ * JUnit ClassRule which initializes the AOSP CalendarProvider.
+ *
+ * It seems that the calendar provider unfortunately forgets the very first requests when it is used the very first time,
+ * maybe by some wrongly synchronized database initialization. So things like querying the instances
+ * fails in this case.
+ *
+ * So this rule is needed to allow tests which need the calendar provider to succeed even when the calendar provider
+ * is used the very first time (especially in CI tests / a fresh emulator).
+ *
+ * See [at.bitfire.davdroid.resource.LocalCalendarTest] for an example of how to use this rule.
+ */
+class InitCalendarProviderRule private constructor(): ExternalResource() {
+
+    companion object {
+
+        private var isInitialized = false
+        private val logger = Logger.getLogger(InitCalendarProviderRule::javaClass.name)
+
+        fun getInstance(): RuleChain = RuleChain
+            .outerRule(GrantPermissionRule.grant(Manifest.permission.READ_CALENDAR, Manifest.permission.WRITE_CALENDAR))
+            .around(InitCalendarProviderRule())
+
+    }
+
+    override fun before() {
+        if (!isInitialized) {
+            logger.info("Initializing calendar provider")
+            if (Build.VERSION.SDK_INT < 31)
+                logger.warning("Calendar provider initialization may or may not work. See InitCalendarProviderRule")
+
+            val context = InstrumentationRegistry.getInstrumentation().targetContext
+            val client = context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)
+            assertNotNull("Couldn't acquire calendar provider", client)
+
+            client!!.use {
+                initCalendarProvider(client)
+                isInitialized = true
+            }
+        }
+    }
+
+    private fun initCalendarProvider(provider: ContentProviderClient) {
+        val account = Account("LocalCalendarTest", CalendarContract.ACCOUNT_TYPE_LOCAL)
+
+        // Sometimes, the calendar provider returns an ID for the created calendar, but then fails to find it.
+        var calendarOrNull: LocalCalendar? = null
+        for (i in 0..50) {
+            calendarOrNull = createAndVerifyCalendar(account, provider)
+            if (calendarOrNull != null)
+                break
+            else
+                Thread.sleep(100)
+        }
+        val calendar = calendarOrNull ?: throw IllegalStateException("Couldn't create calendar")
+
+        try {
+            // single event init
+            val normalEvent = Event().apply {
+                dtStart = DtStart("20220120T010203Z")
+                summary = "Event with 1 instance"
+            }
+            val normalLocalEvent = LocalEvent(calendar, normalEvent, null, null, null, 0)
+            normalLocalEvent.add()
+            LocalEvent.numInstances(provider, account, normalLocalEvent.id!!)
+
+            // recurring event init
+            val recurringEvent = Event().apply {
+                dtStart = DtStart("20220120T010203Z")
+                summary = "Event over 22 years"
+                rRules.add(RRule("FREQ=YEARLY;UNTIL=20740119T010203Z"))     // year needs to be  >2074 (not supported by Android <11 Calendar Storage)
+            }
+            val localRecurringEvent = LocalEvent(calendar, recurringEvent, null, null, null, 0)
+            localRecurringEvent.add()
+            LocalEvent.numInstances(provider, account, localRecurringEvent.id!!)
+        } finally {
+            calendar.delete()
+        }
+    }
+
+    private fun createAndVerifyCalendar(account: Account, provider: ContentProviderClient): LocalCalendar? {
+        val uri = AndroidCalendar.create(account, provider, ContentValues())
+
+        return try {
+            AndroidCalendar.findByID(
+                account,
+                provider,
+                LocalCalendar.Factory,
+                ContentUris.parseId(uri)
+            )
+        } catch (e: Exception) {
+            logger.warning("Couldn't find calendar after creation: $e")
+            null
+        }
+    }
+
+}

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

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

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

@@ -4,20 +4,22 @@
 
 package at.bitfire.davdroid.db
 
+import android.security.NetworkSecurityPolicy
 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 at.bitfire.dav4jvm.DavResource
+import at.bitfire.dav4jvm.property.webdav.ResourceType
+import at.bitfire.davdroid.network.HttpClient
 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.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
+import org.junit.Assume
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -27,12 +29,12 @@ import javax.inject.Inject
 class CollectionTest {
 
     @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
+    lateinit var httpClientBuilder: HttpClient.Builder
 
     @get:Rule
     val hiltRule = HiltAndroidRule(this)
 
-    private lateinit var httpClient: OkHttpClient
+    private lateinit var httpClient: HttpClient
     private val server = MockWebServer()
 
     @Before
@@ -40,6 +42,12 @@ class CollectionTest {
         hiltRule.inject()
 
         httpClient = httpClientBuilder.build()
+        Assume.assumeTrue(NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted)
+    }
+
+    @After
+    fun teardown() {
+        httpClient.close()
     }
 
 
@@ -61,8 +69,8 @@ class CollectionTest {
                         "</multistatus>"))
 
         lateinit var info: Collection
-        DavResource(httpClient, server.url("/"))
-                .propfind(0, WebDAV.ResourceType) { response, _ ->
+        DavResource(httpClient.okHttpClient, server.url("/"))
+                .propfind(0, ResourceType.NAME) { response, _ ->
             info = Collection.fromDavResponse(response) ?: throw IllegalArgumentException()
         }
         assertEquals(Collection.TYPE_ADDRESSBOOK, info.type)
@@ -117,8 +125,8 @@ class CollectionTest {
                     "</multistatus>"))
 
         lateinit var info: Collection
-        DavResource(httpClient, server.url("/"))
-            .propfind(0, WebDAV.ResourceType) { response, _ ->
+        DavResource(httpClient.okHttpClient, server.url("/"))
+            .propfind(0, ResourceType.NAME) { response, _ ->
                 info = Collection.fromDavResponse(response)!!
             }
         assertEquals(Collection.TYPE_CALENDAR, info.type)
@@ -153,8 +161,8 @@ class CollectionTest {
                     "</multistatus>"))
 
         lateinit var info: Collection
-        DavResource(httpClient, server.url("/"))
-            .propfind(0, WebDAV.ResourceType) { response, _ ->
+        DavResource(httpClient.okHttpClient, server.url("/"))
+            .propfind(0, ResourceType.NAME) { response, _ ->
                 info = Collection.fromDavResponse(response)!!
             }
         assertEquals(Collection.TYPE_CALENDAR, info.type)
@@ -187,8 +195,8 @@ class CollectionTest {
                         "</multistatus>"))
 
         lateinit var info: Collection
-        DavResource(httpClient, server.url("/"))
-                .propfind(0, WebDAV.ResourceType) { response, _ ->
+        DavResource(httpClient.okHttpClient, server.url("/"))
+                .propfind(0, ResourceType.NAME) { response, _ ->
                     info = Collection.fromDavResponse(response) ?: throw IllegalArgumentException()
                 }
         assertEquals(Collection.TYPE_WEBCAL, info.type)

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/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/migration/DatabaseMigrationTest.kt

@@ -44,11 +44,6 @@ abstract class DatabaseMigrationTest(
     /**
      * 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].
      */
@@ -66,8 +61,6 @@ abstract class DatabaseMigrationTest(
         // 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()
         }

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/TestLoggerModule.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid.di
+
+import at.bitfire.davdroid.log.LogcatHandler
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.components.SingletonComponent
+import dagger.hilt.testing.TestInstallIn
+import java.util.logging.Level
+import java.util.logging.Logger
+import javax.inject.Singleton
+
+/**
+ * Module that provides verbose logging for tests.
+ */
+@TestInstallIn(
+    components = [SingletonComponent::class],
+    replaces = [LoggerModule::class]
+)
+@Module
+class TestLoggerModule {
+
+    @Provides
+    @Singleton
+    fun logger(): Logger = Logger.getGlobal().apply {
+        level = Level.ALL
+        addHandler(LogcatHandler())
+    }
+
+}

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

@@ -19,7 +19,7 @@ class Android10ResolverTest {
     val FQDN_DAVX5 = "www.davx5.com"
 
     @Test
-    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q, maxSdkVersion = 34)
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q)
     fun testResolveA() {
         val www = InetAddress.getAllByName(FQDN_DAVX5).filterIsInstance<Inet4Address>().first()
 

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/HttpClientTest.kt

@@ -4,11 +4,9 @@
 
 package at.bitfire.davdroid.network
 
+import android.security.NetworkSecurityPolicy
 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
@@ -16,27 +14,30 @@ import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
+import org.junit.Assume
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import javax.inject.Inject
-import javax.inject.Provider
 
 @HiltAndroidTest
-class HttpClientBuilderTest {
+class HttpClientTest {
 
     @get:Rule
     var hiltRule = HiltAndroidRule(this)
 
     @Inject
-    lateinit var httpClientBuilder: Provider<HttpClientBuilder>
+    lateinit var httpClientBuilder: HttpClient.Builder
 
+    lateinit var httpClient: HttpClient
     lateinit var server: MockWebServer
 
     @Before
     fun setUp() {
         hiltRule.inject()
 
+        httpClient = httpClientBuilder.build()
+
         server = MockWebServer()
         server.start(30000)
     }
@@ -44,32 +45,13 @@ class HttpClientBuilderTest {
     @After
     fun tearDown() {
         server.shutdown()
+        httpClient.close()
     }
 
 
-    @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() {
+        Assume.assumeTrue(NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted)
         val url = server.url("/test")
 
         // set cookie for root path (/) and /test path in first response
@@ -78,9 +60,7 @@ class HttpClientBuilderTest {
                 .addHeader("Set-Cookie", "cookie1=1; path=/")
                 .addHeader("Set-Cookie", "cookie2=2")
                 .setBody("Cookie set"))
-
-        val httpClient = httpClientBuilder.get().build()
-        httpClient.newCall(Request.Builder()
+        httpClient.okHttpClient.newCall(Request.Builder()
                 .get().url(url)
                 .build()).execute()
         assertNull(server.takeRequest().getHeader("Cookie"))
@@ -91,7 +71,7 @@ class HttpClientBuilderTest {
                 .addHeader("Set-Cookie", "cookie1=1a; path=/; Max-Age=0")
                 .addHeader("Set-Cookie", "cookie2=2a")
                 .setResponseCode(200))
-        httpClient.newCall(Request.Builder()
+        httpClient.okHttpClient.newCall(Request.Builder()
                 .get().url(url)
                 .build()).execute()
         val header = server.takeRequest().getHeader("Cookie")
@@ -99,7 +79,7 @@ class HttpClientBuilderTest {
 
         server.enqueue(MockResponse()
                 .setResponseCode(200))
-        httpClient.newCall(Request.Builder()
+        httpClient.okHttpClient.newCall(Request.Builder()
                 .get().url(url)
                 .build()).execute()
         assertEquals("cookie2=2a", server.takeRequest().getHeader("Cookie"))

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/repository/DavHomeSetRepositoryTest.kt

@@ -0,0 +1,74 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid.repository
+
+import at.bitfire.davdroid.db.HomeSet
+import at.bitfire.davdroid.db.Service
+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.Before
+import org.junit.Rule
+import org.junit.Test
+import javax.inject.Inject
+
+@HiltAndroidTest
+class DavHomeSetRepositoryTest {
+
+    @Inject
+    lateinit var repository: DavHomeSetRepository
+
+    @Inject
+    lateinit var serviceRepository: DavServiceRepository
+
+    @get:Rule
+    var hiltRule = HiltAndroidRule(this)
+
+    var serviceId: Long = 0
+
+    @Before
+    fun setUp() {
+        hiltRule.inject()
+
+        serviceId = serviceRepository.insertOrReplaceBlocking(
+            Service(id=0, accountName="test", type= Service.TYPE_CALDAV, principal = null)
+        )
+    }
+
+
+    @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 = repository.insertOrUpdateByUrlBlocking(entry1)
+        assertEquals(1L, insertId1)
+        assertEquals(entry1.copy(id = 1L), repository.getByIdBlocking(1L))
+
+        val updatedEntry1 = HomeSet(id=0, serviceId=serviceId, personal=true, url="https://example.com/1".toHttpUrl(), displayName="Updated Entry")
+        val updateId1 = repository.insertOrUpdateByUrlBlocking(updatedEntry1)
+        assertEquals(1L, updateId1)
+        assertEquals(updatedEntry1.copy(id = 1L), repository.getByIdBlocking(1L))
+
+        val entry2 = HomeSet(id=0, serviceId=serviceId, personal=true, url= "https://example.com/2".toHttpUrl())
+        val insertId2 = repository.insertOrUpdateByUrlBlocking(entry2)
+        assertEquals(2L, insertId2)
+        assertEquals(entry2.copy(id = 2L), repository.getByIdBlocking(2L))
+    }
+
+    @Test
+    fun testDeleteBlocking() {
+        // 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 = repository.insertOrUpdateByUrlBlocking(entry1)
+        assertEquals(1L, insertId1)
+        assertEquals(entry1, repository.getByIdBlocking(1L))
+
+        repository.deleteBlocking(entry1)
+        assertEquals(null, repository.getByIdBlocking(1L))
+    }
+
+}

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

@@ -29,7 +29,6 @@ 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
@@ -99,7 +98,7 @@ class LocalAddressBookTest {
             val id = ContentUris.parseId(uri)
 
             // make sure it's not dirty
-            localGroup.clearDirty(Optional.empty(), null, null)
+            localGroup.clearDirty(null, null, null)
             assertFalse("Group is dirty before moving", isGroupDirty(addressBook, id))
 
             // rename address book
@@ -128,7 +127,7 @@ class LocalAddressBookTest {
      */
     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 ->
+        provider!!.query(uri, arrayOf(ContactsContract.RawContacts.DIRTY), null, null, null)?.use { cursor ->
             if (cursor.moveToFirst())
                 return cursor.getInt(0) != 0
         }
@@ -144,7 +143,7 @@ class LocalAddressBookTest {
      */
     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 ->
+        provider!!.query(uri, arrayOf(ContactsContract.Groups.DIRTY), null, null, null)?.use { cursor ->
             if (cursor.moveToFirst())
                 return cursor.getInt(0) != 0
         }

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

@@ -1,113 +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.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()
-    }
-
-
-    @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

@@ -6,137 +6,146 @@ package at.bitfire.davdroid.resource
 
 import android.accounts.Account
 import android.content.ContentProviderClient
+import android.content.ContentUris
 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.davdroid.InitCalendarProviderRule
+import at.bitfire.ical4android.AndroidCalendar
+import at.bitfire.ical4android.Event
+import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
 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 net.fortuna.ical4j.model.property.DtStart
+import net.fortuna.ical4j.model.property.RRule
+import net.fortuna.ical4j.model.property.RecurrenceId
+import net.fortuna.ical4j.model.property.Status
 import org.junit.After
+import org.junit.AfterClass
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
 import org.junit.Before
-import org.junit.Rule
+import org.junit.BeforeClass
+import org.junit.ClassRule
 import org.junit.Test
 import org.junit.rules.TestRule
-import javax.inject.Inject
 
-@HiltAndroidTest
 class LocalCalendarTest {
 
-    @get:Rule
-    val hiltRule = HiltAndroidRule(this)
+    companion object {
 
-    @get:Rule
-    val initCalendarProviderRule: TestRule = InitCalendarProviderRule.initialize()
+        @JvmField
+        @ClassRule
+        val initCalendarProviderRule: TestRule = InitCalendarProviderRule.getInstance()
 
-    @Inject
-    lateinit var localCalendarFactory: LocalCalendar.Factory
+        private lateinit var provider: ContentProviderClient
+
+        @BeforeClass
+        @JvmStatic
+        fun setUpClass() {
+            val context = InstrumentationRegistry.getInstrumentation().targetContext
+            provider = context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)!!
+        }
+
+        @AfterClass
+        @JvmStatic
+        fun tearDownClass() {
+            provider.closeCompat()
+        }
+
+    }
 
     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)
+        val uri = AndroidCalendar.create(account, provider, ContentValues())
+        calendar = AndroidCalendar.findByID(account, provider, LocalCalendar.Factory, ContentUris.parseId(uri))
     }
 
     @After
     fun tearDown() {
-        androidCalendar.delete()
-        client.closeCompat()
+        calendar.delete()
     }
 
 
-    /**
-     * 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)
+    @Test
+    fun testDeleteDirtyEventsWithoutInstances_NoInstances_CancelledExceptions() {
+        // create recurring event with only deleted/cancelled instances
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with 3 instances"
+            rRules.add(RRule("FREQ=DAILY;COUNT=3"))
+            exceptions.add(Event().apply {
+                recurrenceId = RecurrenceId("20220120T010203Z")
+                dtStart = DtStart("20220120T010203Z")
+                summary = "Cancelled exception on 1st day"
+                status = Status.VEVENT_CANCELLED
+            })
+            exceptions.add(Event().apply {
+                recurrenceId = RecurrenceId("20220121T010203Z")
+                dtStart = DtStart("20220121T010203Z")
+                summary = "Cancelled exception on 2nd day"
+                status = Status.VEVENT_CANCELLED
+            })
+            exceptions.add(Event().apply {
+                recurrenceId = RecurrenceId("20220122T010203Z")
+                dtStart = DtStart("20220122T010203Z")
+                summary = "Cancelled exception on 3rd day"
+                status = Status.VEVENT_CANCELLED
+            })
+        }
+        val localEvent = LocalEvent(calendar, event, "filename.ics", null, null, LocalResource.FLAG_REMOTELY_PRESENT)
+        localEvent.add()
+        val eventId = localEvent.id!!
 
-        calendar.removeNotDirtyMarked(123)
+        // set event as dirty
+        provider.update(ContentUris.withAppendedId(Events.CONTENT_URI.asSyncAdapter(account), eventId), ContentValues(1).apply {
+            put(Events.DIRTY, 1)
+        }, null, null)
 
-        assertNull(androidCalendar.getEvent(id))
+        // this method should mark the event as deleted
+        calendar.deleteDirtyEventsWithoutInstances()
+
+        // verify that event is now marked as deleted
+        provider.query(
+            ContentUris.withAppendedId(Events.CONTENT_URI.asSyncAdapter(account), eventId),
+            arrayOf(Events.DELETED), null, null, null
+        )!!.use { cursor ->
+            cursor.moveToNext()
+            assertEquals(1, cursor.getInt(0))
+        }
     }
 
     @Test
-    fun testRemoveNotDirtyMarked_IdLargerThanIntMaxValue() = testRemoveNotDirtyMarked(
-        contentValuesOf(Events._ID to Int.MAX_VALUE.toLong() + 10, Events.DIRTY to 0)
-    )
+    // Needs InitCalendarProviderRule
+    fun testDeleteDirtyEventsWithoutInstances_Recurring_Instances() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with 3 instances"
+            rRules.add(RRule("FREQ=DAILY;COUNT=3"))
+        }
+        val localEvent = LocalEvent(calendar, event, "filename.ics", null, null, LocalResource.FLAG_REMOTELY_PRESENT)
+        localEvent.add()
+        val eventId = localEvent.id!!
 
-    @Test
-    fun testRemoveNotDirtyMarked_DirtyIs0() = testRemoveNotDirtyMarked(
-        contentValuesOf(Events._ID to 1, Events.DIRTY to 0)
-    )
+        // set event as dirty
+        provider.update(ContentUris.withAppendedId(Events.CONTENT_URI.asSyncAdapter(account), eventId), ContentValues(1).apply {
+            put(Events.DIRTY, 1)
+        }, null, null)
 
-    @Test
-    fun testRemoveNotDirtyMarked_DirtyNull() = testRemoveNotDirtyMarked(
-        contentValuesOf(Events._ID to 1, Events.DIRTY to null)
-    )
+        // this method should mark the event as deleted
+        calendar.deleteDirtyEventsWithoutInstances()
 
-    /**
-     * 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))
+        // verify that event is not marked as deleted
+        provider.query(
+            ContentUris.withAppendedId(Events.CONTENT_URI.asSyncAdapter(account), eventId),
+            arrayOf(Events.DELETED), null, null, null
+        )!!.use { cursor ->
+            cursor.moveToNext()
+            assertEquals(0, cursor.getInt(0))
+        }
     }
 
-    @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/LocalEventTest.kt

@@ -0,0 +1,485 @@
+/*
+ * 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.ContentUris
+import android.content.ContentValues
+import android.os.Build
+import android.provider.CalendarContract
+import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL
+import android.provider.CalendarContract.Events
+import androidx.test.platform.app.InstrumentationRegistry
+import at.bitfire.davdroid.InitCalendarProviderRule
+import at.bitfire.ical4android.AndroidCalendar
+import at.bitfire.ical4android.Event
+import at.bitfire.ical4android.util.MiscUtils.closeCompat
+import at.techbee.jtx.JtxContract.asSyncAdapter
+import net.fortuna.ical4j.model.Date
+import net.fortuna.ical4j.model.DateList
+import net.fortuna.ical4j.model.parameter.Value
+import net.fortuna.ical4j.model.property.DtStart
+import net.fortuna.ical4j.model.property.ExDate
+import net.fortuna.ical4j.model.property.RRule
+import net.fortuna.ical4j.model.property.RecurrenceId
+import net.fortuna.ical4j.model.property.Status
+import org.junit.After
+import org.junit.AfterClass
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.BeforeClass
+import org.junit.ClassRule
+import org.junit.Test
+import org.junit.rules.TestRule
+import java.util.UUID
+
+class LocalEventTest {
+
+    private val account = Account("LocalCalendarTest", ACCOUNT_TYPE_LOCAL)
+    private lateinit var calendar: LocalCalendar
+
+    @Before
+    fun setUp() {
+        val uri = AndroidCalendar.create(account, provider, ContentValues())
+        calendar = AndroidCalendar.findByID(account, provider, LocalCalendar.Factory, ContentUris.parseId(uri))
+    }
+
+    @After
+    fun removeCalendar() {
+        calendar.delete()
+    }
+
+
+    @Test
+    fun testNumDirectInstances_SingleInstance() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with 1 instance"
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add()
+
+        assertEquals(1, LocalEvent.numDirectInstances(provider, account, localEvent.id!!))
+    }
+
+    @Test
+    fun testNumDirectInstances_Recurring() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with 5 instances"
+            rRules.add(RRule("FREQ=DAILY;COUNT=5"))
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add()
+
+        assertEquals(5, LocalEvent.numDirectInstances(provider, account, localEvent.id!!))
+    }
+
+    @Test
+    fun testNumDirectInstances_Recurring_Endless() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event without end"
+            rRules.add(RRule("FREQ=DAILY"))
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add()
+
+        assertNull(LocalEvent.numDirectInstances(provider, account, localEvent.id!!))
+    }
+
+    @Test
+    // flaky, needs InitCalendarProviderRule
+    fun testNumDirectInstances_Recurring_LateEnd() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with 53 years"
+            rRules.add(RRule("FREQ=YEARLY;UNTIL=20740119T010203Z"))     // year 2074 is not supported by Android <11 Calendar Storage
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add()
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
+            assertEquals(52, LocalEvent.numDirectInstances(provider, account, localEvent.id!!))
+        else
+            assertNull(LocalEvent.numDirectInstances(provider, account, localEvent.id!!))
+    }
+
+    @Test
+    // flaky, needs InitCalendarProviderRule
+    fun testNumDirectInstances_Recurring_ManyInstances() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with 2 years"
+            rRules.add(RRule("FREQ=DAILY;UNTIL=20240120T010203Z"))
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add()
+        val number = LocalEvent.numDirectInstances(provider, account, localEvent.id!!)
+
+        // Some android versions (i.e. <=Q and S) return 365*2 instances (wrong, 365*2+1 => correct),
+        // but we are satisfied with either result for now
+        assertTrue(number == 365*2 || number == 365*2+1)
+    }
+
+    @Test
+    // flaky, needs InitCalendarProviderRule
+    fun testNumDirectInstances_RecurringWithExdate() {
+        val event = Event().apply {
+            dtStart = DtStart(Date("20220120T010203Z"))
+            summary = "Event with 5 instances"
+            rRules.add(RRule("FREQ=DAILY;COUNT=5"))
+            exDates.add(ExDate(DateList("20220121T010203Z", Value.DATE_TIME)))
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add()
+
+        assertEquals(4, LocalEvent.numDirectInstances(provider, account, localEvent.id!!))
+    }
+
+    @Test
+    fun testNumDirectInstances_RecurringWithExceptions() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with 5 instances"
+            rRules.add(RRule("FREQ=DAILY;COUNT=5"))
+            exceptions.add(Event().apply {
+                recurrenceId = RecurrenceId("20220122T010203Z")
+                dtStart = DtStart("20220122T130203Z")
+                summary = "Exception on 3rd day"
+            })
+            exceptions.add(Event().apply {
+                recurrenceId = RecurrenceId("20220124T010203Z")
+                dtStart = DtStart("20220122T160203Z")
+                summary = "Exception on 5th day"
+            })
+        }
+        val localEvent = LocalEvent(calendar, event, "filename.ics", null, null, 0)
+        localEvent.add()
+
+        assertEquals(5-2, LocalEvent.numDirectInstances(provider, account, localEvent.id!!))
+    }
+
+
+    @Test
+    // flaky, needs InitCalendarProviderRule
+    fun testNumInstances_SingleInstance() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with 1 instance"
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add()
+
+        assertEquals(1, LocalEvent.numInstances(provider, account, localEvent.id!!))
+    }
+
+    @Test
+    fun testNumInstances_Recurring() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with 5 instances"
+            rRules.add(RRule("FREQ=DAILY;COUNT=5"))
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add()
+
+        assertEquals(5, LocalEvent.numInstances(provider, account, localEvent.id!!))
+    }
+
+    @Test
+    fun testNumInstances_Recurring_Endless() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with infinite instances"
+            rRules.add(RRule("FREQ=YEARLY"))
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add()
+
+        assertNull(LocalEvent.numInstances(provider, account, localEvent.id!!))
+    }
+
+    @Test
+    // flaky, needs InitCalendarProviderRule
+    fun testNumInstances_Recurring_LateEnd() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event over 22 years"
+            rRules.add(RRule("FREQ=YEARLY;UNTIL=20740119T010203Z"))     // year 2074 not supported by Android <11 Calendar Storage
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add()
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
+            assertEquals(52, LocalEvent.numInstances(provider, account, localEvent.id!!))
+        else
+            assertNull(LocalEvent.numInstances(provider, account, localEvent.id!!))
+    }
+
+    @Test
+    // flaky, needs InitCalendarProviderRule
+    fun testNumInstances_Recurring_ManyInstances() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event over two years"
+            rRules.add(RRule("FREQ=DAILY;UNTIL=20240120T010203Z"))
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add()
+
+        assertEquals(
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q)
+                365*2       // Android <10: does not include UNTIL (incorrect!)
+            else
+                365*2 + 1,  // Android ≥10: includes UNTIL (correct)
+            LocalEvent.numInstances(provider, account, localEvent.id!!))
+    }
+
+    @Test
+    fun testNumInstances_RecurringWithExceptions() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with 6 instances"
+            rRules.add(RRule("FREQ=DAILY;COUNT=6"))
+            exceptions.add(Event().apply {
+                recurrenceId = RecurrenceId("20220122T010203Z")
+                dtStart = DtStart("20220122T130203Z")
+                summary = "Exception on 3rd day"
+            })
+            exceptions.add(Event().apply {
+                recurrenceId = RecurrenceId("20220124T010203Z")
+                dtStart = DtStart("20220122T160203Z")
+                summary = "Exception on 5th day"
+            })
+        }
+        val localEvent = LocalEvent(calendar, event, "filename.ics", null, null, 0)
+        localEvent.add()
+
+        calendar.findById(localEvent.id!!)
+
+        assertEquals(6, LocalEvent.numInstances(provider, account, localEvent.id!!))
+    }
+
+
+    @Test
+    fun testMarkEventAsDeleted() {
+        // Create event
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "A fine event"
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add()
+
+        // Delete event
+        LocalEvent.markAsDeleted(provider, account, localEvent.id!!)
+
+        // Get the status of whether the event is deleted
+        provider.query(
+            ContentUris.withAppendedId(Events.CONTENT_URI, localEvent.id!!).asSyncAdapter(account),
+            arrayOf(Events.DELETED),
+            null,
+            null, null
+        )!!.use { cursor ->
+            cursor.moveToFirst()
+            assertEquals(1, cursor.getInt(0))
+        }
+    }
+
+
+    @Test
+    fun testPrepareForUpload_NoUid() {
+        // create event
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event without uid"
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add()    // save it to calendar storage
+
+        // prepare for upload - this should generate a new random uuid, returned as filename
+        val fileNameWithSuffix = localEvent.prepareForUpload()
+        val fileName = fileNameWithSuffix.removeSuffix(".ics")
+
+        // throws an exception if fileName is not an UUID
+        UUID.fromString(fileName)
+
+        // UID in calendar storage should be the same as file name
+        provider.query(
+            ContentUris.withAppendedId(Events.CONTENT_URI, localEvent.id!!).asSyncAdapter(account),
+            arrayOf(Events.UID_2445), null, null, null
+        )!!.use { cursor ->
+            cursor.moveToFirst()
+            assertEquals(fileName, cursor.getString(0))
+        }
+    }
+
+    @Test
+    fun testPrepareForUpload_NormalUid() {
+        // create event
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with normal uid"
+            uid = "some-event@hostname.tld"     // old UID format, UUID would be new format
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add() // save it to calendar storage
+
+        // prepare for upload - this should use the UID for the file name
+        val fileNameWithSuffix = localEvent.prepareForUpload()
+        val fileName = fileNameWithSuffix.removeSuffix(".ics")
+
+        assertEquals(event.uid, fileName)
+
+        // UID in calendar storage should still be set, too
+        provider.query(
+            ContentUris.withAppendedId(Events.CONTENT_URI, localEvent.id!!).asSyncAdapter(account),
+            arrayOf(Events.UID_2445), null, null, null
+        )!!.use { cursor ->
+            cursor.moveToFirst()
+            assertEquals(fileName, cursor.getString(0))
+        }
+    }
+
+    @Test
+    fun testPrepareForUpload_UidHasDangerousChars() {
+        // create event
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with funny uid"
+            uid = "https://www.example.com/events/asdfewfe-cxyb-ewrws-sadfrwerxyvser-asdfxye-"
+        }
+        val localEvent = LocalEvent(calendar, event, null, null, null, 0)
+        localEvent.add() // save it to calendar storage
+
+        // prepare for upload - this should generate a new random uuid, returned as filename
+        val fileNameWithSuffix = localEvent.prepareForUpload()
+        val fileName = fileNameWithSuffix.removeSuffix(".ics")
+
+        // throws an exception if fileName is not an UUID
+        UUID.fromString(fileName)
+
+        // UID in calendar storage shouldn't have been changed
+        provider.query(
+            ContentUris.withAppendedId(Events.CONTENT_URI, localEvent.id!!).asSyncAdapter(account),
+            arrayOf(Events.UID_2445), null, null, null
+        )!!.use { cursor ->
+            cursor.moveToFirst()
+            assertEquals(event.uid, cursor.getString(0))
+        }
+    }
+
+
+    @Test
+    fun testDeleteDirtyEventsWithoutInstances_NoInstances_Exdate() {
+        // TODO
+    }
+
+    @Test
+    fun testDeleteDirtyEventsWithoutInstances_NoInstances_CancelledExceptions() {
+        // create recurring event with only deleted/cancelled instances
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with 3 instances"
+            rRules.add(RRule("FREQ=DAILY;COUNT=3"))
+            exceptions.add(Event().apply {
+                recurrenceId = RecurrenceId("20220120T010203Z")
+                dtStart = DtStart("20220120T010203Z")
+                summary = "Cancelled exception on 1st day"
+                status = Status.VEVENT_CANCELLED
+            })
+            exceptions.add(Event().apply {
+                recurrenceId = RecurrenceId("20220121T010203Z")
+                dtStart = DtStart("20220121T010203Z")
+                summary = "Cancelled exception on 2nd day"
+                status = Status.VEVENT_CANCELLED
+            })
+            exceptions.add(Event().apply {
+                recurrenceId = RecurrenceId("20220122T010203Z")
+                dtStart = DtStart("20220122T010203Z")
+                summary = "Cancelled exception on 3rd day"
+                status = Status.VEVENT_CANCELLED
+            })
+        }
+        val localEvent = LocalEvent(calendar, event, "filename.ics", null, null, LocalResource.FLAG_REMOTELY_PRESENT)
+        localEvent.add()
+        val eventId = localEvent.id!!
+
+        // set event as dirty
+        provider.update(ContentUris.withAppendedId(Events.CONTENT_URI.asSyncAdapter(account), eventId), ContentValues(1).apply {
+            put(Events.DIRTY, 1)
+        }, null, null)
+
+        // this method should mark the event as deleted
+        calendar.deleteDirtyEventsWithoutInstances()
+
+        // verify that event is now marked as deleted
+        provider.query(
+            ContentUris.withAppendedId(Events.CONTENT_URI.asSyncAdapter(account), eventId),
+            arrayOf(Events.DELETED), null, null, null
+        )!!.use { cursor ->
+            cursor.moveToNext()
+            assertEquals(1, cursor.getInt(0))
+        }
+    }
+
+    @Test
+    fun testDeleteDirtyEventsWithoutInstances_Recurring_Instances() {
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event with 3 instances"
+            rRules.add(RRule("FREQ=DAILY;COUNT=3"))
+        }
+        val localEvent = LocalEvent(calendar, event, "filename.ics", null, null, LocalResource.FLAG_REMOTELY_PRESENT)
+        localEvent.add()
+        val eventId = localEvent.id!!
+
+        // set event as dirty
+        provider.update(ContentUris.withAppendedId(Events.CONTENT_URI.asSyncAdapter(account), eventId), ContentValues(1).apply {
+            put(Events.DIRTY, 1)
+        }, null, null)
+
+        // this method should mark the event as deleted
+        calendar.deleteDirtyEventsWithoutInstances()
+
+        // verify that event is not marked as deleted
+        provider.query(
+            ContentUris.withAppendedId(Events.CONTENT_URI.asSyncAdapter(account), eventId),
+            arrayOf(Events.DELETED), null, null, null
+        )!!.use { cursor ->
+            cursor.moveToNext()
+            assertEquals(0, cursor.getInt(0))
+        }
+    }
+
+
+    companion object {
+
+        @JvmField
+        @ClassRule
+        val initCalendarProviderRule: TestRule = InitCalendarProviderRule.getInstance()
+
+        private lateinit var provider: ContentProviderClient
+
+        @BeforeClass
+        @JvmStatic
+        fun setUpClass() {
+            val context = InstrumentationRegistry.getInstrumentation().targetContext
+            provider = context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)!!
+        }
+
+        @AfterClass
+        @JvmStatic
+        fun tearDownClass() {
+            provider.closeCompat()
+        }
+
+    }
+
+}

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

@@ -14,54 +14,45 @@ 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.BatchOperation
 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.AfterClass
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
 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.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
+    @get:Rule
+    val hiltRule = HiltAndroidRule(this)
 
     val account = Account("Test Account", "Test Account Type")
 
     @Before
-    fun setUp() {
+    fun setup() {
         hiltRule.inject()
-
-        val context = InstrumentationRegistry.getInstrumentation().context
-        provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!
     }
 
-    @After
-    fun tearDown() {
-        provider.close()
-    }
 
     @Test
     fun testApplyPendingMemberships_addPendingMembership() {
@@ -124,7 +115,7 @@ class LocalGroupTest {
             val group = newGroup(ab)
 
             // add contact1 to group
-            val batch = ContactsBatchOperation(ab.provider!!)
+            val batch = BatchOperation(ab.provider!!)
             contact1.addToGroup(batch, group.id!!)
             batch.commit()
 
@@ -154,6 +145,7 @@ class LocalGroupTest {
         }
     }
 
+
     @Test
     fun testClearDirty_addCachedGroupMembership() {
         localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
@@ -172,7 +164,7 @@ class LocalGroupTest {
                 }
             )
 
-            group.clearDirty(Optional.empty(), null)
+            group.clearDirty(null, null)
 
             // check cached group membership
             ab.provider!!.query(
@@ -208,7 +200,7 @@ class LocalGroupTest {
                 }
             )
 
-            group.clearDirty(Optional.empty(), null)
+            group.clearDirty(null, null)
 
             // cached group membership should be gone
             ab.provider!!.query(
@@ -221,6 +213,7 @@ class LocalGroupTest {
             }
     }
 
+
     @Test
     fun testMarkMembersDirty() {
         localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
@@ -230,7 +223,7 @@ class LocalGroupTest {
                 LocalContact(ab, Contact().apply { displayName = "Test" }, "fn.vcf", null, 0)
             contact1.add()
 
-            val batch = ContactsBatchOperation(ab.provider!!)
+            val batch = BatchOperation(ab.provider!!)
             contact1.addToGroup(batch, group.id!!)
             batch.commit()
 
@@ -240,11 +233,17 @@ class LocalGroupTest {
         }
     }
 
+
     @Test
-    fun testUpdate() {
-        localTestAddressBookProvider.provide(account, provider) { ab ->
+    fun testPrepareForUpload() {
+        localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
             val group = newGroup(ab)
-            group.update(Contact(displayName = "New Group Name"), null, null, null, 0)
+            assertNull(group.getContact().uid)
+
+            val fileName = group.prepareForUpload()
+            val newUid = group.getContact().uid
+            assertNotNull(newUid)
+            assertEquals("$newUid.vcf", fileName)
         }
     }
 
@@ -260,4 +259,27 @@ class LocalGroupTest {
             add()
         }
 
+
+    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/LocalTestAddressBook.kt

@@ -10,7 +10,7 @@ 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.davdroid.sync.SyncFrameworkIntegration
 import at.bitfire.vcard4android.GroupMethod
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

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

@@ -0,0 +1,749 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid.servicedetection
+
+import android.security.NetworkSecurityPolicy
+import at.bitfire.davdroid.db.AppDatabase
+import at.bitfire.davdroid.db.Collection
+import at.bitfire.davdroid.db.HomeSet
+import at.bitfire.davdroid.db.Principal
+import at.bitfire.davdroid.db.Service
+import at.bitfire.davdroid.network.HttpClient
+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 kotlinx.coroutines.test.runTest
+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.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Assume
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import java.util.logging.Logger
+import javax.inject.Inject
+
+@HiltAndroidTest
+class CollectionListRefresherTest {
+
+    @Inject
+    lateinit var db: AppDatabase
+
+    @Inject
+    lateinit var httpClientBuilder: HttpClient.Builder
+
+    @Inject
+    lateinit var logger: Logger
+
+    @Inject
+    lateinit var refresherFactory: CollectionListRefresher.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: HttpClient
+    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()
+        Assume.assumeTrue(NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted)
+
+        // 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() {
+        client.close()
+        mockServer.shutdown()
+    }
+
+
+    @Test
+    fun testDiscoverHomesets() {
+        val baseUrl = mockServer.url(PATH_CARDDAV + SUBPATH_PRINCIPAL)
+
+        // Query home sets
+        refresherFactory.create(service, client.okHttpClient).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)
+    }
+
+
+    // 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
+        refresherFactory.create(service, client.okHttpClient).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
+        refresherFactory.create(service, client.okHttpClient).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
+        refresherFactory.create(service, client.okHttpClient).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.
+        refresherFactory.create(service, client.okHttpClient).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)
+        refresherFactory.create(service, client.okHttpClient).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
+        )
+    }
+
+
+    // refreshHomelessCollections
+
+    @Test
+    fun refreshHomelessCollections_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.okHttpClient).refreshHomelessCollections()
+
+        // 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 refreshHomelessCollections_deletesInaccessibleCollections() {
+        // 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.okHttpClient).refreshHomelessCollections()
+
+        // Check the collection got deleted
+        assertEquals(null, db.collectionDao().get(collectionId))
+    }
+
+    @Test
+    fun refreshHomelessCollections_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.okHttpClient).refreshHomelessCollections()
+
+        // 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
+        )
+    }
+
+
+    // refreshPrincipals
+
+    @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
+        refresherFactory.create(service, client.okHttpClient).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
+        refresherFactory.create(service, client.okHttpClient).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
+        refresherFactory.create(service, client.okHttpClient).refreshPrincipals()
+
+        // Check principal was deleted
+        val principals = db.principalDao().getByService(service.id)
+        assertEquals(0, principals.size)
+    }
+
+    // Others
+
+    @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 = refresherFactory.create(service, client.okHttpClient)
+        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 = refresherFactory.create(service, client.okHttpClient)
+        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 = refresherFactory.create(service, client.okHttpClient)
+        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 = refresherFactory.create(service, client.okHttpClient)
+        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 = refresherFactory.create(service, client.okHttpClient)
+        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 = refresherFactory.create(service, client.okHttpClient)
+        assertFalse(refresher.shouldPreselect(collection, homesets))
+    }
+
+
+    companion object {
+
+        private const val PATH_CALDAV = "/caldav"
+        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_NON_PERSONAL = "/addressbooks-homeset-non-personal"
+        private const val SUBPATH_ADDRESSBOOK_HOMESET_EMPTY = "/addressbooks-homeset-empty"
+        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('/')
+
+            if (request.method.equals("PROPFIND", true)) {
+                val properties = when (path) {
+                    PATH_CALDAV,
+                    PATH_CARDDAV ->
+                        "<current-user-principal>" +
+                        "   <href>$path${SUBPATH_PRINCIPAL}</href>" +
+                        "</current-user-principal>"
+
+                    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>"
+
+                    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>"
+
+                    PATH_CARDDAV + SUBPATH_ADDRESSBOOK,
+                    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>"
+
+                    PATH_CARDDAV + SUBPATH_ADDRESSBOOK_HOMESET_NON_PERSONAL ->
+                        "<resourcetype>" +
+                        "   <collection/>" +
+                        "   <CARD:addressbook/>" +
+                        "</resourcetype>" +
+                        "<displayname>Freds Contacts (not mine)</displayname>" +
+                        "<CARD:addressbook-description>Not personal contacts</CARD:addressbook-description>" +
+                        "<owner>" +
+                        "   <href>${PATH_CARDDAV + SUBPATH_PRINCIPAL}</href>" + // OK, user is allowed to own non-personal contacts
+                        "</owner>"
+
+                    PATH_CALDAV + SUBPATH_PRINCIPAL ->
+                        "<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>"
+
+                    SUBPATH_ADDRESSBOOK_HOMESET_EMPTY -> ""
+
+                    else -> ""
+                }
+
+                var responseBody = ""
+                var responseCode = 207
+                when (path) {
+                    PATH_CARDDAV + SUBPATH_ADDRESSBOOK_HOMESET_PERSONAL ->
+                        responseBody =
+                            "<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>"
+
+                    PATH_CARDDAV + SUBPATH_PRINCIPAL_INACCESSIBLE,
+                    PATH_CARDDAV + SUBPATH_ADDRESSBOOK_INACCESSIBLE ->
+                        responseCode = 404
+
+                    else ->
+                        responseBody =
+                            "<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>"
+                }
+
+                logger.info("Queried: $path")
+                logger.info("Response: $responseBody")
+                return MockResponse()
+                    .setResponseCode(responseCode)
+                    .setBody(responseBody)
+            }
+
+            return MockResponse().setResponseCode(404)
+        }
+
+    }
+
+}

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/DavResourceFinderTest.kt

@@ -4,16 +4,15 @@
 
 package at.bitfire.davdroid.servicedetection
 
-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 android.security.NetworkSecurityPolicy
+import at.bitfire.dav4jvm.DavResource
+import at.bitfire.dav4jvm.property.carddav.AddressbookHomeSet
+import at.bitfire.dav4jvm.property.webdav.ResourceType
+import at.bitfire.davdroid.db.Credentials
+import at.bitfire.davdroid.network.HttpClient
 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 okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
@@ -24,6 +23,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
+import org.junit.Assume
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -49,7 +49,7 @@ class DavResourceFinderTest {
     val hiltRule = HiltAndroidRule(this)
 
     @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
+    lateinit var httpClientBuilder: HttpClient.Builder
 
     @Inject
     lateinit var logger: Logger
@@ -58,7 +58,7 @@ class DavResourceFinderTest {
     lateinit var resourceFinderFactory: DavResourceFinder.Factory
 
     private lateinit var server: MockWebServer
-    private lateinit var client: OkHttpClient
+    private lateinit var client: HttpClient
     private lateinit var finder: DavResourceFinder
 
     @Before
@@ -70,10 +70,11 @@ class DavResourceFinderTest {
             start()
         }
 
-        val credentials = Credentials(username = "mock", password = "12345".toSensitiveString())
+        val credentials = Credentials(username = "mock", password = "12345".toCharArray())
         client = httpClientBuilder
-                .authenticate(domain = null, getCredentials = { credentials })
+                .authenticate(host = null, credentials = credentials)
                 .build()
+        Assume.assumeTrue(NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted)
 
         val baseURI = URI.create("/")
         finder = resourceFinderFactory.create(baseURI, credentials)
@@ -81,6 +82,7 @@ class DavResourceFinderTest {
 
     @After
     fun tearDown() {
+        client.close()
         server.shutdown()
     }
 
@@ -89,9 +91,9 @@ class DavResourceFinderTest {
     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.scanResponse(ResourceType.ADDRESSBOOK, response, info)
         }
         assertEquals(0, info.collections.size)
         assertEquals(1, info.homeSets.size)
@@ -99,9 +101,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.scanResponse(ResourceType.ADDRESSBOOK, response, info)
         }
         assertEquals(1, info.collections.size)
         assertEquals(server.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK/"), info.collections.keys.first())

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/migration/AccountSettingsMigration20Test.kt

@@ -127,16 +127,16 @@ class AccountSettingsMigration20Test {
                     Calendars.NAME to url,
                     Calendars.SYNC_EVENTS to 1
                 )
-            )!!.asSyncAdapter(account)
+            )!!
             try {
-                migration.migrateCalendars(account, 1)
+                migration.migrateCalendars(account, calDavServiceId = 1)
 
-                provider.query(uri, arrayOf(Calendars._SYNC_ID), null, null, null)!!.use { cursor ->
+                provider.query(uri.asSyncAdapter(account), arrayOf(Calendars._SYNC_ID), null, null, null)!!.use { cursor ->
                     cursor.moveToNext()
                     assertEquals(collectionId, cursor.getLongOrNull(0))
                 }
             } finally {
-                provider.delete(uri, null, null)
+                provider.delete(uri.asSyncAdapter(account), 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

@@ -4,12 +4,13 @@
 
 package at.bitfire.davdroid.sync
 
-import android.accounts.Account
 import android.content.ContentProviderClient
 import android.content.Context
+import androidx.test.rule.GrantPermissionRule
+import at.bitfire.davdroid.CatchExceptionsRule
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.db.Service
-import at.bitfire.davdroid.network.HttpClientBuilder
+import at.bitfire.davdroid.network.HttpClient
 import at.bitfire.davdroid.repository.DavServiceRepository
 import at.bitfire.davdroid.resource.LocalJtxCollection
 import at.bitfire.davdroid.resource.LocalJtxCollectionStore
@@ -17,7 +18,6 @@ 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
@@ -25,7 +25,6 @@ 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
@@ -46,7 +45,7 @@ class JtxSyncManagerTest {
     lateinit var context: Context
 
     @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
+    lateinit var httpClientBuilder: HttpClient.Builder
 
     @Inject
     lateinit var serviceRepository: DavServiceRepository
@@ -61,9 +60,12 @@ class JtxSyncManagerTest {
     val hiltRule = HiltAndroidRule(this)
 
     @get:Rule
-    val permissionRule = GrantPermissionOrSkipRule(TaskProvider.PERMISSIONS_JTX.toSet())
+    val permissionRule = CatchExceptionsRule(
+        GrantPermissionRule.grant(*TaskProvider.PERMISSIONS_JTX),
+        SecurityException::class
+    )
 
-    lateinit var account: Account
+    private val account = TestAccount.create()
 
     private lateinit var provider: ContentProviderClient
     private lateinit var syncManager: JtxSyncManager
@@ -77,11 +79,7 @@ class JtxSyncManagerTest {
         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()
+        provider = context.contentResolver.acquireContentProviderClient(JtxContract.AUTHORITY)!!
 
         // Create dummy dependencies
         val service = Service(0, account.name, Service.TYPE_CALDAV, null)
@@ -108,12 +106,9 @@ class JtxSyncManagerTest {
         if (this::localJtxCollection.isInitialized)
             localJtxCollectionStore.delete(localJtxCollection)
         serviceRepository.deleteAllBlocking()
-
         if (this::provider.isInitialized)
             provider.closeCompat()
-
-        if (this::account.isInitialized)
-            TestAccount.remove(account)
+        TestAccount.remove(account)
     }
 
 

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

@@ -4,8 +4,8 @@
 
 package at.bitfire.davdroid.sync
 
+import at.bitfire.davdroid.db.SyncState
 import at.bitfire.davdroid.resource.LocalCollection
-import at.bitfire.davdroid.resource.SyncState
 
 class LocalTestCollection(
     override val dbCollectionId: Long = 0L

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

@@ -4,11 +4,9 @@
 
 package at.bitfire.davdroid.sync
 
-import android.content.Context
 import at.bitfire.davdroid.resource.LocalResource
-import java.util.Optional
 
-class LocalTestResource: LocalResource {
+class LocalTestResource: LocalResource<Any> {
 
     override val id: Long? = null
     override var fileName: String? = null
@@ -19,10 +17,12 @@ class LocalTestResource: LocalResource {
     var deleted = false
     var dirty = false
 
-    override fun clearDirty(fileName: Optional<String>, eTag: String?, scheduleTag: String?) {
+    override fun prepareForUpload() = "generated-file.txt"
+
+    override fun clearDirty(fileName: String?, eTag: String?, scheduleTag: String?) {
         dirty = false
-        if (fileName.isPresent)
-            this.fileName = fileName.get()
+        if (fileName != null)
+            this.fileName = fileName
         this.eTag = eTag
         this.scheduleTag = scheduleTag
     }
@@ -31,14 +31,9 @@ class LocalTestResource: LocalResource {
         this.flags = flags
     }
 
-    override fun updateUid(uid: String) { /* no-op */ }
-    override fun updateSequence(sequence: Int) = throw NotImplementedError()
-
-    override fun deleteLocal() = throw NotImplementedError()
+    override fun add() = throw NotImplementedError()
+    override fun update(data: Any) = throw NotImplementedError()
+    override fun delete() = 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)
-    }
-
-}

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

@@ -5,7 +5,6 @@
 package at.bitfire.davdroid.sync
 
 import android.accounts.Account
-import android.content.ContentResolver
 import android.content.Context
 import android.content.SyncResult
 import android.os.Bundle
@@ -14,17 +13,17 @@ import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import at.bitfire.davdroid.TestUtils
+import at.bitfire.davdroid.repository.DavCollectionRepository
+import at.bitfire.davdroid.repository.DavServiceRepository
+import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.sync.account.TestAccount
-import at.bitfire.davdroid.sync.adapter.SyncAdapterImpl
 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.Awaits
 import io.mockk.coEvery
 import io.mockk.every
-import io.mockk.impl.annotations.MockK
 import io.mockk.junit4.MockKRule
 import io.mockk.just
 import io.mockk.mockk
@@ -40,12 +39,36 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
+import java.util.logging.Logger
 import javax.inject.Inject
-import javax.inject.Provider
 import kotlin.coroutines.cancellation.CancellationException
 
 @HiltAndroidTest
-class SyncAdapterImplTest {
+class SyncAdapterServicesTest {
+
+    lateinit var account: Account
+
+    @Inject
+    lateinit var accountSettingsFactory: AccountSettings.Factory
+
+    @Inject
+    lateinit var collectionRepository: DavCollectionRepository
+
+    @Inject @ApplicationContext
+    lateinit var context: Context
+
+    @Inject
+    lateinit var logger: Logger
+
+    @Inject
+    lateinit var serviceRepository: DavServiceRepository
+
+    @Inject
+    lateinit var syncConditionsFactory: SyncConditions.Factory
+
+    @Inject
+    lateinit var workerFactory: HiltWorkerFactory
 
     @get:Rule
     val hiltRule = HiltAndroidRule(this)
@@ -53,21 +76,10 @@ class SyncAdapterImplTest {
     @get:Rule
     val mockkRule = MockKRule(this)
 
-    @Inject @ApplicationContext
-    lateinit var context: Context
+    // test methods should run quickly and not wait 60 seconds for a sync timeout or something like that
+    @get:Rule
+    val timeoutRule: Timeout = Timeout.seconds(5)
 
-    @Inject
-    lateinit var syncAdapterImplProvider: Provider<SyncAdapterImpl>
-
-    @BindValue @MockK
-    lateinit var syncWorkerManager: SyncWorkerManager
-
-    @Inject
-    lateinit var workerFactory: HiltWorkerFactory
-
-    lateinit var account: Account
-
-    private var masterSyncStateBeforeTest = ContentResolver.getMasterSyncAutomatically()
 
     @Before
     fun setUp() {
@@ -75,23 +87,33 @@ class SyncAdapterImplTest {
         TestUtils.setUpWorkManager(context, workerFactory)
 
         account = TestAccount.create()
-
-        ContentResolver.setMasterSyncAutomatically(true)
-        ContentResolver.setSyncAutomatically(account, CalendarContract.AUTHORITY, true)
-        ContentResolver.setIsSyncable(account, CalendarContract.AUTHORITY, 1)
     }
 
     @After
     fun tearDown() {
-        ContentResolver.setMasterSyncAutomatically(masterSyncStateBeforeTest)
         TestAccount.remove(account)
     }
 
 
+    private fun syncAdapter(
+        syncWorkerManager: SyncWorkerManager
+    ): SyncAdapterService.SyncAdapter =
+        SyncAdapterService.SyncAdapter(
+            accountSettingsFactory = accountSettingsFactory,
+            collectionRepository = collectionRepository,
+            serviceRepository = serviceRepository,
+            context = context,
+            logger = logger,
+            syncConditionsFactory = syncConditionsFactory,
+            syncWorkerManager = syncWorkerManager
+        )
+
+
     @Test
     fun testSyncAdapter_onPerformSync_cancellation() = runTest {
+        val syncWorkerManager = mockk<SyncWorkerManager>()
+        val syncAdapter = syncAdapter(syncWorkerManager = syncWorkerManager)
         val workManager = WorkManager.getInstance(context)
-        val syncAdapter = syncAdapterImplProvider.get()
 
         mockkObject(workManager) {
             // don't actually create a worker
@@ -114,8 +136,9 @@ class SyncAdapterImplTest {
 
     @Test
     fun testSyncAdapter_onPerformSync_returnsAfterTimeout() {
+        val syncWorkerManager = mockk<SyncWorkerManager>()
+        val syncAdapter = syncAdapter(syncWorkerManager = syncWorkerManager)
         val workManager = WorkManager.getInstance(context)
-        val syncAdapter = syncAdapterImplProvider.get()
 
         mockkObject(workManager) {
             // don't actually create a worker
@@ -135,8 +158,9 @@ class SyncAdapterImplTest {
 
     @Test
     fun testSyncAdapter_onPerformSync_runsInTime() {
+        val syncWorkerManager = mockk<SyncWorkerManager>()
+        val syncAdapter = syncAdapter(syncWorkerManager = syncWorkerManager)
         val workManager = WorkManager.getInstance(context)
-        val syncAdapter = syncAdapterImplProvider.get()
 
         mockkObject(workManager) {
             // don't actually create a worker
@@ -155,4 +179,4 @@ class SyncAdapterImplTest {
         }
     }
 
-}
+}

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

@@ -8,16 +8,16 @@ import android.accounts.Account
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
 import androidx.hilt.work.HiltWorkerFactory
-import at.bitfire.dav4jvm.okhttp.PropStat
-import at.bitfire.dav4jvm.okhttp.Response
-import at.bitfire.dav4jvm.okhttp.Response.HrefRelation
+import at.bitfire.dav4jvm.PropStat
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.Response.HrefRelation
 import at.bitfire.dav4jvm.property.webdav.GetETag
 import at.bitfire.davdroid.TestUtils
 import at.bitfire.davdroid.TestUtils.assertWithin
 import at.bitfire.davdroid.db.Collection
-import at.bitfire.davdroid.network.HttpClientBuilder
+import at.bitfire.davdroid.db.SyncState
+import at.bitfire.davdroid.network.HttpClient
 import at.bitfire.davdroid.repository.DavSyncStatsRepository
-import at.bitfire.davdroid.resource.SyncState
 import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.sync.account.TestAccount
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -59,7 +59,7 @@ class SyncManagerTest {
     lateinit var context: Context
 
     @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
+    lateinit var httpClientBuilder: HttpClient.Builder
 
     @Inject
     lateinit var syncManagerFactory: TestSyncManager.Factory

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

@@ -189,12 +189,12 @@ class SyncerTest {
         override val authority: String
             get() = throw NotImplementedError()
 
-        override fun acquireContentProvider(throwOnMissingPermissions: Boolean): ContentProviderClient? {
+        override fun acquireContentProvider(): ContentProviderClient? {
             throw NotImplementedError()
         }
 
         override fun create(
-            client: ContentProviderClient,
+            provider: ContentProviderClient,
             fromCollection: Collection
         ): LocalTestCollection? {
             throw NotImplementedError()
@@ -202,13 +202,13 @@ class SyncerTest {
 
         override fun getAll(
             account: Account,
-            client: ContentProviderClient
+            provider: ContentProviderClient
         ): List<LocalTestCollection> {
             throw NotImplementedError()
         }
 
         override fun update(
-            client: ContentProviderClient,
+            provider: ContentProviderClient,
             localCollection: LocalTestCollection,
             fromCollection: Collection
         ) {
@@ -219,7 +219,7 @@ class SyncerTest {
             throw NotImplementedError()
         }
 
-        override fun updateAccount(oldAccount: Account, newAccount: Account, client: ContentProviderClient?) {
+        override fun updateAccount(oldAccount: Account, newAccount: Account) {
             throw NotImplementedError()
         }
 

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

@@ -5,28 +5,28 @@
 package at.bitfire.davdroid.sync
 
 import android.accounts.Account
-import at.bitfire.dav4jvm.okhttp.DavCollection
-import at.bitfire.dav4jvm.okhttp.MultiResponseCallback
-import at.bitfire.dav4jvm.okhttp.Response
-import at.bitfire.dav4jvm.property.caldav.CalDAV
+import at.bitfire.dav4jvm.DavCollection
+import at.bitfire.dav4jvm.MultiResponseCallback
+import at.bitfire.dav4jvm.Response
 import at.bitfire.dav4jvm.property.caldav.GetCTag
 import at.bitfire.davdroid.db.Collection
+import at.bitfire.davdroid.db.SyncState
 import at.bitfire.davdroid.di.SyncDispatcher
+import at.bitfire.davdroid.network.HttpClient
 import at.bitfire.davdroid.resource.LocalResource
-import at.bitfire.davdroid.resource.SyncState
 import at.bitfire.davdroid.util.DavUtils.lastSegment
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.CoroutineDispatcher
 import okhttp3.HttpUrl
-import okhttp3.OkHttpClient
+import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.junit.Assert.assertEquals
 
 class TestSyncManager @AssistedInject constructor(
     @Assisted account: Account,
-    @Assisted httpClient: OkHttpClient,
+    @Assisted httpClient: HttpClient,
     @Assisted syncResult: SyncResult,
     @Assisted localCollection: LocalTestCollection,
     @Assisted collection: Collection,
@@ -46,7 +46,7 @@ class TestSyncManager @AssistedInject constructor(
     interface Factory {
         fun create(
             account: Account,
-            httpClient: OkHttpClient,
+            httpClient: HttpClient,
             syncResult: SyncResult,
             localCollection: LocalTestCollection,
             collection: Collection
@@ -54,7 +54,7 @@ class TestSyncManager @AssistedInject constructor(
     }
 
     override fun prepare(): Boolean {
-        davCollection = DavCollection(httpClient, collection.url)
+        davCollection = DavCollection(httpClient.okHttpClient, collection.url)
         return true
     }
 
@@ -65,7 +65,7 @@ class TestSyncManager @AssistedInject constructor(
         didQueryCapabilities = true
 
         var cTag: SyncState? = null
-        davCollection.propfind(0, CalDAV.GetCTag) { response, rel ->
+        davCollection.propfind(0, GetCTag.NAME) { response, rel ->
             if (rel == Response.HrefRelation.SELF)
                 response[GetCTag::class.java]?.cTag?.let {
                     cTag = SyncState(SyncState.Type.CTAG, it)
@@ -76,13 +76,9 @@ class TestSyncManager @AssistedInject constructor(
     }
 
     var didGenerateUpload = false
-    override fun generateUpload(resource: LocalTestResource): GeneratedResource {
+    override fun generateUpload(resource: LocalTestResource): RequestBody {
         didGenerateUpload = true
-        return GeneratedResource(
-            suggestedFileName = resource.fileName ?: "generated-file.txt",
-            requestBody = resource.toString().toRequestBody(),
-            onSuccessContext = GeneratedResource.OnSuccessContext()
-        )
+        return resource.toString().toRequestBody()
     }
 
     override fun syncAlgorithm() = SyncAlgorithm.PROPFIND_REPORT

app/src/androidTest/kotlin/at/bitfire/davdroid/sync/account/TestAccount.kt

@@ -8,8 +8,6 @@ import android.accounts.AccountManager
 import androidx.test.platform.app.InstrumentationRegistry
 import at.bitfire.davdroid.R
 import at.bitfire.davdroid.settings.AccountSettings
-import at.bitfire.davdroid.sync.account.TestAccount.remove
-import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 
 object TestAccount {
@@ -21,9 +19,9 @@ object TestAccount {
      *
      * Remove it with [remove].
      */
-    fun create(version: Int = AccountSettings.CURRENT_VERSION, accountName: String = "Test Account"): Account {
+    fun create(version: Int = AccountSettings.CURRENT_VERSION): Account {
         val accountType = targetContext.getString(R.string.account_type)
-        val account = Account(accountName, accountType)
+        val account = Account("Test Account", accountType)
 
         val initialData = AccountSettings.initialUserData(null)
         initialData.putString(AccountSettings.KEY_SETTINGS_VERSION, version.toString())
@@ -32,16 +30,6 @@ object TestAccount {
         return account
     }
 
-    /**
-     * Renames a test account in a blocking way (usually what you want in tests)
-     */
-    fun rename(account: Account, newName: String): Account {
-        val am = AccountManager.get(targetContext)
-        val newAccount = am.renameAccount(account, newName, null, null).result
-        assertEquals(newName, newAccount.name)
-        return newAccount
-    }
-
     /**
      * Removes a test account, usually in the `@After` tearDown of a test.
      */

app/src/androidTest/kotlin/at/bitfire/davdroid/ui/DebugInfoActivityTest.kt

@@ -19,7 +19,7 @@ class DebugInfoActivityTest {
         val expected = StringBuilder(DebugInfoActivity.IntentBuilder.MAX_ELEMENT_SIZE)
         expected.append(String(ByteArray(DebugInfoActivity.IntentBuilder.MAX_ELEMENT_SIZE - 3) { a }))
         expected.append("...")
-        assertEquals(expected.toString(), intent.getStringExtra(DebugInfoActivity.EXTRA_LOCAL_RESOURCE_SUMMARY))
+        assertEquals(expected.toString(), intent.getStringExtra("localResource"))
     }
 
     @Test

app/src/androidTest/kotlin/at/bitfire/davdroid/ui/setup/LoginActivityTest.kt

@@ -21,7 +21,7 @@ class LoginActivityTest {
         val loginInfo = LoginActivity.loginInfoFromIntent(intent)
         assertEquals("https://example.com/nextcloud", loginInfo.baseUri.toString())
         assertEquals("user", loginInfo.credentials!!.username)
-        assertEquals("password", loginInfo.credentials.password?.asString())
+        assertEquals("password", loginInfo.credentials.password?.concatToString())
     }
 
     @Test
@@ -34,7 +34,7 @@ class LoginActivityTest {
         val loginInfo = LoginActivity.loginInfoFromIntent(intent)
         assertEquals("https://example.com:444/nextcloud", loginInfo.baseUri.toString())
         assertEquals("user", loginInfo.credentials!!.username)
-        assertEquals("password", loginInfo.credentials.password?.asString())
+        assertEquals("password", loginInfo.credentials.password?.concatToString())
     }
 
     @Test
@@ -43,7 +43,7 @@ class LoginActivityTest {
         val loginInfo = LoginActivity.loginInfoFromIntent(intent)
         assertEquals("https://example.com/path", loginInfo.baseUri.toString())
         assertEquals("user", loginInfo.credentials!!.username)
-        assertEquals("password", loginInfo.credentials.password?.asString())
+        assertEquals("password", loginInfo.credentials.password?.concatToString())
     }
 
     @Test
@@ -52,7 +52,7 @@ class LoginActivityTest {
         val loginInfo = LoginActivity.loginInfoFromIntent(intent)
         assertEquals("https://example.com:0/path", loginInfo.baseUri.toString())
         assertEquals("user", loginInfo.credentials!!.username)
-        assertEquals("password", loginInfo.credentials.password?.asString())
+        assertEquals("password", loginInfo.credentials.password?.concatToString())
     }
 
     @Test
@@ -61,7 +61,7 @@ class LoginActivityTest {
         val loginInfo = LoginActivity.loginInfoFromIntent(intent)
         assertEquals(null, loginInfo.baseUri)
         assertEquals("user@example.com", loginInfo.credentials!!.username)
-        assertEquals(null, loginInfo.credentials.password?.asString())
+        assertEquals(null, loginInfo.credentials.password?.concatToString())
     }
     
 }

app/src/androidTest/kotlin/at/bitfire/davdroid/webdav/CredentialsStoreTest.kt

@@ -4,8 +4,7 @@
 
 package at.bitfire.davdroid.webdav
 
-import at.bitfire.davdroid.settings.Credentials
-import at.bitfire.davdroid.util.SensitiveString.Companion.toSensitiveString
+import at.bitfire.davdroid.db.Credentials
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Assert.assertEquals
@@ -31,8 +30,8 @@ class CredentialsStoreTest {
 
     @Test
     fun testSetGetDelete() {
-        store.setCredentials(0, Credentials(username = "myname", password = "12345".toSensitiveString()))
-        assertEquals(Credentials(username = "myname", password = "12345".toSensitiveString()), store.getCredentials(0))
+        store.setCredentials(0, Credentials(username = "myname", password = "12345".toCharArray()))
+        assertEquals(Credentials(username = "myname", password = "12345".toCharArray()), store.getCredentials(0))
 
         store.setCredentials(0, null)
         assertNull(store.getCredentials(0))

app/src/androidTest/kotlin/at/bitfire/davdroid/webdav/DavDocumentsProviderTest.kt

@@ -2,21 +2,20 @@
  * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
  */
 
-package at.bitfire.davdroid.webdav.operation
+package at.bitfire.davdroid.webdav
 
 import android.content.Context
 import android.security.NetworkSecurityPolicy
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.WebDavDocument
 import at.bitfire.davdroid.db.WebDavMount
-import at.bitfire.davdroid.network.HttpClientBuilder
+import at.bitfire.davdroid.network.HttpClient
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.mockk.junit4.MockKRule
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
-import okhttp3.OkHttpClient
+import okhttp3.CookieJar
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
@@ -31,7 +30,29 @@ import java.util.logging.Logger
 import javax.inject.Inject
 
 @HiltAndroidTest
-class QueryChildDocumentsOperationTest {
+class DavDocumentsProviderTest {
+
+    companion object {
+        private const val PATH_WEBDAV_ROOT = "/webdav"
+    }
+
+    @Inject @ApplicationContext
+    lateinit var context: Context
+
+    @Inject
+    lateinit var credentialsStore: CredentialsStore
+    
+    @Inject
+    lateinit var davDocumentsActorFactory: DavDocumentsProvider.DavDocumentsActor.Factory
+
+    @Inject
+    lateinit var httpClientBuilder: HttpClient.Builder
+    
+    @Inject
+    lateinit var db: AppDatabase
+
+    @Inject
+    lateinit var testDispatcher: TestDispatcher
 
     @get:Rule
     val hiltRule = HiltAndroidRule(this)
@@ -39,32 +60,13 @@ class QueryChildDocumentsOperationTest {
     @get:Rule
     val mockkRule = MockKRule(this)
 
-    @Inject @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var db: AppDatabase
-
-    @Inject
-    lateinit var operation: QueryChildDocumentsOperation
-
-    @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
-
-    @Inject
-    lateinit var testDispatcher: TestDispatcher
-
     private lateinit var server: MockWebServer
-    private lateinit var client: OkHttpClient
-
-    private lateinit var mount: WebDavMount
-    private lateinit var rootDocument: WebDavDocument
+    private lateinit var client: HttpClient
 
     @Before
     fun setUp() {
         hiltRule.inject()
 
-        // create server and client
         server = MockWebServer().apply {
             dispatcher = testDispatcher
             start()
@@ -74,48 +76,50 @@ class QueryChildDocumentsOperationTest {
 
         // mock server delivers HTTP without encryption
         assertTrue(NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted)
-
-        // create WebDAV mount and root document in DB
-        runBlocking {
-            val mountId = db.webDavMountDao().insert(WebDavMount(0, "Cat food storage", server.url(PATH_WEBDAV_ROOT)))
-            mount = db.webDavMountDao().getById(mountId)
-            rootDocument = db.webDavDocumentDao().getOrCreateRoot(mount)
-        }
     }
 
     @After
     fun tearDown() {
+        client.close()
         server.shutdown()
-
-        runBlocking {
-            db.webDavMountDao().deleteAsync(mount)
-        }
     }
 
 
     @Test
     fun testDoQueryChildren_insert() = runTest {
+        // Create parent and root in database
+        val id = db.webDavMountDao().insert(WebDavMount(0, "Cat food storage", server.url(PATH_WEBDAV_ROOT)))
+        val webDavMount = db.webDavMountDao().getById(id)
+        val parent = db.webDavDocumentDao().getOrCreateRoot(webDavMount)
+
         // Query
-        operation.queryChildren(rootDocument)
+        val actor = davDocumentsActorFactory.create(
+            cookieStore = mutableMapOf<Long, CookieJar>(),
+            credentialsStore = credentialsStore
+        )
+        actor.queryChildren(parent)
 
         // Assert new children were inserted into db
-        assertEquals(3, db.webDavDocumentDao().getChildren(rootDocument.id).size)
-        assertEquals("Library", db.webDavDocumentDao().getChildren(rootDocument.id)[0].displayName)
-        assertEquals("MeowMeow_Cats.docx", db.webDavDocumentDao().getChildren(rootDocument.id)[1].displayName)
-        assertEquals("Secret_Document.pages", db.webDavDocumentDao().getChildren(rootDocument.id)[2].displayName)
+        assertEquals(3, db.webDavDocumentDao().getChildren(parent.id).size)
+        assertEquals("Library", db.webDavDocumentDao().getChildren(parent.id)[0].displayName)
+        assertEquals("MeowMeow_Cats.docx", db.webDavDocumentDao().getChildren(parent.id)[1].displayName)
+        assertEquals("Secret_Document.pages", db.webDavDocumentDao().getChildren(parent.id)[2].displayName)
     }
 
     @Test
     fun testDoQueryChildren_update() = runTest {
         // Create parent and root in database
-        assertEquals("Cat food storage", db.webDavDocumentDao().get(rootDocument.id)!!.displayName)
+        val mountId = db.webDavMountDao().insert(WebDavMount(0, "Cat food storage", server.url(PATH_WEBDAV_ROOT)))
+        val webDavMount = db.webDavMountDao().getById(mountId)
+        val parent = db.webDavDocumentDao().getOrCreateRoot(webDavMount)
+        assertEquals("Cat food storage", db.webDavDocumentDao().get(parent.id)!!.displayName)
 
         // Create a folder
         val folderId = db.webDavDocumentDao().insert(
             WebDavDocument(
                 0,
-                mount.id,
-                rootDocument.id,
+                mountId,
+                parent.id,
                 "My_Books",
                 true,
                 "My Books",
@@ -125,25 +129,38 @@ class QueryChildDocumentsOperationTest {
         assertEquals("My Books", db.webDavDocumentDao().get(folderId)!!.displayName)
 
         // Query - should update the parent displayname and folder name
-        operation.queryChildren(rootDocument)
+        val actor = davDocumentsActorFactory.create(
+            cookieStore = mutableMapOf<Long, CookieJar>(),
+            credentialsStore = credentialsStore
+        )
+        actor.queryChildren(parent)
 
         // Assert parent and children were updated in database
-        assertEquals("Cats WebDAV", db.webDavDocumentDao().get(rootDocument.id)!!.displayName)
-        assertEquals("Library", db.webDavDocumentDao().getChildren(rootDocument.id)[0].name)
-        assertEquals("Library", db.webDavDocumentDao().getChildren(rootDocument.id)[0].displayName)
+        assertEquals("Cats WebDAV", db.webDavDocumentDao().get(parent.id)!!.displayName)
+        assertEquals("Library", db.webDavDocumentDao().getChildren(parent.id)[0].name)
+        assertEquals("Library", db.webDavDocumentDao().getChildren(parent.id)[0].displayName)
 
     }
 
     @Test
     fun testDoQueryChildren_delete() = runTest {
+        // Create parent and root in database
+        val mountId = db.webDavMountDao().insert(WebDavMount(0, "Cat food storage", server.url(PATH_WEBDAV_ROOT)))
+        val webDavMount = db.webDavMountDao().getById(mountId)
+        val parent = db.webDavDocumentDao().getOrCreateRoot(webDavMount)
+
         // Create a folder
         val folderId = db.webDavDocumentDao().insert(
-            WebDavDocument(0, mount.id, rootDocument.id, "deleteme", true, "Should be deleted")
+            WebDavDocument(0, mountId, parent.id, "deleteme", true, "Should be deleted")
         )
         assertEquals("deleteme", db.webDavDocumentDao().get(folderId)!!.name)
 
         // Query - discovers serverside deletion
-        operation.queryChildren(rootDocument)
+        val actor = davDocumentsActorFactory.create(
+            cookieStore = mutableMapOf<Long, CookieJar>(),
+            credentialsStore = credentialsStore
+        )
+        actor.queryChildren(parent)
 
         // Assert folder got deleted
         assertEquals(null, db.webDavDocumentDao().get(folderId))
@@ -151,17 +168,26 @@ class QueryChildDocumentsOperationTest {
 
     @Test
     fun testDoQueryChildren_updateTwoDirectoriesSimultaneously() = runTest {
+        // Create root in database
+        val mountId = db.webDavMountDao().insert(WebDavMount(0, "Cat food storage", server.url(PATH_WEBDAV_ROOT)))
+        val webDavMount = db.webDavMountDao().getById(mountId)
+        val root = db.webDavDocumentDao().getOrCreateRoot(webDavMount)
+
         // Create two directories
-        val parent1Id = db.webDavDocumentDao().insert(WebDavDocument(0, mount.id, rootDocument.id, "parent1", true))
-        val parent2Id = db.webDavDocumentDao().insert(WebDavDocument(0, mount.id, rootDocument.id, "parent2", true))
+        val parent1Id = db.webDavDocumentDao().insert(WebDavDocument(0, mountId, root.id, "parent1", true))
+        val parent2Id = db.webDavDocumentDao().insert(WebDavDocument(0, mountId, root.id, "parent2", true))
         val parent1 = db.webDavDocumentDao().get(parent1Id)!!
         val parent2 = db.webDavDocumentDao().get(parent2Id)!!
         assertEquals("parent1", parent1.name)
         assertEquals("parent2", parent2.name)
 
         // Query - find children of two nodes simultaneously
-        operation.queryChildren(parent1)
-        operation.queryChildren(parent2)
+        val actor = davDocumentsActorFactory.create(
+            cookieStore = mutableMapOf<Long, CookieJar>(),
+            credentialsStore = credentialsStore
+        )
+        actor.queryChildren(parent1)
+        actor.queryChildren(parent2)
 
         // Assert the two folders names have changed
         assertEquals("childOne.txt", db.webDavDocumentDao().getChildren(parent1Id)[0].name)
@@ -189,7 +215,7 @@ class QueryChildDocumentsOperationTest {
                     PATH_WEBDAV_ROOT to arrayOf(
                         Resource("",
                             "<resourcetype><collection/></resourcetype>" +
-                                    "<displayname>Cats WebDAV</displayname>"
+                            "<displayname>Cats WebDAV</displayname>"
                         ),
                         Resource("Secret_Document.pages",
                             "<displayname>Secret_Document.pages</displayname>",
@@ -199,7 +225,7 @@ class QueryChildDocumentsOperationTest {
                         ),
                         Resource("Library",
                             "<resourcetype><collection/></resourcetype>" +
-                                    "<displayname>Library</displayname>"
+                            "<displayname>Library</displayname>"
                         )
                     ),
 
@@ -218,15 +244,15 @@ class QueryChildDocumentsOperationTest {
                 val responses = propsMap[requestPath]?.joinToString { resource ->
                     "<response><href>$requestPath/${resource.name}</href><propstat><prop>" +
                             resource.props +
-                            "</prop></propstat></response>"
+                    "</prop></propstat></response>"
                 }
 
                 val multistatus =
                     "<multistatus xmlns='DAV:' " +
-                            "xmlns:CARD='urn:ietf:params:xml:ns:carddav' " +
-                            "xmlns:CAL='urn:ietf:params:xml:ns:caldav'>" +
-                            responses +
-                            "</multistatus>"
+                        "xmlns:CARD='urn:ietf:params:xml:ns:carddav' " +
+                        "xmlns:CAL='urn:ietf:params:xml:ns:caldav'>" +
+                        responses +
+                    "</multistatus>"
 
                 logger.info("Response: $multistatus")
                 return MockResponse()
@@ -239,9 +265,4 @@ class QueryChildDocumentsOperationTest {
 
     }
 
-
-    companion object {
-        private const val PATH_WEBDAV_ROOT = "/webdav"
-    }
-
 }

app/src/androidTest/kotlin/at/bitfire/davdroid/webdav/WebDavMountRepositoryTest.kt

@@ -6,11 +6,11 @@ package at.bitfire.davdroid.webdav
 
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
-import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.test.runTest
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
-import org.junit.Assert.assertNull
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -36,7 +36,7 @@ class WebDavMountRepositoryTest {
     @Test
     fun testHasWebDav_NoDavHeader() = runTest {
         web.enqueue(MockResponse().setResponseCode(200))
-        assertNull(repository.hasWebDav(url, null))
+        assertFalse(repository.hasWebDav(url, null))
     }
 
     @Test
@@ -44,7 +44,7 @@ class WebDavMountRepositoryTest {
         web.enqueue(MockResponse()
             .setResponseCode(200)
             .addHeader("DAV: 1"))
-        assertEquals(url, repository.hasWebDav(url, null))
+        assertTrue(repository.hasWebDav(url, null))
     }
 
     @Test
@@ -52,7 +52,7 @@ class WebDavMountRepositoryTest {
         web.enqueue(MockResponse()
             .setResponseCode(200)
             .addHeader("DAV: 1, 2"))
-        assertEquals(url,repository.hasWebDav(url, null))
+        assertTrue(repository.hasWebDav(url, null))
     }
 
     @Test
@@ -60,7 +60,7 @@ class WebDavMountRepositoryTest {
         web.enqueue(MockResponse()
             .setResponseCode(200)
             .addHeader("DAV: 1, 3"))
-        assertEquals(url,repository.hasWebDav(url, null))
+        assertTrue(repository.hasWebDav(url, null))
     }
 
 }

app/src/main/AndroidManifest.xml

@@ -45,6 +45,7 @@
     <application
         android:name=".App"
         android:allowBackup="false"
+        android:enableOnBackInvokedCallback="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -53,19 +54,11 @@
         tools:ignore="UnusedAttribute"
         android:supportsRtl="true">
 
-        <!-- Required for Hilt/WorkManager integration. See
-        - https://developer.android.com/develop/background-work/background-tasks/persistent/configuration/custom-configuration#remove-default
-        - https://developer.android.com/training/dependency-injection/hilt-jetpack#workmanager
-        However, we must not disable AndroidX startup completely, as it's needed by other libraries like okhttp. -->
+        <!-- required for Hilt/WorkManager integration -->
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
-            <meta-data
-                android:name="androidx.work.WorkManagerInitializer"
-                android:value="androidx.startup"
-                tools:node="remove" />
+            tools:node="remove">
         </provider>
 
         <!-- Remove the node added by AppAuth (remove only from net.openid.appauth library, not from our flavor manifest files) -->
@@ -74,7 +67,7 @@
 
         <activity android:name=".ui.intro.IntroActivity" />
         <activity
-            android:name=".ui.AccountsActivity"
+            android:name=".ui.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -85,12 +78,12 @@
         <activity
             android:name=".ui.AboutActivity"
             android:label="@string/navigation_drawer_about"
-            android:parentActivityName=".ui.AccountsActivity"/>
+            android:parentActivityName=".ui.MainActivity"/>
 
         <activity
             android:name=".ui.AppSettingsActivity"
             android:label="@string/app_settings"
-            android:parentActivityName=".ui.AccountsActivity"
+            android:parentActivityName=".ui.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES"/>
@@ -100,7 +93,7 @@
         <activity
             android:name=".ui.DebugInfoActivity"
             android:parentActivityName=".ui.AppSettingsActivity"
-            android:exported="false"
+            android:exported="true"
             android:label="@string/debug_info_title">
             <intent-filter>
                 <action android:name="android.intent.action.BUG_REPORT"/>
@@ -118,7 +111,7 @@
 
         <activity
             android:name=".ui.setup.LoginActivity"
-            android:parentActivityName=".ui.AccountsActivity"
+            android:parentActivityName=".ui.MainActivity"
             android:windowSoftInputMode="adjustResize"
             android:exported="true">
             <intent-filter>
@@ -146,7 +139,7 @@
 
         <activity
             android:name=".ui.account.AccountActivity"
-            android:parentActivityName=".ui.AccountsActivity"
+            android:parentActivityName=".ui.MainActivity"
             android:exported="true">
         </activity>
         <activity
@@ -168,7 +161,7 @@
         <activity
             android:name=".ui.webdav.WebdavMountsActivity"
             android:exported="true"
-            android:parentActivityName=".ui.AccountsActivity" />
+            android:parentActivityName=".ui.MainActivity" />
         <activity
             android:name=".ui.webdav.AddWebdavMountActivity"
             android:parentActivityName=".ui.webdav.WebdavMountsActivity"
@@ -186,7 +179,7 @@
                 android:resource="@xml/account_authenticator"/>
         </service>
         <service
-            android:name=".sync.adapter.CalendarsSyncAdapterService"
+            android:name=".sync.CalendarsSyncAdapterService"
             android:exported="true"
             tools:ignore="ExportedService">
             <intent-filter>
@@ -197,7 +190,7 @@
                 android:resource="@xml/sync_calendars"/>
         </service>
         <service
-            android:name=".sync.adapter.JtxSyncAdapterService"
+            android:name=".sync.JtxSyncAdapterService"
             android:exported="true"
             tools:ignore="ExportedService">
             <intent-filter>
@@ -208,7 +201,7 @@
                 android:resource="@xml/sync_notes"/>
         </service>
         <service
-            android:name=".sync.adapter.OpenTasksSyncAdapterService"
+            android:name=".sync.OpenTasksSyncAdapterService"
             android:exported="true"
             tools:ignore="ExportedService">
             <intent-filter>
@@ -219,7 +212,7 @@
                 android:resource="@xml/sync_opentasks"/>
         </service>
         <service
-            android:name=".sync.adapter.TasksOrgSyncAdapterService"
+            android:name=".sync.TasksOrgSyncAdapterService"
             android:exported="true"
             tools:ignore="ExportedService">
             <intent-filter>
@@ -254,7 +247,7 @@
                 android:resource="@xml/account_authenticator_address_book"/>
         </service>
         <service
-            android:name=".sync.adapter.ContactsSyncAdapterService"
+            android:name=".sync.ContactsSyncAdapterService"
             android:exported="true"
             tools:ignore="ExportedService">
             <intent-filter>

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

@@ -7,14 +7,13 @@ package at.bitfire.davdroid
 import android.app.Application
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
-import at.bitfire.davdroid.di.DefaultDispatcher
 import at.bitfire.davdroid.log.LogManager
 import at.bitfire.davdroid.startup.StartupPlugin
 import at.bitfire.davdroid.sync.account.AccountsCleanupWorker
 import at.bitfire.davdroid.ui.UiUtils
 import dagger.hilt.android.HiltAndroidApp
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import java.util.logging.Logger
@@ -32,10 +31,6 @@ class App: Application(), Configuration.Provider {
     @Inject
     lateinit var logManager: LogManager
 
-    @Inject
-    @DefaultDispatcher
-    lateinit var defaultDispatcher: CoroutineDispatcher
-
     @Inject
     lateinit var plugins: Set<@JvmSuppressWildcards StartupPlugin>
 
@@ -65,7 +60,7 @@ class App: Application(), Configuration.Provider {
 
         // don't block UI for some background checks
         @OptIn(DelicateCoroutinesApi::class)
-        GlobalScope.launch(defaultDispatcher) {
+        GlobalScope.launch(Dispatchers.Default) {
             // clean up orphaned accounts in DB from time to time
             AccountsCleanupWorker.enable(this@App)
 

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

@@ -3,8 +3,8 @@
  */
 package at.bitfire.davdroid
 
-import at.bitfire.synctools.icalendar.ical4jVersion
-import ezvcard.Ezvcard
+import android.net.Uri
+import androidx.core.net.toUri
 
 /**
  * Brand-specific constants like (non-theme) colors, homepage URLs etc.
@@ -13,10 +13,48 @@ object Constants {
 
     const val DAVDROID_GREEN_RGBA = 0xFF8bc34a.toInt()
 
+    val HOMEPAGE_URL = "https://www.davx5.com".toUri()
+    const val HOMEPAGE_PATH_FAQ = "faq"
+    const val HOMEPAGE_PATH_FAQ_SYNC_NOT_RUN = "synchronization-is-not-run-as-expected"
+    const val HOMEPAGE_PATH_FAQ_LOCATION_PERMISSION = "wifi-ssid-restriction-location-permission"
+    const val HOMEPAGE_PATH_OPEN_SOURCE = "donate"
+    const val HOMEPAGE_PATH_PRIVACY = "privacy"
+    const val HOMEPAGE_PATH_TESTED_SERVICES = "tested-with"
 
-    // product IDs for iCalendar/vCard
+    val MANUAL_URL = "https://manual.davx5.com".toUri()
 
-    val iCalProdId = "DAVx5/${BuildConfig.VERSION_NAME} ical4j/$ical4jVersion"
-    const val vCardProdId = "+//IDN bitfire.at//DAVx5/${BuildConfig.VERSION_NAME} ez-vcard/${Ezvcard.VERSION}"
+    const val MANUAL_PATH_ACCOUNTS_COLLECTIONS = "accounts_collections.html"
+    const val MANUAL_FRAGMENT_SERVICE_DISCOVERY = "how-does-service-discovery-work"
+
+    const val MANUAL_PATH_INTRODUCTION = "introduction.html"
+    const val MANUAL_FRAGMENT_AUTHENTICATION_METHODS = "authentication-methods"
+
+    const val MANUAL_PATH_SETTINGS = "settings.html"
+    const val MANUAL_FRAGMENT_APP_SETTINGS = "app-wide-settings"
+    const val MANUAL_FRAGMENT_ACCOUNT_SETTINGS = "account-settings"
+
+    const val MANUAL_PATH_WEBDAV_PUSH = "webdav_push.html"
+    const val MANUAL_PATH_WEBDAV_MOUNTS = "webdav_mounts.html"
+
+    val COMMUNITY_URL = "https://github.com/bitfireAT/davx5-ose/discussions".toUri()
+
+    val FEDIVERSE_HANDLE = "@davx5app@fosstodon.org"
+    val FEDIVERSE_URL = "https://fosstodon.org/@davx5app".toUri()
+
+    /**
+     * Appends query parameters for anonymized usage statistics (app ID, version).
+     * Can be used by the called Website to get an idea of which versions etc. are currently used.
+     *
+     * @param context   optional info about from where the URL was opened (like a specific Activity)
+     */
+    fun Uri.Builder.withStatParams(context: String? = null): Uri.Builder {
+        appendQueryParameter("pk_campaign", BuildConfig.APPLICATION_ID)
+        appendQueryParameter("app-version", BuildConfig.VERSION_NAME)
+
+        if (context != null)
+            appendQueryParameter("pk_kwd", context)
+
+        return this
+    }
 
 }

app/src/main/kotlin/at/bitfire/davdroid/db/AppDatabase.kt

@@ -25,7 +25,7 @@ import at.bitfire.davdroid.TextTable
 import at.bitfire.davdroid.db.migration.AutoMigration12
 import at.bitfire.davdroid.db.migration.AutoMigration16
 import at.bitfire.davdroid.db.migration.AutoMigration18
-import at.bitfire.davdroid.ui.AccountsActivity
+import at.bitfire.davdroid.ui.MainActivity
 import at.bitfire.davdroid.ui.NotificationRegistry
 import dagger.Module
 import dagger.Provides
@@ -35,13 +35,6 @@ import dagger.hilt.components.SingletonComponent
 import java.io.Writer
 import javax.inject.Singleton
 
-/**
- * The app database. Managed via android jetpack room. Room provides an abstraction
- * layer over SQLite.
- *
- * Note: In SQLite PRAGMA foreign_keys is off by default. Room activates it for
- * production (non-test) databases.
- */
 @Database(entities = [
     Service::class,
     HomeSet::class,
@@ -86,7 +79,7 @@ abstract class AppDatabase: RoomDatabase() {
             .addCallback(object: Callback() {
                 override fun onDestructiveMigration(db: SupportSQLiteDatabase) {
                     notificationRegistry.notifyIfPossible(NotificationRegistry.NOTIFY_DATABASE_CORRUPTED) {
-                        val launcherIntent = Intent(context, AccountsActivity::class.java)
+                        val launcherIntent = Intent(context, MainActivity::class.java)
                         NotificationCompat.Builder(context, notificationRegistry.CHANNEL_GENERAL)
                             .setSmallIcon(R.drawable.ic_warning_notify)
                             .setContentTitle(context.getString(R.string.database_destructive_migration_title))

app/src/main/kotlin/at/bitfire/davdroid/db/Collection.kt

@@ -10,9 +10,8 @@ import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import at.bitfire.dav4jvm.okhttp.Response
-import at.bitfire.dav4jvm.okhttp.UrlUtils
-import at.bitfire.dav4jvm.property.caldav.CalDAV
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.UrlUtils
 import at.bitfire.dav4jvm.property.caldav.CalendarColor
 import at.bitfire.dav4jvm.property.caldav.CalendarDescription
 import at.bitfire.dav4jvm.property.caldav.CalendarTimezone
@@ -20,7 +19,6 @@ import at.bitfire.dav4jvm.property.caldav.CalendarTimezoneId
 import at.bitfire.dav4jvm.property.caldav.Source
 import at.bitfire.dav4jvm.property.caldav.SupportedCalendarComponentSet
 import at.bitfire.dav4jvm.property.carddav.AddressbookDescription
-import at.bitfire.dav4jvm.property.carddav.CardDAV
 import at.bitfire.dav4jvm.property.push.PushTransports
 import at.bitfire.dav4jvm.property.push.Topic
 import at.bitfire.dav4jvm.property.push.WebPush
@@ -168,9 +166,9 @@ data class Collection(
             val url = UrlUtils.withTrailingSlash(dav.href)
             val type: String = dav[ResourceType::class.java]?.let { resourceType ->
                 when {
-                    resourceType.types.contains(CardDAV.Addressbook) -> TYPE_ADDRESSBOOK
-                    resourceType.types.contains(CalDAV.Calendar)     -> TYPE_CALENDAR
-                    resourceType.types.contains(CalDAV.Subscribed)   -> TYPE_WEBCAL
+                    resourceType.types.contains(ResourceType.ADDRESSBOOK) -> TYPE_ADDRESSBOOK
+                    resourceType.types.contains(ResourceType.CALENDAR)    -> TYPE_CALENDAR
+                    resourceType.types.contains(ResourceType.SUBSCRIBED)  -> TYPE_WEBCAL
                     else -> null
                 }
             } ?: return null

app/src/main/kotlin/at/bitfire/davdroid/db/CollectionDao.kt

@@ -38,10 +38,6 @@ interface CollectionDao {
     @Query("SELECT * FROM collection WHERE pushTopic=:topic AND sync")
     suspend fun getSyncableByPushTopic(topic: String): Collection?
 
-    @Suppress("unused")     // for build variant
-    @Query("SELECT * FROM collection WHERE sync")
-    fun getSyncCollections(): List<Collection>
-
     @Query("SELECT pushVapidKey FROM collection WHERE serviceId=:serviceId AND pushVapidKey IS NOT NULL LIMIT 1")
     suspend fun getFirstVapidKey(serviceId: Long): String?
 

app/src/main/kotlin/at/bitfire/davdroid/db/Converters.kt

@@ -14,7 +14,7 @@ class Converters {
 
     @TypeConverter
     fun httpUrlToString(url: HttpUrl?) =
-        url?.toString()
+            url?.toString()
 
     @TypeConverter
     fun mediaTypeToString(mediaType: MediaType?) =

app/src/main/kotlin/at/bitfire/davdroid/db/Credentials.kt

@@ -0,0 +1,58 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid.db
+
+import net.openid.appauth.AuthState
+
+data class Credentials(
+    val username: String? = null,
+    val password: CharArray? = null,
+
+    val certificateAlias: String? = null,
+
+    val authState: AuthState? = null
+) {
+
+    override fun toString(): String {
+        val s = mutableListOf<String>()
+
+        if (username != null)
+            s += "userName=$username"
+        if (password != null)
+            s += "password=*****"
+
+        if (certificateAlias != null)
+            s += "certificateAlias=$certificateAlias"
+
+        if (authState != null)
+            s += "authState=${authState.jsonSerializeString()}"
+
+        return "Credentials(" + s.joinToString(", ") + ")"
+    }
+
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Credentials
+
+        if (username != other.username) return false
+        if (!password.contentEquals(other.password)) return false
+        if (certificateAlias != other.certificateAlias) return false
+        if (authState != other.authState) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = username?.hashCode() ?: 0
+        result = 31 * result + (password?.contentHashCode() ?: 0)
+        result = 31 * result + (certificateAlias?.hashCode() ?: 0)
+        result = 31 * result + (authState?.hashCode() ?: 0)
+        return result
+    }
+
+}

app/src/main/kotlin/at/bitfire/davdroid/db/HomeSetDao.kt

@@ -8,7 +8,6 @@ import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
-import androidx.room.Transaction
 import androidx.room.Update
 import kotlinx.coroutines.flow.Flow
 
@@ -36,24 +35,6 @@ interface HomeSetDao {
     @Update
     fun update(homeset: HomeSet)
 
-    /**
-     * If a homeset with the given service ID and URL already exists, it is updated with the other fields.
-     * Otherwise, a new homeset is inserted.
-     *
-     * This method preserves the primary key, as opposed to using "@Insert(onConflict = OnConflictStrategy.REPLACE)"
-     * which will create a new row with incremented ID and thus breaks entity relationships!
-     *
-     * @param homeSet   home set to insert/update
-     *
-     * @return ID of the row that has been inserted or updated. -1 If the insert fails due to other reasons.
-     */
-    @Transaction
-    fun insertOrUpdateByUrlBlocking(homeSet: HomeSet): Long =
-        getByUrl(homeSet.serviceId, homeSet.url.toString())?.let { existingHomeset ->
-            update(homeSet.copy(id = existingHomeset.id))
-            existingHomeset.id
-        } ?: insert(homeSet)
-
     @Delete
     fun delete(homeset: HomeSet)
 

app/src/main/kotlin/at/bitfire/davdroid/db/Principal.kt

@@ -8,11 +8,10 @@ import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import at.bitfire.dav4jvm.okhttp.Response
-import at.bitfire.dav4jvm.okhttp.UrlUtils
+import at.bitfire.dav4jvm.Response
+import at.bitfire.dav4jvm.UrlUtils
 import at.bitfire.dav4jvm.property.webdav.DisplayName
 import at.bitfire.dav4jvm.property.webdav.ResourceType
-import at.bitfire.dav4jvm.property.webdav.WebDAV
 import at.bitfire.davdroid.util.trimToNull
 import okhttp3.HttpUrl
 
@@ -47,7 +46,7 @@ data class Principal(
         fun fromDavResponse(serviceId: Long, dav: Response): Principal? {
             // Check if response is a principal
             val resourceType = dav[ResourceType::class.java] ?: return null
-            if (!resourceType.types.contains(WebDAV.Principal))
+            if (!resourceType.types.contains(ResourceType.PRINCIPAL))
                 return null
 
             // Try getting the display name of the principal

app/src/main/kotlin/at/bitfire/davdroid/db/PrincipalDao.kt

@@ -48,20 +48,11 @@ interface PrincipalDao {
      * @param principal Principal to be inserted or updated
      * @return ID of the newly inserted or already existing principal
      */
-    fun insertOrUpdate(serviceId: Long, principal: Principal): Long {
-        // Try to get existing principal by URL
-        val oldPrincipal = getByUrl(serviceId, principal.url)
-
-        // Insert new principal if not existing
-        if (oldPrincipal == null)
-            return insert(principal)
-
-        // Otherwise update the existing principal
-        if (principal.displayName != oldPrincipal.displayName)
-            update(principal.copy(id = oldPrincipal.id))
-
-        // In any case return the id of the principal
-        return oldPrincipal.id
-    }
+    fun insertOrUpdate(serviceId: Long, principal: Principal): Long =
+        getByUrl(serviceId, principal.url)?.let { oldPrincipal ->
+            if (principal.displayName != oldPrincipal.displayName)
+                update(principal.copy(id = oldPrincipal.id))
+            return oldPrincipal.id
+        } ?: insert(principal)
 
 }

app/src/main/kotlin/at/bitfire/davdroid/db/SyncState.kt

@@ -2,21 +2,21 @@
  * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
  */
 
-package at.bitfire.davdroid.resource
+package at.bitfire.davdroid.db
 
 import at.bitfire.dav4jvm.property.webdav.SyncToken
 import org.json.JSONException
 import org.json.JSONObject
 
 data class SyncState(
-    val type: Type,
-    val value: String,
+        val type: Type,
+        val value: String,
 
-    /**
-     * Whether this sync state occurred during an initial sync as described
-     * in RFC 6578, which means the initial sync is not complete yet.
-     */
-    var initialSync: Boolean? = null
+        /**
+         * Whether this sync state occurred during an initial sync as described
+         * in RFC 6578, which means the initial sync is not complete yet.
+         */
+        var initialSync: Boolean? = null
 ) {
 
     companion object {

app/src/main/kotlin/at/bitfire/davdroid/log/LogFileHandler.kt

@@ -12,11 +12,9 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
 import at.bitfire.davdroid.R
-import at.bitfire.davdroid.log.LogFileHandler.Companion.debugDir
 import at.bitfire.davdroid.ui.AppSettingsActivity
 import at.bitfire.davdroid.ui.DebugInfoActivity
 import at.bitfire.davdroid.ui.NotificationRegistry
-import at.bitfire.synctools.log.PlainTextFormatter
 import dagger.hilt.android.qualifiers.ApplicationContext
 import java.io.Closeable
 import java.io.File

app/src/main/kotlin/at/bitfire/davdroid/log/LogManager.kt

@@ -8,7 +8,6 @@ import android.content.Context
 import android.util.Log
 import at.bitfire.davdroid.BuildConfig
 import at.bitfire.davdroid.repository.PreferenceRepository
-import at.bitfire.synctools.log.LogcatHandler
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -39,10 +38,6 @@ import javax.inject.Singleton
  *
  * When using the global logger, the class name of the logging calls will still be logged, so there's
  * no need to always get a separate logger for each class (only if the class wants to customize it).
- *
- * Note about choosing log levels: records with [Level.FINE] or higher will always be printed to adb logs
- * (regardless of whether verbose logging is active). Records with a lower level will only be
- * printed to adb logs when verbose logging is active.
  */
 @Singleton
 class LogManager @Inject constructor(
@@ -83,11 +78,8 @@ class LogManager @Inject constructor(
 
         // root logger: set default log level and always log to logcat
         val rootLogger = Logger.getLogger("")
-        rootLogger.level = if (logVerbose)
-            Level.ALL       // include everything (including HTTP interceptor logs) in verbose logs
-        else
-            Level.FINE      // include detailed information like content provider operations in non-verbose logs
-        rootLogger.addHandler(LogcatHandler(BuildConfig.APPLICATION_ID))
+        rootLogger.level = if (logVerbose) Level.ALL else Level.INFO
+        rootLogger.addHandler(LogcatHandler())
 
         // log to file, if requested
         if (logToFile)

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

@@ -0,0 +1,52 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid.log
+
+import android.os.Build
+import android.util.Log
+import at.bitfire.davdroid.BuildConfig
+import com.google.common.base.Ascii
+import java.util.logging.Handler
+import java.util.logging.Level
+import java.util.logging.LogRecord
+
+/**
+ * Logging handler that logs to Android logcat.
+ */
+internal class LogcatHandler: Handler() {
+
+    init {
+        formatter = PlainTextFormatter.LOGCAT
+    }
+
+    override fun publish(r: LogRecord) {
+        val level = r.level.intValue()
+        val text = formatter.format(r)
+
+        // get class name that calls the logger (or fall back to package name)
+        val className = if (r.sourceClassName != null)
+            PlainTextFormatter.shortClassName(r.sourceClassName)
+        else
+            BuildConfig.APPLICATION_ID
+
+        // truncate class name to 23 characters on Android <8, see Log documentation
+        val tag = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
+            Ascii.truncate(className, 23, "")
+        else
+            className
+
+        when {
+            level >= Level.SEVERE.intValue()  -> Log.e(tag, text, r.thrown)
+            level >= Level.WARNING.intValue() -> Log.w(tag, text, r.thrown)
+            level >= Level.CONFIG.intValue()  -> Log.i(tag, text, r.thrown)
+            level >= Level.FINER.intValue()   -> Log.d(tag, text, r.thrown)
+            else                              -> Log.v(tag, text, r.thrown)
+        }
+    }
+
+    override fun flush() {}
+    override fun close() {}
+
+}

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

@@ -0,0 +1,111 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid.log
+
+import com.google.common.base.Ascii
+import java.io.PrintWriter
+import java.io.StringWriter
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.logging.Formatter
+import java.util.logging.LogRecord
+
+class PlainTextFormatter(
+    private val withTime: Boolean,
+    private val withSource: Boolean,
+    private val padSource: Int = 30,
+    private val withException: Boolean,
+    private val lineSeparator: String?
+): Formatter() {
+
+    companion object {
+
+        /**
+         * Formatter intended for logcat output.
+         */
+        val LOGCAT = PlainTextFormatter(
+            withTime = false,
+            withSource = false,
+            withException = false,
+            lineSeparator = null
+        )
+
+        /**
+         * Formatter intended for file output.
+         */
+        val DEFAULT = PlainTextFormatter(
+            withTime = true,
+            withSource = true,
+            withException = true,
+            lineSeparator = System.lineSeparator()
+        )
+
+        /**
+         * Maximum length of a log line (estimate).
+         */
+        const val MAX_LENGTH = 10000
+
+        fun shortClassName(className: String) = className
+            .replace(Regex("^at\\.bitfire\\.(dav|cert4an|dav4an|ical4an|vcard4an)droid\\."), ".")
+            .replace(Regex("\\$.*$"), "")
+
+        private fun stackTrace(ex: Throwable): String {
+            val writer = StringWriter()
+            ex.printStackTrace(PrintWriter(writer))
+            return writer.toString()
+        }
+
+    }
+
+    private val timeFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ROOT)
+
+
+    override fun format(r: LogRecord): String {
+        val builder = StringBuilder()
+
+        if (withTime)
+            builder .append(timeFormat.format(Date(r.millis)))
+                    .append(" ").append(r.threadID).append(" ")
+
+        if (withSource && r.sourceClassName != null) {
+            val className = shortClassName(r.sourceClassName)
+            if (className != r.loggerName) {
+                val classNameColumn = "[$className] ".padEnd(padSource)
+                builder.append(classNameColumn)
+            }
+        }
+
+        builder.append(truncate(r.message))
+
+        if (withException && r.thrown != null) {
+            val indentedStackTrace = stackTrace(r.thrown)
+                .replace("\n", "\n\t")
+                .removeSuffix("\t")
+            builder.append("\n\tEXCEPTION ").append(indentedStackTrace)
+        }
+
+        r.parameters?.let {
+            for ((idx, param) in it.withIndex()) {
+                builder.append("\n\tPARAMETER #").append(idx + 1).append(" = ")
+
+                val valStr = if (param == null)
+                    "(null)"
+                else
+                    truncate(param.toString())
+                builder.append(valStr)
+            }
+        }
+
+        if (lineSeparator != null)
+            builder.append(lineSeparator)
+
+        return builder.toString()
+    }
+
+    private fun truncate(s: String) =
+        Ascii.truncate(s, MAX_LENGTH, "[…]")
+
+}

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

@@ -4,7 +4,6 @@
 
 package at.bitfire.davdroid.log
 
-import at.bitfire.synctools.log.PlainTextFormatter
 import com.google.common.base.Ascii
 import java.util.logging.Handler
 import java.util.logging.LogRecord

app/src/main/kotlin/at/bitfire/davdroid/network/BearerAuthInterceptor.kt

@@ -0,0 +1,72 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid.network
+
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.runBlocking
+import net.openid.appauth.AuthState
+import net.openid.appauth.AuthorizationException
+import net.openid.appauth.AuthorizationService
+import okhttp3.Interceptor
+import okhttp3.Response
+import java.util.logging.Level
+import java.util.logging.Logger
+
+/**
+ * Sends an OAuth Bearer token authorization as described in RFC 6750.
+ */
+class BearerAuthInterceptor(
+    private val accessToken: String
+): Interceptor {
+
+    companion object {
+
+        val logger: Logger
+            get() = Logger.getGlobal()
+
+        fun fromAuthState(authService: AuthorizationService, authState: AuthState, callback: AuthStateUpdateCallback? = null): BearerAuthInterceptor? {
+            return runBlocking {
+                val accessTokenFuture = CompletableDeferred<String>()
+
+                authState.performActionWithFreshTokens(authService) { accessToken: String?, _: String?, ex: AuthorizationException? ->
+                    if (accessToken != null) {
+                        // persist updated AuthState
+                        callback?.onUpdate(authState)
+
+                        // emit access token
+                        accessTokenFuture.complete(accessToken)
+                    }
+                    else {
+                        logger.log(Level.WARNING, "Couldn't obtain access token", ex)
+                        accessTokenFuture.cancel()
+                    }
+                }
+
+                // return value
+                try {
+                    BearerAuthInterceptor(accessTokenFuture.await())
+                } catch (ignored: CancellationException) {
+                    null
+                }
+            }
+        }
+
+    }
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        logger.finer("Authenticating request with access token")
+        val rq = chain.request().newBuilder()
+            .header("Authorization", "Bearer $accessToken")
+            .build()
+        return chain.proceed(rq)
+    }
+
+
+    fun interface AuthStateUpdateCallback {
+        fun onUpdate(authState: AuthState)
+    }
+
+}

app/src/main/kotlin/at/bitfire/davdroid/network/ClientCertKeyManager.kt

@@ -6,31 +6,22 @@ package at.bitfire.davdroid.network
 
 import android.content.Context
 import android.security.KeyChain
-import android.security.KeyChainException
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.qualifiers.ApplicationContext
 import java.net.Socket
 import java.security.Principal
-import java.security.PrivateKey
-import java.security.cert.X509Certificate
-import java.util.logging.Level
-import java.util.logging.Logger
 import javax.net.ssl.X509ExtendedKeyManager
 
 /**
- * KeyManager that provides a client certificate and private key from the Android [KeyChain].
+ * KeyManager that provides a client certificate and private key from the Android KeyChain.
  *
- * Requests for certificates / private keys for other aliases than the specified one
- * will be ignored.
- *
- * @param alias     alias of the desired certificate / private key
+ * @throws IllegalArgumentException if the alias doesn't exist or is not accessible
  */
 class ClientCertKeyManager @AssistedInject constructor(
     @Assisted private val alias: String,
-    @ApplicationContext private val context: Context,
-    private val logger: Logger
+    @ApplicationContext private val context: Context
 ): X509ExtendedKeyManager() {
 
     @AssistedFactory
@@ -38,42 +29,19 @@ class ClientCertKeyManager @AssistedInject constructor(
         fun create(alias: String): ClientCertKeyManager
     }
 
+    val certs = KeyChain.getCertificateChain(context, alias) ?: throw IllegalArgumentException("Alias doesn't exist or not accessible: $alias")
+    val key = KeyChain.getPrivateKey(context, alias) ?: throw IllegalArgumentException("Alias doesn't exist or not accessible: $alias")
+
     override fun getServerAliases(p0: String?, p1: Array<out Principal>?): Array<String>? = null
     override fun chooseServerAlias(p0: String?, p1: Array<out Principal>?, p2: Socket?) = null
 
     override fun getClientAliases(p0: String?, p1: Array<out Principal>?) = arrayOf(alias)
     override fun chooseClientAlias(p0: Array<out String>?, p1: Array<out Principal>?, p2: Socket?) = alias
 
-    override fun getCertificateChain(forAlias: String): Array<X509Certificate>? {
-        if (forAlias != alias)
-            return null
+    override fun getCertificateChain(forAlias: String?) =
+        certs.takeIf { forAlias == alias }
 
-        return try {
-            KeyChain.getCertificateChain(context, alias).also { result ->
-                if (result == null)
-                    logger.warning("Couldn't obtain certificate chain for alias $alias")
-            }
-        } catch (e: KeyChainException) {
-            // Android <Q throws an exception instead of returning null
-            logger.log(Level.WARNING, "Couldn't obtain certificate chain for alias $alias", e)
-            null
-        }
-    }
-
-    override fun getPrivateKey(forAlias: String): PrivateKey? {
-        if (forAlias != alias)
-            return null
-
-        return try {
-            KeyChain.getPrivateKey(context, alias).also { result ->
-                if (result == null)
-                    logger.log(Level.WARNING, "Couldn't obtain private key for alias $alias")
-            }
-        } catch (e: KeyChainException) {
-            // Android <Q throws an exception instead of returning null
-            logger.log(Level.WARNING, "Couldn't obtain private key for alias $alias", e)
-            null
-        }
-    }
+    override fun getPrivateKey(forAlias: String?) =
+        key.takeIf { forAlias == alias }
 
 }

app/src/main/kotlin/at/bitfire/davdroid/network/ConscryptIntegration.kt

@@ -1,52 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.network
-
-import androidx.annotation.VisibleForTesting
-import org.conscrypt.Conscrypt
-import java.security.Security
-import java.util.logging.Logger
-import javax.net.ssl.SSLContext
-
-/**
- * Integration with the Conscrypt library that provides recent TLS versions and ciphers,
- * regardless of the device Android version.
- */
-class ConscryptIntegration {
-
-    private val logger
-        get() = Logger.getLogger(javaClass.name)
-
-    private var initialized = false
-
-    /**
-     * Loads and initializes Conscrypt (if not already done). Safe to be called multiple times.
-     */
-    fun initialize() {
-        synchronized(ConscryptIntegration::javaClass) {
-            if (initialized)
-                return
-
-            if (Conscrypt.isAvailable() && !conscryptInstalled()) {
-                // install Conscrypt as most preferred provider
-                Security.insertProviderAt(Conscrypt.newProvider(), 1)
-
-                val version = Conscrypt.version()
-                logger.info("Using Conscrypt/${version.major()}.${version.minor()}.${version.patch()} for TLS")
-
-                val engine = SSLContext.getDefault().createSSLEngine()
-                logger.info("Enabled protocols: ${engine.enabledProtocols.joinToString(", ")}")
-                logger.info("Enabled ciphers: ${engine.enabledCipherSuites.joinToString(", ")}")
-            }
-
-            initialized = true
-        }
-    }
-
-    @VisibleForTesting
-    internal fun conscryptInstalled() =
-        Security.getProviders().any { Conscrypt.isConscrypt(it) }
-
-}

app/src/main/kotlin/at/bitfire/davdroid/network/GoogleLogin.kt

@@ -0,0 +1,91 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid.network
+
+import androidx.core.net.toUri
+import at.bitfire.davdroid.BuildConfig
+import at.bitfire.davdroid.db.Credentials
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import net.openid.appauth.AuthState
+import net.openid.appauth.AuthorizationException
+import net.openid.appauth.AuthorizationRequest
+import net.openid.appauth.AuthorizationResponse
+import net.openid.appauth.AuthorizationService
+import net.openid.appauth.AuthorizationServiceConfiguration
+import net.openid.appauth.ResponseTypeValues
+import net.openid.appauth.TokenResponse
+import java.net.URI
+import java.util.logging.Logger
+
+class GoogleLogin(
+    val authService: AuthorizationService
+) {
+    
+    private val logger: Logger = Logger.getGlobal()
+
+
+    companion object {
+
+        // davx5integration@gmail.com (for davx5-ose)
+        private const val CLIENT_ID = "1069050168830-eg09u4tk1cmboobevhm4k3bj1m4fav9i.apps.googleusercontent.com"
+
+        private val SCOPES = arrayOf(
+            "https://www.googleapis.com/auth/calendar",     // CalDAV
+            "https://www.googleapis.com/auth/carddav"       // CardDAV
+        )
+
+        /**
+         * Gets the Google CalDAV/CardDAV base URI. See https://developers.google.com/calendar/caldav/v2/guide;
+         * _calid_ of the primary calendar is the account name.
+         *
+         * This URL allows CardDAV (over well-known URLs) and CalDAV detection including calendar-homesets and secondary
+         * calendars.
+         */
+        fun googleBaseUri(googleAccount: String): URI =
+            URI("https", "apidata.googleusercontent.com", "/caldav/v2/$googleAccount/user", null)
+
+        private val serviceConfig = AuthorizationServiceConfiguration(
+            "https://accounts.google.com/o/oauth2/v2/auth".toUri(),
+            "https://oauth2.googleapis.com/token".toUri()
+        )
+
+    }
+
+    fun signIn(email: String, customClientId: String?, locale: String?): AuthorizationRequest {
+        val builder = AuthorizationRequest.Builder(
+            serviceConfig,
+            customClientId ?: CLIENT_ID,
+            ResponseTypeValues.CODE,
+            (BuildConfig.APPLICATION_ID + ":/oauth2/redirect").toUri()
+        )
+        return builder
+            .setScopes(*SCOPES)
+            .setLoginHint(email)
+            .setUiLocales(locale)
+            .build()
+    }
+
+    suspend fun authenticate(authResponse: AuthorizationResponse): Credentials {
+        val authState = AuthState(authResponse, null)       // authorization code must not be stored; exchange it to refresh token
+        val credentials = CompletableDeferred<Credentials>()
+
+        withContext(Dispatchers.IO) {
+            authService.performTokenRequest(authResponse.createTokenExchangeRequest()) { tokenResponse: TokenResponse?, refreshTokenException: AuthorizationException? ->
+                logger.info("Refresh token response: ${tokenResponse?.jsonSerializeString()}")
+
+                if (tokenResponse != null) {
+                    // success, save authState (= refresh token)
+                    authState.update(tokenResponse, refreshTokenException)
+                    credentials.complete(Credentials(authState = authState))
+                }
+            }
+        }
+
+        return credentials.await()
+    }
+
+}

app/src/main/kotlin/at/bitfire/davdroid/network/HttpClient.kt

@@ -0,0 +1,306 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid.network
+
+import android.accounts.Account
+import android.content.Context
+import androidx.annotation.WorkerThread
+import at.bitfire.cert4android.CustomCertManager
+import at.bitfire.dav4jvm.BasicDigestAuthHandler
+import at.bitfire.dav4jvm.UrlUtils
+import at.bitfire.davdroid.db.Credentials
+import at.bitfire.davdroid.di.IoDispatcher
+import at.bitfire.davdroid.settings.AccountSettings
+import at.bitfire.davdroid.settings.Settings
+import at.bitfire.davdroid.settings.SettingsManager
+import at.bitfire.davdroid.ui.ForegroundTracker
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import net.openid.appauth.AuthState
+import net.openid.appauth.AuthorizationService
+import okhttp3.Authenticator
+import okhttp3.Cache
+import okhttp3.ConnectionSpec
+import okhttp3.CookieJar
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Protocol
+import okhttp3.brotli.BrotliInterceptor
+import okhttp3.internal.tls.OkHostnameVerifier
+import okhttp3.logging.HttpLoggingInterceptor
+import java.io.File
+import java.net.InetSocketAddress
+import java.net.Proxy
+import java.util.concurrent.TimeUnit
+import java.util.logging.Level
+import java.util.logging.Logger
+import javax.inject.Inject
+import javax.inject.Provider
+import javax.net.ssl.KeyManager
+import javax.net.ssl.SSLContext
+
+class HttpClient(
+    val okHttpClient: OkHttpClient,
+    private val authorizationService: AuthorizationService? = null
+): AutoCloseable {
+
+    override fun close() {
+        authorizationService?.dispose()
+        okHttpClient.cache?.close()
+    }
+
+
+    // builder
+
+    /**
+     * Builder for the [HttpClient].
+     *
+     * **Attention:** If the builder is injected, it shouldn't be used from multiple locations to generate different clients because then
+     * there's only one [Builder] object and setting properties from one location would influence the others.
+     *
+     * To generate multiple clients, inject and use `Provider<HttpClient.Builder>` instead.
+     */
+    class Builder @Inject constructor(
+        private val accountSettingsFactory: AccountSettings.Factory,
+        private val authorizationServiceProvider: Provider<AuthorizationService>,
+        @ApplicationContext private val context: Context,
+        defaultLogger: Logger,
+        @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+        private val keyManagerFactory: ClientCertKeyManager.Factory,
+        private val settingsManager: SettingsManager
+    ) {
+
+        // property setters/getters
+
+        private var logger: Logger = defaultLogger
+        fun setLogger(logger: Logger): Builder {
+            this.logger = logger
+            return this
+        }
+
+        private var loggerInterceptorLevel: HttpLoggingInterceptor.Level = HttpLoggingInterceptor.Level.BODY
+        fun loggerInterceptorLevel(level: HttpLoggingInterceptor.Level): Builder {
+            loggerInterceptorLevel = level
+            return this
+        }
+
+        // default cookie store for non-persistent cookies (some services like Horde use cookies for session tracking)
+        private var cookieStore: CookieJar = MemoryCookieStore()
+        fun setCookieStore(cookieStore: CookieJar): Builder {
+            this.cookieStore = cookieStore
+            return this
+        }
+
+        private var authenticationInterceptor: Interceptor? = null
+        private var authenticator: Authenticator? = null
+        private var authorizationService: AuthorizationService? = null
+        private var certificateAlias: String? = null
+        fun authenticate(host: String?, credentials: Credentials, authStateCallback: BearerAuthInterceptor.AuthStateUpdateCallback? = null): Builder {
+            if (credentials.authState != null) {
+                // OAuth
+                val authService = authorizationServiceProvider.get()
+                authenticationInterceptor = BearerAuthInterceptor.fromAuthState(authService, credentials.authState, authStateCallback)
+                authorizationService = authService
+
+            } else if (credentials.username != null && credentials.password != null) {
+                // basic/digest auth
+                val authHandler = BasicDigestAuthHandler(
+                    domain = UrlUtils.hostToDomain(host),
+                    username = credentials.username,
+                    password = credentials.password,
+                    insecurePreemptive = true
+                )
+                authenticationInterceptor = authHandler
+                authenticator = authHandler
+            }
+
+            // client certificate
+            if (credentials.certificateAlias != null)
+                certificateAlias = credentials.certificateAlias
+
+            return this
+        }
+
+        private var followRedirects = false
+        fun followRedirects(follow: Boolean): Builder {
+            followRedirects = follow
+            return this
+        }
+
+        private var cache: Cache? = null
+        @Suppress("unused")
+        fun withDiskCache(maxSize: Long = 10*1024*1024): Builder {
+            for (dir in arrayOf(context.externalCacheDir, context.cacheDir).filterNotNull()) {
+                if (dir.exists() && dir.canWrite()) {
+                    val cacheDir = File(dir, "HttpClient")
+                    cacheDir.mkdir()
+                    logger.fine("Using disk cache: $cacheDir")
+                    cache = Cache(cacheDir, maxSize)
+                    break
+                }
+            }
+            return this
+        }
+
+
+        // convenience builders from other classes
+
+        /**
+         * Takes authentication (basic/digest or OAuth and client certificate) from a given account.
+         *
+         * **Must not be run on main thread, because it creates [AccountSettings]!** Use [fromAccountAsync] if possible.
+         *
+         * @param account   the account to take authentication from
+         * @param onlyHost  if set: only authenticate for this host name
+         *
+         * @throws at.bitfire.davdroid.sync.account.InvalidAccountException     when the account doesn't exist
+         */
+        @WorkerThread
+        fun fromAccount(account: Account, onlyHost: String? = null): Builder {
+            val accountSettings = accountSettingsFactory.create(account)
+            authenticate(
+                host = onlyHost,
+                credentials = accountSettings.credentials(),
+                authStateCallback = { authState: AuthState ->
+                    accountSettings.credentials(Credentials(authState = authState))
+                }
+            )
+            return this
+        }
+
+        /**
+         * Same as [fromAccount], but can be called on any thread.
+         *
+         * @throws at.bitfire.davdroid.sync.account.InvalidAccountException     when the account doesn't exist
+         */
+        suspend fun fromAccountAsync(account: Account, onlyHost: String? = null): Builder = withContext(ioDispatcher) {
+            fromAccount(account, onlyHost)
+        }
+
+
+        // actual builder
+
+        fun build(): HttpClient {
+            val okBuilder = OkHttpClient.Builder()
+                // Set timeouts. According to [AbstractThreadedSyncAdapter], when there is no network
+                // traffic within a minute, a sync will be cancelled.
+                .connectTimeout(15, TimeUnit.SECONDS)
+                .writeTimeout(30, TimeUnit.SECONDS)
+                .readTimeout(120, TimeUnit.SECONDS)
+                .pingInterval(45, TimeUnit.SECONDS)     // avoid cancellation because of missing traffic; only works for HTTP/2
+
+                // don't allow redirects by default because it would break PROPFIND handling
+                .followRedirects(followRedirects)
+
+                // add User-Agent to every request
+                .addInterceptor(UserAgentInterceptor)
+
+                // connection-private cookie store
+                .cookieJar(cookieStore)
+
+                // allow cleartext and TLS 1.2+
+                .connectionSpecs(listOf(
+                    ConnectionSpec.CLEARTEXT,
+                    ConnectionSpec.MODERN_TLS
+                ))
+
+                // offer Brotli and gzip compression (can be disabled per request with `Accept-Encoding: identity`)
+                .addInterceptor(BrotliInterceptor)
+
+                // add cache, if requested
+                .cache(cache)
+
+            // app-wide custom proxy support
+            buildProxy(okBuilder)
+
+            // add authentication
+            buildAuthentication(okBuilder)
+
+            // add network logging, if requested
+            if (logger.isLoggable(Level.FINEST)) {
+                val loggingInterceptor = HttpLoggingInterceptor { message -> logger.finest(message) }
+                loggingInterceptor.level = loggerInterceptorLevel
+                okBuilder.addNetworkInterceptor(loggingInterceptor)
+            }
+
+            return HttpClient(
+                okHttpClient = okBuilder.build(),
+                authorizationService = authorizationService
+            )
+        }
+
+        private fun buildAuthentication(okBuilder: OkHttpClient.Builder) {
+            // basic/digest auth and OAuth
+            authenticationInterceptor?.let { okBuilder.addInterceptor(it) }
+            authenticator?.let { okBuilder.authenticator(it) }
+
+            // client certificate
+            val keyManager: KeyManager? = certificateAlias?.let { alias ->
+                try {
+                    val manager = keyManagerFactory.create(alias)
+                    logger.fine("Using certificate $alias for authentication")
+
+                    // HTTP/2 doesn't support client certificates (yet)
+                    // see https://tools.ietf.org/html/draft-ietf-httpbis-http2-secondary-certs-04
+                    okBuilder.protocols(listOf(Protocol.HTTP_1_1))
+
+                    manager
+                } catch (e: IllegalArgumentException) {
+                    logger.log(Level.SEVERE, "Couldn't create KeyManager for certificate $alias", e)
+                    null
+                }
+            }
+
+            // cert4android integration
+            val certManager = CustomCertManager(
+                context = context,
+                trustSystemCerts = !settingsManager.getBoolean(Settings.DISTRUST_SYSTEM_CERTIFICATES),
+                appInForeground = if (/* davx5-ose */ true)
+                    ForegroundTracker.inForeground  // interactive mode
+                else
+                    null                            // non-interactive mode
+            )
+
+            val sslContext = SSLContext.getInstance("TLS")
+            sslContext.init(
+                /* km = */ if (keyManager != null) arrayOf(keyManager) else null,
+                /* tm = */ arrayOf(certManager),
+                /* random = */ null
+            )
+            okBuilder
+                .sslSocketFactory(sslContext.socketFactory, certManager)
+                .hostnameVerifier(certManager.HostnameVerifier(OkHostnameVerifier))
+        }
+
+        private fun buildProxy(okBuilder: OkHttpClient.Builder) {
+            try {
+                val proxyTypeValue = settingsManager.getInt(Settings.PROXY_TYPE)
+                if (proxyTypeValue != Settings.PROXY_TYPE_SYSTEM) {
+                    // we set our own proxy
+                    val address by lazy {           // lazy because not required for PROXY_TYPE_NONE
+                        InetSocketAddress(
+                            settingsManager.getString(Settings.PROXY_HOST),
+                            settingsManager.getInt(Settings.PROXY_PORT)
+                        )
+                    }
+                    val proxy =
+                        when (proxyTypeValue) {
+                            Settings.PROXY_TYPE_NONE -> Proxy.NO_PROXY
+                            Settings.PROXY_TYPE_HTTP -> Proxy(Proxy.Type.HTTP, address)
+                            Settings.PROXY_TYPE_SOCKS -> Proxy(Proxy.Type.SOCKS, address)
+                            else -> throw IllegalArgumentException("Invalid proxy type")
+                        }
+                    okBuilder.proxy(proxy)
+                    logger.log(Level.INFO, "Using proxy setting", proxy)
+                }
+            } catch (e: Exception) {
+                logger.log(Level.SEVERE, "Can't set proxy, ignoring", e)
+            }
+        }
+
+    }
+
+}

app/src/main/kotlin/at/bitfire/davdroid/network/HttpClientBuilder.kt

@@ -1,419 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.network
-
-import android.accounts.Account
-import android.content.Context
-import androidx.annotation.WorkerThread
-import at.bitfire.cert4android.CustomCertManager
-import at.bitfire.cert4android.CustomCertStore
-import at.bitfire.dav4jvm.okhttp.BasicDigestAuthHandler
-import at.bitfire.dav4jvm.okhttp.UrlUtils
-import at.bitfire.davdroid.BuildConfig
-import at.bitfire.davdroid.di.IoDispatcher
-import at.bitfire.davdroid.settings.AccountSettings
-import at.bitfire.davdroid.settings.Credentials
-import at.bitfire.davdroid.settings.Settings
-import at.bitfire.davdroid.settings.SettingsManager
-import at.bitfire.davdroid.ui.ForegroundTracker
-import com.google.common.net.HttpHeaders
-import com.google.errorprone.annotations.MustBeClosed
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.ktor.client.HttpClient
-import io.ktor.client.engine.okhttp.OkHttp
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.serialization.kotlinx.json.json
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
-import net.openid.appauth.AuthState
-import okhttp3.Authenticator
-import okhttp3.ConnectionSpec
-import okhttp3.CookieJar
-import okhttp3.Interceptor
-import okhttp3.OkHttpClient
-import okhttp3.Protocol
-import okhttp3.brotli.BrotliInterceptor
-import okhttp3.internal.tls.OkHostnameVerifier
-import okhttp3.logging.HttpLoggingInterceptor
-import java.net.InetSocketAddress
-import java.net.Proxy
-import java.security.KeyStore
-import java.util.concurrent.TimeUnit
-import java.util.logging.Level
-import java.util.logging.Logger
-import javax.inject.Inject
-import javax.net.ssl.HostnameVerifier
-import javax.net.ssl.KeyManager
-import javax.net.ssl.SSLContext
-import javax.net.ssl.TrustManagerFactory
-import javax.net.ssl.X509TrustManager
-
-/**
- * Builder for the HTTP client.
- *
- * **Attention:** If the builder is injected, it shouldn't be used from multiple locations to generate different clients because then
- * there's only one [HttpClientBuilder] object and setting properties from one location would influence the others.
- *
- * To generate multiple clients, inject and use `Provider<HttpClientBuilder>` instead.
- */
-class HttpClientBuilder @Inject constructor(
-    private val accountSettingsFactory: AccountSettings.Factory,
-    @ApplicationContext private val context: Context,
-    defaultLogger: Logger,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-    private val keyManagerFactory: ClientCertKeyManager.Factory,
-    private val oAuthInterceptorFactory: OAuthInterceptor.Factory,
-    private val settingsManager: SettingsManager
-) {
-
-    companion object {
-        init {
-            // make sure Conscrypt is available when the HttpClientBuilder class is loaded the first time
-            ConscryptIntegration().initialize()
-        }
-
-        /**
-         * According to [OkHttpClient] documentation, [OkHttpClient]s should be shared, which allows it to use a
-         * shared connection and thread pool.
-         *
-         * We need custom settings for each actual client, but we can use a shared client as a base. This also
-         * enables sharing resources like connection and thread pool.
-         *
-         * The shared client is available for the lifetime of the application and must not be shut down or
-         * closed (which is not necessary, according to its documentation).
-         */
-        val sharedOkHttpClient = OkHttpClient.Builder()
-            .connectTimeout(15, TimeUnit.SECONDS)
-            .writeTimeout(30, TimeUnit.SECONDS)
-            .readTimeout(120, TimeUnit.SECONDS)
-            .pingInterval(45, TimeUnit.SECONDS)     // avoid cancellation because of missing traffic; only works for HTTP/2
-            .build()
-    }
-
-    /**
-     * Flag to prevent multiple [build] calls
-     */
-    var alreadyBuilt = false
-
-    // property setters/getters
-
-    private var logger: Logger = defaultLogger
-    fun setLogger(logger: Logger): HttpClientBuilder {
-        this.logger = logger
-        return this
-    }
-
-    private var loggerInterceptorLevel: HttpLoggingInterceptor.Level = HttpLoggingInterceptor.Level.BODY
-
-    fun loggerInterceptorLevel(level: HttpLoggingInterceptor.Level): HttpClientBuilder {
-        loggerInterceptorLevel = level
-        return this
-    }
-
-    // default cookie store for non-persistent cookies (some services like Horde use cookies for session tracking)
-    private var cookieStore: CookieJar = MemoryCookieStore()
-
-    fun setCookieStore(cookieStore: CookieJar): HttpClientBuilder {
-        this.cookieStore = cookieStore
-        return this
-    }
-
-    private var authenticationInterceptor: Interceptor? = null
-    private var authenticator: Authenticator? = null
-    private var certificateAlias: String? = null
-
-    fun authenticate(domain: String?, getCredentials: () -> Credentials, updateAuthState: ((AuthState) -> Unit)? = null): HttpClientBuilder {
-        val credentials = getCredentials()
-        if (credentials.authState != null) {
-            // OAuth
-            authenticationInterceptor = oAuthInterceptorFactory.create(
-                readAuthState = {
-                    // We don't use the "credentials" object from above because it may contain an outdated access token
-                    // when readAuthState is called. Instead, we fetch the up-to-date auth-state.
-                    getCredentials().authState
-                },
-                writeAuthState = { authState ->
-                    updateAuthState?.invoke(authState)
-                }
-
-            )
-
-        } else if (credentials.username != null && credentials.password != null) {
-            // basic/digest auth
-            val authHandler = BasicDigestAuthHandler(
-                domain = domain,
-                username = credentials.username,
-                password = credentials.password.asCharArray(),
-                insecurePreemptive = true
-            )
-            authenticationInterceptor = authHandler
-            authenticator = authHandler
-        }
-
-        // client certificate
-        if (credentials.certificateAlias != null)
-            certificateAlias = credentials.certificateAlias
-
-        return this
-    }
-
-    private var followRedirects = false
-
-    fun followRedirects(follow: Boolean): HttpClientBuilder {
-        followRedirects = follow
-        return this
-    }
-
-
-    // convenience builders from other classes
-
-    /**
-     * Takes authentication (basic/digest or OAuth and client certificate) from a given account.
-     *
-     * **Must not be run on main thread, because it creates [AccountSettings]!** Use [fromAccountAsync] if possible.
-     *
-     * @param account       the account to take authentication from
-     * @param authDomain    (optional) Send credentials only for the hosts of the given domain. Can be:
-     *
-     * - a full host name (`caldav.example.com`): then credentials are only sent for the domain of that host name (`example.com`), or
-     * - a domain name (`example.com`): then credentials are only sent for the given domain, or
-     * - or _null_: then credentials are always sent, regardless of the resource host name.
-     *
-     * @throws at.bitfire.davdroid.sync.account.InvalidAccountException     when the account doesn't exist
-     */
-    @WorkerThread
-    fun fromAccount(account: Account, authDomain: String? = null): HttpClientBuilder {
-        val accountSettings = accountSettingsFactory.create(account)
-        authenticate(
-            domain = UrlUtils.hostToDomain(authDomain),
-            getCredentials = {
-                accountSettings.credentials()
-            },
-            updateAuthState = { authState ->
-                accountSettings.updateAuthState(authState)
-            }
-        )
-        return this
-    }
-
-    /**
-     * Same as [fromAccount], but can be called on any thread.
-     *
-     * @throws at.bitfire.davdroid.sync.account.InvalidAccountException     when the account doesn't exist
-     */
-    suspend fun fromAccountAsync(account: Account, onlyHost: String? = null): HttpClientBuilder = withContext(ioDispatcher) {
-        fromAccount(account, onlyHost)
-    }
-
-
-    // okhttp builder
-
-    /**
-     * Builds an [OkHttpClient] with the configured settings.
-     *
-     * [build] or [buildKtor] is usually called only once because multiple calls indicate this wrong usage pattern:
-     *
-     * ```
-     * val builder = HttpClientBuilder(/*injected*/)
-     * val client1 = builder.configure().build()
-     * val client2 = builder.configureOtherwise().build()
-     * ```
-     *
-     * However in this case the configuration of `client1` is still in `builder` and would be reused for `client2`,
-     * which is usually not desired.
-     *
-     * Closing/shutting down the client is not necessary.
-     */
-    fun build(): OkHttpClient {
-        if (alreadyBuilt)
-            logger.warning("build() should only be called once; use Provider<HttpClientBuilder> instead")
-
-        val builder = sharedOkHttpClient.newBuilder()
-        configureOkHttp(builder)
-
-        alreadyBuilt = true
-        return builder.build()
-    }
-
-    private fun configureOkHttp(builder: OkHttpClient.Builder) {
-        // don't allow redirects by default because it would break PROPFIND handling
-        builder.followRedirects(followRedirects)
-
-        // add User-Agent to every request
-        builder.addInterceptor(UserAgentInterceptor)
-
-        // connection-private cookie store
-        builder.cookieJar(cookieStore)
-
-        // offer Brotli and gzip compression (can be disabled per request with `Accept-Encoding: identity`)
-        builder.addInterceptor(BrotliInterceptor)
-
-        // app-wide custom proxy support
-        buildProxy(builder)
-
-        // add connection security (including client certificates) and authentication
-        buildConnectionSecurity(builder)
-        buildAuthentication(builder)
-
-        // add network logging, if requested
-        if (logger.isLoggable(Level.FINEST)) {
-            val loggingInterceptor = HttpLoggingInterceptor { message -> logger.finest(message) }
-            loggingInterceptor.redactHeader(HttpHeaders.AUTHORIZATION)
-            loggingInterceptor.redactHeader(HttpHeaders.COOKIE)
-            loggingInterceptor.redactHeader(HttpHeaders.SET_COOKIE)
-            loggingInterceptor.redactHeader(HttpHeaders.SET_COOKIE2)
-            loggingInterceptor.level = loggerInterceptorLevel
-            builder.addNetworkInterceptor(loggingInterceptor)
-        }
-    }
-
-    private fun buildAuthentication(okBuilder: OkHttpClient.Builder) {
-        // basic/digest auth and OAuth
-        authenticationInterceptor?.let { okBuilder.addInterceptor(it) }
-        authenticator?.let { okBuilder.authenticator(it) }
-    }
-
-    private fun buildConnectionSecurity(okBuilder: OkHttpClient.Builder) {
-        // allow cleartext and TLS 1.2+
-        okBuilder.connectionSpecs(listOf(
-            ConnectionSpec.CLEARTEXT,
-            ConnectionSpec.MODERN_TLS
-        ))
-
-        // client certificate
-        val clientKeyManager: KeyManager? = certificateAlias?.let { alias ->
-            try {
-                val manager = keyManagerFactory.create(alias)
-                logger.fine("Using certificate $alias for authentication")
-
-                // HTTP/2 doesn't support client certificates (yet)
-                // see https://datatracker.ietf.org/doc/draft-ietf-httpbis-secondary-server-certs/
-                okBuilder.protocols(listOf(Protocol.HTTP_1_1))
-
-                manager
-            } catch (e: IllegalArgumentException) {
-                logger.log(Level.SEVERE, "Couldn't create KeyManager for certificate $alias", e)
-                null
-            }
-        }
-
-        // select trust manager and hostname verifier depending on whether custom certificates are allowed
-        val customTrustManager: X509TrustManager?
-        val customHostnameVerifier: HostnameVerifier?
-
-        if (BuildConfig.allowCustomCerts) {
-            // use cert4android for custom certificate handling
-            customTrustManager = CustomCertManager(
-                certStore = CustomCertStore.getInstance(context),
-                trustSystemCerts = !settingsManager.getBoolean(Settings.DISTRUST_SYSTEM_CERTIFICATES),
-                appInForeground = ForegroundTracker.inForeground
-            )
-            // allow users to accept certificates with wrong host names
-            customHostnameVerifier = customTrustManager.HostnameVerifier(OkHostnameVerifier)
-
-        } else {
-            // no custom certificates, use default trust manager and hostname verifier
-            customTrustManager = null
-            customHostnameVerifier = null
-        }
-
-        // change settings only if we have at least only one custom component
-        if (clientKeyManager != null || customTrustManager != null) {
-            val trustManager = customTrustManager ?: defaultTrustManager()
-
-            // use trust manager and client key manager (if defined) for TLS connections
-            val sslContext = SSLContext.getInstance("TLS")
-            sslContext.init(
-                /* km = */ if (clientKeyManager != null) arrayOf(clientKeyManager) else null,
-                /* tm = */ arrayOf(trustManager),
-                /* random = */ null
-            )
-            okBuilder.sslSocketFactory(sslContext.socketFactory, trustManager)
-        }
-
-        // also add the custom hostname verifier (if defined)
-        if (customHostnameVerifier != null)
-            okBuilder.hostnameVerifier(customHostnameVerifier)
-    }
-
-    private fun defaultTrustManager(): X509TrustManager {
-        val factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-        factory.init(null as KeyStore?)
-        return factory.trustManagers.filterIsInstance<X509TrustManager>().first()
-    }
-
-    private fun buildProxy(okBuilder: OkHttpClient.Builder) {
-        try {
-            val proxyTypeValue = settingsManager.getInt(Settings.PROXY_TYPE)
-            if (proxyTypeValue != Settings.PROXY_TYPE_SYSTEM) {
-                // we set our own proxy
-                val address by lazy {           // lazy because not required for PROXY_TYPE_NONE
-                    InetSocketAddress(
-                        settingsManager.getString(Settings.PROXY_HOST),
-                        settingsManager.getInt(Settings.PROXY_PORT)
-                    )
-                }
-                val proxy =
-                    when (proxyTypeValue) {
-                        Settings.PROXY_TYPE_NONE -> Proxy.NO_PROXY
-                        Settings.PROXY_TYPE_HTTP -> Proxy(Proxy.Type.HTTP, address)
-                        Settings.PROXY_TYPE_SOCKS -> Proxy(Proxy.Type.SOCKS, address)
-                        else -> throw IllegalArgumentException("Invalid proxy type")
-                    }
-                okBuilder.proxy(proxy)
-                logger.log(Level.INFO, "Using proxy setting", proxy)
-            }
-        } catch (e: Exception) {
-            logger.log(Level.SEVERE, "Can't set proxy, ignoring", e)
-        }
-    }
-
-
-    // Ktor builder
-
-    /**
-     * Builds a Ktor [HttpClient] with the configured settings.
-     *
-     * [buildKtor] or [build] must be called only once because multiple calls indicate this wrong usage pattern:
-     *
-     * ```
-     * val builder = HttpClientBuilder(/*injected*/)
-     * val client1 = builder.configure().buildKtor()
-     * val client2 = builder.configureOtherwise().buildKtor()
-     * ```
-     *
-     * However in this case the configuration of `client1` is still in `builder` and would be reused for `client2`,
-     * which is usually not desired.
-     *
-     * @return the new HttpClient (with [OkHttp] engine) which **must be closed by the caller**
-     */
-    @MustBeClosed
-    fun buildKtor(): HttpClient {
-        if (alreadyBuilt)
-            logger.warning("buildKtor() should only be called once; use Provider<HttpClientBuilder> instead")
-
-        val client = HttpClient(OkHttp) {
-            // Ktor-level configuration here
-
-            // automatically convert JSON from/into data classes (if requested in respective code)
-            install(ContentNegotiation) {
-                json()
-            }
-
-            engine {
-                // okhttp engine configuration here
-
-                config {
-                    // OkHttpClient.Builder configuration here
-                    configureOkHttp(this)
-                }
-            }
-        }
-
-        alreadyBuilt = true
-        return client
-    }
-
-}

app/src/main/kotlin/at/bitfire/davdroid/network/NextcloudLoginFlow.kt

@@ -4,28 +4,26 @@
 
 package at.bitfire.davdroid.network
 
-import androidx.annotation.VisibleForTesting
-import at.bitfire.dav4jvm.ktor.exception.HttpException
-import at.bitfire.davdroid.settings.Credentials
+import at.bitfire.dav4jvm.exception.DavException
+import at.bitfire.dav4jvm.exception.HttpException
+import at.bitfire.davdroid.db.Credentials
 import at.bitfire.davdroid.ui.setup.LoginInfo
-import at.bitfire.davdroid.util.SensitiveString.Companion.toSensitiveString
 import at.bitfire.davdroid.util.withTrailingSlash
 import at.bitfire.vcard4android.GroupMethod
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.request.post
-import io.ktor.client.request.setBody
-import io.ktor.http.ContentType
-import io.ktor.http.URLBuilder
-import io.ktor.http.Url
-import io.ktor.http.appendPathSegments
-import io.ktor.http.contentType
-import io.ktor.http.isSuccess
-import io.ktor.http.path
-import kotlinx.serialization.Serializable
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.withContext
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.Request
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONObject
+import java.net.HttpURLConnection
 import java.net.URI
 import javax.inject.Inject
-import javax.inject.Provider
 
 /**
  * Implements Nextcloud Login Flow v2.
@@ -33,133 +31,8 @@ import javax.inject.Provider
  * See https://docs.nextcloud.com/server/latest/developer_manual/client_apis/LoginFlow/index.html#login-flow-v2
  */
 class NextcloudLoginFlow @Inject constructor(
-    private val httpClientBuilder: Provider<HttpClientBuilder>
-) {
-
-    // Login flow state
-    var pollUrl: Url? = null
-    var token: String? = null
-
-    /**
-     * Starts Nextcloud Login Flow v2.
-     *
-     * @param baseUrl   Nextcloud login flow or base URL
-     *
-     * @return URL that should be opened in the browser (login screen)
-     *
-     * @throws HttpException on non-successful HTTP status
-     */
-    suspend fun start(baseUrl: Url): Url {
-        // reset fields in case something goes wrong
-        pollUrl = null
-        token = null
-
-        // POST to login flow URL in order to receive endpoint data
-        createClient().use { client ->
-            val result = client.post(loginFlowUrl(baseUrl))
-            if (!result.status.isSuccess())
-                throw HttpException.fromResponse(result)
-
-            // save endpoint data for polling
-            val endpointData: EndpointData = result.body()
-            pollUrl = Url(endpointData.poll.endpoint)
-            token = endpointData.poll.token
-
-            return Url(endpointData.login)
-        }
-    }
-
-    @VisibleForTesting
-    internal fun loginFlowUrl(baseUrl: Url): Url {
-        return when {
-            // already a Login Flow v2 URL
-            baseUrl.encodedPath.endsWith(FLOW_V2_PATH) ->
-                baseUrl
-
-            // Login Flow v1 URL, rewrite to v2
-            baseUrl.encodedPath.endsWith(FLOW_V1_PATH) -> {
-                // drop "[index.php/login]/flow" from the end and append "/v2"
-                val v2Segments = baseUrl.segments.dropLast(1) + "v2"
-                val builder = URLBuilder(baseUrl)
-                builder.path(*v2Segments.toTypedArray())
-                builder.build()
-            }
-
-            // other URL, make it a Login Flow v2 URL
-            else ->
-                URLBuilder(baseUrl)
-                    .appendPathSegments(FLOW_V2_PATH.split('/'))
-                    .build()
-        }
-    }
-
-    /**
-     * Retrieves login info from the polling endpoint using [pollUrl]/[token].
-     *
-     * @throws HttpException on non-successful HTTP status
-     */
-    suspend fun fetchLoginInfo(): LoginInfo {
-        val pollUrl = pollUrl ?: throw IllegalArgumentException("Missing pollUrl")
-        val token = token ?: throw IllegalArgumentException("Missing token")
-
-        // send HTTP request to request server, login name and app password
-        createClient().use { client ->
-            val result = client.post(pollUrl) {
-                contentType(ContentType.Application.FormUrlEncoded)
-                setBody("token=$token")
-            }
-            if (!result.status.isSuccess())
-                throw HttpException.fromResponse(result)
-
-            // make sure server URL ends with a slash so that DAV_PATH can be appended
-            val loginData: LoginData = result.body()
-            val serverUrl = loginData.server.withTrailingSlash()
-
-            return LoginInfo(
-                baseUri = URI(serverUrl).resolve(DAV_PATH),
-                credentials = Credentials(
-                    username = loginData.loginName,
-                    password = loginData.appPassword.toSensitiveString()
-                ),
-                suggestedGroupMethod = GroupMethod.CATEGORIES
-            )
-        }
-    }
-
-    /**
-     * Creates a Ktor HTTP client that follows redirects.
-     */
-    private fun createClient(): HttpClient =
-        httpClientBuilder.get()
-            .followRedirects(true)
-            .buildKtor()
-
-
-    /**
-     * Represents the JSON response that is returned on the first call to `/login/v2`.
-     */
-    @Serializable
-    private data class EndpointData(
-        val poll: Poll,
-        val login: String
-    ) {
-        @Serializable
-        data class Poll(
-            val token: String,
-            val endpoint: String
-        )
-    }
-
-    /**
-     * Represents the JSON response that is returned by the polling endpoint.
-     */
-    @Serializable
-    private data class LoginData(
-        val server: String,
-        val loginName: String,
-        val appPassword: String
-    )
-
+    httpClientBuilder: HttpClient.Builder
+): AutoCloseable {
 
     companion object {
         const val FLOW_V1_PATH = "index.php/login/flow"
@@ -169,4 +42,99 @@ class NextcloudLoginFlow @Inject constructor(
         const val DAV_PATH = "remote.php/dav"
     }
 
+    val httpClient = httpClientBuilder
+        .build()
+
+    override fun close() {
+        httpClient.close()
+    }
+
+
+    // Login flow state
+    var loginUrl: HttpUrl? = null
+    var pollUrl: HttpUrl? = null
+    var token: String? = null
+
+
+    suspend fun initiate(baseUrl: HttpUrl): HttpUrl? {
+        loginUrl = null
+        pollUrl = null
+        token = null
+
+        val json = postForJson(initiateUrl(baseUrl), "".toRequestBody())
+
+        loginUrl = json.getString("login").toHttpUrlOrNull()
+        json.getJSONObject("poll").let { poll ->
+            pollUrl = poll.getString("endpoint").toHttpUrl()
+            token = poll.getString("token")
+        }
+
+        return loginUrl
+    }
+
+    fun initiateUrl(baseUrl: HttpUrl): HttpUrl {
+        val path = baseUrl.encodedPath
+
+        if (path.endsWith(FLOW_V2_PATH))
+            // already a Login Flow v2 URL
+            return baseUrl
+
+        if (path.endsWith(FLOW_V1_PATH))
+            // Login Flow v1 URL, rewrite to v2
+            return baseUrl.newBuilder()
+                .encodedPath(path.replace(FLOW_V1_PATH, FLOW_V2_PATH))
+                .build()
+
+        // other URL, make it a Login Flow v2 URL
+        return baseUrl.newBuilder()
+            .addPathSegments(FLOW_V2_PATH)
+            .build()
+    }
+
+
+    suspend fun fetchLoginInfo(): LoginInfo {
+        val pollUrl = pollUrl ?: throw IllegalArgumentException("Missing pollUrl")
+        val token = token ?: throw IllegalArgumentException("Missing token")
+
+        // send HTTP request to request server, login name and app password
+        val json = postForJson(pollUrl, "token=$token".toRequestBody("application/x-www-form-urlencoded".toMediaType()))
+
+        // make sure server URL ends with a slash so that DAV_PATH can be appended
+        val serverUrl = json.getString("server").withTrailingSlash()
+
+        return LoginInfo(
+            baseUri = URI(serverUrl).resolve(DAV_PATH),
+            credentials = Credentials(
+                username = json.getString("loginName"),
+                password = json.getString("appPassword").toCharArray()
+            ),
+            suggestedGroupMethod = GroupMethod.CATEGORIES
+        )
+    }
+
+
+    private suspend fun postForJson(url: HttpUrl, requestBody: RequestBody): JSONObject = withContext(Dispatchers.IO) {
+        val postRq = Request.Builder()
+            .url(url)
+            .post(requestBody)
+            .build()
+        val response = runInterruptible {
+            httpClient.okHttpClient.newCall(postRq).execute()
+        }
+
+        if (response.code != HttpURLConnection.HTTP_OK)
+            throw HttpException(response)
+
+        response.body?.use { body ->
+            val mimeType = body.contentType() ?: throw DavException("Login Flow response without MIME type")
+            if (mimeType.type != "application" || mimeType.subtype != "json")
+                throw DavException("Invalid Login Flow response (not JSON)")
+
+            // decode JSON
+            return@withContext JSONObject(body.string())
+        }
+
+        throw DavException("Invalid Login Flow response (no body)")
+    }
+
 }

app/src/main/kotlin/at/bitfire/davdroid/network/OAuthFastmail.kt

@@ -1,49 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.network
-
-import androidx.core.net.toUri
-import net.openid.appauth.AuthorizationRequest
-import net.openid.appauth.AuthorizationServiceConfiguration
-import net.openid.appauth.ResponseTypeValues
-import java.net.URI
-
-object OAuthFastmail {
-
-    // DAVx5 Client ID (issued by Fastmail)
-    private const val CLIENT_ID = "34ce41ae"
-
-    private val SCOPES = arrayOf(
-        "https://www.fastmail.com/dev/protocol-caldav", // CalDAV
-        "https://www.fastmail.com/dev/protocol-carddav" // CardDAV
-    )
-
-    /**
-     * The base URL for Fastmail. Note that this URL is used for both CalDAV and CardDAV;
-     * the SRV records of the domain are checked to determine the respective service base URL.
-     */
-    val baseUri: URI = URI.create("https://fastmail.com/")
-
-    private val serviceConfig = AuthorizationServiceConfiguration(
-        "https://api.fastmail.com/oauth/authorize".toUri(),
-        "https://api.fastmail.com/oauth/refresh".toUri()
-    )
-
-
-    fun signIn(email: String?, locale: String?): AuthorizationRequest {
-        val builder = AuthorizationRequest.Builder(
-            serviceConfig,
-            CLIENT_ID,
-            ResponseTypeValues.CODE,
-            OAuthIntegration.redirectUri
-        )
-        return builder
-            .setScopes(*SCOPES)
-            .setLoginHint(email)
-            .setUiLocales(locale)
-            .build()
-    }
-
-}

app/src/main/kotlin/at/bitfire/davdroid/network/OAuthGoogle.kt

@@ -1,53 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.network
-
-import androidx.core.net.toUri
-import net.openid.appauth.AuthorizationRequest
-import net.openid.appauth.AuthorizationServiceConfiguration
-import net.openid.appauth.ResponseTypeValues
-import java.net.URI
-
-object OAuthGoogle {
-
-    // davx5integration@gmail.com (for davx5-ose)
-    private const val CLIENT_ID = "1069050168830-eg09u4tk1cmboobevhm4k3bj1m4fav9i.apps.googleusercontent.com"
-
-    private val SCOPES = arrayOf(
-        "https://www.googleapis.com/auth/calendar",     // CalDAV
-        "https://www.googleapis.com/auth/carddav"       // CardDAV
-    )
-
-    /**
-     * Gets the Google CalDAV/CardDAV base URI. See https://developers.google.com/calendar/caldav/v2/guide;
-     * _calid_ of the primary calendar is the account name.
-     *
-     * This URL allows CardDAV (over well-known URLs) and CalDAV detection including calendar-homesets and secondary
-     * calendars.
-     */
-    fun baseUri(googleAccount: String): URI =
-        URI("https", "apidata.googleusercontent.com", "/caldav/v2/$googleAccount/user", null)
-
-    private val serviceConfig = AuthorizationServiceConfiguration(
-        "https://accounts.google.com/o/oauth2/v2/auth".toUri(),
-        "https://oauth2.googleapis.com/token".toUri()
-    )
-
-
-    fun signIn(email: String?, customClientId: String?, locale: String?): AuthorizationRequest {
-        val builder = AuthorizationRequest.Builder(
-            serviceConfig,
-            customClientId ?: CLIENT_ID,
-            ResponseTypeValues.CODE,
-            OAuthIntegration.redirectUri
-        )
-        return builder
-            .setScopes(*SCOPES)
-            .setLoginHint(email)
-            .setUiLocales(locale)
-            .build()
-    }
-
-}

app/src/main/kotlin/at/bitfire/davdroid/network/OAuthIntegration.kt

@@ -1,63 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.network
-
-import android.content.Context
-import android.content.Intent
-import androidx.activity.result.contract.ActivityResultContract
-import androidx.core.net.toUri
-import at.bitfire.davdroid.BuildConfig
-import at.bitfire.davdroid.network.OAuthIntegration.redirectUri
-import kotlinx.coroutines.CompletableDeferred
-import net.openid.appauth.AuthState
-import net.openid.appauth.AuthorizationException
-import net.openid.appauth.AuthorizationRequest
-import net.openid.appauth.AuthorizationResponse
-import net.openid.appauth.AuthorizationService
-import net.openid.appauth.TokenResponse
-
-/**
- * Integration with OpenID AppAuth (Android)
- */
-object OAuthIntegration {
-
-    /** redirect URI, must be registered in Manifest */
-    val redirectUri =
-        (BuildConfig.APPLICATION_ID + ":/oauth2/redirect").toUri()
-
-    /**
-     * Called by the authorization service when the login is finished and [redirectUri] is launched.
-     *
-     * @param authService   authorization service
-     * @param authResponse  response from the server (coming over the Intent from the browser / [AuthorizationContract])
-     */
-    suspend fun authenticate(authService: AuthorizationService, authResponse: AuthorizationResponse): AuthState {
-        val authState = AuthState(authResponse, null)       // authorization code must not be stored; exchange it to refresh token
-        val authStateFuture = CompletableDeferred<AuthState>()
-
-        authService.performTokenRequest(authResponse.createTokenExchangeRequest()) { tokenResponse: TokenResponse?, refreshTokenException: AuthorizationException? ->
-            if (tokenResponse != null) {
-                // success, save authState (= refresh token)
-                authState.update(tokenResponse, refreshTokenException)
-                authStateFuture.complete(authState)
-            } else if (refreshTokenException != null)
-                authStateFuture.completeExceptionally(refreshTokenException)
-        }
-
-        return authStateFuture.await()
-    }
-
-
-    class AuthorizationContract(
-        private val authService: AuthorizationService
-    ) : ActivityResultContract<AuthorizationRequest, AuthorizationResponse?>() {
-        override fun createIntent(context: Context, input: AuthorizationRequest) =
-            authService.getAuthorizationRequestIntent(input)
-
-        override fun parseResult(resultCode: Int, intent: Intent?): AuthorizationResponse? =
-            intent?.let { AuthorizationResponse.fromIntent(it) }
-    }
-
-}

app/src/main/kotlin/at/bitfire/davdroid/network/OAuthInterceptor.kt

@@ -1,106 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.network
-
-import at.bitfire.davdroid.BuildConfig
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import net.openid.appauth.AuthState
-import net.openid.appauth.AuthorizationException
-import net.openid.appauth.AuthorizationService
-import okhttp3.Interceptor
-import okhttp3.Response
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.CompletionException
-import java.util.logging.Level
-import java.util.logging.Logger
-import javax.inject.Provider
-
-/**
- * Sends an OAuth Bearer token authorization as described in RFC 6750.
- *
- * @param readAuthState     callback that fetches an up-to-date authorization state
- * @param writeAuthState    callback that persists a new authorization state
- */
-class OAuthInterceptor @AssistedInject constructor(
-    @Assisted private val readAuthState: () -> AuthState?,
-    @Assisted private val writeAuthState: (AuthState) -> Unit,
-    private val authServiceProvider: Provider<AuthorizationService>,
-    private val logger: Logger
-): Interceptor {
-
-    @AssistedFactory
-    interface Factory {
-        fun create(readAuthState: () -> AuthState?, writeAuthState: (AuthState) -> Unit): OAuthInterceptor
-    }
-
-
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val rq = chain.request().newBuilder()
-
-        /** Syntax for the "Authorization" header [RFC 6750 2.1]:
-         *
-         *      b64token    = 1*( ALPHA / DIGIT /
-         *                        "-" / "." / "_" / "~" / "+" / "/" ) *"="
-         *      credentials = "Bearer" 1*SP b64token
-         */
-
-        val accessToken = provideAccessToken()
-        if (accessToken != null)
-            rq.header("Authorization", "Bearer $accessToken")
-        else
-            logger.severe("No access token available, won't authenticate")
-
-        return chain.proceed(rq.build())
-    }
-
-    /**
-     * Provides a fresh access token for authorization. Uses the current one if it's still valid,
-     * or requests a new one if necessary.
-     *
-     * This method is synchronized / thread-safe so that it can be called for multiple HTTP requests at the same time.
-     *
-     * @return access token or `null` if no valid access token is available (usually because of an error during refresh)
-     */
-    fun provideAccessToken(): String? = synchronized(javaClass) {
-        // if possible, use cached access token
-        val authState = readAuthState() ?: return null
-
-        if (authState.isAuthorized && authState.accessToken != null && !authState.needsTokenRefresh) {
-            if (BuildConfig.DEBUG)      // log sensitive information (refresh/access token) only in debug builds
-                logger.log(Level.FINEST, "Using cached AuthState", authState.jsonSerializeString())
-            return authState.accessToken
-        }
-
-        // request fresh access token
-        logger.fine("Requesting fresh access token")
-        val accessTokenFuture = CompletableFuture<String>()
-        val authService = authServiceProvider.get()
-        try {
-            authState.performActionWithFreshTokens(authService) { accessToken: String?, _: String?, ex: AuthorizationException? ->
-                // appauth internally fetches the new token over HttpURLConnection in an AsyncTask
-                if (BuildConfig.DEBUG)
-                    logger.log(Level.FINEST, "Got new AuthState", authState.jsonSerializeString())
-
-                // persist updated AuthState
-                writeAuthState(authState)
-
-                if (ex != null)
-                    accessTokenFuture.completeExceptionally(ex)
-                else if (accessToken != null)
-                    accessTokenFuture.complete(accessToken)
-            }
-
-            accessTokenFuture.join()
-        } catch (e: CompletionException) {
-            logger.log(Level.SEVERE, "Couldn't obtain access token", e.cause)
-            null
-        } finally {
-            authService.dispose()
-        }
-    }
-
-}

app/src/main/kotlin/at/bitfire/davdroid/network/OAuthModule.kt

@@ -19,12 +19,6 @@ import java.net.URL
 @InstallIn(SingletonComponent::class)
 object OAuthModule {
 
-    /**
-     * Make sure to call [AuthorizationService.dispose] when obtaining an instance.
-     *
-     * Creating an instance is expensive (involves CustomTabsManager), so don't create an
-     * instance if not necessary (use Provider/Lazy).
-     */
     @Provides
     fun authorizationService(@ApplicationContext context: Context): AuthorizationService =
         AuthorizationService(context,

app/src/main/kotlin/at/bitfire/davdroid/push/PushMessageHandler.kt

@@ -7,7 +7,6 @@ package at.bitfire.davdroid.push
 import androidx.annotation.VisibleForTesting
 import at.bitfire.dav4jvm.XmlReader
 import at.bitfire.dav4jvm.XmlUtils
-import at.bitfire.dav4jvm.property.push.WebDAVPush
 import at.bitfire.davdroid.db.Collection.Companion.TYPE_ADDRESSBOOK
 import at.bitfire.davdroid.repository.AccountRepository
 import at.bitfire.davdroid.repository.DavCollectionRepository
@@ -106,7 +105,7 @@ class PushMessageHandler @Inject constructor(
         try {
             parser.setInput(StringReader(message))
 
-            XmlReader(parser).processTag(WebDAVPush.PushMessage) {
+            XmlReader(parser).processTag(DavPushMessage.NAME) {
                 val pushMessage = DavPushMessage.Factory.create(parser)
                 topic = pushMessage.topic?.topic
             }

app/src/main/kotlin/at/bitfire/davdroid/push/PushRegistrationManager.kt

@@ -11,17 +11,22 @@ import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.NetworkType
 import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
+import at.bitfire.dav4jvm.DavCollection
+import at.bitfire.dav4jvm.DavResource
 import at.bitfire.dav4jvm.HttpUtils
 import at.bitfire.dav4jvm.XmlUtils
 import at.bitfire.dav4jvm.XmlUtils.insertTag
-import at.bitfire.dav4jvm.okhttp.DavCollection
-import at.bitfire.dav4jvm.okhttp.DavResource
-import at.bitfire.dav4jvm.okhttp.exception.DavException
-import at.bitfire.dav4jvm.property.push.WebDAVPush
+import at.bitfire.dav4jvm.exception.DavException
+import at.bitfire.dav4jvm.property.push.AuthSecret
+import at.bitfire.dav4jvm.property.push.PushRegister
+import at.bitfire.dav4jvm.property.push.PushResource
+import at.bitfire.dav4jvm.property.push.Subscription
+import at.bitfire.dav4jvm.property.push.SubscriptionPublicKey
+import at.bitfire.dav4jvm.property.push.WebPushSubscription
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.db.Service
 import at.bitfire.davdroid.di.IoDispatcher
-import at.bitfire.davdroid.network.HttpClientBuilder
+import at.bitfire.davdroid.network.HttpClient
 import at.bitfire.davdroid.push.PushRegistrationManager.Companion.mutex
 import at.bitfire.davdroid.repository.AccountRepository
 import at.bitfire.davdroid.repository.DavCollectionRepository
@@ -36,7 +41,6 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.unifiedpush.android.connector.UnifiedPush
 import org.unifiedpush.android.connector.data.PushEndpoint
@@ -61,7 +65,7 @@ class PushRegistrationManager @Inject constructor(
     private val accountRepository: Lazy<AccountRepository>,
     private val collectionRepository: DavCollectionRepository,
     @ApplicationContext private val context: Context,
-    private val httpClientBuilder: Provider<HttpClientBuilder>,
+    private val httpClientBuilder: Provider<HttpClient.Builder>,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
     private val logger: Logger,
     private val serviceRepository: DavServiceRepository
@@ -176,23 +180,25 @@ class PushRegistrationManager @Inject constructor(
             return
 
         val account = accountRepository.get().fromName(service.accountName)
-        val httpClient = httpClientBuilder.get()
+        httpClientBuilder.get()
             .fromAccountAsync(account)
             .build()
-        for (collection in subscribeTo)
-            try {
-                val expires = collection.pushSubscriptionExpires
-                // calculate next run time, but use the duplicate interval for safety (times are not exact)
-                val nextRun = Instant.now() + Duration.ofDays(2 * WORKER_INTERVAL_DAYS)
-                if (expires != null && expires >= nextRun.epochSecond)
-                    logger.fine("Push subscription for ${collection.url} is still valid until ${collection.pushSubscriptionExpires}")
-                else {
-                    // no existing subscription or expiring soon
-                    logger.fine("Registering push subscription for ${collection.url}")
-                    subscribe(httpClient, collection, endpoint)
-                }
-            } catch (e: Exception) {
-                logger.log(Level.WARNING, "Couldn't register subscription at CalDAV/CardDAV server", e)
+            .use { httpClient ->
+                for (collection in subscribeTo)
+                    try {
+                        val expires = collection.pushSubscriptionExpires
+                        // calculate next run time, but use the duplicate interval for safety (times are not exact)
+                        val nextRun = Instant.now() + Duration.ofDays(2 * WORKER_INTERVAL_DAYS)
+                        if (expires != null && expires >= nextRun.epochSecond)
+                            logger.fine("Push subscription for ${collection.url} is still valid until ${collection.pushSubscriptionExpires}")
+                        else {
+                            // no existing subscription or expiring soon
+                            logger.fine("Registering push subscription for ${collection.url}")
+                            subscribe(httpClient, collection, endpoint)
+                        }
+                    } catch (e: Exception) {
+                        logger.log(Level.WARNING, "Couldn't register subscription at CalDAV/CardDAV server", e)
+                    }
             }
     }
 
@@ -224,7 +230,7 @@ class PushRegistrationManager @Inject constructor(
      * @param collection    collection to subscribe to
      * @param endpoint      subscription to register
      */
-    private suspend fun subscribe(httpClient: OkHttpClient, collection: Collection, endpoint: PushEndpoint) {
+    private suspend fun subscribe(httpClient: HttpClient, collection: Collection, endpoint: PushEndpoint) {
         // requested expiration time: 3 days
         val requestedExpiration = Instant.now() + Duration.ofDays(3)
 
@@ -232,26 +238,26 @@ class PushRegistrationManager @Inject constructor(
         val writer = StringWriter()
         serializer.setOutput(writer)
         serializer.startDocument("UTF-8", true)
-        serializer.insertTag(WebDAVPush.PushRegister) {
-            serializer.insertTag(WebDAVPush.Subscription) {
+        serializer.insertTag(PushRegister.NAME) {
+            serializer.insertTag(Subscription.NAME) {
                 // subscription URL
-                serializer.insertTag(WebDAVPush.WebPushSubscription) {
-                    serializer.insertTag(WebDAVPush.PushResource) {
+                serializer.insertTag(WebPushSubscription.NAME) {
+                    serializer.insertTag(PushResource.NAME) {
                         text(endpoint.url)
                     }
                     endpoint.pubKeySet?.let { pubKeySet ->
-                        serializer.insertTag(WebDAVPush.SubscriptionPublicKey) {
+                        serializer.insertTag(SubscriptionPublicKey.NAME) {
                             attribute(null, "type", "p256dh")
                             text(pubKeySet.pubKey)
                         }
-                        serializer.insertTag(WebDAVPush.AuthSecret) {
+                        serializer.insertTag(AuthSecret.NAME) {
                             text(pubKeySet.auth)
                         }
                     }
                 }
             }
             // requested expiration
-            serializer.insertTag(WebDAVPush.Expires) {
+            serializer.insertTag(PushRegister.EXPIRES) {
                 text(HttpUtils.formatDate(requestedExpiration))
             }
         }
@@ -259,7 +265,7 @@ class PushRegistrationManager @Inject constructor(
 
         runInterruptible(ioDispatcher) {
             val xml = writer.toString().toRequestBody(DavResource.MIME_XML)
-            DavCollection(httpClient, collection.url).post(xml) { response ->
+            DavCollection(httpClient.okHttpClient, collection.url).post(xml) { response ->
                 if (response.isSuccessful) {
                     // update subscription URL and expiration in DB
                     val subscriptionUrl = response.header("Location")
@@ -288,20 +294,22 @@ class PushRegistrationManager @Inject constructor(
             return
 
         val account = accountRepository.get().fromName(service.accountName)
-        val httpClient = httpClientBuilder.get()
+        httpClientBuilder.get()
             .fromAccountAsync(account)
             .build()
-        for (collection in from)
-            collection.pushSubscription?.toHttpUrlOrNull()?.let { url ->
-                logger.info("Unsubscribing Push from ${collection.url}")
-                unsubscribe(httpClient, collection, url)
+            .use { httpClient ->
+                for (collection in from)
+                    collection.pushSubscription?.toHttpUrlOrNull()?.let { url ->
+                        logger.info("Unsubscribing Push from ${collection.url}")
+                        unsubscribe(httpClient, collection, url)
+                    }
             }
     }
 
-    private suspend fun unsubscribe(httpClient: OkHttpClient, collection: Collection, url: HttpUrl) {
+    private suspend fun unsubscribe(httpClient: HttpClient, collection: Collection, url: HttpUrl) {
         try {
             runInterruptible(ioDispatcher) {
-                DavResource(httpClient, url).delete {
+                DavResource(httpClient.okHttpClient, url).delete {
                     // deleted
                 }
             }

app/src/main/kotlin/at/bitfire/davdroid/repository/AccountRepository.kt

@@ -8,18 +8,16 @@ import android.accounts.Account
 import android.accounts.AccountManager
 import android.accounts.OnAccountsUpdateListener
 import android.content.Context
-import androidx.annotation.WorkerThread
 import at.bitfire.davdroid.R
+import at.bitfire.davdroid.db.Credentials
 import at.bitfire.davdroid.db.HomeSet
 import at.bitfire.davdroid.db.Service
 import at.bitfire.davdroid.db.ServiceType
-import at.bitfire.davdroid.di.DefaultDispatcher
 import at.bitfire.davdroid.resource.LocalAddressBookStore
 import at.bitfire.davdroid.resource.LocalCalendarStore
 import at.bitfire.davdroid.servicedetection.DavResourceFinder
 import at.bitfire.davdroid.servicedetection.RefreshCollectionsWorker
 import at.bitfire.davdroid.settings.AccountSettings
-import at.bitfire.davdroid.settings.Credentials
 import at.bitfire.davdroid.sync.AutomaticSyncManager
 import at.bitfire.davdroid.sync.SyncDataType
 import at.bitfire.davdroid.sync.TasksAppManager
@@ -30,7 +28,7 @@ import at.bitfire.davdroid.sync.worker.SyncWorkerManager
 import at.bitfire.vcard4android.GroupMethod
 import dagger.Lazy
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.withContext
@@ -49,7 +47,6 @@ class AccountRepository @Inject constructor(
     private val automaticSyncManager: Lazy<AutomaticSyncManager>,
     @ApplicationContext private val context: Context,
     private val collectionRepository: DavCollectionRepository,
-    @DefaultDispatcher private val defaultDispatcher: CoroutineDispatcher,
     private val homeSetRepository: DavHomeSetRepository,
     private val localCalendarStore: Lazy<LocalCalendarStore>,
     private val localAddressBookStore: Lazy<LocalAddressBookStore>,
@@ -73,7 +70,6 @@ class AccountRepository @Inject constructor(
      *
      * @return account if account creation was successful; null otherwise (for instance because an account with this name already exists)
      */
-    @WorkerThread
     fun createBlocking(accountName: String, credentials: Credentials?, config: DavResourceFinder.Configuration, groupMethod: GroupMethod): Account? {
         val account = fromName(accountName)
 
@@ -157,7 +153,7 @@ class AccountRepository @Inject constructor(
         val listener = OnAccountsUpdateListener { accounts ->
             trySend(accounts.filter { it.type == accountType }.toSet())
         }
-        withContext(defaultDispatcher) {  // causes disk I/O
+        withContext(Dispatchers.Default) {  // causes disk I/O
             accountManager.addOnAccountsUpdatedListener(listener, null, true)
         }
 
@@ -169,7 +165,7 @@ class AccountRepository @Inject constructor(
     /**
      * Renames an account.
      *
-     * **Note**: It is highly advised to re-sync the account after renaming in order to restore
+     * **Not**: It is highly advised to re-sync the account after renaming in order to restore
      * a consistent state.
      *
      * @param oldName current name of the account
@@ -179,7 +175,7 @@ class AccountRepository @Inject constructor(
      * @throws IllegalArgumentException if the new account name already exists
      * @throws Exception (or sub-classes) on other errors
      */
-    suspend fun rename(oldName: String, newName: String): Unit = withContext(defaultDispatcher) {
+    suspend fun rename(oldName: String, newName: String) {
         val oldAccount = fromName(oldName)
         val newAccount = fromName(newName)
 
@@ -201,10 +197,13 @@ class AccountRepository @Inject constructor(
             // rename account (also moves AccountSettings)
             val future = accountManager.renameAccount(oldAccount, newName, null, null)
 
-            // wait for operation to complete (blocks calling thread)
-            val newNameFromApi: Account = future.result
-            if (newNameFromApi.name != newName)
-                throw IllegalStateException("renameAccount returned ${newNameFromApi.name} instead of $newName")
+            // wait for operation to complete
+            withContext(Dispatchers.Default) {
+                // blocks calling thread
+                val newNameFromApi: Account = future.result
+                if (newNameFromApi.name != newName)
+                    throw IllegalStateException("renameAccount returned ${newNameFromApi.name} instead of $newName")
+            }
 
             // account renamed, cancel maybe running synchronization of old account
             syncWorkerManager.get().cancelAllWork(oldAccount)
@@ -218,27 +217,22 @@ class AccountRepository @Inject constructor(
 
             try {
                 // update address books
-                localAddressBookStore.get().updateAccount(oldAccount, newAccount, null)
+                localAddressBookStore.get().updateAccount(oldAccount, newAccount)
             } catch (e: Exception) {
                 logger.log(Level.WARNING, "Couldn't change address books to renamed account", e)
             }
 
             try {
                 // update calendar events
-                val store = localCalendarStore.get()
-                store.acquireContentProvider(true)?.use { client ->
-                    store.updateAccount(oldAccount, newAccount, client)
-                }
+                localCalendarStore.get().updateAccount(oldAccount, newAccount)
             } catch (e: Exception) {
                 logger.log(Level.WARNING, "Couldn't change calendars to renamed account", e)
             }
 
             try {
                 // update account_name of local tasks
-                val store = tasksAppManager.get().getDataStore()
-                store?.acquireContentProvider(true)?.use { client ->
-                    store.updateAccount(oldAccount, newAccount, client)
-                }
+                val dataStore = tasksAppManager.get().getDataStore()
+                dataStore?.updateAccount(oldAccount, newAccount)
             } catch (e: Exception) {
                 logger.log(Level.WARNING, "Couldn't change task lists to renamed account", e)
             }

app/src/main/kotlin/at/bitfire/davdroid/repository/DavCollectionRepository.kt

@@ -6,41 +6,43 @@ package at.bitfire.davdroid.repository
 
 import android.accounts.Account
 import android.content.Context
+import at.bitfire.dav4jvm.DavResource
 import at.bitfire.dav4jvm.XmlUtils
 import at.bitfire.dav4jvm.XmlUtils.insertTag
-import at.bitfire.dav4jvm.okhttp.DavResource
-import at.bitfire.dav4jvm.okhttp.exception.GoneException
-import at.bitfire.dav4jvm.okhttp.exception.HttpException
-import at.bitfire.dav4jvm.okhttp.exception.NotFoundException
-import at.bitfire.dav4jvm.property.caldav.CalDAV
-import at.bitfire.dav4jvm.property.carddav.CardDAV
-import at.bitfire.dav4jvm.property.webdav.WebDAV
-import at.bitfire.davdroid.Constants
+import at.bitfire.dav4jvm.property.caldav.CalendarColor
+import at.bitfire.dav4jvm.property.caldav.CalendarDescription
+import at.bitfire.dav4jvm.property.caldav.CalendarTimezone
+import at.bitfire.dav4jvm.property.caldav.CalendarTimezoneId
+import at.bitfire.dav4jvm.property.caldav.NS_CALDAV
+import at.bitfire.dav4jvm.property.caldav.SupportedCalendarComponentSet
+import at.bitfire.dav4jvm.property.carddav.AddressbookDescription
+import at.bitfire.dav4jvm.property.carddav.NS_CARDDAV
+import at.bitfire.dav4jvm.property.webdav.DisplayName
+import at.bitfire.dav4jvm.property.webdav.NS_WEBDAV
+import at.bitfire.dav4jvm.property.webdav.ResourceType
 import at.bitfire.davdroid.R
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.db.CollectionType
 import at.bitfire.davdroid.db.HomeSet
-import at.bitfire.davdroid.di.IoDispatcher
-import at.bitfire.davdroid.network.HttpClientBuilder
+import at.bitfire.davdroid.network.HttpClient
 import at.bitfire.davdroid.servicedetection.RefreshCollectionsWorker
 import at.bitfire.davdroid.util.DavUtils
+import at.bitfire.ical4android.ICalendar
+import at.bitfire.ical4android.util.DateUtils
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import net.fortuna.ical4j.model.Calendar
 import net.fortuna.ical4j.model.Component
 import net.fortuna.ical4j.model.ComponentList
 import net.fortuna.ical4j.model.Property
 import net.fortuna.ical4j.model.PropertyList
-import net.fortuna.ical4j.model.TimeZoneRegistryFactory
 import net.fortuna.ical4j.model.component.VTimeZone
-import net.fortuna.ical4j.model.property.ProdId
 import net.fortuna.ical4j.model.property.Version
 import okhttp3.HttpUrl
 import java.io.StringWriter
 import java.util.UUID
-import java.util.logging.Logger
 import javax.inject.Inject
 import javax.inject.Provider
 
@@ -50,9 +52,7 @@ import javax.inject.Provider
 class DavCollectionRepository @Inject constructor(
     @ApplicationContext private val context: Context,
     private val db: AppDatabase,
-    private val logger: Logger,
-    private val httpClientBuilder: Provider<HttpClientBuilder>,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val httpClientBuilder: Provider<HttpClient.Builder>,
     private val serviceRepository: DavServiceRepository
 ) {
 
@@ -165,22 +165,17 @@ class DavCollectionRepository @Inject constructor(
         val service = serviceRepository.getBlocking(collection.serviceId) ?: throw IllegalArgumentException("Service not found")
         val account = Account(service.accountName, context.getString(R.string.account_type))
 
-        val httpClient = httpClientBuilder.get().fromAccount(account).build()
-        runInterruptible(ioDispatcher) {
-            try {
-                DavResource(httpClient, collection.url).delete {
-                    // success, otherwise an exception would have been thrown → delete locally, too
-                    delete(collection)
+        httpClientBuilder.get()
+            .fromAccount(account)
+            .build()
+            .use { httpClient ->
+                runInterruptible(Dispatchers.IO) {
+                    DavResource(httpClient.okHttpClient, collection.url).delete {
+                        // success, otherwise an exception would have been thrown → delete locally, too
+                        delete(collection)
+                    }
                 }
-            } catch (e: HttpException) {
-                if (e is NotFoundException || e is GoneException) {
-                    // HTTP 404 Not Found or 410 Gone (collection is not there anymore) -> delete locally, too
-                    logger.info("Collection ${collection.url} not found on server, deleting locally")
-                    delete(collection)
-                } else
-                    throw e
             }
-        }
     }
 
     suspend fun getSyncableByTopic(topic: String) = dao.getSyncableByPushTopic(topic)
@@ -220,7 +215,7 @@ class DavCollectionRepository @Inject constructor(
      *
      * @param newCollection Collection to be inserted or updated
      */
-    fun insertOrUpdateByUrlRememberSync(newCollection: Collection) {
+    fun insertOrUpdateByUrlAndRememberFlags(newCollection: Collection) {
         db.runInTransaction {
             // remember locally set flags
             val oldCollection = dao.getByServiceAndUrl(newCollection.serviceId, newCollection.url.toString())
@@ -242,15 +237,11 @@ class DavCollectionRepository @Inject constructor(
         dao.insertOrUpdateByUrl(collection)
     }
 
-    /**
-     * Returns paging source to retrieve collections for given service, of given collection type and
-     * depending on whether they are considered personal or not (see [HomeSet.personal]).
-     */
-    fun pageByServiceAndType(serviceId: Long, @CollectionType type: String, onlyPersonal: Boolean) =
-        if (onlyPersonal)
-            dao.pagePersonalByServiceAndType(serviceId, type)
-        else
-            dao.pageByServiceAndType(serviceId, type)
+    fun pageByServiceAndType(serviceId: Long, @CollectionType type: String) =
+        dao.pageByServiceAndType(serviceId, type)
+
+    fun pagePersonalByServiceAndType(serviceId: Long, @CollectionType type: String) =
+        dao.pagePersonalByServiceAndType(serviceId, type)
 
     /**
      * Sets the flag for whether read-only should be enforced on the local collection
@@ -285,17 +276,19 @@ class DavCollectionRepository @Inject constructor(
     // helpers
 
     private suspend fun createOnServer(account: Account, url: HttpUrl, method: String, xmlBody: String) {
-        val httpClient = httpClientBuilder.get()
+        httpClientBuilder.get()
             .fromAccount(account)
             .build()
-        runInterruptible(ioDispatcher) {
-            DavResource(httpClient, url).mkCol(
-                xmlBody = xmlBody,
-                method = method
-            ) {
-                // success, otherwise an exception would have been thrown
+            .use { httpClient ->
+                runInterruptible(Dispatchers.IO) {
+                    DavResource(httpClient.okHttpClient, url).mkCol(
+                        xmlBody = xmlBody,
+                        method = method
+                    ) {
+                        // success, otherwise an exception would have been thrown
+                    }
+                }
             }
-        }
     }
 
     private fun generateMkColXml(
@@ -314,27 +307,27 @@ class DavCollectionRepository @Inject constructor(
             setOutput(writer)
 
             startDocument("UTF-8", null)
-            setPrefix("", WebDAV.NS_WEBDAV)
-            setPrefix("CAL", CalDAV.NS_CALDAV)
-            setPrefix("CARD", CardDAV.NS_CARDDAV)
+            setPrefix("", NS_WEBDAV)
+            setPrefix("CAL", NS_CALDAV)
+            setPrefix("CARD", NS_CARDDAV)
 
             if (addressBook)
-                startTag(WebDAV.NS_WEBDAV, "mkcol")
+                startTag(NS_WEBDAV, "mkcol")
             else
-                startTag(CalDAV.NS_CALDAV, "mkcalendar")
+                startTag(NS_CALDAV, "mkcalendar")
 
-            insertTag(WebDAV.Set) {
-                insertTag(WebDAV.Prop) {
-                    insertTag(WebDAV.ResourceType) {
-                        insertTag(WebDAV.Collection)
+            insertTag(DavResource.SET) {
+                insertTag(DavResource.PROP) {
+                    insertTag(ResourceType.NAME) {
+                        insertTag(ResourceType.COLLECTION)
                         if (addressBook)
-                            insertTag(CardDAV.Addressbook)
+                            insertTag(ResourceType.ADDRESSBOOK)
                         else
-                            insertTag(CalDAV.Calendar)
+                            insertTag(ResourceType.CALENDAR)
                     }
 
                     displayName?.let {
-                        insertTag(WebDAV.DisplayName) {
+                        insertTag(DisplayName.NAME) {
                             text(it)
                         }
                     }
@@ -342,7 +335,7 @@ class DavCollectionRepository @Inject constructor(
                     if (addressBook) {
                         // addressbook-specific properties
                         description?.let {
-                            insertTag(CardDAV.AddressbookDescription) {
+                            insertTag(AddressbookDescription.NAME) {
                                 text(it)
                             }
                         }
@@ -350,27 +343,27 @@ class DavCollectionRepository @Inject constructor(
                     } else {
                         // calendar-specific properties
                         description?.let {
-                            insertTag(CalDAV.CalendarDescription) {
+                            insertTag(CalendarDescription.NAME) {
                                 text(it)
                             }
                         }
                         color?.let {
-                            insertTag(CalDAV.CalendarColor) {
+                            insertTag(CalendarColor.NAME) {
                                 text(DavUtils.ARGBtoCalDAVColor(it))
                             }
                         }
                         timezoneId?.let { id ->
-                            insertTag(CalDAV.CalendarTimezoneId) {
+                            insertTag(CalendarTimezoneId.NAME) {
                                 text(id)
                             }
                             getVTimeZone(id)?.let { vTimezone ->
-                                insertTag(CalDAV.CalendarTimezone) {
+                                insertTag(CalendarTimezone.NAME) {
                                     text(
                                         // spec requires "an iCalendar object with exactly one VTIMEZONE component"
                                         Calendar(
                                             PropertyList<Property>().apply {
+                                                add(ICalendar.prodId)
                                                 add(Version.VERSION_2_0)
-                                                add(ProdId(Constants.iCalProdId))
                                             },
                                             ComponentList(
                                                 listOf(vTimezone)
@@ -382,19 +375,19 @@ class DavCollectionRepository @Inject constructor(
                         }
 
                         if (!supportsVEVENT || !supportsVTODO || !supportsVJOURNAL) {
-                            insertTag(CalDAV.SupportedCalendarComponentSet) {
+                            insertTag(SupportedCalendarComponentSet.NAME) {
                                 // Only if there's at least one not explicitly supported calendar component set,
                                 // otherwise don't include the property, which means "supports everything".
                                 if (supportsVEVENT)
-                                    insertTag(CalDAV.Comp) {
+                                    insertTag(SupportedCalendarComponentSet.COMP) {
                                         attribute(null, "name", Component.VEVENT)
                                     }
                                 if (supportsVTODO)
-                                    insertTag(CalDAV.Comp) {
+                                    insertTag(SupportedCalendarComponentSet.COMP) {
                                         attribute(null, "name", Component.VTODO)
                                     }
                                 if (supportsVJOURNAL)
-                                    insertTag(CalDAV.Comp) {
+                                    insertTag(SupportedCalendarComponentSet.COMP) {
                                         attribute(null, "name", Component.VJOURNAL)
                                     }
                             }
@@ -403,17 +396,14 @@ class DavCollectionRepository @Inject constructor(
                 }
             }
             if (addressBook)
-                endTag(WebDAV.NS_WEBDAV, "mkcol")
+                endTag(NS_WEBDAV, "mkcol")
             else
-                endTag(CalDAV.NS_CALDAV, "mkcalendar")
+                endTag(NS_CALDAV, "mkcalendar")
             endDocument()
         }
         return writer.toString()
     }
 
-    private fun getVTimeZone(tzId: String): VTimeZone? {
-        val tzRegistry = TimeZoneRegistryFactory.getInstance().createRegistry()
-        return tzRegistry.getTimeZone(tzId)?.vTimeZone
-    }
+    private fun getVTimeZone(tzId: String): VTimeZone? = DateUtils.ical4jTimeZone(tzId)?.vTimeZone
 
 }

app/src/main/kotlin/at/bitfire/davdroid/repository/DavHomeSetRepository.kt

@@ -5,6 +5,7 @@
 package at.bitfire.davdroid.repository
 
 import android.accounts.Account
+import androidx.room.Transaction
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.HomeSet
 import at.bitfire.davdroid.db.Service
@@ -28,8 +29,21 @@ class DavHomeSetRepository @Inject constructor(
     fun getCalendarHomeSetsFlow(account: Account) =
         dao.getBindableByAccountAndServiceTypeFlow(account.name, Service.TYPE_CALDAV)
 
-    fun insertOrUpdateByUrlBlocking(homeSet: HomeSet): Long =
-        dao.insertOrUpdateByUrlBlocking(homeSet)
+
+    /**
+     * Tries to insert new row, but updates existing row if already present.
+     * This method preserves the primary key, as opposed to using "@Insert(onConflict = OnConflictStrategy.REPLACE)"
+     * which will create a new row with incremented ID and thus breaks entity relationships!
+     *
+     * @return ID of the row, that has been inserted or updated. -1 If the insert fails due to other reasons.
+     */
+    @Transaction
+    fun insertOrUpdateByUrlBlocking(homeset: HomeSet): Long =
+        dao.getByUrl(homeset.serviceId, homeset.url.toString())?.let { existingHomeset ->
+            dao.update(homeset.copy(id = existingHomeset.id))
+            existingHomeset.id
+        } ?: dao.insert(homeset)
+
 
     fun deleteBlocking(homeSet: HomeSet) = dao.delete(homeSet)
 

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

@@ -6,8 +6,4 @@ package at.bitfire.davdroid.resource
 
 import at.bitfire.vcard4android.Contact
 
-interface LocalAddress: LocalResource {
-
-    fun update(data: Contact, fileName: String?, eTag: String?, scheduleTag: String?, flags: Int)
-
-}
+interface LocalAddress: LocalResource<Contact>

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

@@ -17,20 +17,19 @@ import android.provider.ContactsContract.RawContacts
 import androidx.annotation.OpenForTesting
 import androidx.core.content.contentValuesOf
 import at.bitfire.davdroid.R
+import at.bitfire.davdroid.db.SyncState
 import at.bitfire.davdroid.repository.DavCollectionRepository
 import at.bitfire.davdroid.repository.DavServiceRepository
 import at.bitfire.davdroid.resource.LocalAddressBook.Companion.USER_DATA_READ_ONLY
 import at.bitfire.davdroid.resource.workaround.ContactDirtyVerifier
 import at.bitfire.davdroid.settings.AccountSettings
-import at.bitfire.davdroid.sync.SyncDataType
+import at.bitfire.davdroid.sync.SyncFrameworkIntegration
 import at.bitfire.davdroid.sync.account.SystemAccountUtils
 import at.bitfire.davdroid.sync.account.setAndVerifyUserData
-import at.bitfire.davdroid.sync.adapter.SyncFrameworkIntegration
-import at.bitfire.synctools.storage.BatchOperation
-import at.bitfire.synctools.storage.ContactsBatchOperation
 import at.bitfire.vcard4android.AndroidAddressBook
 import at.bitfire.vcard4android.AndroidContact
 import at.bitfire.vcard4android.AndroidGroup
+import at.bitfire.vcard4android.BatchOperation
 import at.bitfire.vcard4android.GroupMethod
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -199,17 +198,17 @@ open class LocalAddressBook @AssistedInject constructor(
             return false
 
         // move contacts and groups to new account
-        val batch = ContactsBatchOperation(provider!!)
-        batch += BatchOperation.CpoBuilder
+        val batch = BatchOperation(provider!!)
+        batch.enqueue(BatchOperation.CpoBuilder
             .newUpdate(groupsSyncUri())
             .withSelection(Groups.ACCOUNT_NAME + "=? AND " + Groups.ACCOUNT_TYPE + "=?", arrayOf(oldAccount.name, oldAccount.type))
             .withValue(Groups.ACCOUNT_NAME, newAccount.name)
-            .withValue(Groups.ACCOUNT_TYPE, newAccount.type)
-        batch += BatchOperation.CpoBuilder
+        )
+        batch.enqueue(BatchOperation.CpoBuilder
             .newUpdate(rawContactsSyncUri())
             .withSelection(RawContacts.ACCOUNT_NAME + "=? AND " + RawContacts.ACCOUNT_TYPE + "=?", arrayOf(oldAccount.name, oldAccount.type))
             .withValue(RawContacts.ACCOUNT_NAME, newAccount.name)
-            .withValue(RawContacts.ACCOUNT_TYPE, newAccount.type)
+        )
         batch.commit()
 
         // update AndroidAddressBook.account
@@ -223,18 +222,15 @@ open class LocalAddressBook @AssistedInject constructor(
 
 
     /**
-     * Enables or disables sync on content changes for the address book account based on the current sync
-     * interval account setting.
+     * Makes contacts of this address book available to be synced and activates synchronization upon
+     * contact data changes.
      */
     fun updateSyncFrameworkSettings() {
-        val accountSettings = accountSettingsFactory.create(account)
-        val syncInterval = accountSettings.getSyncInterval(SyncDataType.CONTACTS)
+        // Enable sync-ability of contacts
+        syncFramework.enableSyncAbility(addressBookAccount, ContactsContract.AUTHORITY)
 
-        // Enable/Disable content triggered syncs for the address book account.
-        if (syncInterval != null)
-            syncFramework.enableSyncOnContentChange(addressBookAccount, ContactsContract.AUTHORITY)
-        else
-            syncFramework.disableSyncOnContentChange(addressBookAccount, ContactsContract.AUTHORITY)
+        // Changes in contact data should trigger syncs
+        syncFramework.enableSyncOnContentChange(addressBookAccount, ContactsContract.AUTHORITY)
     }
 
 

app/src/main/kotlin/at/bitfire/davdroid/resource/LocalAddressBookStore.kt

@@ -6,7 +6,6 @@ package at.bitfire.davdroid.resource
 
 import android.accounts.Account
 import android.accounts.AccountManager
-import android.accounts.OnAccountsUpdateListener
 import android.content.ContentProviderClient
 import android.content.Context
 import android.provider.ContactsContract
@@ -24,9 +23,6 @@ import at.bitfire.davdroid.sync.account.setAndVerifyUserData
 import at.bitfire.davdroid.util.DavUtils.lastSegment
 import com.google.common.base.CharMatcher
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
 import java.util.logging.Level
 import java.util.logging.Logger
 import javax.inject.Inject
@@ -78,16 +74,10 @@ class LocalAddressBookStore @Inject constructor(
         return sb.toString()
     }
 
-    override fun acquireContentProvider(throwOnMissingPermissions: Boolean) = try {
+    override fun acquireContentProvider() =
         context.contentResolver.acquireContentProviderClient(authority)
-    } catch (e: SecurityException) {
-        if (throwOnMissingPermissions)
-            throw e
-        else
-            /* return */ null
-    }
 
-    override fun create(client: ContentProviderClient, fromCollection: Collection): LocalAddressBook? {
+    override fun create(provider: ContentProviderClient, fromCollection: Collection): LocalAddressBook? {
         val service = serviceRepository.getBlocking(fromCollection.serviceId) ?: throw IllegalArgumentException("Couldn't fetch DB service from collection")
         val account = Account(service.accountName, context.getString(R.string.account_type))
 
@@ -98,7 +88,7 @@ class LocalAddressBookStore @Inject constructor(
             id = fromCollection.id
         ) ?: return null
 
-        val addressBook = localAddressBookFactory.create(account, addressBookAccount, client)
+        val addressBook = localAddressBookFactory.create(account, addressBookAccount, provider)
 
         // update settings
         addressBook.updateSyncFrameworkSettings()
@@ -125,12 +115,19 @@ class LocalAddressBookStore @Inject constructor(
         return addressBookAccount
     }
 
-    override fun getAll(account: Account, client: ContentProviderClient): List<LocalAddressBook> =
-        getAddressBookAccounts(account).map { addressBookAccount ->
-            localAddressBookFactory.create(account, addressBookAccount, client)
-        }
+    override fun getAll(account: Account, provider: ContentProviderClient): List<LocalAddressBook> {
+        val accountManager = AccountManager.get(context)
+        return accountManager.getAccountsByType(context.getString(R.string.account_type_address_book))
+            .filter { addressBookAccount ->
+                accountManager.getUserData(addressBookAccount, LocalAddressBook.USER_DATA_ACCOUNT_NAME) == account.name &&
+                accountManager.getUserData(addressBookAccount, LocalAddressBook.USER_DATA_ACCOUNT_TYPE) == account.type
+            }
+            .map { addressBookAccount ->
+                localAddressBookFactory.create(account, addressBookAccount, provider)
+            }
+    }
 
-    override fun update(client: ContentProviderClient, localCollection: LocalAddressBook, fromCollection: Collection) {
+    override fun update(provider: ContentProviderClient, localCollection: LocalAddressBook, fromCollection: Collection) {
         var currentAccount = localCollection.addressBookAccount
         logger.log(Level.INFO, "Updating local address book $currentAccount from collection $fromCollection")
 
@@ -158,7 +155,7 @@ class LocalAddressBookStore @Inject constructor(
             localCollection.readOnly = nowReadOnly
         }
 
-        // Update automatic synchronization
+        // make sure it will still be synchronized when contacts are updated
         localCollection.updateSyncFrameworkSettings()
     }
 
@@ -167,9 +164,8 @@ class LocalAddressBookStore @Inject constructor(
      *
      * @param oldAccount    The old account
      * @param newAccount    The new account
-     * @param client        content provider client (not needed/does not exist for address books)
      */
-    override fun updateAccount(oldAccount: Account, newAccount: Account, client: ContentProviderClient?) {
+    override fun updateAccount(oldAccount: Account, newAccount: Account) {
         val accountManager = AccountManager.get(context)
         accountManager.getAccountsByType(context.getString(R.string.account_type_address_book))
             .filter { addressBookAccount ->
@@ -201,45 +197,6 @@ class LocalAddressBookStore @Inject constructor(
             accountManager.removeAccountExplicitly(addressBookAccount)
     }
 
-    /**
-     * Returns all address book accounts that belong to the given account.
-     *
-     * @param account    Account which has the address books.
-     * @return List of address book accounts.
-     */
-    fun getAddressBookAccounts(account: Account): List<Account> =
-        AccountManager.get(context).let { accountManager ->
-            accountManager.getAccountsByType(context.getString(R.string.account_type_address_book))
-                .filter { addressBookAccount ->
-                    account.name == accountManager.getUserData(
-                        addressBookAccount,
-                        LocalAddressBook.USER_DATA_ACCOUNT_NAME
-                    ) && account.type == accountManager.getUserData(
-                        addressBookAccount,
-                        LocalAddressBook.USER_DATA_ACCOUNT_TYPE
-                    )
-                }
-        }
-
-    /**
-     * Returns all address book accounts that belong to the given account in a flow.
-     *
-     * @param account    Account which has the address books.
-     * @return List of address book accounts as flow.
-     */
-    fun getAddressBookAccountsFlow(account: Account): Flow<List<Account>> = callbackFlow {
-        val accountManager = AccountManager.get(context)
-        val listener = OnAccountsUpdateListener { accounts ->
-            trySend(getAddressBookAccounts(account))
-        }
-        accountManager.addOnAccountsUpdatedListener(
-            /* listener = */ listener,
-            /* handler = */ null,
-            /* updateImmediately = */ true
-        )
-        awaitClose { accountManager.removeOnAccountsUpdatedListener(listener) }
-    }
-
 
     companion object {