master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Ignore server errors (network error, etc.) when login out the user after 3 incorrect PIN entered.

Browse Source
This commit is contained in:
Benoit Marty 2025-02-28 09:58:49 +01:00
parent cd90bb255f
commit 55ddf72168
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/java/im/vector/app/features/MainActivity.kt
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 {

8
vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
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,
)
)
}
}