Merge branch 'develop'

Author: bmarty

CHANGES.md

@@ -1,3 +1,10 @@
+Changes in Element v1.6.34 (2025-03-07)
+=======================================
+
+Security fixes 🔐
+-----------------
+- Fix for [GHSA-632v-9pm3-m8ch](https://github.com/element-hq/element-android/security/advisories/GHSA-632v-9pm3-m8ch) / [CVE-2025-27606](https://www.cve.org/CVERecord?id=CVE-2025-27606)
+
 Changes in Element v1.6.32 (2025-02-18)
 =======================================
 

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

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

matrix-sdk-android/build.gradle

@@ -62,7 +62,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.6.32\""
+        buildConfigField "String", "SDK_VERSION", "\"1.6.34\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""

vector-app/build.gradle

@@ -37,7 +37,7 @@ ext.versionMinor = 6
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 32
+ext.versionPatch = 34
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

vector/src/main/java/im/vector/app/features/MainActivity.kt

@@ -61,6 +61,7 @@ import javax.inject.Inject
 data class MainActivityArgs(
         val clearCache: Boolean = false,
         val clearCredentials: Boolean = false,
+        val ignoreLogoutServerError: Boolean = false,
         val isUserLoggedOut: Boolean = false,
         val isAccountDeactivated: Boolean = false,
         val isSoftLogout: Boolean = false
@@ -238,6 +239,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
         return MainActivityArgs(
                 clearCache = argsFromIntent?.clearCache ?: false,
                 clearCredentials = argsFromIntent?.clearCredentials ?: false,
+                ignoreLogoutServerError = argsFromIntent?.ignoreLogoutServerError ?: false,
                 isUserLoggedOut = argsFromIntent?.isUserLoggedOut ?: false,
                 isAccountDeactivated = argsFromIntent?.isAccountDeactivated ?: false,
                 isSoftLogout = argsFromIntent?.isSoftLogout ?: false
@@ -263,7 +265,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
                 }
             }
             args.clearCredentials -> {
-                signout(session, onboardingStore, ignoreServerError = false)
+                signout(session, onboardingStore, ignoreServerError = args.ignoreLogoutServerError)
             }
             args.clearCache -> {
                 lifecycleScope.launch {

vector/src/main/java/im/vector/app/features/pin/PinFragment.kt

@@ -162,6 +162,12 @@ class PinFragment :
     }
 
     private fun launchResetPinFlow() {
-        MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCredentials = true))
+        MainActivity.restartApp(
+                activity = requireActivity(),
+                args = MainActivityArgs(
+                        clearCredentials = true,
+                        ignoreLogoutServerError = true,
+                )
+        )
     }
 }