Merge branch 'release/25.04.3' into main

Author: ganfra

.github/workflows/danger.yml

@@ -20,7 +20,7 @@ jobs:
       - run: |
           npm install --save-dev @babel/plugin-transform-flow-strip-types
       - name: Danger
-        uses: danger/danger-js@12.3.4
+        uses: danger/danger-js@13.0.4
         with:
           args: "--dangerfile ./tools/danger/dangerfile.js"
         env:

.github/workflows/quality.yml

@@ -294,7 +294,7 @@ jobs:
           yarn add danger-plugin-lint-report --dev
       - name: Danger lint
         if: always()
-        uses: danger/danger-js@12.3.4
+        uses: danger/danger-js@13.0.4
         with:
           args: "--dangerfile ./tools/danger/dangerfile-lint.js"
         env:

CONTRIBUTING.md

@@ -2,8 +2,8 @@
 
 <!--- TOC -->
 
-* [Contributing code to Matrix](#contributing-code-to-matrix)
 * [Developer onboarding](#developer-onboarding)
+* [Contributing code to Matrix](#contributing-code-to-matrix)
 * [Android Studio settings](#android-studio-settings)
 * [Compilation](#compilation)
 * [Strings](#strings)
@@ -28,17 +28,17 @@
 
 <!--- END -->
 
-## Contributing code to Matrix
+## Developer onboarding
 
-Please read https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md
+For a detailed overview of the project, see [Developer Onboarding](./docs/_developer_onboarding.md).
 
-Element X Android support can be found in this room: [![Element X Android Matrix room #element-x-android:matrix.org](https://img.shields.io/matrix/element-x-android:matrix.org.svg?label=%23element-x-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-x-android:matrix.org).
+## Contributing code to Matrix
 
-The rest of the document contains specific rules for Matrix Android projects
+If instead of contributing to the Element X Android project, you want to contribute to Synapse, the homeserver implementation, please read the [Synapse contribution guide](https://element-hq.github.io/synapse/latest/development/contributing_guide.html).
 
-## Developer onboarding
+Element X Android support can be found in this room: [![Element X Android Matrix room #element-x-android:matrix.org](https://img.shields.io/matrix/element-x-android:matrix.org.svg?label=%23element-x-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-x-android:matrix.org).
 
-For a detailed overview of the project, see [Developer Onboarding](./docs/_developer_onboarding.md).
+The rest of the document contains specific rules for Matrix Android projects.
 
 ## Android Studio settings
 

app/build.gradle.kts

@@ -300,6 +300,7 @@ licensee {
     allow("Apache-2.0")
     allow("MIT")
     allow("BSD-2-Clause")
+    allow("BSD-3-Clause")
     allowUrl("https://opensource.org/licenses/MIT")
     allowUrl("https://developer.android.com/studio/terms.html")
     allowUrl("https://www.zetetic.net/sqlcipher/license/")

app/src/main/res/xml/locales_config.xml

@@ -3,6 +3,7 @@
     <locale android:name="be"/>
     <locale android:name="bg"/>
     <locale android:name="cs"/>
+    <locale android:name="cy"/>
     <locale android:name="de"/>
     <locale android:name="el"/>
     <locale android:name="en"/>
@@ -17,6 +18,7 @@
     <locale android:name="in"/>
     <locale android:name="it"/>
     <locale android:name="ka"/>
+    <locale android:name="lt"/>
     <locale android:name="nb"/>
     <locale android:name="nl"/>
     <locale android:name="pl"/>

appnav/src/main/kotlin/io/element/android/appnav/di/SyncOrchestrator.kt

@@ -78,15 +78,21 @@ class SyncOrchestrator @AssistedInject constructor(
     internal fun observeStates() = coroutineScope.launch {
         Timber.tag(tag).d("start observing the app and network state")
 
+        val isAppActiveFlow = combine(
+            appForegroundStateService.isInForeground,
+            appForegroundStateService.isInCall,
+            appForegroundStateService.isSyncingNotificationEvent,
+            appForegroundStateService.hasRingingCall,
+        ) { isInForeground, isInCall, isSyncingNotificationEvent, hasRingingCall ->
+            isInForeground || isInCall || isSyncingNotificationEvent || hasRingingCall
+        }
+
         combine(
             // small debounce to avoid spamming startSync when the state is changing quickly in case of error.
             syncService.syncState.debounce(100.milliseconds),
             networkMonitor.connectivity,
-            appForegroundStateService.isInForeground,
-            appForegroundStateService.isInCall,
-            appForegroundStateService.isSyncingNotificationEvent,
-        ) { syncState, networkState, isInForeground, isInCall, isSyncingNotificationEvent ->
-            val isAppActive = isInForeground || isInCall || isSyncingNotificationEvent
+            isAppActiveFlow,
+        ) { syncState, networkState, isAppActive ->
             val isNetworkAvailable = networkState == NetworkStatus.Connected
 
             Timber.tag(tag).d("isAppActive=$isAppActive, isNetworkAvailable=$isNetworkAvailable")

appnav/src/main/res/values-cy/translations.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="banner_migrate_to_native_sliding_sync_action">"Allgofnodi ac Uwchraddio"</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"Nid yw %1$s bellach yn cefnogi\'r hen brotocol. Allgofnodwch a mewngofnodi\'n ôl i barhau i ddefnyddio\'r ap."</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Nid yw eich gweinydd cartref yn cefnogi\'r hen brotocol mwyach. Allgofnodwch a mewngofnodwch yn ôl i barhau i ddefnyddio\'r ap."</string>
+</resources>

appnav/src/main/res/values-nb/translations.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="banner_migrate_to_native_sliding_sync_action">"Logg ut og oppgrader"</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s støtter ikke lenger den gamle protokollen. Logg ut og logg inn igjen for å fortsette å bruke appen."</string>
   <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Hjemmeserveren din støtter ikke lenger den gamle protokollen. Vennligst logg ut og inn igjen for å fortsette å bruke appen."</string>
 </resources>

appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt

@@ -236,6 +236,50 @@ class SyncOrchestratorTest {
         stopSyncRecorder.assertions().isCalledOnce()
     }
 
+    @Test
+    fun `when the app was in background and we have an incoming ringing call, a sync will be started`() = runTest {
+        val startSyncRecorder = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val stopSyncRecorder = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val syncService = FakeSyncService(initialSyncState = SyncState.Idle).apply {
+            startSyncLambda = startSyncRecorder
+            stopSyncLambda = stopSyncRecorder
+        }
+        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Connected)
+        val appForegroundStateService = FakeAppForegroundStateService(
+            initialForegroundValue = false,
+            initialIsSyncingNotificationEventValue = false,
+            initialHasRingingCall = false,
+        )
+        val syncOrchestrator = createSyncOrchestrator(
+            syncService = syncService,
+            networkMonitor = networkMonitor,
+            appForegroundStateService = appForegroundStateService,
+        )
+
+        // We start observing
+        syncOrchestrator.observeStates()
+
+        // Advance the time to make sure the orchestrator has had time to start processing the inputs
+        advanceTimeBy(100.milliseconds)
+
+        // Start sync was never called
+        startSyncRecorder.assertions().isNeverCalled()
+
+        // Now we receive a ringing call
+        appForegroundStateService.updateHasRingingCall(true)
+
+        // Start sync will be called shortly after
+        advanceTimeBy(1.milliseconds)
+        startSyncRecorder.assertions().isCalledOnce()
+
+        // If the sync is running and the ringing call notification is now over, the sync stops after a delay
+        syncService.emitSyncState(SyncState.Running)
+        appForegroundStateService.updateHasRingingCall(false)
+
+        advanceTimeBy(10.seconds)
+        stopSyncRecorder.assertions().isCalledOnce()
+    }
+
     @Test
     fun `when the app is in foreground, we sync for a notification and a call is ongoing, the sync will only stop when all conditions are false`() = runTest {
         val startSyncRecorder = lambdaRecorder<Result<Unit>> { Result.success(Unit) }

docs/_developer_onboarding.md

@@ -10,7 +10,7 @@
     * [Sync](#sync)
   * [Rust SDK](#rust-sdk)
     * [Matrix Rust Component Kotlin](#matrix-rust-component-kotlin)
-    * [Build the SDK locally](#build-the-sdk-locally)
+    * [Building the SDK locally](#building-the-sdk-locally)
   * [The Android project](#the-android-project)
   * [Application](#application)
     * [Jetpack Compose](#jetpack-compose)
@@ -107,15 +107,17 @@ This is the goal of https://github.com/matrix-org/matrix-rust-components-kotlin.
 This repository is used for distributing kotlin releases of the Matrix Rust SDK.
 It'll provide the corresponding aar and also publish them on maven.
 
-Most of the time you want to use the releases made on maven with gradle:
+Most of the time **you want to use the releases made on maven with gradle**:
 
 ```groovy
 implementation("org.matrix.rustcomponents:sdk-android:latest-version")
 ```
 
 You can also have access to the aars through the [release](https://github.com/matrix-org/matrix-rust-components-kotlin/releases) page.
 
-#### Build the SDK locally
+#### Building the SDK locally
+
+If you want to make changes to the SDK or test them before integrating it with your codebase, you can build the SDK locally too.
 
 Prerequisites:
 * Install the Android NDK (Native Development Kit). To do this from within