Merge branch 'develop' into fix/jme/verification-auto-cancelled

README.md

@@ -8,7 +8,7 @@
 
 # Element X Android
 
-Element X Android is a [Matrix](https://matrix.org/) Android Client provided by [element.io](https://element.io/). This app is currently in a pre-alpha release stage with only basic functionalities.
+Element X Android is a [Matrix](https://matrix.org/) Android Client provided by [element.io](https://element.io/).
 
 The application is a total rewrite of [Element-Android](https://github.com/element-hq/element-android) using the [Matrix Rust SDK](https://github.com/matrix-org/matrix-rust-sdk) underneath and targeting devices running Android 7+. The UI layer is written using [Jetpack Compose](https://developer.android.com/jetpack/compose), and the navigation is managed using [Appyx](https://github.com/bumble-tech/appyx).
 
@@ -71,7 +71,7 @@ We're doing this as a way to share code between platforms and while we've seen p
 
 ## Status
 
-This project is in work in progress. The app does not cover yet all functionalities we expect. The list of supported features can be found in [this issue](https://github.com/element-hq/element-x-android/issues/911).
+This project is in an early rollout and migration phase.
 
 ## Contributing
 

app/build.gradle.kts

@@ -48,9 +48,9 @@ android {
         } else {
             "io.element.android.x"
         }
-        targetSdk = Versions.targetSdk
-        versionCode = Versions.versionCode
-        versionName = Versions.versionName
+        targetSdk = Versions.TARGET_SDK
+        versionCode = Versions.VERSION_CODE
+        versionName = Versions.VERSION_NAME
 
         // Keep abiFilter for the universalApk
         ndk {

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt

@@ -183,6 +183,7 @@ private fun WebView.setup(
         allowFileAccess = true
         domStorageEnabled = true
         mediaPlaybackRequiresUserGesture = false
+        @Suppress("DEPRECATION")
         databaseEnabled = true
         loadsImagesAutomatically = true
         userAgentString = userAgent

features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareService.kt

@@ -46,7 +46,7 @@ class DefaultShareService @Inject constructor(
                 PackageManager.GET_ACTIVITIES or PackageManager.MATCH_DISABLED_COMPONENTS
             )
             .activities
-            .firstOrNull { it.name.endsWith(".ShareActivity") }
+            ?.firstOrNull { it.name.endsWith(".ShareActivity") }
             ?.let { shareActivityInfo ->
                 ComponentName(
                     shareActivityInfo.packageName,

gradle/libs.versions.toml

@@ -17,7 +17,7 @@ core = "1.13.1"
 # due to the DefaultMigrationStore not behaving as expected.
 # Stick to 1.0.0 for now, and ensure that this scenario cannot be reproduced when upgrading the version.
 datastore = "1.0.0"
-constraintlayout = "2.1.4"
+constraintlayout = "2.2.0"
 constraintlayout_compose = "1.1.0"
 lifecycle = "2.8.6"
 activity = "1.9.3"

libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt

@@ -86,6 +86,7 @@ fun OidcView(
                             javaScriptEnabled = true
                             allowContentAccess = true
                             allowFileAccess = true
+                            @Suppress("DEPRECATION")
                             databaseEnabled = true
                             domStorageEnabled = true
                         }

plugins/src/main/kotlin/Versions.kt

@@ -50,10 +50,10 @@ private const val versionMinor = 7
 private const val versionPatch = 3
 
 object Versions {
-    val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch
-    val versionName = "$versionMajor.$versionMinor.$versionPatch"
-    const val compileSdk = 34
-    const val targetSdk = 34
+    const val VERSION_CODE = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch
+    const val VERSION_NAME = "$versionMajor.$versionMinor.$versionPatch"
+    const val COMPILE_SDK = 35
+    const val TARGET_SDK = 35
 
     // When updating the `minSdk`, make sure to update the value of `minSdkVersion` in the file `tools/release/release.sh`
     val minSdk = if (isEnterpriseBuild) 26 else 24

plugins/src/main/kotlin/extension/CommonExtension.kt

@@ -15,7 +15,7 @@ import java.io.File
 
 fun CommonExtension<*, *, *, *, *, *>.androidConfig(project: Project) {
     defaultConfig {
-        compileSdk = Versions.compileSdk
+        compileSdk = Versions.COMPILE_SDK
         minSdk = Versions.minSdk
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

samples/minimal/build.gradle.kts

@@ -14,9 +14,9 @@ android {
 
     defaultConfig {
         applicationId = "io.element.android.samples.minimal"
-        targetSdk = Versions.targetSdk
-        versionCode = Versions.versionCode
-        versionName = Versions.versionName
+        targetSdk = Versions.TARGET_SDK
+        versionCode = Versions.VERSION_CODE
+        versionName = Versions.VERSION_NAME
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }