Merge branch 'release/0.3.2'

Author: jmartinesp

.github/workflows/build.yml

@@ -55,7 +55,7 @@ jobs:
           name: elementx-debug
           path: |
             app/build/outputs/apk/debug/*.apk
-      - uses: rnkdsh/[email protected].3
+      - uses: rnkdsh/[email protected].4
         id: diawi
         # Do not fail the whole build if Diawi upload fails
         continue-on-error: true

.github/workflows/maestro.yml

@@ -40,7 +40,7 @@ jobs:
           ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
           ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
           ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
-      - uses: mobile-dev-inc/action-maestro-cloud@v1.6.0
+      - uses: mobile-dev-inc/action-maestro-cloud@v1.8.0
         with:
           api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
           # Doc says (https://github.com/mobile-dev-inc/action-maestro-cloud#android):

.maestro/tests/settings/settings.yaml

@@ -16,7 +16,7 @@ appId: ${APP_ID}
 
 - tapOn:
     text: "Report a problem"
-- assertVisible: "Report a bug"
+- assertVisible: "Report a problem"
 - back
 
 - tapOn:

CHANGES.md

@@ -1,3 +1,28 @@
+Changes in Element X v0.3.2 (2023-11-22)
+========================================
+
+Features ✨
+----------
+ - Add ongoing call indicator to rooms lists items. ([#1158](https://github.com/vector-im/element-x-android/issues/1158))
+ - Add support for typing mentions in the message composer. ([#1453](https://github.com/vector-im/element-x-android/issues/1453))
+ - Add intentional mentions to messages. This needs to be enabled in developer options since it's disabled by default. ([#1591](https://github.com/vector-im/element-x-android/issues/1591))
+ - Update voice message recording behaviour. Instead of holding the record button, users can now tap the record button to start recording and tap again to stop recording. ([#1784](https://github.com/vector-im/element-x-android/issues/1784))
+
+Bugfixes 🐛
+----------
+ - Always ensure media temp dir exists ([#1790](https://github.com/vector-im/element-x-android/issues/1790))
+
+Other changes
+-------------
+ - Update icons and move away from `PreferenceText` components. ([#1718](https://github.com/vector-im/element-x-android/issues/1718))
+ - Add item "This is the beginning of..." at the beginning of the timeline. ([#1801](https://github.com/vector-im/element-x-android/issues/1801))
+ - LockScreen : rework LoggedInFlowNode and back management when locked. ([#1806](https://github.com/vector-im/element-x-android/issues/1806))
+ - Suppress usage of removeTimeline method. ([#1824](https://github.com/vector-im/element-x-android/issues/1824))
+ - Remove Element Call feature flag, it's now always enabled.
+  - Reverted the EC base URL to `https://call.element.io`.
+  - Moved the option to override this URL to developer settings from advanced settings.
+
+
 Changes in Element X v0.3.1 (2023-11-09)
 ========================================
 

anvilcodegen/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
     implementation(projects.anvilannotations)
     api(libs.anvil.compiler.api)
     implementation(libs.anvil.compiler.utils)
-    implementation("com.squareup:kotlinpoet:1.14.2")
+    implementation(libs.kotlinpoet)
     implementation(libs.dagger)
     compileOnly(libs.google.autoservice.annotations)
     kapt(libs.google.autoservice)

app/build.gradle.kts

@@ -27,8 +27,8 @@ plugins {
     alias(libs.plugins.anvil)
     alias(libs.plugins.ksp)
     alias(libs.plugins.kapt)
-    id("com.google.firebase.appdistribution") version "4.0.1"
-    id("org.jetbrains.kotlinx.knit") version "0.4.0"
+    alias(libs.plugins.firebaseAppDistribution)
+    alias(libs.plugins.knit)
     id("kotlin-parcelize")
     // To be able to update the firebase.xml files, uncomment and build the project
     // id("com.google.gms.google-services")

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

@@ -18,6 +18,7 @@ package io.element.android.x
 
 import android.app.Application
 import androidx.startup.AppInitializer
+import io.element.android.features.cachecleaner.api.CacheCleanerInitializer
 import io.element.android.libraries.di.DaggerComponentOwner
 import io.element.android.x.di.AppComponent
 import io.element.android.x.di.DaggerAppComponent
@@ -27,17 +28,14 @@ import io.element.android.x.initializer.TracingInitializer
 
 class ElementXApplication : Application(), DaggerComponentOwner {
 
-    private lateinit var appComponent: AppComponent
-
-    override val daggerComponent: Any
-        get() = appComponent
+    override val daggerComponent: AppComponent = DaggerAppComponent.factory().create(this)
 
     override fun onCreate() {
         super.onCreate()
-        appComponent = DaggerAppComponent.factory().create(applicationContext)
         AppInitializer.getInstance(this).apply {
             initializeComponent(CrashInitializer::class.java)
             initializeComponent(TracingInitializer::class.java)
+            initializeComponent(CacheCleanerInitializer::class.java)
         }
         logApplicationInfo()
     }

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

@@ -25,6 +25,9 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -33,10 +36,14 @@ import com.bumble.appyx.core.integration.NodeHost
 import com.bumble.appyx.core.integrationpoint.NodeActivity
 import com.bumble.appyx.core.plugin.NodeReadyObserver
 import io.element.android.features.lockscreen.api.handleSecureFlag
+import io.element.android.features.lockscreen.api.isLocked
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.designsystem.utils.snackbar.LocalSnackbarDispatcher
 import io.element.android.libraries.theme.ElementTheme
+import io.element.android.libraries.theme.theme.Theme
+import io.element.android.libraries.theme.theme.isDark
+import io.element.android.libraries.theme.theme.mapToTheme
 import io.element.android.x.di.AppBindings
 import io.element.android.x.intent.SafeUriHandler
 import timber.log.Timber
@@ -46,7 +53,6 @@ private val loggerTag = LoggerTag("MainActivity")
 class MainActivity : NodeActivity() {
 
     private lateinit var mainNode: MainNode
-
     private lateinit var appBindings: AppBindings
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -61,9 +67,29 @@ class MainActivity : NodeActivity() {
         }
     }
 
+    @Deprecated("")
+    override fun onBackPressed() {
+        // If the app is locked, we need to intercept onBackPressed before it goes to OnBackPressedDispatcher.
+        // Indeed, otherwise we would need to trick Appyx backstack management everywhere.
+        // Without this trick, we would get pop operations on the hidden backstack.
+        if (appBindings.lockScreenService().isLocked) {
+            // Do not kill the app in this case, just go to background.
+            moveTaskToBack(false)
+        } else {
+            @Suppress("DEPRECATION")
+            super.onBackPressed()
+        }
+    }
+
     @Composable
     private fun MainContent(appBindings: AppBindings) {
-        ElementTheme {
+        val theme by remember {
+            appBindings.preferencesStore().getThemeFlow().mapToTheme()
+        }
+            .collectAsState(initial = Theme.System)
+        ElementTheme(
+            darkTheme = theme.isDark()
+        ) {
             CompositionLocalProvider(
                 LocalSnackbarDispatcher provides appBindings.snackbarDispatcher(),
                 LocalUriHandler provides SafeUriHandler(this),

app/src/main/kotlin/io/element/android/x/di/AppBindings.kt

@@ -18,6 +18,7 @@ package io.element.android.x.di
 
 import com.squareup.anvil.annotations.ContributesTo
 import io.element.android.features.lockscreen.api.LockScreenService
+import io.element.android.features.preferences.api.store.PreferencesStore
 import io.element.android.features.rageshake.api.reporter.BugReporter
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
 import io.element.android.libraries.di.AppScope
@@ -29,4 +30,5 @@ interface AppBindings {
     fun tracingService(): TracingService
     fun bugReporter(): BugReporter
     fun lockScreenService(): LockScreenService
+    fun preferencesStore(): PreferencesStore
 }

appconfig/src/main/kotlin/io/element/android/appconfig/ElementCallConfig.kt

@@ -17,5 +17,5 @@
 package io.element.android.appconfig
 
 object ElementCallConfig {
-    const val DEFAULT_BASE_URL = "https://call.element.dev"
+    const val DEFAULT_BASE_URL = "https://call.element.io"
 }