mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-09-26 18:06:21 +02:00
Refactor the UISharedPreferences into two files
This commit is contained in:
Vitor Pamplona
@@ -0,0 +1,137 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2025 Vitor Pamplona
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
* this software and associated documentation files (the "Software"), to deal in
|
||||||
|
* the Software without restriction, including without limitation the rights to use,
|
||||||
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
|
||||||
|
* Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
* subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
|
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||||
|
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package com.vitorpamplona.amethyst.model.preferences
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.util.Log
|
||||||
|
import androidx.compose.runtime.Stable
|
||||||
|
import androidx.datastore.preferences.core.booleanPreferencesKey
|
||||||
|
import androidx.datastore.preferences.core.edit
|
||||||
|
import androidx.datastore.preferences.core.intPreferencesKey
|
||||||
|
import androidx.datastore.preferences.core.stringPreferencesKey
|
||||||
|
import com.vitorpamplona.amethyst.ui.actions.MediaSaverToDisk.save
|
||||||
|
import com.vitorpamplona.amethyst.ui.tor.TorSettings
|
||||||
|
import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
|
||||||
|
import com.vitorpamplona.amethyst.ui.tor.TorType
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.FlowPreview
|
||||||
|
import kotlinx.coroutines.flow.SharingStarted
|
||||||
|
import kotlinx.coroutines.flow.debounce
|
||||||
|
import kotlinx.coroutines.flow.distinctUntilChanged
|
||||||
|
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(
|
||||||
|
val context: Context,
|
||||||
|
val scope: CoroutineScope,
|
||||||
|
) {
|
||||||
|
companion object {
|
||||||
|
// loads faster when individualized
|
||||||
|
val TOR_TYPE_KEY = stringPreferencesKey("tor.torType")
|
||||||
|
val EXTERNAL_SOCKS_PORT_KEY = intPreferencesKey("tor.externalSocksPort")
|
||||||
|
val ONION_RELAYS_VIA_TOR_KEY = booleanPreferencesKey("tor.onionRelaysViaTor")
|
||||||
|
val DM_RELAYS_VIA_TOR_KEY = booleanPreferencesKey("tor.dmRelaysViaTor")
|
||||||
|
val NEW_RELAYS_VIA_TOR_KEY = booleanPreferencesKey("tor.newRelaysViaTor")
|
||||||
|
val TRUSTED_RELAYS_VIA_TOR_KEY = booleanPreferencesKey("tor.trustedRelaysViaTor")
|
||||||
|
val URL_PREVIEWS_VIA_TOR_KEY = booleanPreferencesKey("tor.urlPreviewsViaTor")
|
||||||
|
val PROFILE_PICS_VIA_TOR_KEY = booleanPreferencesKey("tor.profilePicsViaTor")
|
||||||
|
val IMAGES_VIA_TOR_KEY = booleanPreferencesKey("tor.imagesViaTor")
|
||||||
|
val VIDEOS_VIA_TOR_KEY = booleanPreferencesKey("tor.videosViaTor")
|
||||||
|
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? =
|
||||||
|
try {
|
||||||
|
// Get the preference flow and take the first value.
|
||||||
|
val preferences = context.sharedPreferencesDataStore.data.first()
|
||||||
|
TorSettings(
|
||||||
|
torType = preferences[TOR_TYPE_KEY]?.let { TorType.valueOf(it) } ?: TorType.INTERNAL,
|
||||||
|
externalSocksPort = preferences[EXTERNAL_SOCKS_PORT_KEY] ?: 9050,
|
||||||
|
onionRelaysViaTor = preferences[ONION_RELAYS_VIA_TOR_KEY] ?: true,
|
||||||
|
dmRelaysViaTor = preferences[DM_RELAYS_VIA_TOR_KEY] ?: true,
|
||||||
|
newRelaysViaTor = preferences[NEW_RELAYS_VIA_TOR_KEY] ?: true,
|
||||||
|
trustedRelaysViaTor = preferences[TRUSTED_RELAYS_VIA_TOR_KEY] ?: false,
|
||||||
|
urlPreviewsViaTor = preferences[URL_PREVIEWS_VIA_TOR_KEY] ?: false,
|
||||||
|
profilePicsViaTor = preferences[PROFILE_PICS_VIA_TOR_KEY] ?: false,
|
||||||
|
imagesViaTor = preferences[IMAGES_VIA_TOR_KEY] ?: false,
|
||||||
|
videosViaTor = preferences[VIDEOS_VIA_TOR_KEY] ?: false,
|
||||||
|
moneyOperationsViaTor = preferences[MONEY_OPERATIONS_VIA_TOR_KEY] ?: false,
|
||||||
|
nip05VerificationsViaTor = preferences[NIP05_VERIFICATIONS_VIA_TOR_KEY] ?: false,
|
||||||
|
nip96UploadsViaTor = preferences[MEDIA_UPLOADS_VIA_TOR_KEY] ?: false,
|
||||||
|
)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
if (e is CancellationException) throw e
|
||||||
|
// Log any errors that occur while reading the DataStore.
|
||||||
|
Log.e("SharedPreferences", "Error reading DataStore preferences: ${e.message}")
|
||||||
|
null
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun save(torSettings: TorSettings) {
|
||||||
|
try {
|
||||||
|
context.sharedPreferencesDataStore.edit { preferences ->
|
||||||
|
preferences[TOR_TYPE_KEY] = torSettings.torType.name
|
||||||
|
preferences[EXTERNAL_SOCKS_PORT_KEY] = torSettings.externalSocksPort
|
||||||
|
preferences[ONION_RELAYS_VIA_TOR_KEY] = torSettings.onionRelaysViaTor
|
||||||
|
preferences[DM_RELAYS_VIA_TOR_KEY] = torSettings.dmRelaysViaTor
|
||||||
|
preferences[NEW_RELAYS_VIA_TOR_KEY] = torSettings.newRelaysViaTor
|
||||||
|
preferences[TRUSTED_RELAYS_VIA_TOR_KEY] = torSettings.trustedRelaysViaTor
|
||||||
|
preferences[URL_PREVIEWS_VIA_TOR_KEY] = torSettings.urlPreviewsViaTor
|
||||||
|
preferences[PROFILE_PICS_VIA_TOR_KEY] = torSettings.profilePicsViaTor
|
||||||
|
preferences[IMAGES_VIA_TOR_KEY] = torSettings.imagesViaTor
|
||||||
|
preferences[VIDEOS_VIA_TOR_KEY] = torSettings.videosViaTor
|
||||||
|
preferences[MONEY_OPERATIONS_VIA_TOR_KEY] = torSettings.moneyOperationsViaTor
|
||||||
|
preferences[NIP05_VERIFICATIONS_VIA_TOR_KEY] = torSettings.nip05VerificationsViaTor
|
||||||
|
preferences[MEDIA_UPLOADS_VIA_TOR_KEY] = torSettings.nip96UploadsViaTor
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
if (e is CancellationException) throw e
|
||||||
|
// Log any errors that occur while reading the DataStore.
|
||||||
|
Log.e("SharedPreferences", "Error saving DataStore preferences: ${e.message}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -29,7 +29,6 @@ import androidx.datastore.core.DataStore
|
|||||||
import androidx.datastore.preferences.core.Preferences
|
import androidx.datastore.preferences.core.Preferences
|
||||||
import androidx.datastore.preferences.core.booleanPreferencesKey
|
import androidx.datastore.preferences.core.booleanPreferencesKey
|
||||||
import androidx.datastore.preferences.core.edit
|
import androidx.datastore.preferences.core.edit
|
||||||
import androidx.datastore.preferences.core.intPreferencesKey
|
|
||||||
import androidx.datastore.preferences.core.stringPreferencesKey
|
import androidx.datastore.preferences.core.stringPreferencesKey
|
||||||
import androidx.datastore.preferences.preferencesDataStore
|
import androidx.datastore.preferences.preferencesDataStore
|
||||||
import com.vitorpamplona.amethyst.LocalPreferences
|
import com.vitorpamplona.amethyst.LocalPreferences
|
||||||
@@ -41,9 +40,6 @@ import com.vitorpamplona.amethyst.model.ThemeType
|
|||||||
import com.vitorpamplona.amethyst.model.UiSettings
|
import com.vitorpamplona.amethyst.model.UiSettings
|
||||||
import com.vitorpamplona.amethyst.model.UiSettingsFlow
|
import com.vitorpamplona.amethyst.model.UiSettingsFlow
|
||||||
import com.vitorpamplona.amethyst.ui.actions.MediaSaverToDisk.save
|
import com.vitorpamplona.amethyst.ui.actions.MediaSaverToDisk.save
|
||||||
import com.vitorpamplona.amethyst.ui.tor.TorSettings
|
|
||||||
import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
|
|
||||||
import com.vitorpamplona.amethyst.ui.tor.TorType
|
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.FlowPreview
|
import kotlinx.coroutines.FlowPreview
|
||||||
@@ -168,95 +164,3 @@ class UiSharedPreferences(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Stable
|
|
||||||
class TorSharedPreferences(
|
|
||||||
val context: Context,
|
|
||||||
val scope: CoroutineScope,
|
|
||||||
) {
|
|
||||||
companion object {
|
|
||||||
// loads faster when individualized
|
|
||||||
val TOR_TYPE_KEY = stringPreferencesKey("tor.torType")
|
|
||||||
val EXTERNAL_SOCKS_PORT_KEY = intPreferencesKey("tor.externalSocksPort")
|
|
||||||
val ONION_RELAYS_VIA_TOR_KEY = booleanPreferencesKey("tor.onionRelaysViaTor")
|
|
||||||
val DM_RELAYS_VIA_TOR_KEY = booleanPreferencesKey("tor.dmRelaysViaTor")
|
|
||||||
val NEW_RELAYS_VIA_TOR_KEY = booleanPreferencesKey("tor.newRelaysViaTor")
|
|
||||||
val TRUSTED_RELAYS_VIA_TOR_KEY = booleanPreferencesKey("tor.trustedRelaysViaTor")
|
|
||||||
val URL_PREVIEWS_VIA_TOR_KEY = booleanPreferencesKey("tor.urlPreviewsViaTor")
|
|
||||||
val PROFILE_PICS_VIA_TOR_KEY = booleanPreferencesKey("tor.profilePicsViaTor")
|
|
||||||
val IMAGES_VIA_TOR_KEY = booleanPreferencesKey("tor.imagesViaTor")
|
|
||||||
val VIDEOS_VIA_TOR_KEY = booleanPreferencesKey("tor.videosViaTor")
|
|
||||||
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? =
|
|
||||||
try {
|
|
||||||
// Get the preference flow and take the first value.
|
|
||||||
val preferences = context.sharedPreferencesDataStore.data.first()
|
|
||||||
TorSettings(
|
|
||||||
torType = preferences[TOR_TYPE_KEY]?.let { TorType.valueOf(it) } ?: TorType.INTERNAL,
|
|
||||||
externalSocksPort = preferences[EXTERNAL_SOCKS_PORT_KEY] ?: 9050,
|
|
||||||
onionRelaysViaTor = preferences[ONION_RELAYS_VIA_TOR_KEY] ?: true,
|
|
||||||
dmRelaysViaTor = preferences[DM_RELAYS_VIA_TOR_KEY] ?: true,
|
|
||||||
newRelaysViaTor = preferences[NEW_RELAYS_VIA_TOR_KEY] ?: true,
|
|
||||||
trustedRelaysViaTor = preferences[TRUSTED_RELAYS_VIA_TOR_KEY] ?: false,
|
|
||||||
urlPreviewsViaTor = preferences[URL_PREVIEWS_VIA_TOR_KEY] ?: false,
|
|
||||||
profilePicsViaTor = preferences[PROFILE_PICS_VIA_TOR_KEY] ?: false,
|
|
||||||
imagesViaTor = preferences[IMAGES_VIA_TOR_KEY] ?: false,
|
|
||||||
videosViaTor = preferences[VIDEOS_VIA_TOR_KEY] ?: false,
|
|
||||||
moneyOperationsViaTor = preferences[MONEY_OPERATIONS_VIA_TOR_KEY] ?: false,
|
|
||||||
nip05VerificationsViaTor = preferences[NIP05_VERIFICATIONS_VIA_TOR_KEY] ?: false,
|
|
||||||
nip96UploadsViaTor = preferences[MEDIA_UPLOADS_VIA_TOR_KEY] ?: false,
|
|
||||||
)
|
|
||||||
} catch (e: Exception) {
|
|
||||||
if (e is CancellationException) throw e
|
|
||||||
// Log any errors that occur while reading the DataStore.
|
|
||||||
Log.e("SharedPreferences", "Error reading DataStore preferences: ${e.message}")
|
|
||||||
null
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun save(torSettings: TorSettings) {
|
|
||||||
try {
|
|
||||||
context.sharedPreferencesDataStore.edit { preferences ->
|
|
||||||
preferences[TOR_TYPE_KEY] = torSettings.torType.name
|
|
||||||
preferences[EXTERNAL_SOCKS_PORT_KEY] = torSettings.externalSocksPort
|
|
||||||
preferences[ONION_RELAYS_VIA_TOR_KEY] = torSettings.onionRelaysViaTor
|
|
||||||
preferences[DM_RELAYS_VIA_TOR_KEY] = torSettings.dmRelaysViaTor
|
|
||||||
preferences[NEW_RELAYS_VIA_TOR_KEY] = torSettings.newRelaysViaTor
|
|
||||||
preferences[TRUSTED_RELAYS_VIA_TOR_KEY] = torSettings.trustedRelaysViaTor
|
|
||||||
preferences[URL_PREVIEWS_VIA_TOR_KEY] = torSettings.urlPreviewsViaTor
|
|
||||||
preferences[PROFILE_PICS_VIA_TOR_KEY] = torSettings.profilePicsViaTor
|
|
||||||
preferences[IMAGES_VIA_TOR_KEY] = torSettings.imagesViaTor
|
|
||||||
preferences[VIDEOS_VIA_TOR_KEY] = torSettings.videosViaTor
|
|
||||||
preferences[MONEY_OPERATIONS_VIA_TOR_KEY] = torSettings.moneyOperationsViaTor
|
|
||||||
preferences[NIP05_VERIFICATIONS_VIA_TOR_KEY] = torSettings.nip05VerificationsViaTor
|
|
||||||
preferences[MEDIA_UPLOADS_VIA_TOR_KEY] = torSettings.nip96UploadsViaTor
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
|
||||||
if (e is CancellationException) throw e
|
|
||||||
// Log any errors that occur while reading the DataStore.
|
|
||||||
Log.e("SharedPreferences", "Error saving DataStore preferences: ${e.message}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user