Removing internal runBlockings

2026-03-29 10:43:38 -04:00
parent ebbcb603fb
commit 9dc208deba
4 changed files with 157 additions and 151 deletions
@@ -28,6 +28,7 @@ import com.vitorpamplona.amethyst.commons.model.NoteState
 import com.vitorpamplona.amethyst.commons.robohash.CachedRobohash
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.UiSettings
 import com.vitorpamplona.amethyst.model.accountsCache.AccountCacheState
 import com.vitorpamplona.amethyst.model.nip03Timestamp.IncomingOtsEventVerifier
 import com.vitorpamplona.amethyst.model.nip03Timestamp.TorAwareOkHttpOtsResolverBuilder
@@ -67,6 +68,7 @@ import com.vitorpamplona.amethyst.ui.resourceCacheInit
 import com.vitorpamplona.amethyst.ui.screen.AccountSessionManager
 import com.vitorpamplona.amethyst.ui.screen.UiSettingsState
 import com.vitorpamplona.amethyst.ui.tor.TorManager
+import com.vitorpamplona.amethyst.ui.tor.TorSettings
 import com.vitorpamplona.quartz.nip01Core.core.Address
 import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
@@ -117,12 +119,14 @@ class AppModules(
    // reduces total blocking time from (torPrefs + uiPrefs) to ~max(torPrefs, uiPrefs).
    private val uiPrefsDeferred =
        applicationIOScope.async {
-            UiSharedPreferences(appContext, applicationIOScope)
+            val prefs = UiSharedPreferences.uiPreferences(appContext) ?: UiSettings()
+            UiSharedPreferences(prefs, appContext, applicationIOScope)
        }

    private val torPrefsDeferred =
        applicationIOScope.async {
-            TorSharedPreferences(appContext, applicationIOScope)
+            val prefs = TorSharedPreferences.torPreferences(appContext) ?: TorSettings()
+            TorSharedPreferences(prefs, appContext, applicationIOScope)
        }

    // Blocking load of UI Preferences to avoid theme/language blinking
@@ -151,19 +151,19 @@ class UiSettingsFlow(
    }

    companion object {
-        fun build(torSettings: UiSettings): UiSettingsFlow =
+        fun build(uiSettings: UiSettings): UiSettingsFlow =
            UiSettingsFlow(
-                MutableStateFlow(torSettings.theme),
-                MutableStateFlow(torSettings.preferredLanguage),
-                MutableStateFlow(torSettings.automaticallyShowImages),
-                MutableStateFlow(torSettings.automaticallyStartPlayback),
-                MutableStateFlow(torSettings.automaticallyShowUrlPreview),
-                MutableStateFlow(torSettings.automaticallyHideNavigationBars),
-                MutableStateFlow(torSettings.automaticallyShowProfilePictures),
-                MutableStateFlow(torSettings.dontShowPushNotificationSelector),
-                MutableStateFlow(torSettings.dontAskForNotificationPermissions),
-                MutableStateFlow(torSettings.featureSet),
-                MutableStateFlow(torSettings.gallerySet),
+                MutableStateFlow(uiSettings.theme),
+                MutableStateFlow(uiSettings.preferredLanguage),
+                MutableStateFlow(uiSettings.automaticallyShowImages),
+                MutableStateFlow(uiSettings.automaticallyStartPlayback),
+                MutableStateFlow(uiSettings.automaticallyShowUrlPreview),
+                MutableStateFlow(uiSettings.automaticallyHideNavigationBars),
+                MutableStateFlow(uiSettings.automaticallyShowProfilePictures),
+                MutableStateFlow(uiSettings.dontShowPushNotificationSelector),
+                MutableStateFlow(uiSettings.dontAskForNotificationPermissions),
+                MutableStateFlow(uiSettings.featureSet),
+                MutableStateFlow(uiSettings.gallerySet),
            )
    }
 }
@@ -40,14 +40,31 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.runBlocking
 import kotlin.coroutines.cancellation.CancellationException

@Stable
 class TorSharedPreferences(
+    prefs: TorSettings,
    val context: Context,
    val scope: CoroutineScope,
 ) {
+    // Tor Preferences. Makes sure to wait for it to avoid connecting with random IPs
+    val value = TorSettingsFlow.build(prefs)
+
+    @OptIn(FlowPreview::class)
+    val saving =
+        value.propertyWatchFlow
+            .debounce(1000)
+            .distinctUntilChanged()
+            .onEach {
+                save(it, context)
+            }.flowOn(Dispatchers.IO)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                value.toSettings(),
+            )
+
    companion object {
        // loads faster when individualized
        val TOR_TYPE_KEY = stringPreferencesKey("tor.torType")
@@ -63,28 +80,8 @@ class TorSharedPreferences(
        val MONEY_OPERATIONS_VIA_TOR_KEY = booleanPreferencesKey("tor.moneyOperationsViaTor")
        val NIP05_VERIFICATIONS_VIA_TOR_KEY = booleanPreferencesKey("tor.nip05VerificationsViaTor")
        val MEDIA_UPLOADS_VIA_TOR_KEY = booleanPreferencesKey("tor.mediaUploadsViaTor")
-    }

-    // Tor Preferences. Makes sure to wait for it to avoid connecting with random IPs
-    val value =
-        runBlocking {
-            TorSettingsFlow.build(torPreferences() ?: TorSettings())
-        }
-
-    @OptIn(FlowPreview::class)
-    val saving =
-        value.propertyWatchFlow
-            .debounce(1000)
-            .distinctUntilChanged()
-            .onEach(::save)
-            .flowOn(Dispatchers.IO)
-            .stateIn(
-                scope,
-                SharingStarted.Eagerly,
-                value.toSettings(),
-            )
-
-    suspend fun torPreferences(): TorSettings? =
+        suspend fun torPreferences(context: Context): TorSettings? =
            try {
                // Get the preference flow and take the first value.
                val preferences = context.sharedPreferencesDataStore.data.first()
@@ -110,7 +107,10 @@ class TorSharedPreferences(
                null
            }

-    suspend fun save(torSettings: TorSettings) {
+        suspend fun save(
+            torSettings: TorSettings,
+            context: Context,
+        ) {
            try {
                context.sharedPreferencesDataStore.edit { preferences ->
                    preferences[TOR_TYPE_KEY] = torSettings.torType.name
@@ -133,4 +133,5 @@ class TorSharedPreferences(
                Log.e("SharedPreferences") { "Error saving DataStore preferences: ${e.message}" }
            }
        }
+    }
 }
@@ -49,36 +49,18 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.runBlocking
 import kotlin.coroutines.cancellation.CancellationException

 val Context.sharedPreferencesDataStore: DataStore<Preferences> by preferencesDataStore(name = "shared_settings")

@Stable
 class UiSharedPreferences(
+    prefs: UiSettings,
    val context: Context,
    val scope: CoroutineScope,
 ) {
-    companion object {
-        // loads faster when individualized
-        val UI_THEME = stringPreferencesKey("ui.theme")
-        val UI_LANGUAGE = stringPreferencesKey("ui.language")
-        val UI_SHOW_IMAGES = stringPreferencesKey("ui.show_images")
-        val UI_START_PLAYBACK = stringPreferencesKey("ui.start_playback")
-        val UI_SHOW_URL_PREVIEW = stringPreferencesKey("ui.show_url_preview")
-        val UI_HIDE_NAVIGATION_BARS = stringPreferencesKey("ui.hide_navigation_bars")
-        val UI_SHOW_PROFILE_PICTURES = stringPreferencesKey("ui.show_profile_pictures")
-        val UI_DONT_SHOW_PUSH_NOTIFICATION_SELECTOR = booleanPreferencesKey("ui.dont_show_push_notification_selector")
-        val UI_DONT_ASK_FOR_NOTIFICATION_PERMISSIONS = booleanPreferencesKey("ui.dont_ask_for_notification_permissions")
-        val UI_FEATURE_SET = stringPreferencesKey("ui.feature_set")
-        val UI_GALLERY_SET = stringPreferencesKey("ui.gallery_set")
-    }
-
    // UI Preferences. Makes sure to wait for it to avoid blinking themes and language preferences
-    val value =
-        runBlocking {
-            UiSettingsFlow.build(uiPreferences() ?: UiSettings())
-        }
+    val value = UiSettingsFlow.build(prefs)

    val languageUpdate =
        value.preferredLanguage
@@ -98,15 +80,30 @@ class UiSharedPreferences(
        value.propertyWatchFlow
            .debounce(1000)
            .distinctUntilChanged()
-            .onEach(::save)
-            .flowOn(Dispatchers.IO)
+            .onEach {
+                save(it, context)
+            }.flowOn(Dispatchers.IO)
            .stateIn(
                scope,
                SharingStarted.Eagerly,
                value.toSettings(),
            )

-    suspend fun uiPreferences(): UiSettings? =
+    companion object {
+        // loads faster when individualized
+        val UI_THEME = stringPreferencesKey("ui.theme")
+        val UI_LANGUAGE = stringPreferencesKey("ui.language")
+        val UI_SHOW_IMAGES = stringPreferencesKey("ui.show_images")
+        val UI_START_PLAYBACK = stringPreferencesKey("ui.start_playback")
+        val UI_SHOW_URL_PREVIEW = stringPreferencesKey("ui.show_url_preview")
+        val UI_HIDE_NAVIGATION_BARS = stringPreferencesKey("ui.hide_navigation_bars")
+        val UI_SHOW_PROFILE_PICTURES = stringPreferencesKey("ui.show_profile_pictures")
+        val UI_DONT_SHOW_PUSH_NOTIFICATION_SELECTOR = booleanPreferencesKey("ui.dont_show_push_notification_selector")
+        val UI_DONT_ASK_FOR_NOTIFICATION_PERMISSIONS = booleanPreferencesKey("ui.dont_ask_for_notification_permissions")
+        val UI_FEATURE_SET = stringPreferencesKey("ui.feature_set")
+        val UI_GALLERY_SET = stringPreferencesKey("ui.gallery_set")
+
+        suspend fun uiPreferences(context: Context): UiSettings? =
            try {
                // Get the preference flow and take the first value.
                val preferences = context.sharedPreferencesDataStore.data.first()
@@ -132,7 +129,7 @@ class UiSharedPreferences(
                try {
                    val oldVersion = LocalPreferences.loadSharedSettings()
                    if (oldVersion != null) {
-                    save(oldVersion)
+                        save(oldVersion, context)
                    }
                    oldVersion
                } catch (e: Exception) {
@@ -141,7 +138,10 @@ class UiSharedPreferences(
                }
            }

-    suspend fun save(sharedSettings: UiSettings) {
+        suspend fun save(
+            sharedSettings: UiSettings,
+            context: Context,
+        ) {
            try {
                context.sharedPreferencesDataStore.edit { preferences ->
                    preferences[UI_THEME] = sharedSettings.theme.name
@@ -162,4 +162,5 @@ class UiSharedPreferences(
                Log.e("SharedPreferences") { "Error saving DataStore preferences: ${e.message}" }
            }
        }
+    }
 }