Update baseline profile with DeckPicker onResume journey

.github/workflows/codeql.yml

@@ -102,6 +102,8 @@ jobs:
       shell: bash
       run: |
         ./gradlew assemblePlayRelease -x lintVitalPlayRelease
+        # Free the Gradle daemon's heap before CodeQL analysis runs, or we OOM the runner (#20768)
+        ./gradlew --stop
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v4

.github/workflows/compare_apk_size.yml

@@ -42,6 +42,12 @@ jobs:
           echo y | keytool -genkeypair -dname "cn=AnkiDroid, ou=ankidroid, o=AnkiDroid, c=US" -alias $KEYALIAS -keypass $KEYPWD -keystore $KEYSTOREPATH -storepass $KEYSTOREPWD -keyalg RSA -validity 20000
         shell: bash
 
+      - name: Checkout PR
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          ref: 'refs/pull/${{ github.event.inputs.prNumber }}/head'
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
         timeout-minutes: 5
@@ -50,12 +56,6 @@ jobs:
           cache-provider: basic
           cache-read-only: true
 
-      - name: Checkout PR
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          ref: 'refs/pull/${{ github.event.inputs.prNumber }}/head'
-
       - name: Assemble PR APK
         # This makes sure we fetch gradle network resources with a retry
         uses: nick-fields/retry@v4

.github/workflows/sync_translations.yml

@@ -3,14 +3,18 @@ name: 🌐 Sync Translations
 on:
   workflow_dispatch:
 
+concurrency:
+  group: sync-translations
+  cancel-in-progress: true
+
 # We use a machine account PAT from secrets so workflows are triggered
 # the default token is not needed and should be fully restricted
 permissions: {}
 
 jobs:
   sync_translations:
     name: 'Sync Translations with Crowdin'
-    timeout-minutes: 20
+    timeout-minutes: 50
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -32,6 +36,28 @@ jobs:
           git reset --hard origin/main
         shell: bash
 
+      - name: Get second to latest run time
+        env:
+          GH_TOKEN: ${{ secrets.MACHINE_ACCOUNT_PAT }}
+        run: |
+          OUTPUT=$(gh run list --workflow sync_translations.yml --json updatedAt | jq -r '.[1].updatedAt')
+          echo "LATEST_RUN=$OUTPUT" >> $GITHUB_ENV
+
+      - name: Calculate seconds passed
+        id: calc_time
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const lastRun = new Date(process.env.LATEST_RUN);
+            const secondsPassed = Math.floor((Date.now() - lastRun.getTime()) / 1000);
+            const timeLeft = 1800 - secondsPassed > 0 ? 1800 - secondsPassed: 0;
+            console.log('Seconds to sleep for: ' + timeLeft);
+            core.setOutput('time_left', timeLeft);
+
+      - name: Await CrowdIn API Cooldown If Needed
+        if: steps.calc_time.outputs.time_left > 0
+        run: sleep ${{ steps.calc_time.outputs.time_left }}
+
       - uses: actions/setup-node@v6
         with:
           node-version: 20

AnkiDroid/build.gradle

@@ -397,6 +397,7 @@ dependencies {
 
     // modules
     implementation project(":common")
+    implementation project(":common:android")
     implementation project(":compat")
     implementation project(":libanki")
     implementation project(":vbpd")

AnkiDroid/jacoco.gradle

@@ -102,8 +102,10 @@ tasks.register('jacocoTestReport', JacocoReport) {
     dependsOn("connectedPlay${rootProject.androidTestVariantName}AndroidTest")
 }
 
-// modules do not yet support flavors (play/full)
-def modulesToUnitTest = [":common", ":libanki", ":compat"]
+// Android library modules (do not yet support flavors play/full)
+def androidModulesToUnitTest = [":common:android", ":libanki", ":compat"]
+// JVM modules: use 'test' task and 'classes/kotlin/main' class dir
+def jvmModulesToUnitTest = [":common"]
 
 // A unit-test only report task
 tasks.register('jacocoUnitTestReport', JacocoReport) {report ->
@@ -121,10 +123,15 @@ tasks.register('jacocoUnitTestReport', JacocoReport) {report ->
     includeUnitTestCoverage(report, getProject(), flavorClassDir)
     dependsOn('testPlayDebugUnitTest')
 
-    for (module in modulesToUnitTest) {
+    for (module in androidModulesToUnitTest) {
         includeUnitTestCoverage(report, project(module), moduleClassDir)
         dependsOn("${module}:testDebugUnitTest")
     }
+
+    for (module in jvmModulesToUnitTest) {
+        includeUnitTestCoverage(report, project(module), 'classes/kotlin/main')
+        dependsOn("${module}:test")
+    }
 }
 
 gradle.projectsEvaluated {
@@ -135,12 +142,18 @@ gradle.projectsEvaluated {
             task.outputs.cacheIf { false }
         }
     }
-    for (module in modulesToUnitTest) {
+    for (module in androidModulesToUnitTest) {
         project(module).tasks.named('testDebugUnitTest')?.configure {task ->
             task.outputs.upToDateWhen { false }
             task.outputs.cacheIf { false }
         }
     }
+    for (module in jvmModulesToUnitTest) {
+        project(module).tasks.named('test')?.configure {task ->
+            task.outputs.upToDateWhen { false }
+            task.outputs.cacheIf { false }
+        }
+    }
 }
 
 

AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ACRATest.kt

@@ -22,14 +22,18 @@ import androidx.core.content.edit
 import androidx.test.annotation.UiThreadTest
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.AnkiDroidApp
-import com.ichi2.anki.CrashReportService
-import com.ichi2.anki.CrashReportService.FEEDBACK_REPORT_ALWAYS
-import com.ichi2.anki.CrashReportService.FEEDBACK_REPORT_ASK
 import com.ichi2.anki.R
+import com.ichi2.anki.acraCoreConfigBuilder
 import com.ichi2.anki.analytics.UsageAnalytics
+import com.ichi2.anki.common.crashreporting.CrashReportService
+import com.ichi2.anki.common.crashreporting.CrashReporter
+import com.ichi2.anki.common.crashreporting.CrashReporter.Companion.FEEDBACK_REPORT_ALWAYS
+import com.ichi2.anki.common.crashreporting.CrashReporter.Companion.FEEDBACK_REPORT_ASK
 import com.ichi2.anki.logging.ProductionCrashReportingTree
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.servicelayer.ThrowableFilterService
+import com.ichi2.anki.setDebugACRAConfig
+import com.ichi2.anki.setProductionACRAConfig
 import com.ichi2.anki.testutil.GrantStoragePermission
 import org.acra.ACRA
 import org.acra.builder.ReportBuilder
@@ -70,7 +74,7 @@ class ACRATest : InstrumentedTest() {
     @Throws(Exception::class)
     fun testDebugConfiguration() {
         // Debug mode overrides all saved state so no setup needed
-        CrashReportService.setDebugACRAConfig(sharedPrefs)
+        setDebugACRAConfig(sharedPrefs)
         assertArrayEquals(
             "Debug logcat arguments not set correctly",
             CrashReportService.acraCoreConfigBuilder
@@ -90,21 +94,21 @@ class ACRATest : InstrumentedTest() {
         )
         assertEquals(
             "ACRA feedback was not turned off correctly",
-            CrashReportService.FEEDBACK_REPORT_NEVER,
+            CrashReporter.FEEDBACK_REPORT_NEVER,
             sharedPrefs
-                .getString(CrashReportService.FEEDBACK_REPORT_KEY, "undefined"),
+                .getString(CrashReporter.FEEDBACK_REPORT_KEY, "undefined"),
         )
     }
 
     @Test
     @Throws(Exception::class)
     fun testProductionConfigurationUserDisabled() {
         // set up as if the user had prefs saved to disable completely
-        setReportConfig(CrashReportService.FEEDBACK_REPORT_NEVER)
+        setReportConfig(CrashReporter.FEEDBACK_REPORT_NEVER)
 
         // ACRA initializes production logcat via annotation and we can't mock Build.DEBUG
         // That means we are restricted from verifying production logcat args and this is the debug case again
-        CrashReportService.setProductionACRAConfig(sharedPrefs)
+        setProductionACRAConfig(sharedPrefs)
         verifyDebugACRAPreferences()
     }
 
@@ -115,7 +119,7 @@ class ACRATest : InstrumentedTest() {
         setReportConfig(FEEDBACK_REPORT_ASK)
 
         // If the user is set to ask, then it's production, with interaction mode dialog
-        CrashReportService.setProductionACRAConfig(sharedPrefs)
+        setProductionACRAConfig(sharedPrefs)
         verifyACRANotDisabled()
 
         assertToastMessage(R.string.feedback_for_manual_toast_text)
@@ -134,7 +138,7 @@ class ACRATest : InstrumentedTest() {
 
         // If the user is set to always, then it's production, with interaction mode toast
         // will be useful with ACRA 5.2.0
-        CrashReportService.setProductionACRAConfig(sharedPrefs)
+        setProductionACRAConfig(sharedPrefs)
 
         // The same class/method combo is only sent once, so we face a new method each time (should test that system later)
         val crash = Exception("testCrashReportSend at " + System.currentTimeMillis())
@@ -173,7 +177,7 @@ class ACRATest : InstrumentedTest() {
         )
 
         // Now let's clear data
-        CrashReportService.deleteACRALimiterData(testContext)
+        CrashReportService.deleteLimiterData(testContext)
 
         // A third send should work again
         assertTrue(
@@ -192,7 +196,7 @@ class ACRATest : InstrumentedTest() {
         setReportConfig(FEEDBACK_REPORT_ALWAYS)
 
         // If the user is set to always, then it's production, with interaction mode toast
-        CrashReportService.setProductionACRAConfig(sharedPrefs)
+        setProductionACRAConfig(sharedPrefs)
         verifyACRANotDisabled()
 
         assertToastMessage(R.string.feedback_auto_toast_text)
@@ -207,7 +211,7 @@ class ACRATest : InstrumentedTest() {
         setReportConfig(FEEDBACK_REPORT_ALWAYS)
 
         // If the user is set to ask, then it's production, with interaction mode dialog
-        CrashReportService.setProductionACRAConfig(sharedPrefs)
+        setProductionACRAConfig(sharedPrefs)
         verifyACRANotDisabled()
 
         assertDialogEnabledStatus("dialog should be disabled when status is ALWAYS", false)
@@ -226,7 +230,7 @@ class ACRATest : InstrumentedTest() {
         setReportConfig(FEEDBACK_REPORT_ASK)
 
         // If the user is set to ask, then it's production, with interaction mode dialog
-        CrashReportService.setProductionACRAConfig(sharedPrefs)
+        setProductionACRAConfig(sharedPrefs)
         verifyACRANotDisabled()
 
         assertToastMessage(R.string.feedback_for_manual_toast_text)
@@ -282,7 +286,7 @@ class ACRATest : InstrumentedTest() {
     }
 
     private fun setAcraReportingMode(feedbackReportAlways: String) {
-        CrashReportService.setAcraReportingMode(feedbackReportAlways)
+        CrashReportService.setReportingMode(feedbackReportAlways)
     }
 
     @Throws(ACRAConfigurationException::class)
@@ -333,7 +337,7 @@ class ACRATest : InstrumentedTest() {
     }
 
     private fun setReportConfig(feedbackReportAsk: String) {
-        sharedPrefs.edit { putString(CrashReportService.FEEDBACK_REPORT_KEY, feedbackReportAsk) }
+        sharedPrefs.edit { putString(CrashReporter.FEEDBACK_REPORT_KEY, feedbackReportAsk) }
     }
 
     private val sharedPrefs: SharedPreferences