From 1ed2e7d39a6b54db1b49d9169e826dc396c27709 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Thu, 21 Mar 2024 16:30:47 +0200
Subject: [PATCH] Fix clear uia provider
---
.../circles/auth/feature/uia/UIADialogFragment.kt | 6 ------
.../org/futo/circles/auth/feature/uia/UIAViewModel.kt | 11 ++++++++---
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/uia/UIADialogFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/UIADialogFragment.kt
index 046a9860c..080e28f95 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/uia/UIADialogFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/UIADialogFragment.kt
@@ -1,7 +1,6 @@
package org.futo.circles.auth.feature.uia
import android.app.Dialog
-import android.content.DialogInterface
import android.net.Uri
import android.os.Bundle
import android.view.View
@@ -70,11 +69,6 @@ class UIADialogFragment :
setupObservers()
}
- override fun onDismiss(dialog: DialogInterface) {
- super.onDismiss(dialog)
- UIADataSourceProvider.clear()
- }
-
private fun setupViews() {
binding.toolbar.apply {
title = getString(
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/uia/UIAViewModel.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/UIAViewModel.kt
index 3616f1ff1..98bf1c773 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/uia/UIAViewModel.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/UIAViewModel.kt
@@ -88,7 +88,7 @@ class UIAViewModel @Inject constructor(
passPhraseLoadingLiveData.postValue(LoadingData(isLoading = false))
refreshTokenManager.scheduleTokenRefreshIfNeeded(session)
handleKeysBackup()
- BSSpekeClientProvider.clear()
+ clearProviders()
}
}
@@ -99,7 +99,7 @@ class UIAViewModel @Inject constructor(
MatrixSessionProvider.awaitForSessionStart(session)
preferencesProvider.setShouldShowAllExplanations()
createPassPhraseDataSource.createPassPhraseBackup()
- BSSpekeClientProvider.clear()
+ clearProviders()
}
(result as? Response.Success)?.let {
navigationLiveData.postValue(AuthUIAScreenNavigationEvent.ConfigureWorkspace)
@@ -116,7 +116,7 @@ class UIAViewModel @Inject constructor(
)
MatrixSessionProvider.awaitForSessionSync(session)
createPassPhraseDataSource.replaceToNewKeyBackup()
- BSSpekeClientProvider.clear()
+ clearProviders()
}
(result as? Response.Success)?.let {
navigationLiveData.postValue(AuthUIAScreenNavigationEvent.Home)
@@ -170,4 +170,9 @@ class UIAViewModel @Inject constructor(
}
}
+ private fun clearProviders() {
+ BSSpekeClientProvider.clear()
+ UIADataSourceProvider.clear()
+ }
+
}
\ No newline at end of file
--
GitLab