Merge branch 'main' into release_automation

thunderbird · Oct 4, 2024 · a5ef3e0 · a5ef3e0
2 parents 4c6870c + e2097fc
commit a5ef3e0
Show file tree

Hide file tree

Showing 90 changed files with 1,024 additions and 389 deletions.
diff --git a/.github/workflows/needinfo-remove.yml b/.github/workflows/needinfo-remove.yml
@@ -11,18 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       github.event.comment.author_association != 'OWNER' &&
+      github.event.comment.author_association != 'MEMBER' &&
       github.event.comment.author_association != 'COLLABORATOR'
     permissions:
       issues: write
       pull-requests: write
     steps:
+      # https://github.com/octokit/request-action/issues/118
       - name: Remove needinfo label
-        uses: octokit/[email protected]
-        continue-on-error: true
-        with:
-          route: DELETE /repos/:repository/issues/:issue/labels/:label
-          repository: ${{ github.repository }}
-          issue: ${{ github.event.issue.number }}
-          label: "status: needs information"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          curl --request DELETE \
+            --url 'https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels/status%3A%20needs%20information' \
+            --header 'Authorization: token ${{ secrets.GITHUB_TOKEN }}'
diff --git a/app-k9mail/badging/release-badging.txt b/app-k9mail/badging/release-badging.txt
@@ -1,4 +1,4 @@
-package: name='com.fsck.k9' versionCode='39004' versionName='6.905-SNAPSHOT' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
+package: name='com.fsck.k9' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
 install-location:'auto'
 sdkVersion:'21'
 targetSdkVersion:'34'
@@ -34,7 +34,7 @@ application-label-eo:'K-9 Retpoŝtilo'
 application-label-es:'K-9 Mail'
 application-label-et:'K-9 Mail'
 application-label-eu:'K-9 Mail'
-application-label-fa:'پست الکترونیکی k-9'
+application-label-fa:'نامهٔ کی۹'
 application-label-fi:'K-9 Mail'
 application-label-fr:'Courriel K-9 Mail'
 application-label-fy:'K-9 Mail'

diff --git a/app-k9mail/dependencies/releaseRuntimeClasspath.txt b/app-k9mail/dependencies/releaseRuntimeClasspath.txt
@@ -196,9 +196,11 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
-org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3
 org.jetbrains:annotations:24.1.0
 org.jsoup:jsoup:1.17.2
 org.minidns:minidns-client:1.0.5

diff --git a/app-thunderbird/badging/fossBeta-badging.txt b/app-thunderbird/badging/fossBeta-badging.txt
@@ -1,4 +1,4 @@
-package: name='net.thunderbird.android.beta' versionCode='2' versionName='0.1b1' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
+package: name='net.thunderbird.android.beta' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
 install-location:'auto'
 sdkVersion:'21'
 targetSdkVersion:'34'

diff --git a/app-thunderbird/badging/fossDaily-badging.txt b/app-thunderbird/badging/fossDaily-badging.txt
@@ -1,4 +1,4 @@
-package: name='net.thunderbird.android.daily' versionCode='2' versionName='0.1a1' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
+package: name='net.thunderbird.android.daily' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
 install-location:'auto'
 sdkVersion:'21'
 targetSdkVersion:'34'

diff --git a/app-thunderbird/badging/fossRelease-badging.txt b/app-thunderbird/badging/fossRelease-badging.txt
@@ -1,4 +1,4 @@
-package: name='net.thunderbird.android' versionCode='2' versionName='0.1' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
+package: name='net.thunderbird.android' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
 install-location:'auto'
 sdkVersion:'21'
 targetSdkVersion:'34'

diff --git a/app-thunderbird/badging/fullBeta-badging.txt b/app-thunderbird/badging/fullBeta-badging.txt
@@ -1,4 +1,4 @@
-package: name='net.thunderbird.android.beta' versionCode='2' versionName='0.1b1' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
+package: name='net.thunderbird.android.beta' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
 install-location:'auto'
 sdkVersion:'21'
 targetSdkVersion:'34'

diff --git a/app-thunderbird/badging/fullDaily-badging.txt b/app-thunderbird/badging/fullDaily-badging.txt
@@ -1,4 +1,4 @@
-package: name='net.thunderbird.android.daily' versionCode='2' versionName='0.1a1' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
+package: name='net.thunderbird.android.daily' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
 install-location:'auto'
 sdkVersion:'21'
 targetSdkVersion:'34'

diff --git a/app-thunderbird/badging/fullRelease-badging.txt b/app-thunderbird/badging/fullRelease-badging.txt
@@ -1,4 +1,4 @@
-package: name='net.thunderbird.android' versionCode='2' versionName='0.1' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
+package: name='net.thunderbird.android' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
 install-location:'auto'
 sdkVersion:'21'
 targetSdkVersion:'34'

diff --git a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
@@ -200,11 +200,11 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
-org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3
 org.jetbrains:annotations:24.1.0
 org.jsoup:jsoup:1.17.2
 org.minidns:minidns-client:1.0.5

diff --git a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
@@ -200,11 +200,11 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
-org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3
 org.jetbrains:annotations:24.1.0
 org.jsoup:jsoup:1.17.2
 org.minidns:minidns-client:1.0.5

diff --git a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
@@ -200,11 +200,11 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
-org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3
 org.jetbrains:annotations:24.1.0
 org.jsoup:jsoup:1.17.2
 org.minidns:minidns-client:1.0.5

diff --git a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
@@ -134,6 +134,7 @@ co.touchlab:stately-concurrent-collections-jvm:2.0.6
 co.touchlab:stately-concurrent-collections:2.0.6
 co.touchlab:stately-strict-jvm:2.0.6
 co.touchlab:stately-strict:2.0.6
+com.android.billingclient:billing-ktx:7.0.0
 com.android.billingclient:billing:7.0.0
 com.beetstra.jutf7:jutf7:1.0.0
 com.github.ByteHamster:SearchPreference:v2.3.0
@@ -213,11 +214,11 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
-org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3
 org.jetbrains:annotations:24.1.0
 org.jsoup:jsoup:1.17.2
 org.minidns:minidns-client:1.0.5

diff --git a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
@@ -134,6 +134,7 @@ co.touchlab:stately-concurrent-collections-jvm:2.0.6
 co.touchlab:stately-concurrent-collections:2.0.6
 co.touchlab:stately-strict-jvm:2.0.6
 co.touchlab:stately-strict:2.0.6
+com.android.billingclient:billing-ktx:7.0.0
 com.android.billingclient:billing:7.0.0
 com.beetstra.jutf7:jutf7:1.0.0
 com.github.ByteHamster:SearchPreference:v2.3.0
@@ -213,11 +214,11 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
-org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3
 org.jetbrains:annotations:24.1.0
 org.jsoup:jsoup:1.17.2
 org.minidns:minidns-client:1.0.5

diff --git a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
@@ -134,6 +134,7 @@ co.touchlab:stately-concurrent-collections-jvm:2.0.6
 co.touchlab:stately-concurrent-collections:2.0.6
 co.touchlab:stately-strict-jvm:2.0.6
 co.touchlab:stately-strict:2.0.6
+com.android.billingclient:billing-ktx:7.0.0
 com.android.billingclient:billing:7.0.0
 com.beetstra.jutf7:jutf7:1.0.0
 com.github.ByteHamster:SearchPreference:v2.3.0
@@ -213,11 +214,11 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
-org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3
 org.jetbrains:annotations:24.1.0
 org.jsoup:jsoup:1.17.2
 org.minidns:minidns-client:1.0.5

diff --git a/app-thunderbird/src/main/res/values/constants.xml b/app-thunderbird/src/main/res/values/constants.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_webpage_url" translatable="false">https://k9mail.app/</string>
+    <string name="user_forum_url" translatable="false">https://support.mozilla.org/products/thunderbird-android</string>
+    <string name="message_header_mua" translatable="false">Thunderbird for Android</string>
+    <string name="app_authors_url" translatable="false">https://github.com/thunderbird/thunderbird-android/graphs/contributors</string>
+    <string name="app_source_url" translatable="false">https://github.com/thunderbird/thunderbird-android</string>
+    <string name="app_license_url" translatable="false">https://www.apache.org/licenses/LICENSE-2.0</string>
+</resources>
diff --git a/build-plugin/build.gradle.kts b/build-plugin/build.gradle.kts
@@ -1,13 +1,14 @@
 plugins {
     `kotlin-dsl`
-    `kotlin-dsl-precompiled-script-plugins`
 }
 
 dependencies {
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 
     implementation(plugin(libs.plugins.kotlin.jvm))
     implementation(plugin(libs.plugins.kotlin.android))
+    implementation(plugin(libs.plugins.kotlin.parcelize))
+    implementation(plugin(libs.plugins.kotlin.serialization))
 
     implementation(plugin(libs.plugins.android.application))
     implementation(plugin(libs.plugins.android.library))

diff --git a/build-plugin/settings.gradle.kts b/build-plugin/settings.gradle.kts
@@ -1,16 +1,16 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        google()
-        mavenCentral()
     }
 }
 
 dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+
     repositories {
+        gradlePluginPortal()
         google()
         mavenCentral()
-        gradlePluginPortal()
     }
 
     versionCatalogs.create("libs") {

diff --git a/build-plugin/src/main/kotlin/KotlinExtension.kt b/build-plugin/src/main/kotlin/KotlinExtension.kt
@@ -1,11 +1,12 @@
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 fun Project.configureKotlinJavaCompatibility() {
     tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = ThunderbirdProjectConfig.javaCompatibilityVersion.toString()
+        compilerOptions {
+            jvmTarget.set(JvmTarget.fromTarget(ThunderbirdProjectConfig.javaCompatibilityVersion.toString()))
         }
     }
 }
diff --git a/build-plugin/src/main/kotlin/thunderbird.library.android.compose.gradle.kts b/build-plugin/src/main/kotlin/thunderbird.library.android.compose.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("thunderbird.library.android")
     id("org.jetbrains.kotlin.plugin.compose")
+    id("org.jetbrains.kotlin.plugin.serialization")
     id("thunderbird.quality.detekt.typed")
 }
 

diff --git a/build-plugin/src/main/kotlin/thunderbird.quality.badging.gradle.kts b/build-plugin/src/main/kotlin/thunderbird.quality.badging.gradle.kts
@@ -2,6 +2,8 @@ import com.android.SdkConstants
 import com.android.build.api.artifact.SingleArtifact
 import com.github.difflib.text.DiffRow
 import com.github.difflib.text.DiffRowGenerator
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
 
 /**
  * This is a Gradle plugin that adds a task to generate the badging of the APKs and a task to check that the
@@ -92,14 +94,36 @@ abstract class GenerateBadgingTask : DefaultTask() {
 
     @TaskAction
     fun taskAction() {
+        val outputStream = ByteArrayOutputStream()
         execOperations.exec {
             commandLine(
                 aapt2Executable.get().asFile.absolutePath,
                 "dump",
                 "badging",
                 apk.get().asFile.absolutePath,
             )
-            standardOutput = badging.asFile.get().outputStream()
+            standardOutput = outputStream
+        }
+
+        badging.asFile.get().writeText(cleanBadgingContent(outputStream) + "\n")
+    }
+
+    private fun cleanBadgingContent(outputStream: ByteArrayOutputStream): String {
+        return ByteArrayInputStream(outputStream.toByteArray()).bufferedReader().use { reader ->
+            reader.lineSequence().map { line ->
+                line.cleanBadgingLine()
+            }.joinToString("\n")
+        }
+    }
+
+    private fun String.cleanBadgingLine(): String {
+        return if (startsWith("package:")) {
+            replace(Regex("versionName='[^']*'"), "")
+                .replace(Regex("versionCode='[^']*'"), "")
+                .replace(Regex("\\s+"), " ")
+                .trim()
+        } else {
+            this
         }
     }
 }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.ksp) apply false
 
     id("thunderbird.quality.spotless")

diff --git a/core/mail/folder/api/src/main/kotlin/app/k9mail/core/mail/folder/api/FolderDetails.kt b/core/mail/folder/api/src/main/kotlin/app/k9mail/core/mail/folder/api/FolderDetails.kt
@@ -6,7 +6,7 @@ data class FolderDetails(
     val folder: Folder,
     val isInTopGroup: Boolean,
     val isIntegrate: Boolean,
-    val syncClass: FolderClass,
+    val isSyncEnabled: Boolean,
     val displayClass: FolderClass,
     val isNotificationsEnabled: Boolean,
     val isPushEnabled: Boolean,

diff --git a/...ose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/Checkbox.kt b/...ose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/Checkbox.kt
@@ -7,7 +7,7 @@ import androidx.compose.material3.Checkbox as Material3Checkbox
 @Composable
 fun Checkbox(
     checked: Boolean,
-    onCheckedChange: (Boolean) -> Unit,
+    onCheckedChange: ((Boolean) -> Unit)?,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
 ) {

diff --git a/...m/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/molecule/input/CheckboxInput.kt b/...m/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/molecule/input/CheckboxInput.kt
@@ -1,13 +1,14 @@
 package app.k9mail.core.ui.compose.designsystem.molecule.input
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.selection.toggleable
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.Role
 import app.k9mail.core.ui.compose.designsystem.atom.Checkbox
 import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodyLarge
 import app.k9mail.core.ui.compose.theme2.MainTheme
@@ -29,13 +30,17 @@ fun CheckboxInput(
         Row(
             modifier = Modifier
                 .fillMaxWidth()
-                .clickable { onCheckedChange(!checked) },
+                .toggleable(
+                    value = checked,
+                    role = Role.Checkbox,
+                    onValueChange = { onCheckedChange(!checked) },
+                ),
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.spacedBy(MainTheme.spacings.half),
         ) {
             Checkbox(
                 checked = checked,
-                onCheckedChange = onCheckedChange,
+                onCheckedChange = null,
             )
             TextBodyLarge(text = text)
         }