Skip to content

Commit 945d0ce

Browse files
Fix import ordering
1 parent 459ae72 commit 945d0ce

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ package org.matrix.android.sdk.internal.session.account
1919
import org.matrix.android.sdk.api.auth.UIABaseAuth
2020
import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
2121
import org.matrix.android.sdk.api.session.uia.UiaResult
22+
import org.matrix.android.sdk.api.session.uia.exceptions.UiaCancelledException
2223
import org.matrix.android.sdk.internal.auth.registration.handleUIA
2324
import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
2425
import org.matrix.android.sdk.internal.network.executeRequest
2526
import org.matrix.android.sdk.internal.session.cleanup.CleanupSession
2627
import org.matrix.android.sdk.internal.session.identity.IdentityDisconnectTask
2728
import org.matrix.android.sdk.internal.task.Task
28-
import org.matrix.android.sdk.api.session.uia.exceptions.UiaCancelledException
2929
import timber.log.Timber
3030
import javax.inject.Inject
3131

vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
3232
import org.matrix.android.sdk.api.failure.isInvalidUIAAuth
3333
import org.matrix.android.sdk.api.session.Session
3434
import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
35-
import org.matrix.android.sdk.api.util.fromBase64
3635
import org.matrix.android.sdk.api.session.uia.exceptions.UiaCancelledException
36+
import org.matrix.android.sdk.api.util.fromBase64
3737
import timber.log.Timber
3838
import kotlin.coroutines.Continuation
3939
import kotlin.coroutines.resume
@@ -45,7 +45,7 @@ data class DeactivateAccountViewState(
4545

4646
class DeactivateAccountViewModel @AssistedInject constructor(@Assisted private val initialState: DeactivateAccountViewState,
4747
private val session: Session) :
48-
VectorViewModel<DeactivateAccountViewState, DeactivateAccountAction, DeactivateAccountViewEvents>(initialState) {
48+
VectorViewModel<DeactivateAccountViewState, DeactivateAccountAction, DeactivateAccountViewEvents>(initialState) {
4949

5050
@AssistedFactory
5151
interface Factory : MavericksAssistedViewModelFactory<DeactivateAccountViewModel, DeactivateAccountViewState> {
@@ -58,7 +58,7 @@ class DeactivateAccountViewModel @AssistedInject constructor(@Assisted private v
5858
override fun handle(action: DeactivateAccountAction) {
5959
when (action) {
6060
is DeactivateAccountAction.DeactivateAccount -> handleDeactivateAccount(action)
61-
DeactivateAccountAction.SsoAuthDone -> {
61+
DeactivateAccountAction.SsoAuthDone -> {
6262
Timber.d("## UIA - FallBack success")
6363
_viewEvents.post(DeactivateAccountViewEvents.Loading())
6464
if (pendingAuth != null) {
@@ -67,7 +67,7 @@ class DeactivateAccountViewModel @AssistedInject constructor(@Assisted private v
6767
uiaContinuation?.resumeWithException(IllegalArgumentException())
6868
}
6969
}
70-
is DeactivateAccountAction.PasswordAuthDone -> {
70+
is DeactivateAccountAction.PasswordAuthDone -> {
7171
_viewEvents.post(DeactivateAccountViewEvents.Loading())
7272
val decryptedPass = session.loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
7373
uiaContinuation?.resume(

0 commit comments

Comments
 (0)