Merge branch 'release/25.04.0' into main

Author: bmarty

.github/workflows/nightly_enterprise.yml

@@ -1,6 +1,6 @@
 name: Pull Request
 on:
-  pull_request:
+  pull_request_target:
     types: [ opened, edited, labeled, unlabeled, synchronize ]
   workflow_call:
     secrets:

.github/workflows/pull_request.yml

@@ -1,3 +1,21 @@
+Changes in Element X v25.03.4
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v25.03.4 -->
+
+## What's Changed
+### 🙌 Improvements
+* Change : composer suggestions by @ganfra in https://github.com/element-hq/element-x-android/pull/4485
+### 🧱 Build
+* Fix flaky incoming verification tests by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4479
+### Dependency upgrades
+* fix(deps): update dagger to v2.56.1 by @renovate in https://github.com/element-hq/element-x-android/pull/4472
+* fix(deps): update dependencyanalysis to v2.13.2 by @renovate in https://github.com/element-hq/element-x-android/pull/4473
+* Upgrade embedded EC version to `v0.9.0-rc.4` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4489
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.03.3...v25.03.4
+
 Changes in Element X v25.03.3
 =============================
 

.idea/kotlinc.xml

@@ -20,6 +20,7 @@ import extension.allEnterpriseImpl
 import extension.allFeaturesImpl
 import extension.allLibrariesImpl
 import extension.allServicesImpl
+import extension.buildConfigFieldStr
 import extension.koverDependencies
 import extension.locales
 import extension.setupAnvil
@@ -102,7 +103,7 @@ android {
     }
 
     val baseAppName = BuildTimeConfig.APPLICATION_NAME
-    logger.warnInBox("Building $baseAppName")
+    logger.warnInBox("Building ${defaultConfig.applicationId} ($baseAppName)")
 
     buildTypes {
         getByName("debug") {
@@ -170,13 +171,13 @@ android {
         create("gplay") {
             dimension = "store"
             isDefault = true
-            buildConfigField("String", "SHORT_FLAVOR_DESCRIPTION", "\"G\"")
-            buildConfigField("String", "FLAVOR_DESCRIPTION", "\"GooglePlay\"")
+            buildConfigFieldStr("SHORT_FLAVOR_DESCRIPTION", "G")
+            buildConfigFieldStr("FLAVOR_DESCRIPTION", "GooglePlay")
         }
         create("fdroid") {
             dimension = "store"
-            buildConfigField("String", "SHORT_FLAVOR_DESCRIPTION", "\"F\"")
-            buildConfigField("String", "FLAVOR_DESCRIPTION", "\"FDroid\"")
+            buildConfigFieldStr("SHORT_FLAVOR_DESCRIPTION", "F")
+            buildConfigFieldStr("FLAVOR_DESCRIPTION", "FDroid")
         }
     }
 }
@@ -291,8 +292,8 @@ tasks.withType<GenerateBuildConfig>().configureEach {
     outputs.upToDateWhen { false }
     val gitRevision = providers.of(GitRevisionValueSource::class.java) {}.get()
     val gitBranchName = providers.of(GitBranchNameValueSource::class.java) {}.get()
-    android.defaultConfig.buildConfigField("String", "GIT_REVISION", "\"$gitRevision\"")
-    android.defaultConfig.buildConfigField("String", "GIT_BRANCH_NAME", "\"$gitBranchName\"")
+    android.defaultConfig.buildConfigFieldStr("GIT_REVISION", gitRevision)
+    android.defaultConfig.buildConfigFieldStr("GIT_BRANCH_NAME", gitBranchName)
 }
 
 licensee {

CHANGES.md

@@ -9,6 +9,8 @@ package io.element.android.x
 
 import android.app.Application
 import androidx.startup.AppInitializer
+import io.element.android.appconfig.RageshakeConfig
+import io.element.android.appconfig.isEnabled
 import io.element.android.features.cachecleaner.api.CacheCleanerInitializer
 import io.element.android.libraries.di.DaggerComponentOwner
 import io.element.android.x.di.AppComponent
@@ -23,7 +25,9 @@ class ElementXApplication : Application(), DaggerComponentOwner {
     override fun onCreate() {
         super.onCreate()
         AppInitializer.getInstance(this).apply {
-            initializeComponent(CrashInitializer::class.java)
+            if (RageshakeConfig.isEnabled) {
+                initializeComponent(CrashInitializer::class.java)
+            }
             initializeComponent(PlatformInitializer::class.java)
             initializeComponent(CacheCleanerInitializer::class.java)
         }

app/build.gradle.kts

@@ -37,6 +37,7 @@ class PlatformInitializer : Initializer<Unit> {
             writesToFilesConfiguration = defaultWriteToDiskConfiguration(bugReporter),
             logLevel = logLevel,
             extraTargets = listOf(ELEMENT_X_TARGET),
+            traceLogPacks = runBlocking { preferencesStore.getTracingLogPacksFlow().first() },
         )
         bugReporter.setCurrentTracingLogLevel(logLevel.name)
         platformService.init(tracingConfiguration)

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

@@ -5,8 +5,8 @@
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <resources>
-    <!-- Must be equal to DarkDesignTokens.colorThemeBg -->
+    <!-- Must be equal to DarkColorTokens.colorThemeBg -->
     <color name="splashscreen_bg_dark">#FF101317</color>
-    <!-- Must be equal to LightDesignTokens.colorThemeBg -->
+    <!-- Must be equal to LightColorTokens.colorThemeBg -->
     <color name="splashscreen_bg_light">#FFFFFFFF</color>
 </resources>

app/src/main/kotlin/io/element/android/x/initializer/PlatformInitializer.kt

@@ -1,3 +1,6 @@
+import config.BuildTimeConfig
+import extension.buildConfigFieldStr
+
 /*
  * Copyright 2022-2024 New Vector Ltd.
  *
@@ -10,6 +13,37 @@ plugins {
 
 android {
     namespace = "io.element.android.appconfig"
+
+    buildFeatures {
+        buildConfig = true
+    }
+
+    defaultConfig {
+        buildConfigFieldStr(
+            name = "URL_POLICY",
+            value = if (isEnterpriseBuild) {
+                BuildTimeConfig.URL_POLICY ?: ""
+            } else {
+                "https://element.io/cookie-policy"
+            },
+        )
+        buildConfigFieldStr(
+            name = "BUG_REPORT_URL",
+            value = if (isEnterpriseBuild) {
+                BuildTimeConfig.BUG_REPORT_URL ?: ""
+            } else {
+                "https://riot.im/bugreports/submit"
+            },
+        )
+        buildConfigFieldStr(
+            name = "BUG_REPORT_APP_NAME",
+            value = if (isEnterpriseBuild) {
+                BuildTimeConfig.BUG_REPORT_APP_NAME ?: ""
+            } else {
+                "element-x-android"
+            },
+        )
+    }
 }
 
 dependencies {

app/src/main/res/values/colors.xml

@@ -8,5 +8,5 @@
 package io.element.android.appconfig
 
 object AnalyticsConfig {
-    const val POLICY_LINK = "https://element.io/cookie-policy"
+    const val POLICY_LINK = BuildConfig.URL_POLICY
 }

appconfig/build.gradle.kts

@@ -11,17 +11,23 @@ object RageshakeConfig {
     /**
      * The URL to submit bug reports to.
      */
-    const val BUG_REPORT_URL = "https://riot.im/bugreports/submit"
+    const val BUG_REPORT_URL = BuildConfig.BUG_REPORT_URL
 
     /**
      * As per https://github.com/matrix-org/rageshake:
      * Identifier for the application (eg 'riot-web').
      * Should correspond to a mapping configured in the configuration file for github issue reporting to work.
      */
-    const val BUG_REPORT_APP_NAME = "element-x-android"
+    const val BUG_REPORT_APP_NAME = BuildConfig.BUG_REPORT_APP_NAME
 
     /**
      * The maximum size of the upload request. Default value is just below CloudFlare's max request size.
      */
     const val MAX_LOG_UPLOAD_SIZE = 50 * 1024 * 1024L
 }
+
+/**
+ * Whether the rageshake feature is enabled.
+ */
+val RageshakeConfig.isEnabled: Boolean
+    get() = BUG_REPORT_URL.isNotEmpty() && BUG_REPORT_APP_NAME.isNotEmpty()

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

@@ -10,34 +10,44 @@ package io.element.android.appicon.element
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 
 @Preview
 @Composable
 internal fun IconPreview() {
     Box {
-        Image(painter = painterResource(id = R.mipmap.ic_launcher_background), contentDescription = null)
-        Image(painter = painterResource(id = R.mipmap.ic_launcher_foreground), contentDescription = null)
+        Image(
+            modifier = Modifier.matchParentSize(),
+            painter = painterResource(id = R.drawable.ic_launcher_background),
+            contentDescription = null,
+        )
+        Image(
+            painter = painterResource(id = R.mipmap.ic_launcher_foreground),
+            contentDescription = null,
+        )
     }
 }
 
 @Preview
 @Composable
 internal fun RoundIconPreview() {
     Box(modifier = Modifier.clip(shape = CircleShape)) {
-        Image(painter = painterResource(id = R.mipmap.ic_launcher_background), contentDescription = null)
-        Image(painter = painterResource(id = R.mipmap.ic_launcher_foreground), contentDescription = null)
+        Image(
+            modifier = Modifier.matchParentSize(),
+            painter = painterResource(id = R.drawable.ic_launcher_background),
+            contentDescription = null,
+        )
+        Image(
+            painter = painterResource(id = R.mipmap.ic_launcher_foreground),
+            contentDescription = null,
+        )
     }
 }
 
@@ -46,10 +56,7 @@ internal fun RoundIconPreview() {
 internal fun MonochromeIconPreview() {
     Box(
         modifier = Modifier
-            .size(108.dp)
-            .background(Color(0xFF2F3133))
-            .clip(shape = RoundedCornerShape(32.dp)),
-        contentAlignment = Alignment.Center
+            .background(Color(0xFF2F3133)),
     ) {
         Image(
             painter = painterResource(id = R.mipmap.ic_launcher_monochrome),

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

@@ -1,2 +1,10 @@
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@mipmap/ic_launcher_background" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#010302"
+        android:fillType="evenOdd"
+        android:pathData="m0,0h108v108h-108z" />
+</vector>

appicon/element/src/main/ic_launcher-playstore.png

@@ -30,7 +30,6 @@ import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.api.sync.SlidingSyncVersion
 import io.element.android.libraries.matrix.api.sync.SyncService
-import io.element.android.libraries.matrix.api.sync.isOnline
 import io.element.android.libraries.matrix.api.verification.SessionVerificationService
 import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
 import io.element.android.libraries.push.api.PushService
@@ -79,7 +78,7 @@ class LoggedInPresenter @Inject constructor(
                 .launchIn(this)
         }
         val syncIndicator by matrixClient.roomListService.syncIndicator.collectAsState()
-        val isOnline by syncService.isOnline().collectAsState()
+        val isOnline by syncService.isOnline.collectAsState()
         val showSyncSpinner by remember {
             derivedStateOf {
                 isOnline && syncIndicator == RoomListService.SyncIndicator.Show

appicon/element/src/main/kotlin/io/element/android/appicon/element/IconPreview.kt

@@ -49,7 +49,6 @@ import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 import io.element.android.libraries.matrix.api.sync.SyncService
-import io.element.android.libraries.matrix.api.sync.isOnline
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.first
@@ -211,7 +210,7 @@ class RoomFlowNode @AssistedInject constructor(
     }
 
     private fun loadingNode(buildContext: BuildContext) = node(buildContext) { modifier ->
-        val isOnline by syncService.isOnline().collectAsState()
+        val isOnline by syncService.isOnline.collectAsState()
         LoadingRoomNodeView(
             state = LoadingRoomState.Loading,
             hasNetworkConnection = isOnline,

appicon/element/src/main/res/mipmap-hdpi/ic_launcher.webp

@@ -36,7 +36,6 @@ import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.sync.SyncService
-import io.element.android.libraries.matrix.api.sync.isOnline
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
@@ -114,7 +113,7 @@ class JoinedRoomFlowNode @AssistedInject constructor(
 
     private fun loadingNode(buildContext: BuildContext, onBackClick: () -> Unit) = node(buildContext) { modifier ->
         val loadingRoomState by loadingRoomStateStateFlow.collectAsState()
-        val isOnline by syncService.isOnline().collectAsState()
+        val isOnline by syncService.isOnline.collectAsState()
         LoadingRoomNodeView(
             state = loadingRoomState,
             hasNetworkConnection = isOnline,

appicon/element/src/main/res/mipmap-hdpi/ic_launcher_background.webp

@@ -241,7 +241,7 @@ class IntentResolverTest {
     }
 
     private fun createIntentResolver(
-        permalinkParserResult: () -> PermalinkData = { lambdaError() }
+        permalinkParserResult: (String) -> PermalinkData = { lambdaError() }
     ): IntentResolver {
         return IntentResolver(
             deeplinkParser = DeeplinkParser(),

appicon/element/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp

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