Merge branch 'release/1.6.50' into main

Author: bmarty

CHANGES.md

@@ -1,3 +1,16 @@
+Changes in Element v1.6.50 (2026-02-04)
+=======================================
+
+Other changes
+-------------
+ - Update the default bug reporting URL. ([#9097](https://github.com/element-hq/element-android/issues/9097))
+ - Update OAuth-awareness to support the stable version of MSC3824. ([#9102](https://github.com/element-hq/element-android/issues/9102))
+ - Update realm plugin to 10.19.0 ([#9111](https://github.com/element-hq/element-android/issues/9116))
+ - Bump org.matrix.rustcomponents:crypto-android from 26.1.22 to 26.1.28 ([#9114](https://github.com/element-hq/element-android/issues/9114))
+ - Update sentry to version 8.31.0 ([#9115](https://github.com/element-hq/element-android/issues/9115))
+ - Update Maplibre dependency to version 11.6.1 ([#9116](https://github.com/element-hq/element-android/issues/9116))
+ - Remove flipper from the codebase. ([#9117](https://github.com/element-hq/element-android/issues/9117))
+
 Changes in Element v1.6.48 (2025-10-15)
 =======================================
 

dependencies.gradle

@@ -19,14 +19,13 @@ def markwon = "4.6.2"
 def moshi = "1.15.1"
 def lifecycle = "2.8.3"
 def flowBinding = "1.2.0"
-def flipper = "0.259.0"
 def epoxy = "5.0.0"
 def mavericks = "3.0.9"
 def glide = "4.16.0"
 def bigImageViewer = "1.8.1"
 def jjwt = "0.11.5"
 def vanniktechEmoji = "0.16.0"
-def sentry = "6.18.1"
+def sentry = "8.31.0"
 def fragment = "1.8.6"
 // Testing
 def mockk = "1.13.11"
@@ -95,10 +94,6 @@ ext.libs = [
                 'hiltAndroidTesting'      : "com.google.dagger:hilt-android-testing:$dagger",
                 'hiltCompiler'            : "com.google.dagger:hilt-compiler:$dagger"
         ],
-        flipper     : [
-                'flipper'                 : "com.facebook.flipper:flipper:$flipper",
-                'flipperNetworkPlugin'    : "com.facebook.flipper:flipper-network-plugin:$flipper",
-        ],
         element     : [
                 'opusencoder'             : "io.element.android:opusencoder:1.1.0",
                 'wysiwyg'                 : "io.element.android:wysiwyg:2.38.2"
@@ -132,8 +127,8 @@ ext.libs = [
                 'mavericksTesting'       : "com.airbnb.android:mavericks-testing:$mavericks"
         ],
         maplibre    : [
-                'androidSdk'             : "org.maplibre.gl:android-sdk:10.0.2",
-                'pluginAnnotation'       : "org.maplibre.gl:android-plugin-annotation-v9:1.0.0"
+                'androidSdk'             : "org.maplibre.gl:android-sdk:11.6.1",
+                'pluginAnnotation'       : "org.maplibre.gl:android-plugin-annotation-v9:3.0.2"
         ],
         mockk      : [
                 'mockk'                   : "io.mockk:mockk:$mockk",

dependencies_groups.gradle

@@ -69,7 +69,6 @@ ext.groups = [
                         'com.dropbox.core',
                         'com.soywiz.korlibs.korte',
                         'com.facebook.fbjni',
-                        'com.facebook.flipper',
                         'com.facebook.fresco',
                         'com.facebook.infer.annotation',
                         'com.facebook.react',
@@ -114,7 +113,6 @@ ext.groups = [
                         'com.intellij',
                         'com.jakewharton.android.repackaged',
                         'com.jakewharton.timber',
-                        'com.kgurgul.flipper',
                         'com.linkedin.dexmaker',
                         'com.mapbox.mapboxsdk',
                         'com.nulab-inc',

docs/flipper.md

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

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

@@ -17,7 +17,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "io.realm:realm-gradle-plugin:10.18.0"
+        classpath "io.realm:realm-gradle-plugin:10.19.0"
     }
 }
 
@@ -62,7 +62,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.6.48\""
+        buildConfigField "String", "SDK_VERSION", "\"1.6.50\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
@@ -221,7 +221,7 @@ dependencies {
 
     implementation libs.google.phonenumber
 
-    implementation("org.matrix.rustcomponents:crypto-android:0.11.1")
+    implementation("org.matrix.rustcomponents:crypto-android:26.1.28")
 //    api project(":library:rustCrypto")
 
     testImplementation libs.tests.junit

matrix-sdk-android/build.gradle

@@ -19,7 +19,7 @@ package org.matrix.android.sdk.api.auth
 /**
  * See https://github.com/matrix-org/matrix-spec-proposals/pull/3824
  */
-enum class SSOAction {
-    LOGIN,
-    REGISTER;
+enum class SSOAction(val value: String) {
+    LOGIN("login"),
+    REGISTER("register");
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/SSOAction.kt

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2026 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.auth.data
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * This is a subset of the server metadata discovery for the OAuth 2.0 API
+ * https://spec.matrix.org/v1.16/client-server-api/#get_matrixclientv1auth_metadata
+ *
+ * Includes the values from MSC4191: https://github.com/matrix-org/matrix-spec-proposals/pull/4191
+ *
+ * <pre>
+ * {
+ *     "issuer": "https://id.server.org",
+ *     "account_management_uri": "https://id.server.org/my-account",
+ *     "account_management_actions_supported": ["org.matrix.profile", "org.matrix.devices_list"],
+ * }
+ * </pre>
+ * .
+ */
+
+@JsonClass(generateAdapter = true)
+data class AuthMetadata(
+        @Json(name = "issuer")
+        val issuer: String,
+
+        @Json(name = "account_management_uri")
+        val accountManagementUri: String?,
+
+        @Json(name = "account_management_actions_supported")
+        val accountManagementActionsSupported: List<String>?,
+)

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/AuthMetadata.kt

@@ -82,12 +82,17 @@ data class HomeServerCapabilities(
         var canRedactRelatedEvents: Boolean = false,
 
         /**
-         * External account management url for use with MSC3824 delegated OIDC, provided in Wellknown.
+         * External account management url for use with OAuth API, provided by MSC4191 /auth_metadata discovery or in unstable Wellknown.
          */
         val externalAccountManagementUrl: String? = null,
 
         /**
-         * Authentication issuer for use with MSC3824 delegated OIDC, provided in Wellknown.
+         * External account management supported actions for use with OAuth API, provided by MSC4191 /auth_metadata discovery.
+         */
+        val externalAccountManagementSupportedActions: List<String>? = null,
+
+        /**
+         * Authentication issuer for use with MSC3824 delegated OIDC, provided by /auth_metadata discovery or in unstable Wellknown.
          */
         val authenticationIssuer: String? = null,
 
@@ -162,4 +167,26 @@ data class HomeServerCapabilities(
         const val ROOM_CAP_KNOCK = "knock"
         const val ROOM_CAP_RESTRICTED = "restricted"
     }
+
+    fun getLogoutDeviceURL(deviceId: String): String? {
+        if (externalAccountManagementUrl == null) {
+            return null
+        }
+
+        // default to the stable value:
+        var action = "org.matrix.device_delete"
+        externalAccountManagementSupportedActions?.also { actions ->
+            if (actions.contains("org.matrix.device_delete")) {
+                // server supports stable version so use it
+            } else if (actions.contains("org.matrix.session_end")) {
+                // earlier version of MSC4191:
+                action = "org.matrix.session_end"
+            } else if (actions.contains("session_end")) {
+                // previous unspecified version
+                action = "session_end"
+            }
+        }
+
+        return externalAccountManagementUrl.removeSuffix("/") + "?action=${action}&device_id=${deviceId}"
+    }
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt

@@ -106,7 +106,11 @@ internal class DefaultAuthenticationService @Inject constructor(
             }
 
             // unstable MSC3824 action param
-            appendParamToUrl("org.matrix.msc3824.action", action.toString())
+            // This can be removed once servers have been updated to support the stable one.
+            appendParamToUrl("org.matrix.msc3824.action", action.value)
+
+            // stable param:
+            appendParamToUrl("action", action.value)
         }
     }
 
@@ -297,8 +301,8 @@ internal class DefaultAuthenticationService @Inject constructor(
             authAPI.getLoginFlows()
         }
 
-        // If an m.login.sso flow is present that is flagged as being for MSC3824 OIDC compatibility then we only return that flow
-        val oidcCompatibilityFlow = loginFlowResponse.flows.orEmpty().firstOrNull { it.type == "m.login.sso" && it.delegatedOidcCompatibility == true }
+        // If an m.login.sso flow is present that is flagged as being for MSC3824 OAuth compatibility then we only return that flow
+        val oidcCompatibilityFlow = loginFlowResponse.flows.orEmpty().firstOrNull { it.type == "m.login.sso" && it.delegatedOidcCompatibility }
         val flows = if (oidcCompatibilityFlow != null) listOf(oidcCompatibilityFlow) else loginFlowResponse.flows
 
         val supportsGetLoginTokenFlow = loginFlowResponse.flows.orEmpty().firstOrNull { it.type == "m.login.token" && it.getLoginToken == true } != null