fix: SafeSearchに関するダイアログの表示条件を修正

pantasystem · Sep 9, 2024 · 9646eb2 · 9646eb2
1 parent 8dfea3d
commit 9646eb2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/app/src/main/java/jp/panta/misskeyandroidclient/ui/main/SafeSearchDescriptionDialog.kt b/app/src/main/java/jp/panta/misskeyandroidclient/ui/main/SafeSearchDescriptionDialog.kt
@@ -27,6 +27,7 @@ class SafeSearchDescriptionDialog : DialogFragment() {
             .setTitle(R.string.safe_search_description_dialog_title)
             .setMessage(R.string.safe_search_description_dialog_message)
             .setPositiveButton(R.string.safe_search_description_dialog_positive_button) { _, _ ->
+                mainViewModel.onGoToSettingSafeSearchButtonClicked()
                 val intent = Intent(requireContext(), SettingMovementActivity::class.java)
                 intent.putExtra(SettingMovementActivity.EXTRA_HIGHLIGHT_SAFE_SEARCH, true)
                 startActivity(intent)

diff --git a/app/src/main/java/jp/panta/misskeyandroidclient/ui/main/viewmodel/MainViewModel.kt b/app/src/main/java/jp/panta/misskeyandroidclient/ui/main/viewmodel/MainViewModel.kt
@@ -6,7 +6,17 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.shareIn
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import net.pantasystem.milktea.app_store.account.AccountStore
 import net.pantasystem.milktea.app_store.setting.SettingStore
@@ -68,7 +78,7 @@ class MainViewModel @Inject constructor(
     val isShowEnableSafeSearchDescription = settingStore.configState.map {
         it.isEnableSafeSearch
     }.map {
-        !(!it.isEnabled || it.isConfirmed)
+        !it.isConfirmed
     }.distinctUntilChanged().shareIn(viewModelScope, SharingStarted.Lazily)
 
     val isShowGoogleAnalyticsDialog = settingStore.configState.map { config ->
@@ -138,6 +148,15 @@ class MainViewModel @Inject constructor(
         }
     }
 
+    fun onGoToSettingSafeSearchButtonClicked() {
+        viewModelScope.launch {
+            configRepository.get().mapCancellableCatching {
+                configRepository.save(it.copy(isEnableSafeSearch = it.isEnableSafeSearch.copy(isConfirmed = true)))
+            }.onFailure {
+                logger.error("設定状態の保存に失敗", it)
+            }
+        }
+    }
 }
 
 data class MainUiState (