Merge branch 'release/0.7.4' into main

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        variant: [debug, release, nightly, samples]
+        variant: [debug, release, nightly]
       fail-fast: false
     # Allow all jobs on develop. Just one per PR.
     concurrency:
@@ -82,6 +82,3 @@ jobs:
       - name: Compile nightly sources
         if: ${{ matrix.variant == 'nightly' }}
         run: ./gradlew compileGplayNightlySources -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
-      - name: Compile samples minimal
-        if: ${{ matrix.variant == 'samples' }}
-        run: ./gradlew :samples:minimal:assemble $CI_GRADLE_ARG_PROPERTIES

.github/workflows/maestro.yml

@@ -79,7 +79,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: elementx-apk-maestro
-      - uses: mobile-dev-inc/[email protected].4
+      - uses: mobile-dev-inc/[email protected].6
         if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
         with:
           api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}

.github/workflows/tests.yml

@@ -82,7 +82,7 @@ jobs:
 
       # https://github.com/codecov/codecov-action
       - name: ☂️ Upload coverage reports to codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}

CHANGES.md

@@ -1,3 +1,65 @@
+Changes in Element X v0.7.3 (2024-11-08)
+========================================
+
+## What's Changed
+### ✨ Features
+* Incoming session verification by @bmarty in https://github.com/element-hq/element-x-android/pull/3733
+* Remove all GPS metadata from images uploaded as media by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3781
+* Send caption with image and video by @bmarty in https://github.com/element-hq/element-x-android/pull/3803
+### 🙌 Improvements
+* UI iteration on the encryption settings by @bmarty in https://github.com/element-hq/element-x-android/pull/3750
+* Rotate firebase token in case of error by @bmarty in https://github.com/element-hq/element-x-android/pull/3755
+* Optimize media upload by @bmarty in https://github.com/element-hq/element-x-android/pull/3779
+* Iteration on caption by @bmarty in https://github.com/element-hq/element-x-android/pull/3816
+* Hide join call button when the user is already in the call by @bmarty in https://github.com/element-hq/element-x-android/pull/3815
+* Disable button during the "verifying" step. by @bmarty in https://github.com/element-hq/element-x-android/pull/3832
+### 🐛 Bugfixes
+* Fix oversize padding on captioned images/videos by @frebib in https://github.com/element-hq/element-x-android/pull/3732
+* Fix the onboarding flow getting stuck in some cases by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3778
+* bugfix: do not remove logs after sending them by @ganfra in https://github.com/element-hq/element-x-android/pull/3780
+* Use in-memory thumbnail APIs when possible by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3817
+* ElementCall: allow user to switch to another call. by @bmarty in https://github.com/element-hq/element-x-android/pull/3833
+* Do not delete the original file if it's not a temporary file when sending it to a room. by @bmarty in https://github.com/element-hq/element-x-android/pull/3819
+* Fix verification failed issue, simplify verification logic by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3830
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/3798
+### 🧱 Build
+* Target api 35 by @bmarty in https://github.com/element-hq/element-x-android/pull/3776
+### 🚧 In development 🚧
+* Knocking : update create room flow  by @ganfra in https://github.com/element-hq/element-x-android/pull/3804
+### Dependency upgrades
+* Update dependency io.nlopez.compose.rules:detekt to v0.4.17 by @renovate in https://github.com/element-hq/element-x-android/pull/3746
+* Update dependency com.posthog:posthog-android to v3.8.3 - autoclosed by @renovate in https://github.com/element-hq/element-x-android/pull/3742
+* Update dependency org.maplibre.gl:android-plugin-annotation-v9 to v3.0.2 by @renovate in https://github.com/element-hq/element-x-android/pull/3702
+* Update dependency com.posthog:posthog-android to v3.9.0 by @renovate in https://github.com/element-hq/element-x-android/pull/3754
+* Update kotlin by @renovate in https://github.com/element-hq/element-x-android/pull/3283
+* Update camera to v1.4.0 by @renovate in https://github.com/element-hq/element-x-android/pull/3765
+* Update dependencyAnalysis to v2.4.0 by @renovate in https://github.com/element-hq/element-x-android/pull/3773
+* Update kotlin to v2.0.21-1.0.26 by @renovate in https://github.com/element-hq/element-x-android/pull/3774
+* Update dependency androidx.annotation:annotation-jvm to v1.9.1 - autoclosed by @renovate in https://github.com/element-hq/element-x-android/pull/3762
+* chore(deps): update dependencyanalysis to v2.4.2 by @renovate in https://github.com/element-hq/element-x-android/pull/3791
+* fix(deps): update dependency androidx.compose:compose-bom to v2024.10.01 by @renovate in https://github.com/element-hq/element-x-android/pull/3782
+* Update dependency androidx.constraintlayout:constraintlayout-compose to v1.1.0 by @renovate in https://github.com/element-hq/element-x-android/pull/3770
+* fix(deps): update dependency androidx.constraintlayout:constraintlayout to v2.2.0 by @renovate in https://github.com/element-hq/element-x-android/pull/3784
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v0.2.59 by @renovate in https://github.com/element-hq/element-x-android/pull/3809
+* Update mobile-dev-inc/action-maestro-cloud action to v1.9.4 by @renovate in https://github.com/element-hq/element-x-android/pull/3820
+* Update dependency com.otaliastudios:transcoder to v0.11.2 by @renovate in https://github.com/element-hq/element-x-android/pull/3805
+* Update plugin paparazzi to v1.3.5 by @renovate in https://github.com/element-hq/element-x-android/pull/3826
+* Update dependency org.matrix.rustcomponents:sdk-android to v0.2.60 by @renovate in https://github.com/element-hq/element-x-android/pull/3827
+### Others
+* Change wording to "Verify identity" by @bmarty in https://github.com/element-hq/element-x-android/pull/3751
+* Improve FakeMatrixRoom to be able to check all the parameters. by @bmarty in https://github.com/element-hq/element-x-android/pull/3761
+* Editor state fixture and preview improvement by @bmarty in https://github.com/element-hq/element-x-android/pull/3758
+* Enable identity pinning violation notifications unconditionally by @andybalaam in https://github.com/element-hq/element-x-android/pull/3745
+* Enable predictive back gesture by @frebib in https://github.com/element-hq/element-x-android/pull/3797
+* Update project status by @mxandreas in https://github.com/element-hq/element-x-android/pull/3806
+* Remove code duplication - no behavior change. by @bmarty in https://github.com/element-hq/element-x-android/pull/3823
+* Verification UI / UX iteration by @bmarty in https://github.com/element-hq/element-x-android/pull/3829
+
+## New Contributors
+* @andybalaam made their first contribution in https://github.com/element-hq/element-x-android/pull/3745
+* @mxandreas made their first contribution in https://github.com/element-hq/element-x-android/pull/3806
+
 Changes in Element X v0.7.2 (2024-10-29)
 ========================================
 

CONTRIBUTING.md

@@ -49,8 +49,6 @@ Please ensure that you're using the project formatting rules (which are in the p
 
 This project should compile without any special action. Just clone it and open it with Android Studio, or compile from command line using `gradlew`.
 
-Note: please make sure that the configuration is `app` and not `samples.minimal`.
-
 ## Strings
 
 The strings of the project are managed externally using [https://localazy.com](https://localazy.com) and shared with Element X iOS.

app/src/main/kotlin/io/element/android/x/MainActivity.kt

@@ -87,7 +87,7 @@ class MainActivity : NodeActivity() {
 
     @Composable
     private fun MainNodeHost() {
-        NodeHost(integrationPoint = appyxIntegrationPoint) {
+        NodeHost(integrationPoint = appyxV1IntegrationPoint) {
             MainNode(
                 it,
                 plugins = listOf(

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

@@ -9,6 +9,7 @@
     <locale android:name="es"/>
     <locale android:name="et"/>
     <locale android:name="fa"/>
+    <locale android:name="fi"/>
     <locale android:name="fr"/>
     <locale android:name="hu"/>
     <locale android:name="in"/>

appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt

@@ -142,12 +142,12 @@ class LoggedInPresenter @Inject constructor(
                     .also { Timber.tag(pusherTag.value).w("No distributors available") }
                     .also {
                         // In this case, consider the push provider is chosen.
-                        pushService.selectPushProvider(matrixClient, pushProvider)
+                        pushService.selectPushProvider(matrixClient.sessionId, pushProvider)
                     }
                     .also { pusherRegistrationState.value = AsyncData.Failure(PusherRegistrationFailure.NoDistributorsAvailable()) }
             pushService.registerWith(matrixClient, pushProvider, distributor)
         } else {
-            val currentPushDistributor = currentPushProvider.getCurrentDistributor(matrixClient)
+            val currentPushDistributor = currentPushProvider.getCurrentDistributor(matrixClient.sessionId)
             if (currentPushDistributor == null) {
                 Timber.tag(pusherTag.value).d("Register with the first available distributor")
                 val distributor = currentPushProvider.getDistributors().firstOrNull()

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

@@ -0,0 +1,5 @@
+<?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">"Kirjaudu Ulos &amp; Päivitä"</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Kotipalvelimesi ei enää tue vanhaa protokollaa. Kirjaudu ulos ja takaisin sisään jatkaaksesi sovelluksen käyttöä."</string>
+</resources>

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

@@ -0,0 +1,5 @@
+<?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">"Вийти та оновити"</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Ваш домашній сервер більше не підтримує старий протокол. Будь ласка, вийдіть і увійдіть знову, щоб продовжити використання програми."</string>
+</resources>

appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt

@@ -378,7 +378,7 @@ class LoggedInPresenterTest {
         val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
             Result.success(Unit)
         }
-        val selectPushProviderLambda = lambdaRecorder<MatrixClient, PushProvider, Unit> { _, _ -> }
+        val selectPushProviderLambda = lambdaRecorder<SessionId, PushProvider, Unit> { _, _ -> }
         val sessionVerificationService = FakeSessionVerificationService(
             initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
         )
@@ -408,8 +408,8 @@ class LoggedInPresenterTest {
             selectPushProviderLambda.assertions()
                 .isCalledOnce()
                 .with(
-                    // MatrixClient
-                    any(),
+                    // SessionId
+                    value(A_SESSION_ID),
                     // PushProvider
                     value(pushProvider),
                 )
@@ -481,7 +481,7 @@ class LoggedInPresenterTest {
         registerWithLambda: (MatrixClient, PushProvider, Distributor) -> Result<Unit> = { _, _, _ ->
             Result.success(Unit)
         },
-        selectPushProviderLambda: (MatrixClient, PushProvider) -> Unit = { _, _ -> lambdaError() },
+        selectPushProviderLambda: (SessionId, PushProvider) -> Unit = { _, _ -> lambdaError() },
         currentPushProvider: () -> PushProvider? = { null },
         setIgnoreRegistrationErrorLambda: (SessionId, Boolean) -> Unit = { _, _ -> lambdaError() },
     ): PushService {

build.gradle.kts

@@ -49,7 +49,7 @@ allprojects {
         config.from(files("$rootDir/tools/detekt/detekt.yml"))
     }
     dependencies {
-        detektPlugins("io.nlopez.compose.rules:detekt:0.4.17")
+        detektPlugins("io.nlopez.compose.rules:detekt:0.4.19")
     }
 
     // KtLint

docs/continuous_integration.md

@@ -40,7 +40,7 @@ We want:
 
 The CI checks that:
 
-1. The code is compiling, without any warnings, for all the app build types and variants and for the minimal app
+1. The code is compiling, without any warnings, for all the app build types and variants
 2. The tests are passing
 3. The code quality is good (detekt, ktlint, lint)
 4. The code is running and smoke tests are passing (maestro)

fastlane/metadata/android/en-US/changelogs/40007040.txt

@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes.
+Full changelog: https://github.com/element-hq/element-x-android/releases

features/analytics/api/src/main/res/values-fi/translations.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_help_us_improve">"Jaa anonyymejä käyttötietoja auttaaksesi meitä tunnistamaan ongelmat."</string>
+  <string name="screen_analytics_settings_read_terms">"Voit lukea kaikki ehtomme %1$s."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"täällä"</string>
+  <string name="screen_analytics_settings_share_data">"Jaa analytiikkatietoja"</string>
+</resources>

features/analytics/impl/src/main/res/values-fi/translations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_prompt_data_usage">"Emme tallenna tai profiloi henkilötietoja"</string>
+  <string name="screen_analytics_prompt_help_us_improve">"Jaa anonyymejä käyttötietoja auttaaksesi meitä tunnistamaan ongelmat."</string>
+  <string name="screen_analytics_prompt_read_terms">"Voit lukea kaikki ehtomme %1$s."</string>
+  <string name="screen_analytics_prompt_read_terms_content_link">"täällä"</string>
+  <string name="screen_analytics_prompt_settings">"Voit poistaa tämän käytöstä milloin tahansa"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"Emme jaa tietojasi kolmansien osapuolien kanssa"</string>
+  <string name="screen_analytics_prompt_title">"Auta parantamaan %1$s -sovellusta"</string>
+</resources>

features/analytics/impl/src/main/res/values-uk/translations.xml

@@ -5,6 +5,6 @@
   <string name="screen_analytics_prompt_read_terms">"Ви можете прочитати всі наші умови %1$s."</string>
   <string name="screen_analytics_prompt_read_terms_content_link">"тут"</string>
   <string name="screen_analytics_prompt_settings">"Ви можете вимкнути цю функцію в будь-який час"</string>
-  <string name="screen_analytics_prompt_third_party_sharing">"Ми не передаватимемо Ваші дані третім особам"</string>
-  <string name="screen_analytics_prompt_title">"Допоможіть покращити %1$s"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"Ми не передаватимемо ваші дані третім особам"</string>
+  <string name="screen_analytics_prompt_title">"Допоможіть вдосконалити %1$s"</string>
 </resources>

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt

@@ -8,6 +8,7 @@
 package io.element.android.features.call.impl.utils
 
 import android.annotation.SuppressLint
+import androidx.annotation.VisibleForTesting
 import androidx.core.app.NotificationManagerCompat
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.appconfig.ElementCallConfig
@@ -56,11 +57,6 @@ interface ActiveCallManager {
      */
     fun registerIncomingCall(notificationData: CallNotificationData)
 
-    /**
-     * Called when the incoming call timed out. It will remove the active call and remove any associated UI, adding a 'missed call' notification.
-     */
-    fun incomingCallTimedOut()
-
     /**
      * Called when the active call has been hung up. It will remove any existing UI and the active call.
      * @param callType The type of call that the user hung up, either an external url one or a room one.
@@ -113,18 +109,24 @@ class DefaultActiveCallManager @Inject constructor(
 
             // Wait for the ringing call to time out
             delay(ElementCallConfig.RINGING_CALL_DURATION_SECONDS.seconds)
-            incomingCallTimedOut()
+            incomingCallTimedOut(displayMissedCallNotification = true)
         }
     }
 
-    override fun incomingCallTimedOut() {
+    /**
+     * Called when the incoming call timed out. It will remove the active call and remove any associated UI, adding a 'missed call' notification.
+     */
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    fun incomingCallTimedOut(displayMissedCallNotification: Boolean) {
         val previousActiveCall = activeCall.value ?: return
         val notificationData = (previousActiveCall.callState as? CallState.Ringing)?.notificationData ?: return
         activeCall.value = null
 
         cancelIncomingCallNotification()
 
-        displayMissedCallNotification(notificationData)
+        if (displayMissedCallNotification) {
+            displayMissedCallNotification(notificationData)
+        }
     }
 
     override fun hungUpCall(callType: CallType) {
@@ -186,28 +188,35 @@ class DefaultActiveCallManager @Inject constructor(
 
     @OptIn(ExperimentalCoroutinesApi::class)
     private fun observeRingingCall() {
-        // This will observe ringing calls and ensure they're terminated if the room call is cancelled
+        // This will observe ringing calls and ensure they're terminated if the room call is cancelled or if the user
+        // has joined the call from another session.
         activeCall
             .filterNotNull()
             .filter { it.callState is CallState.Ringing && it.callType is CallType.RoomCall }
             .flatMapLatest { activeCall ->
                 val callType = activeCall.callType as CallType.RoomCall
-                // Get a flow of updated `hasRoomCall` values for the room
+                // Get a flow of updated `hasRoomCall` and `activeRoomCallParticipants` values for the room
                 matrixClientProvider.getOrRestore(callType.sessionId).getOrNull()
                     ?.getRoom(callType.roomId)
                     ?.roomInfoFlow
-                    ?.map { it.hasRoomCall }
+                    ?.map {
+                        it.hasRoomCall to (callType.sessionId in it.activeRoomCallParticipants)
+                    }
                     ?: flowOf()
             }
             // We only want to check if the room active call status changes
             .distinctUntilChanged()
             // Skip the first one, we're not interested in it (if the check below passes, it had to be active anyway)
             .drop(1)
-            .onEach { roomHasActiveCall ->
+            .onEach { (roomHasActiveCall, userIsInTheCall) ->
                 if (!roomHasActiveCall) {
                     // The call was cancelled
                     timedOutCallJob?.cancel()
-                    incomingCallTimedOut()
+                    incomingCallTimedOut(displayMissedCallNotification = true)
+                } else if (userIsInTheCall) {
+                    // The user joined the call from another session
+                    timedOutCallJob?.cancel()
+                    incomingCallTimedOut(displayMissedCallNotification = false)
                 }
             }
             .launchIn(coroutineScope)

features/call/impl/src/main/res/values-fi/translations.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_foreground_service_channel_title_android">"Käynnissä oleva puhelu"</string>
+  <string name="call_foreground_service_message_android">"Palaa puheluun napauttamalla"</string>
+  <string name="call_foreground_service_title_android">"☎️ Puhelu käynnissä"</string>
+  <string name="screen_incoming_call_subtitle_android">"Saapuva Element Call -puhelu"</string>
+</resources>