1
0
mirror of https://github.com/vector-im/riotX-android synced 2025-10-05 15:52:47 +02:00

Merge commit from fork

Ignore server errors (network error, etc.) when login out the user after incorrect PIN code has been entered
This commit is contained in:
Benoit Marty
2025-03-13 15:32:19 +01:00
committed by GitHub
4 changed files with 19 additions and 2 deletions

View File

@@ -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)
=======================================

View File

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

View File

@@ -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 {

View File

@@ -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,
)
)
}
}