Skip to content

Commit 55ddf72

Browse files
committed
Ignore server errors (network error, etc.) when login out the user after 3 incorrect PIN entered.
1 parent cd90bb2 commit 55ddf72

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ import javax.inject.Inject
6161
data class MainActivityArgs(
6262
val clearCache: Boolean = false,
6363
val clearCredentials: Boolean = false,
64+
val ignoreLogoutServerError: Boolean = false,
6465
val isUserLoggedOut: Boolean = false,
6566
val isAccountDeactivated: Boolean = false,
6667
val isSoftLogout: Boolean = false
@@ -238,6 +239,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
238239
return MainActivityArgs(
239240
clearCache = argsFromIntent?.clearCache ?: false,
240241
clearCredentials = argsFromIntent?.clearCredentials ?: false,
242+
ignoreLogoutServerError = argsFromIntent?.ignoreLogoutServerError ?: false,
241243
isUserLoggedOut = argsFromIntent?.isUserLoggedOut ?: false,
242244
isAccountDeactivated = argsFromIntent?.isAccountDeactivated ?: false,
243245
isSoftLogout = argsFromIntent?.isSoftLogout ?: false
@@ -263,7 +265,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
263265
}
264266
}
265267
args.clearCredentials -> {
266-
signout(session, onboardingStore, ignoreServerError = false)
268+
signout(session, onboardingStore, ignoreServerError = args.ignoreLogoutServerError)
267269
}
268270
args.clearCache -> {
269271
lifecycleScope.launch {

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,12 @@ class PinFragment :
162162
}
163163

164164
private fun launchResetPinFlow() {
165-
MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCredentials = true))
165+
MainActivity.restartApp(
166+
activity = requireActivity(),
167+
args = MainActivityArgs(
168+
clearCredentials = true,
169+
ignoreLogoutServerError = true,
170+
)
171+
)
166172
}
167173
}

0 commit comments

Comments
 (0)