Add OpenID AppAuth library

- Add managed device for testing
- Set device to "Pixel 3" with API level 34
- Use AOSP system image source

.github/workflows/test-dev.yml

@@ -49,10 +49,10 @@ jobs:
       # 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
+          ./gradlew --dry-run core:assembleDebug app:assembleDebug
+          ./gradlew --dry-run core:lintDebug app:lintOseDebug
+          ./gradlew --dry-run core:testDebugUnitTest app:testOseDebugUnitTest
+          ./gradlew --dry-run core:virtualDebugAndroidTest app:virtualOseDebugAndroidTest
 
   unit_tests:
     needs: compile
@@ -76,10 +76,10 @@ jobs:
           key: android-${{ hashFiles('app/build.gradle.kts') }}
 
       - name: Lint checks
-        run: ./gradlew app:lintOseDebug
+        run: ./gradlew core:lintDebug app:lintOseDebug
 
       - name: Unit tests
-        run: ./gradlew app:testOseDebugUnitTest
+        run: ./gradlew core:testDebugUnitTest app:testOseDebugUnitTest
 
   instrumented_tests:
     needs: compile
@@ -126,7 +126,7 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: Instrumented tests
-        run: ./gradlew app:virtualOseDebugAndroidTest
+        run: ./gradlew core:virtualDebugAndroidTest app:virtualOseDebugAndroidTest
 
       - name: Cache AVD
         uses: actions/cache/save@v5

app-ose/build.gradle.kts

@@ -0,0 +1,132 @@
+/*
+ * 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"
+        }
+    }
+
+    sourceSets {
+        getByName("androidTest") {
+            assets.srcDir("$projectDir/schemas")
+        }
+    }
+
+    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 module
+    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

@@ -0,0 +1,11 @@
+<?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"
+        android:installLocation="internalOnly">
+
+    <application android:name=".App"/>
+
+</manifest>

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

@@ -2,12 +2,12 @@
  * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
  */
 
-package at.bitfire.davdroid
+package com.davx5.ose
 
 import android.app.Application
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
-import at.bitfire.davdroid.di.DefaultDispatcher
+import at.bitfire.davdroid.di.scope.DefaultDispatcher
 import at.bitfire.davdroid.log.LogManager
 import at.bitfire.davdroid.startup.StartupPlugin
 import at.bitfire.davdroid.sync.account.AccountsCleanupWorker
@@ -27,7 +27,7 @@ class App: Application(), Configuration.Provider {
     lateinit var logger: Logger
 
     /**
-     * Creates the [LogManager] singleton and thus initializes logging.
+     * Creates the [at.bitfire.davdroid.log.LogManager] singleton and thus initializes logging.
      */
     @Inject
     lateinit var logManager: LogManager
@@ -67,7 +67,7 @@ class App: Application(), Configuration.Provider {
         @OptIn(DelicateCoroutinesApi::class)
         GlobalScope.launch(defaultDispatcher) {
             // clean up orphaned accounts in DB from time to time
-            AccountsCleanupWorker.enable(this@App)
+            AccountsCleanupWorker.Companion.enable(this@App)
 
             // create/update app shortcuts
             UiUtils.updateShortcuts(this@App)

app-ose/src/ose/kotlin/com/davx5/ose/DebugInfoCrashHandler.kt

@@ -1,8 +1,8 @@
-/***************************************************************************************************
+/*
  * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- **************************************************************************************************/
+ */
 
-package at.bitfire.davdroid
+package com.davx5.ose
 
 import android.content.Context
 import at.bitfire.davdroid.ui.DebugInfoActivity

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

@@ -2,63 +2,60 @@
  * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
  */
 
-package at.bitfire.davdroid.di
+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.BuildConfig
 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
-import javax.inject.Singleton
 
-@Module
-@InstallIn(SingletonComponent::class)
 /**
  * cert4android integration module
  */
+@Module
+@InstallIn(SingletonComponent::class)
 class CustomCertManagerModule {
 
     @Provides
-    @Singleton
-    fun customCertManager(
-        @ApplicationContext context: Context,
-        settings: SettingsManager
-    ): Optional<CustomCertManager> =
-        if (BuildConfig.allowCustomCerts)
-            Optional.of(CustomCertManager(
-                certStore = CustomCertStore.getInstance(context),
-                settings = object : SettingsProvider {
-
-                    override val appInForeground: Boolean
-                        get() = ForegroundTracker.inForeground.value
-
-                    override val trustSystemCerts: Boolean
-                        get() = !settings.getBoolean(Settings.DISTRUST_SYSTEM_CERTIFICATES)
-
-                }
-            ))
-        else
-            Optional.empty()
+    fun customCertStore(@ApplicationContext context: Context): Optional<CustomCertStore> =
+        Optional.of(CustomCertStore.getInstance(context))
 
     @Provides
-    @Singleton
+    @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> =
-        if (BuildConfig.allowCustomCerts && customCertManager.isPresent) {
-            val hostnameVerifier = customCertManager.get().HostnameVerifier(OkHostnameVerifier)
-            Optional.of(hostnameVerifier)
-        } else
-            Optional.empty()
+        Optional.of(customCertManager.get().HostnameVerifier(OkHostnameVerifier))
 
 }

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

@@ -0,0 +1,28 @@
+/*
+ * 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.scope.DarkColorScheme
+import at.bitfire.davdroid.di.scope.LightColorScheme
+import com.davx5.ose.ui.OseTheme
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+class OseColorSchemesModule {
+
+    @Provides
+    @LightColorScheme
+    fun lightColorScheme(): ColorScheme = OseTheme.lightScheme
+
+    @Provides
+    @DarkColorScheme
+    fun darkColorScheme(): ColorScheme = OseTheme.darkScheme
+
+}

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

@@ -2,16 +2,16 @@
  * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
  */
 
-package at.bitfire.davdroid.di
+package com.davx5.ose.di
 
 import at.bitfire.davdroid.ui.AccountsDrawerHandler
 import at.bitfire.davdroid.ui.OseAccountsDrawerHandler
 import at.bitfire.davdroid.ui.about.AboutActivity
-import at.bitfire.davdroid.ui.about.OpenSourceLicenseInfoProvider
 import at.bitfire.davdroid.ui.intro.IntroPageFactory
-import at.bitfire.davdroid.ui.intro.OseIntroPageFactory
 import at.bitfire.davdroid.ui.setup.LoginTypesProvider
-import at.bitfire.davdroid.ui.setup.StandardLoginTypesProvider
+import com.davx5.ose.ui.about.OpenSourceLicenseInfoProvider
+import com.davx5.ose.ui.intro.OseIntroPageFactory
+import com.davx5.ose.ui.setup.StandardLoginTypesProvider
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn

app-ose/src/ose/kotlin/com/davx5/ose/ui/OseTheme.kt

@@ -2,14 +2,13 @@
  * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
  */
 
-package at.bitfire.davdroid.ui
+package com.davx5.ose.ui
 
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.ui.graphics.Color
 
-@Suppress("MemberVisibilityCanBePrivate")
-object M3ColorScheme {
+object OseTheme {
 
     // All colors hand-crafted because Material Theme Builder generates unbelievably ugly colors
 

app-ose/src/ose/kotlin/com/davx5/ose/ui/about/OpenSourceLicenseInfoProvider.kt

@@ -2,9 +2,9 @@
  * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
  */
 
-package at.bitfire.davdroid.ui.about
+package com.davx5.ose.ui.about
 
-import android.app.Application
+import android.content.Context
 import android.text.Spanned
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -14,13 +14,16 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.core.text.HtmlCompat
-import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.compose.viewModel
+import at.bitfire.davdroid.di.scope.IoDispatcher
 import at.bitfire.davdroid.ui.UiUtils.toAnnotatedString
+import at.bitfire.davdroid.ui.about.AboutActivity
 import com.google.common.io.CharStreams
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -40,13 +43,16 @@ class OpenSourceLicenseInfoProvider @Inject constructor(): AboutActivity.AppLice
 
 
     @HiltViewModel
-    class Model @Inject constructor(app: Application): AndroidViewModel(app) {
+    class Model @Inject constructor(
+        @ApplicationContext private val context: Context,
+        @IoDispatcher private val ioDispatcher: CoroutineDispatcher
+    ): ViewModel() {
 
         var gpl by mutableStateOf<Spanned?>(null)
 
         init {
-            viewModelScope.launch(Dispatchers.IO) {
-                app.resources.assets.open("gplv3.html").use { inputStream ->
+            viewModelScope.launch(ioDispatcher) {
+                context.resources.assets.open("gplv3.html").use { inputStream ->
                     val raw = CharStreams.toString(inputStream.bufferedReader())
                     gpl = HtmlCompat.fromHtml(raw, HtmlCompat.FROM_HTML_MODE_LEGACY)
                 }

app-ose/src/ose/kotlin/com/davx5/ose/ui/intro/OseIntroPageFactory.kt

@@ -2,8 +2,15 @@
  * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
  */
 
-package at.bitfire.davdroid.ui.intro
+package com.davx5.ose.ui.intro
 
+import at.bitfire.davdroid.ui.intro.BackupsPage
+import at.bitfire.davdroid.ui.intro.BatteryOptimizationsPage
+import at.bitfire.davdroid.ui.intro.IntroPageFactory
+import at.bitfire.davdroid.ui.intro.OpenSourcePage
+import at.bitfire.davdroid.ui.intro.PermissionsIntroPage
+import at.bitfire.davdroid.ui.intro.TasksIntroPage
+import at.bitfire.davdroid.ui.intro.WelcomePage
 import javax.inject.Inject
 
 class OseIntroPageFactory @Inject constructor(

app-ose/src/ose/kotlin/com/davx5/ose/ui/setup/StandardLoginTypePage.kt

@@ -2,7 +2,7 @@
  * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
  */
 
-package at.bitfire.davdroid.ui.setup
+package com.davx5.ose.ui.setup
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
@@ -15,6 +15,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -24,6 +25,8 @@ import at.bitfire.davdroid.ui.ExternalUris
 import at.bitfire.davdroid.ui.ExternalUris.withStatParams
 import at.bitfire.davdroid.ui.UiUtils.toAnnotatedString
 import at.bitfire.davdroid.ui.composable.Assistant
+import at.bitfire.davdroid.ui.setup.LoginInfo
+import at.bitfire.davdroid.ui.setup.LoginType
 
 @Composable
 fun StandardLoginTypePage(
@@ -67,9 +70,10 @@ fun StandardLoginTypePage(
 
             HorizontalDivider(Modifier.padding(vertical = 12.dp))
 
+            val context = LocalContext.current
             val privacyPolicy = ExternalUris.Homepage.baseUrl.buildUpon()
                 .appendPath(ExternalUris.Homepage.PATH_PRIVACY)
-                .withStatParams("StandardLoginTypePage")
+                .withStatParams(context, "StandardLoginTypePage")
                 .build().toString()
             val privacy = HtmlCompat.fromHtml(
                 stringResource(R.string.login_privacy_hint, stringResource(R.string.app_name), privacyPolicy),

app-ose/src/ose/kotlin/com/davx5/ose/ui/setup/StandardLoginTypesProvider.kt

@@ -2,12 +2,22 @@
  * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
  */
 
-package at.bitfire.davdroid.ui.setup
+package com.davx5.ose.ui.setup
 
 import android.content.Intent
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
+import at.bitfire.davdroid.ui.setup.AdvancedLogin
+import at.bitfire.davdroid.ui.setup.EmailLogin
+import at.bitfire.davdroid.ui.setup.FastmailLogin
+import at.bitfire.davdroid.ui.setup.GoogleLogin
+import at.bitfire.davdroid.ui.setup.LoginActivity
+import at.bitfire.davdroid.ui.setup.LoginInfo
+import at.bitfire.davdroid.ui.setup.LoginType
+import at.bitfire.davdroid.ui.setup.LoginTypesProvider
 import at.bitfire.davdroid.ui.setup.LoginTypesProvider.LoginAction
+import at.bitfire.davdroid.ui.setup.NextcloudLogin
+import at.bitfire.davdroid.ui.setup.UrlLogin
 import java.util.logging.Logger
 import javax.inject.Inject
 

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

@@ -1,22 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-package at.bitfire.davdroid
-
-import at.bitfire.synctools.icalendar.ical4jVersion
-import ezvcard.Ezvcard
-
-/**
- * Brand-specific constants like (non-theme) colors, homepage URLs etc.
- */
-object Constants {
-
-    const val DAVDROID_GREEN_RGBA = 0xFF8bc34a.toInt()
-
-
-    // product IDs for iCalendar/vCard
-
-    val iCalProdId = "DAVx5/${BuildConfig.VERSION_NAME} ical4j/$ical4jVersion"
-    const val vCardProdId = "+//IDN bitfire.at//DAVx5/${BuildConfig.VERSION_NAME} ez-vcard/${Ezvcard.VERSION}"
-
-}

app/src/main/kotlin/at/bitfire/davdroid/ui/widget/IconSyncButtonWidgetReceiver.kt

@@ -1,12 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.ui.widget
-
-import androidx.glance.appwidget.GlanceAppWidget
-import androidx.glance.appwidget.GlanceAppWidgetReceiver
-
-class IconSyncButtonWidgetReceiver : GlanceAppWidgetReceiver() {
-    override val glanceAppWidget: GlanceAppWidget = IconSyncButtonWidget()
-}

app/src/main/kotlin/at/bitfire/davdroid/ui/widget/LabeledSyncButtonWidgetReceiver.kt

@@ -1,12 +0,0 @@
-/*
- * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- */
-
-package at.bitfire.davdroid.ui.widget
-
-import androidx.glance.appwidget.GlanceAppWidget
-import androidx.glance.appwidget.GlanceAppWidgetReceiver
-
-class LabeledSyncButtonWidgetReceiver : GlanceAppWidgetReceiver() {
-    override val glanceAppWidget: GlanceAppWidget = LabeledSyncButtonWidget()
-}

build.gradle.kts

@@ -4,6 +4,7 @@
 
 plugins {
     alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.ksp) apply false

core/build.gradle.kts

@@ -3,7 +3,7 @@
  */
 
 plugins {
-    alias(libs.plugins.android.application)
+    alias(libs.plugins.android.library)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.hilt)
     alias(libs.plugins.kotlin.serialization)
@@ -16,18 +16,7 @@ android {
     compileSdk = 36
 
     defaultConfig {
-        applicationId = "at.bitfire.davdroid"
-
-        versionCode = 405090005
-        versionName = "4.5.9"
-
-        base.archivesName = "davx5-$versionCode-$versionName"
-
         minSdk = 24        // Android 7.0
-        targetSdk = 36     // Android 16
-
-        // whether the build supports and allows to use custom certificates
-        buildConfigField("boolean", "allowCustomCerts", "true")
 
         testInstrumentationRunner = "at.bitfire.davdroid.HiltTestRunner"
     }
@@ -53,37 +42,9 @@ 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 = true
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules-release.pro")
-
-            isShrinkResources = true
-
-            signingConfig = signingConfigs.findByName("bitfire")
+            isMinifyEnabled = false
         }
     }
 
@@ -91,10 +52,6 @@ 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
@@ -130,7 +87,7 @@ aboutLibraries {
 }
 
 dependencies {
-    // core
+    // Kotlin / Android
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlinx.coroutines)
     coreLibraryDesugaring(libs.android.desugaring)
@@ -167,7 +124,7 @@ dependencies {
 
     // Glance Widgets
     implementation(libs.androidx.glance.base)
-    implementation(libs.androidx.glance.material)
+    implementation(libs.androidx.glance.material3)
 
     // Jetpack Room
     implementation(libs.androidx.room.runtime)

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

@@ -10,7 +10,6 @@ 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
@@ -29,7 +28,7 @@ class HiltTestRunner : AndroidJUnitRunner() {
         val rootLogger = Logger.getLogger("")
         rootLogger.level = Level.ALL
         rootLogger.handlers.forEach { rootLogger.removeHandler(it) }
-        rootLogger.addHandler(LogcatHandler(BuildConfig.APPLICATION_ID))
+        rootLogger.addHandler(LogcatHandler(javaClass.name))
 
         // MockK requirements
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P)

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

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

core/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.SyncDispatcher
+import at.bitfire.davdroid.di.scope.SyncDispatcher
 import at.bitfire.davdroid.resource.LocalResource
 import at.bitfire.davdroid.resource.SyncState
 import at.bitfire.davdroid.util.DavUtils.lastSegment