From b1a0a2434a15c90020a8de6596d8e5a35cd3ba41 Mon Sep 17 00:00:00 2001
From: "ingvar.skogen" <ingvar.skogen@tari.com>
Date: Wed, 28 Feb 2024 20:29:13 +0100
Subject: [PATCH] Fix the update in the background thread issue

---
 .../onboarding/localAuth/LocalAuthFragment.kt | 22 ++++++++++-------
 .../localAuth/LocalAuthViewModel.kt           | 24 +++++++++++--------
 .../onboarding/localAuth/SecureState.kt       |  6 ++++-
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/tari/android/wallet/ui/fragment/onboarding/localAuth/LocalAuthFragment.kt b/app/src/main/java/com/tari/android/wallet/ui/fragment/onboarding/localAuth/LocalAuthFragment.kt
index a6387159e..2908d6446 100644
--- a/app/src/main/java/com/tari/android/wallet/ui/fragment/onboarding/localAuth/LocalAuthFragment.kt
+++ b/app/src/main/java/com/tari/android/wallet/ui/fragment/onboarding/localAuth/LocalAuthFragment.kt
@@ -40,6 +40,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import com.daasuu.ei.Ease
 import com.daasuu.ei.EasingInterpolator
@@ -49,7 +50,7 @@ import com.tari.android.wallet.application.WalletState
 import com.tari.android.wallet.databinding.FragmentLocalAuthBinding
 import com.tari.android.wallet.event.EventBus
 import com.tari.android.wallet.extension.addTo
-import com.tari.android.wallet.extension.observe
+import com.tari.android.wallet.extension.launchAndRepeatOnLifecycle
 import com.tari.android.wallet.infrastructure.security.biometric.BiometricAuthenticationException
 import com.tari.android.wallet.ui.common.CommonFragment
 import com.tari.android.wallet.ui.extension.doOnGlobalLayout
@@ -78,11 +79,15 @@ class LocalAuthFragment : CommonFragment<FragmentLocalAuthBinding, LocalAuthView
     }
 
     private fun observeUi() = with(viewModel) {
-        observe(secureState) {
-            ui.continueBtn.setVisible(it.pinCodeSecured)
-            ui.authTypeBiometrics.setVisible(it.biometricsAvailable)
-            ui.secureWithPasscode.setVisible(!it.pinCodeSecured)
-            ui.secureWithBiometrics.setVisible(it.biometricsAvailable && !it.biometricsSecured)
+        viewLifecycleOwner.launchAndRepeatOnLifecycle(Lifecycle.State.STARTED) {
+            launch {
+                secureState.collect { state ->
+                    ui.continueBtn.setVisible(state.pinCodeSecured)
+                    ui.authTypeBiometrics.setVisible(state.biometricsAvailable)
+                    ui.secureWithPasscode.setVisible(!state.pinCodeSecured)
+                    ui.secureWithBiometrics.setVisible(state.biometricsAvailable && !state.biometricsSecured)
+                }
+            }
         }
     }
 
@@ -122,10 +127,11 @@ class LocalAuthFragment : CommonFragment<FragmentLocalAuthBinding, LocalAuthView
         lifecycleScope.launch {
             try {
                 val subtitle = string(onboarding_auth_biometric_prompt)
-                if (viewModel.authService.authenticate(this@LocalAuthFragment, string(onboarding_auth_title), subtitle))
+                if (viewModel.authService.authenticate(this@LocalAuthFragment, string(onboarding_auth_title), subtitle)) {
                     viewModel.securedWithBiometrics()
+                }
             } catch (exception: BiometricAuthenticationException) {
-                viewModel.logger.i( exception.message + "Biometric authentication failed")
+                viewModel.logger.i(exception.message + "Biometric authentication failed")
             }
         }
     }
diff --git a/app/src/main/java/com/tari/android/wallet/ui/fragment/onboarding/localAuth/LocalAuthViewModel.kt b/app/src/main/java/com/tari/android/wallet/ui/fragment/onboarding/localAuth/LocalAuthViewModel.kt
index 378b7aea8..fcd48239c 100644
--- a/app/src/main/java/com/tari/android/wallet/ui/fragment/onboarding/localAuth/LocalAuthViewModel.kt
+++ b/app/src/main/java/com/tari/android/wallet/ui/fragment/onboarding/localAuth/LocalAuthViewModel.kt
@@ -1,10 +1,12 @@
 package com.tari.android.wallet.ui.fragment.onboarding.localAuth
 
-import androidx.lifecycle.MutableLiveData
 import com.tari.android.wallet.extension.addTo
 import com.tari.android.wallet.infrastructure.backup.BackupManager
 import com.tari.android.wallet.infrastructure.security.biometric.BiometricAuthenticationService
 import com.tari.android.wallet.ui.common.CommonViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
 import javax.inject.Inject
 
 class LocalAuthViewModel : CommonViewModel() {
@@ -15,8 +17,8 @@ class LocalAuthViewModel : CommonViewModel() {
     @Inject
     lateinit var backupManager: BackupManager
 
-    val secureState = MutableLiveData(SecureState(true, false, false))
-
+    private val _secureState = MutableStateFlow(SecureState())
+    val secureState = _secureState.asStateFlow()
 
     init {
         component.inject(this)
@@ -28,16 +30,18 @@ class LocalAuthViewModel : CommonViewModel() {
         }.addTo(compositeDisposable)
     }
 
-    fun updateState() {
-        secureState.value = SecureState(
-            authService.isBiometricAuthAvailable,
-            securityPrefRepository.pinCode != null,
-            securityPrefRepository.biometricsAuth == true
-        )
+    private fun updateState() {
+        _secureState.update {
+            SecureState(
+                biometricsAvailable = authService.isBiometricAuthAvailable,
+                pinCodeSecured = securityPrefRepository.pinCode != null,
+                biometricsSecured = securityPrefRepository.biometricsAuth == true,
+            )
+        }
     }
 
     fun securedWithBiometrics() {
         securityPrefRepository.biometricsAuth = true
-        secureState.value = secureState.value!!.copy(biometricsSecured = true)
+        _secureState.update { it.copy(biometricsSecured = true) }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tari/android/wallet/ui/fragment/onboarding/localAuth/SecureState.kt b/app/src/main/java/com/tari/android/wallet/ui/fragment/onboarding/localAuth/SecureState.kt
index 83aa00108..de87ae2a4 100644
--- a/app/src/main/java/com/tari/android/wallet/ui/fragment/onboarding/localAuth/SecureState.kt
+++ b/app/src/main/java/com/tari/android/wallet/ui/fragment/onboarding/localAuth/SecureState.kt
@@ -1,3 +1,7 @@
 package com.tari.android.wallet.ui.fragment.onboarding.localAuth
 
-data class SecureState(val biometricsAvailable: Boolean, val pinCodeSecured: Boolean, val biometricsSecured: Boolean)
\ No newline at end of file
+data class SecureState(
+    val biometricsAvailable: Boolean = true,
+    val pinCodeSecured: Boolean = false,
+    val biometricsSecured: Boolean = false,
+)
\ No newline at end of file