Merge branch 'main-ose' into 1737-enable-push-by-default

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

.github/CODEOWNERS

@@ -3,3 +3,6 @@
 
 # Dependabot
 gradle/**   @bitfireAT/app-dev
+
+# everything else
+*   @rfc2822

.github/ISSUE_TEMPLATE/qualified-bug.yml

@@ -1,7 +1,7 @@
 name: Qualified Bug Report
 description: "For qualified bug reports. (Use Discussions if unsure.)"
 type: bug
-labels: ["needs-triage"]
+labels: ["bug"]
 body:
   - type: checkboxes
     attributes:

.github/ISSUE_TEMPLATE/qualified-feature.yml

@@ -1,7 +1,7 @@
 name: Qualified Feature Request
 description: "For qualified feature requests. (Use Discussions if unsure.)"
 type: feature
-labels: ["needs-triage"]
+labels: ["enhancement"]
 body:
   - type: checkboxes
     attributes:

.github/workflows/codeql.yml

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

.github/workflows/dependency-submission.yml

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

.github/workflows/release.yml

@@ -9,7 +9,6 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  java-version: 21
   prerelease: ${{ contains(github.ref_name, '-alpha') || contains(github.ref_name, '-beta') || contains(github.ref_name, '-rc') }}
 
 jobs:
@@ -24,17 +23,15 @@ jobs:
       - uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: ${{ env.java-version }}
+          java-version: 21
       - uses: gradle/actions/setup-gradle@v5
-        with:
-          cache-encryption-key: ${{ secrets.gradle_encryption_key }}
 
       - name: Prepare keystore
         run: echo ${{ secrets.android_keystore_base64 }} | base64 -d >$GITHUB_WORKSPACE/keystore.jks
 
       - name: Build signed package
-        # don't use build cache to guarantee deterministic, fresh builds
-        run: ./gradlew --no-build-cache --configuration-cache --no-daemon app:clean app-ose:assembleRelease
+        # Use build cache to speed up building of build variants, but clean caches from previous tests before
+        run: ./gradlew --build-cache --configuration-cache --no-daemon app:clean app:assembleRelease
         env:
           ANDROID_KEYSTORE: ${{ github.workspace }}/keystore.jks
           ANDROID_KEYSTORE_PASSWORD: ${{ secrets.android_keystore_password }}
@@ -45,6 +42,6 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           prerelease: ${{ env.prerelease }}
-          files: app-ose/build/outputs/apk/ose/release/*.apk
+          files: app/build/outputs/apk/ose/release/*.apk
           fail_on_unmatched_files: true
           generate_release_notes: true

.github/workflows/test-dev.yml

@@ -2,7 +2,7 @@ name: Development tests
 on:
   push:
     branches:
-      - 'main'
+      - 'main-ose'
   pull_request:
 
 concurrency:
@@ -18,7 +18,6 @@ env:
   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
-  JAVA_VERSION: 21
 
 jobs:
   compile:
@@ -29,17 +28,31 @@ jobs:
       - uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: ${{ env.JAVA_VERSION }}
+          java-version: 21
 
       # See https://community.gradle.org/github-actions/docs/setup-gradle/ for more information
       - uses: gradle/actions/setup-gradle@v5
         with:
           cache-encryption-key: ${{ secrets.gradle_encryption_key }}
-          cache-read-only: false                            # allow to update the cache
+          cache-read-only: false                            # allow branches to update their configuration cache
           gradle-home-cache-excludes: caches/build-cache-1  # don't cache local build cache because we use a remote cache
 
+      - name: Cache Android environment
+        uses: actions/cache@v5
+        with:
+          path: ~/.config/.android                          # needs to be cached so that configuration cache can work
+          key: android-${{ hashFiles('app/build.gradle.kts') }}
+
       - name: Compile
-        run: ./gradlew app-ose:assembleDebug
+        run: ./gradlew app:compileOseDebugSource
+
+      # Cache configurations for the other jobs (including assemble for CodeQL)
+      - name: Populate configuration cache
+        run: |
+          ./gradlew --dry-run app:assembleDebug
+          ./gradlew --dry-run app:lintOseDebug
+          ./gradlew --dry-run app:testOseDebugUnitTest
+          ./gradlew --dry-run app:virtualOseDebugAndroidTest
 
   unit_tests:
     needs: compile
@@ -50,18 +63,23 @@ jobs:
       - uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: ${{ env.JAVA_VERSION }}
+          java-version: 21
       - uses: gradle/actions/setup-gradle@v5
         with:
           cache-encryption-key: ${{ secrets.gradle_encryption_key }}
           cache-read-only: true
 
+      - name: Restore Android environment
+        uses: actions/cache/restore@v5
+        with:
+          path: ~/.config/.android
+          key: android-${{ hashFiles('app/build.gradle.kts') }}
+
       - name: Lint checks
-        run: ./gradlew core:lintDebug app:lintOseDebug
+        run: ./gradlew app:lintOseDebug
 
       - name: Unit tests
-        # currently no unit tests for app-ose
-        run: ./gradlew core:testDebugUnitTest
+        run: ./gradlew app:testOseDebugUnitTest
 
   instrumented_tests:
     needs: compile
@@ -72,12 +90,18 @@ jobs:
       - uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: ${{ env.JAVA_VERSION }}
+          java-version: 21
       - uses: gradle/actions/setup-gradle@v5
         with:
           cache-encryption-key: ${{ secrets.gradle_encryption_key }}
           cache-read-only: true
 
+      - name: Restore Android environment
+        uses: actions/cache/restore@v5
+        with:
+          path: ~/.config/.android
+          key: android-${{ hashFiles('app/build.gradle.kts') }}
+
       # gradle and Android SDK often take more space than what is available on the default runner.
       # We try to free a few GB here to make gradle-managed devices more reliable.
       - name: Free some disk space
@@ -91,8 +115,8 @@ jobs:
         id: restore-avd
         uses: actions/cache/restore@v5
         with:
-          path: ~/.config/.android/avd                          # where AVD is stored
-          key: avd-${{ hashFiles('app-ose/build.gradle.kts') }} # gradle-managed devices are defined there
+          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
@@ -102,12 +126,11 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: Instrumented tests
-        # currently no instrumented tests for app-ose
-        run: ./gradlew core:virtualDebugAndroidTest
+        run: ./gradlew app:virtualOseDebugAndroidTest
 
       - name: Cache AVD
         uses: actions/cache/save@v5
         if: steps.restore-avd.outputs.cache-hit != 'true'
         with:
-          path: ~/.config/.android/avd                          # where AVD is stored
-          key: avd-${{ hashFiles('app-ose/build.gradle.kts') }} # gradle-managed devices are defined there
+          path: ~/.config/.android/avd                        # where AVD is stored
+          key: avd-${{ hashFiles('app/build.gradle.kts') }}   # gradle-managed devices are defined there

app-ose/build.gradle.kts

@@ -1,130 +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)
-    alias(libs.plugins.mikepenz.aboutLibraries.android)
-}
-
-android {
-    compileSdk = 36
-
-    defaultConfig {
-        minSdk = 24        // Android 7.0
-        targetSdk = 36     // Android 16
-
-        applicationId = "at.bitfire.davdroid"
-
-        versionCode = 405100000
-        versionName = "4.5.10-alpha.1"
-
-        base.archivesName = "davx5-$versionCode-$versionName"
-
-        // currently no instrumentation tests for app-ose, so no testInstrumentationRunner
-    }
-
-    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
-    }
-
-    @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"
-                }
-            }
-        }
-    }
-
-    signingConfigs {
-        create("bitfire") {
-            storeFile = file(System.getenv("ANDROID_KEYSTORE") ?: "/dev/null")
-            storePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD")
-            keyAlias = System.getenv("ANDROID_KEY_ALIAS")
-            keyPassword = System.getenv("ANDROID_KEY_PASSWORD")
-        }
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules-release.pro")
-
-            isShrinkResources = true
-
-            // must be after signingConfigs {} block
-            signingConfig = signingConfigs.findByName("bitfire")
-        }
-    }
-}
-
-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/proguard-rules-release.pro

@@ -1,5 +0,0 @@
-
--dontobfuscate
--printusage build/reports/r8-usage.txt
-
-# keep rules are taken from core/core-proguard-rules.pro

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/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 IntroPageFactoryModule {
-    @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,7 +3,7 @@
  */
 
 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)
@@ -16,12 +16,20 @@ android {
     compileSdk = 36
 
     defaultConfig {
+        applicationId = "at.bitfire.davdroid"
+
+        versionCode = 405090002
+        versionName = "4.5.9-rc.1"
+
+        base.archivesName = "davx5-ose-$versionName"
+
         minSdk = 24        // Android 7.0
+        targetSdk = 36     // Android 16
+
+        // whether the build supports and allows to use custom certificates
+        buildConfigField("boolean", "allowCustomCerts", "true")
 
         testInstrumentationRunner = "at.bitfire.davdroid.HiltTestRunner"
-
-        // include these rules in the app that uses the core library
-        consumerProguardFile("core-proguard-rules.pro")
     }
 
     java {
@@ -45,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")
         }
     }
 
@@ -55,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
@@ -62,12 +102,6 @@ android {
         }
     }
 
-    sourceSets {
-        getByName("androidTest") {
-            assets.srcDir("$projectDir/schemas")
-        }
-    }
-
     @Suppress("UnstableApiUsage")
     testOptions {
         managedDevices {
@@ -96,7 +130,7 @@ aboutLibraries {
 }
 
 dependencies {
-    // Kotlin / Android
+    // core
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlinx.coroutines)
     coreLibraryDesugaring(libs.android.desugaring)
@@ -133,7 +167,7 @@ dependencies {
 
     // Glance Widgets
     implementation(libs.androidx.glance.base)
-    implementation(libs.androidx.glance.material3)
+    implementation(libs.androidx.glance.material)
 
     // Jetpack Room
     implementation(libs.androidx.room.runtime)

app/proguard-rules-release.pro

@@ -1,4 +1,13 @@
 
+# R8 usage for DAVx⁵:
+#    shrinking        yes (only in release builds)
+#    optimization     yes (on by R8 defaults)
+#      full-mode      no (see gradle.properties)
+#    obfuscation      no (open-source)
+
+-dontobfuscate
+-printusage build/reports/r8-usage.txt
+
 # keep rules
 -keep class at.bitfire.** { *; }        # all DAVx5 code is required
 -keep class org.xmlpull.** { *; }

app/src/.gitignore

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

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

@@ -28,11 +28,11 @@ class AutoMigration16Test: DatabaseMigrationTest(toVersion = 16) {
             """.trimIndent()
             db.execSQL(
                 "INSERT INTO service (id, accountName, type) VALUES (?, ?, ?)",
-                arrayOf<Any>(1, "test", Service.Companion.TYPE_CALDAV)
+                arrayOf(1, "test", Service.Companion.TYPE_CALDAV)
             )
             db.execSQL(
                 "INSERT INTO collection (id, serviceId, type, url, privWriteContent, privUnbind, forceReadOnly, sync, timezone) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
-                arrayOf<Any>(1, 1, TYPE_CALENDAR, "https://example.com", true, true, false, false, minimalVTimezone)
+                arrayOf(1, 1, TYPE_CALENDAR, "https://example.com", true, true, false, false, minimalVTimezone)
             )
         }
     ) { db ->
@@ -47,11 +47,11 @@ class AutoMigration16Test: DatabaseMigrationTest(toVersion = 16) {
         prepare = { db ->
             db.execSQL(
                 "INSERT INTO service (id, accountName, type) VALUES (?, ?, ?)",
-                arrayOf<Any>(1, "test", Service.Companion.TYPE_CALDAV)
+                arrayOf(1, "test", Service.Companion.TYPE_CALDAV)
             )
             db.execSQL(
                 "INSERT INTO collection (id, serviceId, type, url, privWriteContent, privUnbind, forceReadOnly, sync, timezone) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
-                arrayOf<Any>(1, 1, TYPE_CALENDAR, "https://example.com", true, true, false, false, "Some Garbage Content")
+                arrayOf(1, 1, TYPE_CALENDAR, "https://example.com", true, true, false, false, "Some Garbage Content")
             )
         }
     ) { db ->
@@ -66,11 +66,11 @@ class AutoMigration16Test: DatabaseMigrationTest(toVersion = 16) {
         prepare = { db ->
             db.execSQL(
                 "INSERT INTO service (id, accountName, type) VALUES (?, ?, ?)",
-                arrayOf<Any>(1, "test", Service.Companion.TYPE_CALDAV)
+                arrayOf(1, "test", Service.Companion.TYPE_CALDAV)
             )
             db.execSQL(
                 "INSERT INTO collection (id, serviceId, type, url, privWriteContent, privUnbind, forceReadOnly, sync) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
-                arrayOf<Any>(1, 1, TYPE_CALENDAR, "https://example.com", true, true, false, false)
+                arrayOf(1, 1, TYPE_CALENDAR, "https://example.com", true, true, false, false)
             )
         }
     ) { db ->

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

@@ -5,20 +5,20 @@
 package at.bitfire.davdroid.di
 
 import at.bitfire.davdroid.startup.StartupPlugin
+import at.bitfire.davdroid.startup.TasksAppWatcher
 import dagger.Module
 import dagger.hilt.components.SingletonComponent
 import dagger.hilt.testing.TestInstallIn
 import dagger.multibindings.Multibinds
 
+// remove TasksAppWatcherModule from Android tests
 @Module
 @TestInstallIn(
     components = [SingletonComponent::class],
-    replaces = [StartupPluginsModule::class]
+    replaces = [TasksAppWatcher.TasksAppWatcherModule::class]
 )
-abstract class TestStartupPluginsModule {
-
-    // provides empty set of startup plugins so that nothing interferes with tests
+abstract class TestTasksAppWatcherModule {
+    // provides empty set of plugins
     @Multibinds
     abstract fun empty(): Set<StartupPlugin>
-
 }

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

@@ -11,7 +11,7 @@ import at.bitfire.dav4jvm.okhttp.Response
 import at.bitfire.dav4jvm.property.caldav.CalDAV
 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.resource.LocalResource
 import at.bitfire.davdroid.resource.SyncState
 import at.bitfire.davdroid.util.DavUtils.lastSegment

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

@@ -5,7 +5,7 @@
 package at.bitfire.davdroid.ui
 
 import android.content.Context
-import at.bitfire.davdroid.di.qualifier.IoDispatcher
+import at.bitfire.davdroid.di.IoDispatcher
 import at.bitfire.davdroid.ui.about.AboutModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.testing.HiltAndroidRule