Merge branch 'main' into release/1.4.0

Concordium · Dec 16, 2024 · 3ad5612 · 3ad5612
2 parents 0ced8d1 + 8d7a349
commit 3ad5612
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/app/src/main/java/com/concordium/wallet/ui/welcome/WelcomeActivity.kt b/app/src/main/java/com/concordium/wallet/ui/welcome/WelcomeActivity.kt
@@ -69,6 +69,7 @@ class WelcomeActivity :
                     supportFragmentManager,
                     NotificationsPermissionDialog.TAG,
                 )
+                viewModel.setNotificationDialogShowed()
             }
         }
 

diff --git a/app/src/main/java/com/concordium/wallet/ui/welcome/WelcomeViewModel.kt b/app/src/main/java/com/concordium/wallet/ui/welcome/WelcomeViewModel.kt
@@ -27,4 +27,10 @@ class WelcomeViewModel(application: Application) : AndroidViewModel(application)
             _isNotificationDialogEverShowed.emit(notificationsPreferences.hasEverShownPermissionDialog)
         }
     }
+
+    fun setNotificationDialogShowed() {
+        viewModelScope.launch {
+            _isNotificationDialogEverShowed.emit(true)
+        }
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,6 +69,7 @@ class WelcomeActivity : @@
                         supportFragmentManager,
                         NotificationsPermissionDialog.TAG,
                     )
+                    viewModel.setNotificationDialogShowed()
                 }
             }
@@ Expand Down @@