HomePage: mark changelog as shown before dismissing dialog

Signed-off-by: Lucchetto <[email protected]>
Lucchetto · Feb 17, 2023 · 82979c6 · 82979c6
1 parent cff5ebc
commit 82979c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/app/src/main/java/com/zhenxiang/superimage/home/HomePage.kt b/app/src/main/java/com/zhenxiang/superimage/home/HomePage.kt
@@ -177,7 +177,7 @@ fun HomePage(viewModel: HomePageViewModel, navController: NavHostController) {
     }
 
     val showChangelogState by viewModel.showChangelogFlow.collectAsStateWithLifecycle()
-    ChangelogDialog(showChangelogState) { viewModel.changelogShown() }
+    ChangelogDialog(showChangelogState) { viewModel.showChangelogFlow.tryEmit(Changelog.Hide) }
 }
 
 @Composable

diff --git a/app/src/main/java/com/zhenxiang/superimage/home/HomePageViewModel.kt b/app/src/main/java/com/zhenxiang/superimage/home/HomePageViewModel.kt
@@ -97,6 +97,7 @@ class HomePageViewModel(application: Application): AndroidViewModel(application)
         if (runBlocking { AppVersionUtils.shouldShowChangelog(dataStore) }) {
             showChangelogFlow = MutableStateFlow(Changelog.Loading)
             viewModelScope.launch(Dispatchers.IO) {
+                AppVersionUtils.clearShowChangelog(dataStore)
                 showChangelogFlow.tryEmit(readChangelog())
             }
         } else {
@@ -171,11 +172,6 @@ class HomePageViewModel(application: Application): AndroidViewModel(application)
         Timber.wtf(e)
         Changelog.Hide
     }
-
-    fun changelogShown() {
-        showChangelogFlow.tryEmit(Changelog.Hide)
-        viewModelScope.launch { AppVersionUtils.clearShowChangelog(dataStore) }
-    }
 }
 
 private fun RealESRGANWorker.InputData.toInputImage(context: Context) = with(RealESRGANWorkerManager.getTempFile(context, tempFileName)) {