fix: clean queue on timed sheet dismiss and reapply critical navigation

Author: jvsena42

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -409,7 +409,7 @@ fun ContentView(
                                 TimedSheetType.NOTIFICATIONS -> {
                                     BackgroundPaymentsIntroSheet(
                                         onContinue = {
-                                            appViewModel.dismissTimedSheet(skipQueue = true)
+                                            appViewModel.dismissTimedSheet()
                                             navController.navigate(Routes.BackgroundPaymentsSettings)
                                             settingsViewModel.setBgPaymentsIntroSeen(true)
                                         },
@@ -419,7 +419,7 @@ fun ContentView(
                                 TimedSheetType.QUICK_PAY -> {
                                     QuickPayIntroSheet(
                                         onContinue = {
-                                            appViewModel.dismissTimedSheet(skipQueue = true)
+                                            appViewModel.dismissTimedSheet()
                                             navController.navigate(Routes.QuickPaySettings)
                                         },
                                     )
@@ -432,7 +432,7 @@ fun ContentView(
                                             val intent =
                                                 Intent(Intent.ACTION_VIEW, Env.STORING_BITCOINS_URL.toUri())
                                             context.startActivity(intent)
-                                            appViewModel.dismissTimedSheet(skipQueue = true)
+                                            appViewModel.dismissTimedSheet()
                                         }
                                     )
                                 }

app/src/main/java/to/bitkit/utils/timedsheets/TimedSheetManager.kt

@@ -42,21 +42,20 @@ class TimedSheetManager(private val scope: CoroutineScope) {
         checkJob = null
     }
 
-    fun dismissCurrentSheet(skipQueue: Boolean = false) {
+    fun dismissCurrentSheet() {
+        if (currentTimedSheet == null) return
+
         scope.launch {
             currentTimedSheet?.onDismissed()
+            _currentSheet.value = null
+            currentTimedSheet = null
 
-            if (skipQueue) {
-                Logger.debug("Clearing timed sheet queue", context = TAG)
-                _currentSheet.value = null
-                currentTimedSheet = null
-            } else {
-                checkAndShowNextSheet()
-            }
+            Logger.debug("Clearing timed sheet queue", context = TAG)
         }
     }
 
     private suspend fun checkAndShowNextSheet() {
+        Logger.debug("Registered sheets: ${registeredSheets.map { it.type.name }}")
         for (sheet in registeredSheets.toList()) {
             if (sheet.shouldShow()) {
                 Logger.debug(

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -48,6 +48,7 @@ import org.lightningdevkit.ldknode.Event
 import org.lightningdevkit.ldknode.PaymentId
 import org.lightningdevkit.ldknode.SpendableUtxo
 import org.lightningdevkit.ldknode.Txid
+import to.bitkit.BuildConfig
 import to.bitkit.R
 import to.bitkit.data.CacheStore
 import to.bitkit.data.SettingsStore
@@ -93,6 +94,7 @@ import to.bitkit.repositories.LightningRepo
 import to.bitkit.repositories.PreActivityMetadataRepo
 import to.bitkit.repositories.TransferRepo
 import to.bitkit.repositories.WalletRepo
+import to.bitkit.services.AppUpdaterService
 import to.bitkit.ui.Routes
 import to.bitkit.ui.components.Sheet
 import to.bitkit.ui.shared.toast.ToastEventBus
@@ -131,6 +133,7 @@ class AppViewModel @Inject constructor(
     private val activityRepo: ActivityRepo,
     private val preActivityMetadataRepo: PreActivityMetadataRepo,
     private val blocktankRepo: BlocktankRepo,
+    private val appUpdaterService: AppUpdaterService,
     private val notifyPaymentReceivedHandler: NotifyPaymentReceivedHandler,
     private val cacheStore: CacheStore,
     private val transferRepo: TransferRepo,
@@ -238,15 +241,11 @@ class AppViewModel @Inject constructor(
                 }
             }
         }
-
-        observeLdkNodeEvents()
-        observeSendEvents()
-
         viewModelScope.launch {
-            walletRepo.balanceState.collect {
-                checkTimedSheets()
-            }
+            checkCriticalAppUpdate()
         }
+        observeLdkNodeEvents()
+        observeSendEvents()
     }
 
     private fun observeLdkNodeEvents() {
@@ -1805,8 +1804,31 @@ class AppViewModel @Inject constructor(
 
     fun onLeftHome() = timedSheetManager.onHomeScreenExited()
 
-    fun dismissTimedSheet(skipQueue: Boolean = false) =
-        timedSheetManager.dismissCurrentSheet(skipQueue)
+    fun dismissTimedSheet() = timedSheetManager.dismissCurrentSheet()
+
+    private suspend fun checkCriticalAppUpdate() = withContext(bgDispatcher) {
+        delay(SCREEN_TRANSITION_DELAY_MS)
+
+        runCatching {
+            val androidReleaseInfo = appUpdaterService.getReleaseInfo().platforms.android
+            val currentBuildNumber = BuildConfig.VERSION_CODE
+
+            if (androidReleaseInfo.buildNumber <= currentBuildNumber) return@withContext
+
+            if (androidReleaseInfo.isCritical) {
+                mainScreenEffect(
+                    MainScreenEffect.Navigate(
+                        route = Routes.CriticalUpdate,
+                        navOptions = navOptions {
+                            popUpTo(0) { inclusive = true }
+                        }
+                    )
+                )
+            }
+        }.onFailure { e ->
+            Logger.warn("Failure fetching new releases", e = e, context = TAG)
+        }
+    }
 
     companion object {
         private const val TAG = "AppViewModel"

app/src/test/java/to/bitkit/utils/timedsheets/TimedSheetManagerTest.kt

@@ -103,7 +103,7 @@ class TimedSheetManagerTest : BaseUnitTest() {
 
         assertEquals(TimedSheetType.APP_UPDATE, sut.currentSheet.value)
 
-        sut.dismissCurrentSheet(skipQueue = true)
+        sut.dismissCurrentSheet()
         testScope.advanceTimeBy(100)
 
         assertNull(sut.currentSheet.value)
@@ -139,7 +139,7 @@ class TimedSheetManagerTest : BaseUnitTest() {
 
         assertEquals(TimedSheetType.BACKUP, sut.currentSheet.value)
 
-        sut.dismissCurrentSheet(skipQueue = false)
+        sut.dismissCurrentSheet()
         testScope.advanceTimeBy(100)
 
         assertNull(sut.currentSheet.value)