Cancel syncs for calendar, tasks, and contacts separately

.github/CODEOWNERS

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

.github/dependabot.yml

@@ -9,24 +9,6 @@ updates:
       interval: "weekly"
     commit-message:
       prefix: "[CI] "
-    labels:
-      - "github_actions"
-      - "dependencies"
     groups:
       ci-actions:
         patterns: ["*"]
-        
-  - package-ecosystem: "gradle"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    labels:             # don't create "java" label (default for gradle ecosystem)
-      - "dependencies"
-    groups:
-      app-dependencies:
-        patterns: ["*"]
-    ignore:
-      # dependencies without semantic versioning
-      - dependency-name: "com.github.bitfireat:cert4android"
-      - dependency-name: "com.github.bitfireat:dav4jvm"
-      - dependency-name: "com.github.bitfireat:synctools"

.github/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/checkout@v5
     - uses: actions/setup-java@v5
       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 --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,12 +19,12 @@ jobs:
       discussions: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: actions/setup-java@v5
         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

.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/checkout@v5
       - uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
 
       # See https://community.gradle.org/github-actions/docs/setup-gradle/ for more information
-      - uses: gradle/actions/setup-gradle@v5
+      - 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 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 core:assembleDebug app:assembleDebug
-          ./gradlew --dry-run core:lintDebug app:lintOseDebug
-          ./gradlew --dry-run core:testDebugUnitTest
-          ./gradlew --dry-run core:virtualDebugAndroidTest
-
-  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/checkout@v5
       - uses: actions/setup-java@v5
         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 app:lintOseDebug
+      - name: Run unit tests
+        run: ./gradlew --build-cache --configuration-cache app:testOseDebugUnitTest
 
-      - name: Lint checks
-        run: ./gradlew core:lintDebug app:lintOseDebug
-
-      - name: Unit tests
-        run: ./gradlew core:testDebugUnitTest
-
-  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/checkout@v5
       - uses: actions/setup-java@v5
         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 core:virtualDebugAndroidTest
-
       - 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 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).
 

app-ose/build.gradle.kts

@@ -1,126 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.compose.compiler)
-    alias(libs.plugins.hilt)
-    alias(libs.plugins.ksp)
-}
-
-android {
-    compileSdk = 36
-
-    defaultConfig {
-        minSdk = 24        // Android 7.0
-        targetSdk = 36     // Android 16
-
-        applicationId = "at.bitfire.davdroid"
-
-        versionCode = 405090005
-        versionName = "4.5.9"
-
-        base.archivesName = "davx5-$versionCode-$versionName"
-    }
-
-    java {
-        toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
-        }
-    }
-
-    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
-    }
-
-    buildFeatures {
-        compose = true
-    }
-
-    // Java namespace for our classes (not to be confused with Android package ID)
-    namespace = "com.davx5.ose"
-
-    flavorDimensions += "distribution"
-    productFlavors {
-        create("ose") {
-            dimension = "distribution"
-            versionNameSuffix = "-ose"
-        }
-    }
-
-    androidResources {
-        generateLocaleConfig = true
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules-release.pro")
-
-            isShrinkResources = true
-
-            signingConfig = signingConfigs.findByName("bitfire")
-        }
-    }
-
-    signingConfigs {
-        create("bitfire") {
-            storeFile = file(System.getenv("ANDROID_KEYSTORE") ?: "/dev/null")
-            storePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD")
-            keyAlias = System.getenv("ANDROID_KEY_ALIAS")
-            keyPassword = System.getenv("ANDROID_KEY_PASSWORD")
-        }
-    }
-
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        managedDevices {
-            localDevices {
-                create("virtual") {
-                    device = "Pixel 3"
-                    // TBD: API level 35 and higher causes network tests to fail sometimes, see https://github.com/bitfireAT/davx5-ose/issues/1525
-                    // Suspected reason: https://developer.android.com/about/versions/15/behavior-changes-all#background-network-access
-                    apiLevel = 34
-                    systemImageSource = "aosp-atd"
-                }
-            }
-        }
-    }
-}
-
-dependencies {
-    // include core subproject (manages its own dependencies itself, however from same version catalog)
-    implementation(project(":core"))
-
-    // Kotlin / Android
-    implementation(libs.kotlin.stdlib)
-    implementation(libs.kotlinx.coroutines)
-    coreLibraryDesugaring(libs.android.desugaring)
-
-    // Hilt
-    implementation(libs.hilt.android.base)
-    ksp(libs.androidx.hilt.compiler)
-    ksp(libs.hilt.android.compiler)
-
-    // support libs
-    implementation(libs.androidx.core)
-    implementation(libs.androidx.hilt.work)
-    implementation(libs.androidx.lifecycle.viewmodel.base)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    implementation(libs.androidx.work.base)
-
-    // Jetpack Compose
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    debugImplementation(libs.androidx.compose.ui.tooling)
-    implementation(libs.androidx.compose.ui.toolingPreview)
-
-    // own libraries
-    implementation(libs.bitfire.cert4android)
-
-    // third-party libs
-    implementation(libs.guava)
-    implementation(libs.okhttp.base)
-    implementation(libs.openid.appauth)
-}

app-ose/src/main/AndroidManifest.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:installLocation="internalOnly">
-
-    <application android:name=".App">
-
-        <!-- 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. -->
-        <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" />
-        </provider>
-
-    </application>
-
-</manifest>

app-ose/src/main/kotlin/com/davx5/ose/App.kt

@@ -1,30 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package com.davx5.ose
-
-import androidx.work.Configuration
-import at.bitfire.davdroid.CoreApp
-import dagger.hilt.android.HiltAndroidApp
-
-/**
- * Actual implementation of Application, used for Hilt. Delegates to [CoreApp].
- */
-@HiltAndroidApp
-class App: CoreApp(), Configuration.Provider {
-
-    /**
-     * Required for Hilt/WorkManager integration, see:
-     * https://developer.android.com/training/dependency-injection/hilt-jetpack#workmanager
-     *
-     * This requires to remove the androidx.work.WorkManagerInitializer from App Startup
-     * in the AndroidManifest, see:
-     * https://developer.android.com/develop/background-work/background-tasks/persistent/configuration/custom-configuration#remove-default
-     */
-    override val workManagerConfiguration: Configuration
-        get() = Configuration.Builder()
-            .setWorkerFactory(workerFactory)
-            .build()
-
-}

app-ose/src/ose/kotlin/com/davx5/ose/di/AccountsDrawerHandlerModule.kt

@@ -1,19 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package com.davx5.ose.di
-
-import at.bitfire.davdroid.ui.AccountsDrawerHandler
-import at.bitfire.davdroid.ui.OseAccountsDrawerHandler
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ActivityComponent
-
-@Module
-@InstallIn(ActivityComponent::class)
-interface AccountsDrawerHandlerModule {
-    @Binds
-    fun accountsDrawerHandler(impl: OseAccountsDrawerHandler): AccountsDrawerHandler
-}

app-ose/src/ose/kotlin/com/davx5/ose/di/AppLicenseInfoProviderModule.kt

@@ -1,19 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package com.davx5.ose.di
-
-import at.bitfire.davdroid.ui.about.AboutActivity
-import com.davx5.ose.ui.about.OpenSourceLicenseInfoProvider
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ViewModelComponent
-
-@Module
-@InstallIn(ViewModelComponent::class)
-interface AppLicenseInfoProviderModule {
-    @Binds
-    fun appLicenseInfoProvider(impl: OpenSourceLicenseInfoProvider): AboutActivity.AppLicenseInfoProvider
-}

app-ose/src/ose/kotlin/com/davx5/ose/di/Cert4AndroidModule.kt

@@ -1,61 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package com.davx5.ose.di
-
-import android.content.Context
-import at.bitfire.cert4android.CustomCertManager
-import at.bitfire.cert4android.CustomCertStore
-import at.bitfire.cert4android.SettingsProvider
-import at.bitfire.davdroid.settings.Settings
-import at.bitfire.davdroid.settings.SettingsManager
-import at.bitfire.davdroid.ui.ForegroundTracker
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import okhttp3.internal.tls.OkHostnameVerifier
-import java.util.Optional
-
-/**
- * cert4android integration module
- */
-@Module
-@InstallIn(SingletonComponent::class)
-class Cert4AndroidModule {
-
-    @Provides
-    fun customCertStore(@ApplicationContext context: Context): Optional<CustomCertStore> =
-        Optional.of(CustomCertStore.getInstance(context))
-
-    @Provides
-    @Reusable
-    fun customCertManager(
-        customCertStore: Optional<CustomCertStore>,
-        settings: SettingsManager
-    ): Optional<CustomCertManager> =
-        Optional.of(
-            CustomCertManager(
-            certStore = customCertStore.get(),
-            settings = object : SettingsProvider {
-
-                override val appInForeground: Boolean
-                    get() = ForegroundTracker.inForeground.value
-
-                override val trustSystemCerts: Boolean
-                    get() = !settings.getBoolean(Settings.DISTRUST_SYSTEM_CERTIFICATES)
-
-            }
-        ))
-
-    @Provides
-    @Reusable
-    fun customHostnameVerifier(
-        customCertManager: Optional<CustomCertManager>
-    ): Optional<CustomCertManager.HostnameVerifier> =
-        Optional.of(customCertManager.get().HostnameVerifier(OkHostnameVerifier))
-
-}

app-ose/src/ose/kotlin/com/davx5/ose/di/ColorSchemesModule.kt

@@ -1,28 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package com.davx5.ose.di
-
-import androidx.compose.material3.ColorScheme
-import at.bitfire.davdroid.di.qualifier.DarkColorScheme
-import at.bitfire.davdroid.di.qualifier.LightColorScheme
-import at.bitfire.davdroid.ui.OseTheme
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-
-@Module
-@InstallIn(SingletonComponent::class)
-class ColorSchemesModule {
-
-    @Provides
-    @LightColorScheme
-    fun lightColorScheme(): ColorScheme = OseTheme.lightScheme
-
-    @Provides
-    @DarkColorScheme
-    fun darkColorScheme(): ColorScheme = OseTheme.darkScheme
-
-}

app-ose/src/ose/kotlin/com/davx5/ose/di/IntroPageFactoryModule.kt

@@ -1,19 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package com.davx5.ose.di
-
-import at.bitfire.davdroid.ui.intro.IntroPageFactory
-import com.davx5.ose.ui.intro.OseIntroPageFactory
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-
-@Module
-@InstallIn(SingletonComponent::class)
-interface Global {
-    @Binds
-    fun introPageFactory(impl: OseIntroPageFactory): IntroPageFactory
-}

app-ose/src/ose/kotlin/com/davx5/ose/di/LoginTypesProviderModule.kt

@@ -1,21 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package com.davx5.ose.di
-
-import at.bitfire.davdroid.ui.setup.LoginTypesProvider
-import at.bitfire.davdroid.ui.setup.StandardLoginTypesProvider
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-
-@Module
-@InstallIn(SingletonComponent::class)
-interface LoginTypesProviderModule {
-
-    @Binds
-    fun loginTypesProvider(impl: StandardLoginTypesProvider): LoginTypesProvider
-
-}

app/build.gradle.kts

@@ -3,12 +3,13 @@
  */
 
 plugins {
-    alias(libs.plugins.android.library)
+    alias(libs.plugins.android.application)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.hilt)
-    alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
-    alias(libs.plugins.mikepenz.aboutLibraries.android)
+
+    alias(libs.plugins.mikepenz.aboutLibraries)
 }
 
 // Android configuration
@@ -16,7 +17,17 @@ android {
     compileSdk = 36
 
     defaultConfig {
+        applicationId = "at.bitfire.davdroid"
+
+        versionCode = 405040002
+        versionName = "4.5.4-rc.1"
+
+        base.archivesName = "davx5-ose-$versionName"
+
         minSdk = 24        // Android 7.0
+        targetSdk = 36     // Android 16
+
+        buildConfigField("boolean", "customCertsUI", "true")
 
         testInstrumentationRunner = "at.bitfire.davdroid.HiltTestRunner"
     }
@@ -42,9 +53,37 @@ android {
     // Java namespace for our classes (not to be confused with Android package ID)
     namespace = "at.bitfire.davdroid"
 
+    flavorDimensions += "distribution"
+    productFlavors {
+        create("ose") {
+            dimension = "distribution"
+            versionNameSuffix = "-ose"
+        }
+    }
+
+    sourceSets {
+        getByName("androidTest") {
+            assets.srcDir("$projectDir/schemas")
+        }
+    }
+
+    signingConfigs {
+        create("bitfire") {
+            storeFile = file(System.getenv("ANDROID_KEYSTORE") ?: "/dev/null")
+            storePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD")
+            keyAlias = System.getenv("ANDROID_KEY_ALIAS")
+            keyPassword = System.getenv("ANDROID_KEY_PASSWORD")
+        }
+    }
+
     buildTypes {
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules-release.pro")
+
+            isShrinkResources = true
+
+            signingConfig = signingConfigs.findByName("bitfire")
         }
     }
 
@@ -52,6 +91,10 @@ android {
         disable += arrayOf("GoogleAppIndexingWarning", "ImpliedQuantity", "MissingQuantity", "MissingTranslation", "ExtraTranslation", "RtlEnabled", "RtlHardcoded", "Typos")
     }
 
+    androidResources {
+        generateLocaleConfig = true
+    }
+
     packaging {
         resources {
             // multiple (test) dependencies have LICENSE files at same location
@@ -59,12 +102,6 @@ android {
         }
     }
 
-    sourceSets {
-        getByName("androidTest") {
-            assets.srcDir("$projectDir/schemas")
-        }
-    }
-
     @Suppress("UnstableApiUsage")
     testOptions {
         managedDevices {
@@ -86,14 +123,12 @@ 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 {
-    // Kotlin / Android
+    // core
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlinx.coroutines)
     coreLibraryDesugaring(libs.android.desugaring)
@@ -121,22 +156,21 @@ dependencies {
 
     // Jetpack Compose
     implementation(libs.compose.accompanist.permissions)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.material3.adaptive)
-    implementation(libs.androidx.compose.materialIconsExtended)
-    debugImplementation(libs.androidx.compose.ui.tooling)
-    implementation(libs.androidx.compose.ui.toolingPreview)
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.material3)
+    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.material3)
+    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)
@@ -150,14 +184,10 @@ dependencies {
     }
 
     // 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.okhttp.base)
     implementation(libs.okhttp.brotli)
     implementation(libs.okhttp.logging)
@@ -176,7 +206,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)
@@ -187,10 +216,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/.gitignore

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

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

@@ -10,6 +10,7 @@ import android.os.Build
 import android.os.Bundle
 import androidx.test.runner.AndroidJUnitRunner
 import at.bitfire.davdroid.di.TestCoroutineDispatchersModule
+import at.bitfire.davdroid.test.BuildConfig
 import at.bitfire.synctools.log.LogcatHandler
 import dagger.hilt.android.testing.HiltTestApplication
 import java.util.logging.Level
@@ -28,7 +29,7 @@ class HiltTestRunner : AndroidJUnitRunner() {
         val rootLogger = Logger.getLogger("")
         rootLogger.level = Level.ALL
         rootLogger.handlers.forEach { rootLogger.removeHandler(it) }
-        rootLogger.addHandler(LogcatHandler(javaClass.name))
+        rootLogger.addHandler(LogcatHandler(BuildConfig.APPLICATION_ID))
 
         // MockK requirements
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P)

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/di/TestCoroutineDispatchersModule.kt

@@ -5,10 +5,6 @@
 package at.bitfire.davdroid.di
 
 import at.bitfire.davdroid.di.TestCoroutineDispatchersModule.standardTestDispatcher
-import at.bitfire.davdroid.di.qualifier.DefaultDispatcher
-import at.bitfire.davdroid.di.qualifier.IoDispatcher
-import at.bitfire.davdroid.di.qualifier.MainDispatcher
-import at.bitfire.davdroid.di.qualifier.SyncDispatcher
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.components.SingletonComponent

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/network/OkhttpClientTest.kt

@@ -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)
@@ -31,15 +31,16 @@ 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/resource/LocalCalendarTest.kt

@@ -6,6 +6,7 @@ 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
@@ -13,15 +14,22 @@ import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL
 import android.provider.CalendarContract.Events
 import androidx.core.content.contentValuesOf
 import androidx.test.platform.app.InstrumentationRegistry
+import at.bitfire.ical4android.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.storage.calendar.AndroidEvent2
 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.Assert.assertEquals
+import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Before
 import org.junit.Rule
@@ -65,6 +73,93 @@ class LocalCalendarTest {
     }
 
 
+    @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
+            })
+        }
+        calendar.add(
+            event = event,
+            fileName = "filename.ics",
+            eTag = null,
+            scheduleTag = null,
+            flags = LocalResource.FLAG_REMOTELY_PRESENT
+        )
+        val localEvent = calendar.findByName("filename.ics")!!
+        val eventId = localEvent.id
+
+        // set event as dirty
+        client.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
+        client.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
+    // 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"))
+        }
+        calendar.add(
+            event = event,
+            fileName = "filename.ics",
+            eTag = null,
+            scheduleTag = null,
+            flags = LocalResource.FLAG_REMOTELY_PRESENT
+        )
+        val localEvent = calendar.findByName("filename.ics")!!
+        val eventUrl = androidCalendar.eventUri(localEvent.id)
+
+        // set event as dirty
+        client.update(eventUrl, contentValuesOf(
+            Events.DIRTY to 1
+        ), null, null)
+
+        // this method should mark the event as deleted
+        calendar.deleteDirtyEventsWithoutInstances()
+
+        // verify that event is not marked as deleted
+        client.query(eventUrl, arrayOf(Events.DELETED), null, null, null)!!.use { cursor ->
+            cursor.moveToNext()
+            assertEquals(0, cursor.getInt(0))
+        }
+    }
+
     /**
      * Verifies that [LocalCalendar.removeNotDirtyMarked] works as expected.
      * @param contentValues values to set on the event. Required:
@@ -72,16 +167,15 @@ class LocalCalendarTest {
      * - [Events.DIRTY]
      */
     private fun testRemoveNotDirtyMarked(contentValues: ContentValues) {
-        val entity = Entity(
+        val id = androidCalendar.addEvent(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
+                AndroidEvent2.COLUMN_FLAGS to 123
             ).apply { putAll(contentValues) }
-        )
-        val id = androidCalendar.addEvent(entity)
+        ))
 
         calendar.removeNotDirtyMarked(123)
 
@@ -116,13 +210,13 @@ class LocalCalendarTest {
                 Events.DTSTART to System.currentTimeMillis(),
                 Events.DTEND to System.currentTimeMillis(),
                 Events.TITLE to "Some Event",
-                EventsContract.COLUMN_FLAGS to 123
+                AndroidEvent2.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))
+        assertEquals(321, androidCalendar.getEvent(id)?.flags)
     }
 
     @Test

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

@@ -0,0 +1,265 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid.resource
+
+import android.Manifest
+import android.accounts.Account
+import android.content.ContentProviderClient
+import android.content.ContentUris
+import android.content.ContentValues
+import android.provider.CalendarContract
+import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL
+import android.provider.CalendarContract.Events
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.GrantPermissionRule
+import at.bitfire.ical4android.Event
+import at.bitfire.ical4android.util.MiscUtils.closeCompat
+import at.bitfire.synctools.storage.calendar.AndroidCalendarProvider
+import at.techbee.jtx.JtxContract.asSyncAdapter
+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.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import java.util.UUID
+import javax.inject.Inject
+
+@HiltAndroidTest
+class LocalEventTest {
+
+    @get:Rule
+    val hiltRule = HiltAndroidRule(this)
+
+    @get:Rule
+    val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CALENDAR, Manifest.permission.WRITE_CALENDAR)
+
+    @Inject
+    lateinit var localCalendarFactory: LocalCalendar.Factory
+
+    private val account = Account("LocalCalendarTest", ACCOUNT_TYPE_LOCAL)
+    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)
+        calendar = localCalendarFactory.create(provider.createAndGetCalendar(ContentValues()))
+    }
+
+    @After
+    fun tearDown() {
+        calendar.androidCalendar.delete()
+        client.closeCompat()
+    }
+
+
+    @Test
+    fun testPrepareForUpload_NoUid() {
+        // create event
+        val event = Event().apply {
+            dtStart = DtStart("20220120T010203Z")
+            summary = "Event without uid"
+        }
+
+        calendar.add(
+            event = event,
+            fileName = "filename.ics",
+            eTag = null,
+            scheduleTag = null,
+            flags = LocalResource.FLAG_REMOTELY_PRESENT
+        )
+        val localEvent = calendar.findByName("filename.ics")!!
+
+        // 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
+        client.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
+        }
+        calendar.add(
+            event = event,
+            fileName = "filename.ics",
+            eTag = null,
+            scheduleTag = null,
+            flags = LocalResource.FLAG_REMOTELY_PRESENT
+        )
+        val localEvent = calendar.findByName("filename.ics")!!
+
+        // 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
+        client.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-"
+        }
+        calendar.add(
+            event = event,
+            fileName = "filename.ics",
+            eTag = null,
+            scheduleTag = null,
+            flags = LocalResource.FLAG_REMOTELY_PRESENT
+        )
+        val localEvent = calendar.findByName("filename.ics")!!
+
+        // 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
+        client.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
+            })
+        }
+        calendar.add(
+            event = event,
+            fileName = "filename.ics",
+            eTag = null,
+            scheduleTag = null,
+            flags = LocalResource.FLAG_REMOTELY_PRESENT
+        )
+        val localEvent = calendar.findByName("filename.ics")!!
+        val eventId = localEvent.id!!
+
+        // set event as dirty
+        client.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
+        client.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"))
+        }
+        calendar.add(
+            event = event,
+            fileName = "filename.ics",
+            eTag = null,
+            scheduleTag = null,
+            flags = LocalResource.FLAG_REMOTELY_PRESENT
+        )
+        val localEvent = calendar.findByName("filename.ics")!!
+        val eventId = localEvent.id!!
+
+        // set event as dirty
+        client.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
+        client.query(
+            ContentUris.withAppendedId(Events.CONTENT_URI.asSyncAdapter(account), eventId),
+            arrayOf(Events.DELETED), null, null, null
+        )!!.use { cursor ->
+            cursor.moveToNext()
+            assertEquals(0, cursor.getInt(0))
+        }
+    }
+
+}

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

@@ -21,11 +21,15 @@ 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
@@ -34,34 +38,22 @@ 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() {
@@ -154,6 +146,7 @@ class LocalGroupTest {
         }
     }
 
+
     @Test
     fun testClearDirty_addCachedGroupMembership() {
         localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
@@ -221,6 +214,7 @@ class LocalGroupTest {
             }
     }
 
+
     @Test
     fun testMarkMembersDirty() {
         localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
@@ -240,11 +234,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 +260,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/servicedetection/CollectionsWithoutHomeSetRefresherTest.kt

@@ -4,23 +4,24 @@
 
 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.Service
-import at.bitfire.davdroid.network.HttpClientBuilder
+import at.bitfire.davdroid.network.HttpClient
 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.Assume
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -40,7 +41,7 @@ class CollectionsWithoutHomeSetRefresherTest {
     lateinit var db: AppDatabase
 
     @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
+    lateinit var httpClientBuilder: HttpClient.Builder
 
     @Inject
     lateinit var logger: Logger
@@ -52,7 +53,7 @@ class CollectionsWithoutHomeSetRefresherTest {
     @MockK(relaxed = true)
     lateinit var settings: SettingsManager
 
-    private lateinit var client: OkHttpClient
+    private lateinit var client: HttpClient
     private lateinit var mockServer: MockWebServer
     private lateinit var service: Service
 
@@ -68,6 +69,7 @@ class CollectionsWithoutHomeSetRefresherTest {
 
         // build HTTP client
         client = httpClientBuilder.build()
+        Assume.assumeTrue(NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted)
 
         // insert test service
         val serviceId = db.serviceDao().insertOrReplace(
@@ -78,6 +80,7 @@ class CollectionsWithoutHomeSetRefresherTest {
 
     @After
     fun tearDown() {
+        client.close()
         mockServer.shutdown()
     }
 
@@ -99,7 +102,7 @@ class CollectionsWithoutHomeSetRefresherTest {
         )
 
         // Refresh
-        refresherFactory.create(service, client).refreshCollectionsWithoutHomeSet()
+        refresherFactory.create(service, client.okHttpClient).refreshCollectionsWithoutHomeSet()
 
         // Check the collection got updated - with display name and description
         assertEquals(
@@ -132,7 +135,7 @@ class CollectionsWithoutHomeSetRefresherTest {
         )
 
         // Refresh - should delete collection
-        refresherFactory.create(service, client).refreshCollectionsWithoutHomeSet()
+        refresherFactory.create(service, client.okHttpClient).refreshCollectionsWithoutHomeSet()
 
         // Check the collection got deleted
         assertEquals(null, db.collectionDao().get(collectionId))
@@ -154,7 +157,7 @@ class CollectionsWithoutHomeSetRefresherTest {
 
         // Refresh homeless collections
         assertEquals(0, db.principalDao().getByService(service.id).size)
-        refresherFactory.create(service, client).refreshCollectionsWithoutHomeSet()
+        refresherFactory.create(service, client.okHttpClient).refreshCollectionsWithoutHomeSet()
 
         // Check principal saved and the collection was updated with its reference
         val principals = db.principalDao().getByService(service.id)

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.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, getCredentials = { 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

@@ -4,11 +4,12 @@
 
 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.Service
-import at.bitfire.davdroid.network.HttpClientBuilder
+import at.bitfire.davdroid.network.HttpClient
 import at.bitfire.davdroid.settings.Settings
 import at.bitfire.davdroid.settings.SettingsManager
 import dagger.hilt.android.testing.BindValue
@@ -20,13 +21,13 @@ 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.Assume
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -46,7 +47,7 @@ class HomeSetRefresherTest {
     lateinit var db: AppDatabase
 
     @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
+    lateinit var httpClientBuilder: HttpClient.Builder
 
     @Inject
     lateinit var logger: Logger
@@ -58,7 +59,7 @@ class HomeSetRefresherTest {
     @MockK(relaxed = true)
     lateinit var settings: SettingsManager
 
-    private lateinit var client: OkHttpClient
+    private lateinit var client: HttpClient
     private lateinit var mockServer: MockWebServer
     private lateinit var service: Service
 
@@ -74,6 +75,7 @@ class HomeSetRefresherTest {
 
         // build HTTP client
         client = httpClientBuilder.build()
+        Assume.assumeTrue(NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted)
 
         // insert test service
         val serviceId = db.serviceDao().insertOrReplace(
@@ -84,6 +86,7 @@ class HomeSetRefresherTest {
 
     @After
     fun tearDown() {
+        client.close()
         mockServer.shutdown()
     }
 
@@ -98,7 +101,7 @@ class HomeSetRefresherTest {
         )
 
         // Refresh
-        homeSetRefresherFactory.create(service, client)
+        homeSetRefresherFactory.create(service, client.okHttpClient)
             .refreshHomesetsAndTheirCollections()
 
         // Check the collection defined in homeset is now in the database
@@ -134,7 +137,7 @@ class HomeSetRefresherTest {
         )
 
         // Refresh
-        homeSetRefresherFactory.create(service, client).refreshHomesetsAndTheirCollections()
+        homeSetRefresherFactory.create(service, client.okHttpClient).refreshHomesetsAndTheirCollections()
 
         // Check the collection got updated
         assertEquals(
@@ -171,7 +174,7 @@ class HomeSetRefresherTest {
         )
 
         // Refresh
-        homeSetRefresherFactory.create(service, client).refreshHomesetsAndTheirCollections()
+        homeSetRefresherFactory.create(service, client.okHttpClient).refreshHomesetsAndTheirCollections()
 
         // Check the collection got updated
         assertEquals(
@@ -211,7 +214,7 @@ class HomeSetRefresherTest {
         )
 
         // Refresh - should mark collection as homeless, because serverside homeset is empty.
-        homeSetRefresherFactory.create(service, client).refreshHomesetsAndTheirCollections()
+        homeSetRefresherFactory.create(service, client.okHttpClient).refreshHomesetsAndTheirCollections()
 
         // Check the collection, is now marked as homeless
         assertEquals(null, db.collectionDao().get(collectionId)!!.homeSetId)
@@ -238,7 +241,7 @@ class HomeSetRefresherTest {
 
         // Refresh - homesets and their collections
         assertEquals(0, db.principalDao().getByService(service.id).size)
-        homeSetRefresherFactory.create(service, client).refreshHomesetsAndTheirCollections()
+        homeSetRefresherFactory.create(service, client.okHttpClient).refreshHomesetsAndTheirCollections()
 
         // Check principal saved and the collection was updated with its reference
         val principals = db.principalDao().getByService(service.id)
@@ -275,7 +278,7 @@ class HomeSetRefresherTest {
             )
         )
 
-        val refresher = homeSetRefresherFactory.create(service, client)
+        val refresher = homeSetRefresherFactory.create(service, client.okHttpClient)
         assertFalse(refresher.shouldPreselect(collection, homesets))
     }
 
@@ -300,7 +303,7 @@ class HomeSetRefresherTest {
             )
         )
 
-        val refresher = homeSetRefresherFactory.create(service, client)
+        val refresher = homeSetRefresherFactory.create(service, client.okHttpClient)
         assertTrue(refresher.shouldPreselect(collection, homesets))
     }
 
@@ -327,7 +330,7 @@ class HomeSetRefresherTest {
             )
         )
 
-        val refresher = homeSetRefresherFactory.create(service, client)
+        val refresher = homeSetRefresherFactory.create(service, client.okHttpClient)
         assertFalse(refresher.shouldPreselect(collection, homesets))
     }
 
@@ -352,7 +355,7 @@ class HomeSetRefresherTest {
             )
         )
 
-        val refresher = homeSetRefresherFactory.create(service, client)
+        val refresher = homeSetRefresherFactory.create(service, client.okHttpClient)
         assertFalse(refresher.shouldPreselect(collection, homesets))
     }
 
@@ -377,7 +380,7 @@ class HomeSetRefresherTest {
             )
         )
 
-        val refresher = homeSetRefresherFactory.create(service, client)
+        val refresher = homeSetRefresherFactory.create(service, client.okHttpClient)
         assertTrue(refresher.shouldPreselect(collection, homesets))
     }
 
@@ -404,7 +407,7 @@ class HomeSetRefresherTest {
             )
         )
 
-        val refresher = homeSetRefresherFactory.create(service, client)
+        val refresher = homeSetRefresherFactory.create(service, client.okHttpClient)
         assertFalse(refresher.shouldPreselect(collection, homesets))
     }
 

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

@@ -4,11 +4,12 @@
 
 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.Principal
 import at.bitfire.davdroid.db.Service
-import at.bitfire.davdroid.network.HttpClientBuilder
+import at.bitfire.davdroid.network.HttpClient
 import at.bitfire.davdroid.settings.SettingsManager
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
@@ -16,12 +17,12 @@ 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.Assume
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -35,7 +36,7 @@ class PrincipalsRefresherTest {
     lateinit var db: AppDatabase
 
     @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
+    lateinit var httpClientBuilder: HttpClient.Builder
 
     @Inject
     lateinit var logger: Logger
@@ -53,7 +54,7 @@ class PrincipalsRefresherTest {
     @get:Rule
     val mockKRule = MockKRule(this)
 
-    private lateinit var client: OkHttpClient
+    private lateinit var client: HttpClient
     private lateinit var mockServer: MockWebServer
     private lateinit var service: Service
 
@@ -69,6 +70,7 @@ class PrincipalsRefresherTest {
 
         // build HTTP client
         client = httpClientBuilder.build()
+        Assume.assumeTrue(NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted)
 
         // insert test service
         val serviceId = db.serviceDao().insertOrReplace(
@@ -79,6 +81,7 @@ class PrincipalsRefresherTest {
 
     @After
     fun tearDown() {
+        client.close()
         mockServer.shutdown()
     }
 
@@ -107,7 +110,7 @@ class PrincipalsRefresherTest {
         )
 
         // Refresh principals
-        principalsRefresher.create(service, client).refreshPrincipals()
+        principalsRefresher.create(service, client.okHttpClient).refreshPrincipals()
 
         // Check principal was not updated
         val principals = db.principalDao().getByService(service.id)
@@ -140,7 +143,7 @@ class PrincipalsRefresherTest {
         )
 
         // Refresh principals
-        principalsRefresher.create(service, client).refreshPrincipals()
+        principalsRefresher.create(service, client.okHttpClient).refreshPrincipals()
 
         // Check principal now got a display name
         val principals = db.principalDao().getByService(service.id)
@@ -161,7 +164,7 @@ class PrincipalsRefresherTest {
         )
 
         // Refresh principals - detecting it does not own collections
-        principalsRefresher.create(service, client).refreshPrincipals()
+        principalsRefresher.create(service, client.okHttpClient).refreshPrincipals()
 
         // Check principal was deleted
         val principals = db.principalDao().getByService(service.id)

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

@@ -4,18 +4,19 @@
 
 package at.bitfire.davdroid.servicedetection
 
+import android.security.NetworkSecurityPolicy
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Service
-import at.bitfire.davdroid.network.HttpClientBuilder
+import at.bitfire.davdroid.network.HttpClient
 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.Assume
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -32,7 +33,7 @@ class ServiceRefresherTest {
     lateinit var db: AppDatabase
 
     @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
+    lateinit var httpClientBuilder: HttpClient.Builder
 
     @Inject
     lateinit var logger: Logger
@@ -40,7 +41,7 @@ class ServiceRefresherTest {
     @Inject
     lateinit var serviceRefresherFactory: ServiceRefresher.Factory
 
-    private lateinit var client: OkHttpClient
+    private lateinit var client: HttpClient
     private lateinit var mockServer: MockWebServer
     private lateinit var service: Service
 
@@ -56,6 +57,7 @@ class ServiceRefresherTest {
 
         // build HTTP client
         client = httpClientBuilder.build()
+        Assume.assumeTrue(NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted)
 
         // insert test service
         val serviceId = db.serviceDao().insertOrReplace(
@@ -66,6 +68,7 @@ class ServiceRefresherTest {
 
     @After
     fun tearDown() {
+        client.close()
         mockServer.shutdown()
     }
 
@@ -75,7 +78,7 @@ class ServiceRefresherTest {
         val baseUrl = mockServer.url(PATH_CARDDAV + SUBPATH_PRINCIPAL)
 
         // Query home sets
-        serviceRefresherFactory.create(service, client)
+        serviceRefresherFactory.create(service, client.okHttpClient)
             .discoverHomesets(baseUrl)
 
         // Check home set has been saved correctly to database

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

@@ -6,20 +6,22 @@ package at.bitfire.davdroid.sync
 
 import android.accounts.Account
 import android.content.ContentResolver
+import android.content.Context
 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.qualifiers.ApplicationContext
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
+import io.mockk.junit4.MockKRule
+import junit.framework.AssertionFailedError
 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
@@ -31,11 +33,18 @@ import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
 
 @HiltAndroidTest
-class AndroidSyncFrameworkTest: SyncStatusObserver {
+class AndroidSyncFrameworkTest {
 
     @get:Rule
     val hiltRule = HiltAndroidRule(this)
 
+    @get:Rule
+    val mockkRule = MockKRule(this)
+
+    @Inject
+    @ApplicationContext
+    lateinit var context: Context
+
     @Inject
     lateinit var logger: Logger
 
@@ -59,7 +68,7 @@ class AndroidSyncFrameworkTest: SyncStatusObserver {
         onStatusChanged(0)      // record first entry (pending = false, active = false)
         stateChangeListener = ContentResolver.addStatusChangeListener(
             ContentResolver.SYNC_OBSERVER_TYPE_PENDING or ContentResolver.SYNC_OBSERVER_TYPE_ACTIVE,
-            this
+            ::onStatusChanged
         )
     }
 
@@ -88,11 +97,11 @@ class AndroidSyncFrameworkTest: SyncStatusObserver {
         )
     }
 
-    /* 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 */)
+    @SdkSuppress(minSdkVersion = 34 /*, maxSdkVersion = 36 */)
     @Test
     fun testVerifySyncAlwaysPending_wrongBehaviour_android14() {
         verifySyncStates(
@@ -103,7 +112,7 @@ class AndroidSyncFrameworkTest: SyncStatusObserver {
                 State(pending = true, active = false)                   // ... and finishes, but stays pending
             )
         )
-    }*/
+    }
 
 
     // helpers
@@ -120,10 +129,6 @@ class AndroidSyncFrameworkTest: SyncStatusObserver {
      * 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.
@@ -138,60 +143,47 @@ class AndroidSyncFrameworkTest: SyncStatusObserver {
             while (recordedStates.size < expectedStates.size) {
                 // verify already known states
                 if (recordedStates.isNotEmpty())
-                    assertStatesEqual(expectedStates, recordedStates, fullMatch = false)
+                    assertStatesEqual(expectedStates.subList(0, recordedStates.size), recordedStates)
 
                 delay(500) // avoid busy-waiting
             }
 
-            assertStatesEqual(expectedStates, recordedStates, fullMatch = true)
+            assertStatesEqual(expectedStates, recordedStates)
         }
     }
 
-    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
+     * Asserts whether [actualStates] and [expectedStates] are the same, 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 {
+    private fun assertStatesEqual(expectedStates: List<State>, actualStates: List<State>) {
+        fun fail() {
+            throw AssertionFailedError("Expected states=$expectedStates, actual=$actualStates")
+        }
+
         // iterate through entries
         val expectedIterator = expectedStates.iterator()
         for (actual in actualStates) {
             if (!expectedIterator.hasNext())
-                return false
+                fail()
             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
+                    fail()
                 expected = expectedIterator.next()
             }
 
-            // we now have a non-optional expected state and it must match
             if (!actual.stateEquals(expected))
-                return false
+                fail()
         }
-
-        // 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) {
+    fun onStatusChanged(which: Int) {
         val state = State(
             pending = ContentResolver.isSyncPending(account, authority),
             active = ContentResolver.isSyncActive(account, authority)

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

@@ -9,7 +9,7 @@ import android.content.ContentProviderClient
 import android.content.Context
 import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.db.Service
-import at.bitfire.davdroid.network.HttpClientBuilder
+import at.bitfire.davdroid.network.HttpClient
 import at.bitfire.davdroid.repository.DavServiceRepository
 import at.bitfire.davdroid.resource.LocalJtxCollection
 import at.bitfire.davdroid.resource.LocalJtxCollectionStore
@@ -46,7 +46,7 @@ class JtxSyncManagerTest {
     lateinit var context: Context
 
     @Inject
-    lateinit var httpClientBuilder: HttpClientBuilder
+    lateinit var httpClientBuilder: HttpClient.Builder
 
     @Inject
     lateinit var serviceRepository: DavServiceRepository

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

@@ -4,11 +4,10 @@
 
 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,6 +18,8 @@ class LocalTestResource: LocalResource {
     var deleted = false
     var dirty = false
 
+    override fun prepareForUpload() = "generated-file.txt"
+
     override fun clearDirty(fileName: Optional<String>, eTag: String?, scheduleTag: String?) {
         dirty = false
         if (fileName.isPresent)
@@ -31,14 +32,8 @@ class LocalTestResource: LocalResource {
         this.flags = flags
     }
 
-    override fun updateUid(uid: String) { /* no-op */ }
-    override fun updateSequence(sequence: Int) = throw NotImplementedError()
-
+    override fun update(data: Any, fileName: String?, eTag: String?, scheduleTag: String?, flags: Int) = throw NotImplementedError()
     override fun deleteLocal() = throw NotImplementedError()
     override fun resetDeleted() = throw NotImplementedError()
 
-    override fun getDebugSummary() = "Test Resource"
-
-    override fun getViewUri(context: Context) = null
-
 }

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

@@ -8,14 +8,14 @@ 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.network.HttpClient
 import at.bitfire.davdroid.repository.DavSyncStatsRepository
 import at.bitfire.davdroid.resource.SyncState
 import at.bitfire.davdroid.settings.AccountSettings
@@ -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

@@ -194,7 +194,7 @@ class SyncerTest {
         }
 
         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,13 +5,13 @@
 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.di.qualifier.SyncDispatcher
+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
@@ -20,13 +20,13 @@ 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

@@ -5,7 +5,6 @@
 package at.bitfire.davdroid.webdav
 
 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 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))