0.92.2

Check for the result field when using external signer

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,9 +24,10 @@ A clear and concise description of what you expected to happen.
 If applicable, add a video and/or screenshots to help explain your problem.
 
 **Device (please complete the following information):**
- - Phone Brand/Model [e.g. Pixel 7 Pro]: 
- - Android Version [e.g. 33]: 
- - App Version [e.g. v0.20.3]: 
+ - Phone Brand/Model [e.g. Pixel 7 Pro]:
+ - Android Version [e.g. 33]:
+ - App Version [e.g. v0.20.3]:
+ - Amber Version (if using it to sign):
 
 **Bounty (in Bitcoin sats) offered for a solution**
 Incentivize developers to work on your issue. Describe clear milestones to claim payment.

.github/workflows/build.yml

@@ -43,13 +43,13 @@ jobs:
         run: ./gradlew assembleDebug --no-daemon
 
       - name: Upload APK
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Debug APK
           path: amethyst/build/outputs/apk/debug/app-debug.apk
 
       - name: Upload Test Results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Build Reports
           path: amethyst/build/reports

.gitignore

@@ -13,6 +13,7 @@
 /.idea/ktfmt.xml
 /.idea/studiobot.xml
 /.idea/other.xml
+/.idea/runConfigurations.xml
 .DS_Store
 /build
 /captures

amethyst/build.gradle

@@ -16,9 +16,9 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk libs.versions.android.minSdk.get().toInteger()
         targetSdk libs.versions.android.targetSdk.get().toInteger()
-        versionCode 404
-        versionName "0.91.0"
-        buildConfigField "String", "RELEASE_NOTES_ID", "\"fba090fe820d4ca42c2d808400268be68389337e4cac552e5aaa876e929a0eaf\""
+        versionCode 407
+        versionName "0.92.2"
+        buildConfigField "String", "RELEASE_NOTES_ID", "\"98f2acaf9b3eb70d87607942e576f9a086ac28adf37869da9a29f4815cecac86\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -288,8 +288,12 @@ dependencies {
     // Cbor for cashuB format
     implementation libs.kotlinx.serialization.cbor
 
+    implementation libs.tor.android
+    implementation libs.jtorctl
+
     testImplementation libs.junit
     testImplementation libs.mockk
+    testImplementation libs.kotlinx.coroutines.test
 
     androidTestImplementation platform(libs.androidx.compose.bom)
     androidTestImplementation libs.androidx.junit
@@ -299,5 +303,11 @@ dependencies {
     debugImplementation platform(libs.androidx.compose.bom)
     debugImplementation libs.androidx.ui.tooling
     debugImplementation libs.androidx.ui.test.manifest
+
+    implementation libs.androidx.camera.core
+    implementation libs.androidx.camera.camera2
+    implementation libs.androidx.camera.lifecycle
+    implementation libs.androidx.camera.view
+    implementation libs.androidx.camera.extensions
 }
 

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ImageUploadTesting.kt

@@ -52,6 +52,7 @@ class ImageUploadTesting {
             Nip96Retriever()
                 .loadInfo(
                     server.baseUrl,
+                    false,
                 )
 
         val bitmap = Bitmap.createBitmap(200, 300, Bitmap.Config.ARGB_8888)
@@ -80,6 +81,7 @@ class ImageUploadTesting {
                     alt = null,
                     sensitiveContent = null,
                     serverInfo,
+                    forceProxy = { false },
                     onProgress = {},
                     context = InstrumentationRegistry.getInstrumentation().targetContext,
                 )
@@ -106,7 +108,7 @@ class ImageUploadTesting {
         Assert.assertTrue("${server.name}: Invalid result url", url.startsWith("http"))
 
         val imageData: ByteArray =
-            ImageDownloader().waitAndGetImage(url)
+            ImageDownloader().waitAndGetImage(url, false)
                 ?: run {
                     fail("${server.name}: Should not be null")
                     return

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/OkHttpOtsTest.kt

@@ -46,7 +46,7 @@ class OkHttpOtsTest {
 
     @Before
     fun setup() {
-        OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer(), OkHttpCalendarBuilder())
+        OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer(forceProxy = { false }), OkHttpCalendarBuilder(forceProxy = { false }))
     }
 
     @Test

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt

@@ -38,7 +38,6 @@ interface PushDistributorActions {
 }
 
 object PushDistributorHandler : PushDistributorActions {
-    private val appContext = Amethyst.instance.applicationContext
     private val unifiedPush: UnifiedPush = UnifiedPush
 
     private var endpointInternal = ""
@@ -54,11 +53,13 @@ object PushDistributorHandler : PushDistributorActions {
         endpointInternal = ""
     }
 
-    override fun getSavedDistributor(): String = unifiedPush.getSavedDistributor(appContext) ?: ""
+    fun appContext(): Context = Amethyst.instance.applicationContext
+
+    override fun getSavedDistributor(): String = unifiedPush.getSavedDistributor(appContext()) ?: ""
 
     fun savedDistributorExists(): Boolean = getSavedDistributor().isNotEmpty()
 
-    override fun getInstalledDistributors(): List<String> = unifiedPush.getDistributors(appContext)
+    override fun getInstalledDistributors(): List<String> = unifiedPush.getDistributors(appContext())
 
     fun formattedDistributorNames(): List<String> {
         val distributorsArray = getInstalledDistributors().toTypedArray()
@@ -68,16 +69,16 @@ object PushDistributorHandler : PushDistributorActions {
                     try {
                         val ai =
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                                appContext.packageManager.getApplicationInfo(
+                                appContext().packageManager.getApplicationInfo(
                                     it,
                                     PackageManager.ApplicationInfoFlags.of(
                                         PackageManager.GET_META_DATA.toLong(),
                                     ),
                                 )
                             } else {
-                                appContext.packageManager.getApplicationInfo(it, 0)
+                                appContext().packageManager.getApplicationInfo(it, 0)
                             }
-                        appContext.packageManager.getApplicationLabel(ai)
+                        appContext().packageManager.getApplicationLabel(ai)
                     } catch (e: PackageManager.NameNotFoundException) {
                         it
                     }
@@ -87,12 +88,12 @@ object PushDistributorHandler : PushDistributorActions {
     }
 
     override fun saveDistributor(distributor: String) {
-        unifiedPush.saveDistributor(appContext, distributor)
-        unifiedPush.registerApp(appContext)
+        unifiedPush.saveDistributor(appContext(), distributor)
+        unifiedPush.registerApp(appContext())
     }
 
     override fun removeSavedDistributor() {
-        unifiedPush.safeRemoveDistributor(appContext)
+        unifiedPush.safeRemoveDistributor(appContext())
     }
 
     fun forceRemoveDistributor(context: Context) {

amethyst/src/main/AndroidManifest.xml

@@ -16,6 +16,9 @@
     <!-- To connect with relays -->
     <uses-permission android:name="android.permission.INTERNET"/>
 
+    <!-- To take pictures -->
+    <uses-permission android:name="android.permission.CAMERA" />
+
     <!-- To Upload media (newer devices) -->
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
@@ -121,6 +124,16 @@
             </intent-filter>
         </service>
 
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
     </application>
 
 </manifest>

amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt

@@ -32,11 +32,8 @@ import androidx.security.crypto.EncryptedSharedPreferences
 import coil.ImageLoader
 import coil.disk.DiskCache
 import coil.memory.MemoryCache
-import com.vitorpamplona.amethyst.service.ots.OkHttpBlockstreamExplorer
-import com.vitorpamplona.amethyst.service.ots.OkHttpCalendarBuilder
 import com.vitorpamplona.amethyst.service.playback.VideoCache
-import com.vitorpamplona.quartz.events.OtsEvent
-import com.vitorpamplona.quartz.ots.OpenTimestamps
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
@@ -94,7 +91,7 @@ class Amethyst : Application() {
 
         instance = this
 
-        OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer(), OkHttpCalendarBuilder())
+        HttpClientManager.setDefaultUserAgent("Amethyst/${BuildConfig.VERSION_NAME}")
 
         if (BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "benchmark") {
             StrictMode.setThreadPolicy(

amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt

@@ -34,8 +34,10 @@ import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.model.Settings
 import com.vitorpamplona.amethyst.service.Nip96MediaServers
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.ui.tor.TorSettings
+import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
+import com.vitorpamplona.amethyst.ui.tor.TorType
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
-import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
@@ -55,6 +57,7 @@ import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
@@ -72,6 +75,7 @@ data class AccountInfo(
     val npub: String,
     val hasPrivKey: Boolean,
     val loggedInWithExternalSigner: Boolean,
+    val isTransient: Boolean,
 )
 
 private object PrefKeys {
@@ -103,6 +107,7 @@ private object PrefKeys {
     const val HIDE_DELETE_REQUEST_DIALOG = "hide_delete_request_dialog"
     const val HIDE_BLOCK_ALERT_DIALOG = "hide_block_alert_dialog"
     const val HIDE_NIP_17_WARNING_DIALOG = "hide_nip24_warning_dialog" // delete later
+    const val TOR_SETTINGS = "tor_settings"
     const val USE_PROXY = "use_proxy"
     const val PROXY_PORT = "proxy_port"
     const val SHOW_SENSITIVE_CONTENT = "show_sensitive_content"
@@ -122,7 +127,7 @@ object LocalPreferences {
     private const val COMMA = ","
 
     private var currentAccount: String? = null
-    private var savedAccounts: List<AccountInfo>? = null
+    private var savedAccounts: MutableStateFlow<List<AccountInfo>?> = MutableStateFlow(null)
     private var cachedAccounts: MutableMap<String, AccountSettings?> = mutableMapOf()
 
     suspend fun currentAccount(): String? {
@@ -135,22 +140,24 @@ object LocalPreferences {
         return currentAccount
     }
 
-    private suspend fun updateCurrentAccount(npub: String?) {
-        if (npub == null) {
+    private suspend fun updateCurrentAccount(info: AccountInfo?) {
+        if (info == null) {
             currentAccount = null
             withContext(Dispatchers.IO) {
                 encryptedPreferences().edit().clear().apply()
             }
-        } else if (currentAccount != npub) {
-            currentAccount = npub
-            withContext(Dispatchers.IO) {
-                encryptedPreferences().edit().apply { putString(PrefKeys.CURRENT_ACCOUNT, npub) }.apply()
+        } else if (currentAccount != info.npub) {
+            currentAccount = info.npub
+            if (!info.isTransient) {
+                withContext(Dispatchers.IO) {
+                    encryptedPreferences().edit().apply { putString(PrefKeys.CURRENT_ACCOUNT, info.npub) }.apply()
+                }
             }
         }
     }
 
     private suspend fun savedAccounts(): List<AccountInfo> {
-        if (savedAccounts == null) {
+        if (savedAccounts.value == null) {
             withContext(Dispatchers.IO) {
                 with(encryptedPreferences()) {
                     val newSystemOfAccounts =
@@ -159,7 +166,7 @@ object LocalPreferences {
                         }
 
                     if (!newSystemOfAccounts.isNullOrEmpty()) {
-                        savedAccounts = newSystemOfAccounts
+                        savedAccounts.emit(newSystemOfAccounts)
                     } else {
                         val oldAccounts = getString(PrefKeys.SAVED_ACCOUNTS, null)?.split(COMMA) ?: listOf()
 
@@ -168,32 +175,37 @@ object LocalPreferences {
                                 AccountInfo(
                                     npub,
                                     encryptedPreferences(npub).getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false),
-                                    (encryptedPreferences(npub).getString(PrefKeys.NOSTR_PRIVKEY, "") ?: "")
-                                        .isNotBlank(),
+                                    (encryptedPreferences(npub).getString(PrefKeys.NOSTR_PRIVKEY, "") ?: "").isNotBlank(),
+                                    false,
                                 )
                             }
 
-                        savedAccounts = migrated
+                        savedAccounts.emit(migrated)
 
-                        edit().apply { putString(PrefKeys.ALL_ACCOUNT_INFO, Event.mapper.writeValueAsString(savedAccounts)) }.apply()
+                        edit().apply { putString(PrefKeys.ALL_ACCOUNT_INFO, Event.mapper.writeValueAsString(savedAccounts.value)) }.apply()
                     }
                 }
             }
         }
-        return savedAccounts!!
+        // it's always not null when it gets here.
+        return savedAccounts.value!!
     }
 
-    fun cachedAccounts() = savedAccounts
+    fun accountsFlow() = savedAccounts
 
     private suspend fun updateSavedAccounts(accounts: List<AccountInfo>) =
         withContext(Dispatchers.IO) {
             if (savedAccounts != accounts) {
-                savedAccounts = accounts
+                savedAccounts.emit(accounts)
 
                 encryptedPreferences()
                     .edit()
-                    .apply { putString(PrefKeys.ALL_ACCOUNT_INFO, Event.mapper.writeValueAsString(accounts)) }
-                    .apply()
+                    .apply {
+                        putString(
+                            PrefKeys.ALL_ACCOUNT_INFO,
+                            Event.mapper.writeValueAsString(accounts.filter { !it.isTransient }),
+                        )
+                    }.apply()
             }
         }
 
@@ -212,12 +224,13 @@ object LocalPreferences {
                 npub,
                 accountSettings.isWriteable(),
                 accountSettings.externalSignerPackageName != null,
+                accountSettings.transientAccount,
             )
-        updateCurrentAccount(npub)
+        updateCurrentAccount(accInfo)
         addAccount(accInfo)
     }
 
-    suspend fun switchToAccount(accountInfo: AccountInfo) = updateCurrentAccount(accountInfo.npub)
+    suspend fun switchToAccount(accountInfo: AccountInfo) = updateCurrentAccount(accountInfo)
 
     /** Removes the account from the app level shared preferences */
     private suspend fun removeAccount(accountInfo: AccountInfo) {
@@ -258,7 +271,7 @@ object LocalPreferences {
      */
     @SuppressLint("ApplySharedPref")
     suspend fun updatePrefsForLogout(accountInfo: AccountInfo) {
-        Log.d("LocalPreferences", "Saving to encrypted storage updatePrefsForLogout")
+        Log.d("LocalPreferences", "Saving to encrypted storage updatePrefsForLogout ${accountInfo.npub}")
         withContext(Dispatchers.IO) {
             encryptedPreferences(accountInfo.npub).edit().clear().commit()
             removeAccount(accountInfo)
@@ -267,7 +280,7 @@ object LocalPreferences {
             if (savedAccounts().isEmpty()) {
                 updateCurrentAccount(null)
             } else if (currentAccount() == accountInfo.npub) {
-                updateCurrentAccount(savedAccounts().elementAt(0).npub)
+                updateCurrentAccount(savedAccounts().elementAt(0))
             }
         }
     }
@@ -281,145 +294,152 @@ object LocalPreferences {
 
     suspend fun saveToEncryptedStorage(settings: AccountSettings) {
         Log.d("LocalPreferences", "Saving to encrypted storage")
-        withContext(Dispatchers.IO) {
-            val prefs = encryptedPreferences(settings.keyPair.pubKey.toNpub())
-            prefs
-                .edit()
-                .apply {
-                    putBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, settings.externalSignerPackageName != null)
-                    if (settings.externalSignerPackageName != null) {
-                        remove(PrefKeys.NOSTR_PRIVKEY)
-                        putString(PrefKeys.SIGNER_PACKAGE_NAME, settings.externalSignerPackageName)
-                    } else {
-                        remove(PrefKeys.SIGNER_PACKAGE_NAME)
-                        settings.keyPair.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHexKey()) }
-                    }
-                    settings.keyPair.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHexKey()) }
-                    putString(PrefKeys.RELAYS, Event.mapper.writeValueAsString(settings.localRelays))
-                    putStringSet(PrefKeys.DONT_TRANSLATE_FROM, settings.dontTranslateFrom)
-                    putStringSet(PrefKeys.LOCAL_RELAY_SERVERS, settings.localRelayServers)
-                    putString(
-                        PrefKeys.LANGUAGE_PREFS,
-                        Event.mapper.writeValueAsString(settings.languagePreferences),
-                    )
-                    putString(PrefKeys.TRANSLATE_TO, settings.translateTo)
-                    putString(PrefKeys.ZAP_AMOUNTS, Event.mapper.writeValueAsString(settings.zapAmountChoices.value))
-                    putString(
-                        PrefKeys.REACTION_CHOICES,
-                        Event.mapper.writeValueAsString(settings.reactionChoices.value),
-                    )
-                    putString(PrefKeys.DEFAULT_ZAPTYPE, settings.defaultZapType.value.name)
-                    putString(
-                        PrefKeys.DEFAULT_FILE_SERVER,
-                        Event.mapper.writeValueAsString(settings.defaultFileServer),
-                    )
-                    putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, settings.defaultHomeFollowList.value)
-                    putString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, settings.defaultStoriesFollowList.value)
-                    putString(
-                        PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST,
-                        settings.defaultNotificationFollowList.value,
-                    )
-                    putString(
-                        PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST,
-                        settings.defaultDiscoveryFollowList.value,
-                    )
-                    putString(
-                        PrefKeys.ZAP_PAYMENT_REQUEST_SERVER,
-                        Event.mapper.writeValueAsString(settings.zapPaymentRequest),
-                    )
-                    if (settings.backupContactList != null) {
+        if (!settings.transientAccount) {
+            withContext(Dispatchers.IO) {
+                val prefs = encryptedPreferences(settings.keyPair.pubKey.toNpub())
+                prefs
+                    .edit()
+                    .apply {
+                        putBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, settings.externalSignerPackageName != null)
+                        if (settings.externalSignerPackageName != null) {
+                            remove(PrefKeys.NOSTR_PRIVKEY)
+                            putString(PrefKeys.SIGNER_PACKAGE_NAME, settings.externalSignerPackageName)
+                        } else {
+                            remove(PrefKeys.SIGNER_PACKAGE_NAME)
+                            settings.keyPair.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHexKey()) }
+                        }
+                        settings.keyPair.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHexKey()) }
+                        putString(PrefKeys.RELAYS, Event.mapper.writeValueAsString(settings.localRelays))
+                        putStringSet(PrefKeys.DONT_TRANSLATE_FROM, settings.dontTranslateFrom)
+                        putStringSet(PrefKeys.LOCAL_RELAY_SERVERS, settings.localRelayServers)
                         putString(
-                            PrefKeys.LATEST_CONTACT_LIST,
-                            Event.mapper.writeValueAsString(settings.backupContactList),
+                            PrefKeys.LANGUAGE_PREFS,
+                            Event.mapper.writeValueAsString(settings.languagePreferences),
                         )
-                    } else {
-                        remove(PrefKeys.LATEST_CONTACT_LIST)
-                    }
-
-                    if (settings.backupUserMetadata != null) {
+                        putString(PrefKeys.TRANSLATE_TO, settings.translateTo)
+                        putString(PrefKeys.ZAP_AMOUNTS, Event.mapper.writeValueAsString(settings.zapAmountChoices.value))
                         putString(
-                            PrefKeys.LATEST_USER_METADATA,
-                            Event.mapper.writeValueAsString(settings.backupUserMetadata),
+                            PrefKeys.REACTION_CHOICES,
+                            Event.mapper.writeValueAsString(settings.reactionChoices.value),
                         )
-                    } else {
-                        remove(PrefKeys.LATEST_USER_METADATA)
-                    }
-
-                    if (settings.backupDMRelayList != null) {
+                        putString(PrefKeys.DEFAULT_ZAPTYPE, settings.defaultZapType.value.name)
                         putString(
-                            PrefKeys.LATEST_DM_RELAY_LIST,
-                            Event.mapper.writeValueAsString(settings.backupDMRelayList),
+                            PrefKeys.DEFAULT_FILE_SERVER,
+                            Event.mapper.writeValueAsString(settings.defaultFileServer),
                         )
-                    } else {
-                        remove(PrefKeys.LATEST_DM_RELAY_LIST)
-                    }
-
-                    if (settings.backupNIP65RelayList != null) {
+                        putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, settings.defaultHomeFollowList.value)
+                        putString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, settings.defaultStoriesFollowList.value)
                         putString(
-                            PrefKeys.LATEST_NIP65_RELAY_LIST,
-                            Event.mapper.writeValueAsString(settings.backupNIP65RelayList),
+                            PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST,
+                            settings.defaultNotificationFollowList.value,
                         )
-                    } else {
-                        remove(PrefKeys.LATEST_NIP65_RELAY_LIST)
-                    }
-
-                    if (settings.backupSearchRelayList != null) {
                         putString(
-                            PrefKeys.LATEST_SEARCH_RELAY_LIST,
-                            Event.mapper.writeValueAsString(settings.backupSearchRelayList),
+                            PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST,
+                            settings.defaultDiscoveryFollowList.value,
                         )
-                    } else {
-                        remove(PrefKeys.LATEST_SEARCH_RELAY_LIST)
-                    }
-
-                    if (settings.backupMuteList != null) {
                         putString(
-                            PrefKeys.LATEST_MUTE_LIST,
-                            Event.mapper.writeValueAsString(settings.backupMuteList),
+                            PrefKeys.ZAP_PAYMENT_REQUEST_SERVER,
+                            Event.mapper.writeValueAsString(settings.zapPaymentRequest),
                         )
-                    } else {
-                        remove(PrefKeys.LATEST_MUTE_LIST)
-                    }
-
-                    if (settings.backupPrivateHomeRelayList != null) {
-                        putString(
-                            PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST,
-                            Event.mapper.writeValueAsString(settings.backupPrivateHomeRelayList),
-                        )
-                    } else {
-                        remove(PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST)
-                    }
-
-                    putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, settings.hideDeleteRequestDialog)
-                    putBoolean(PrefKeys.HIDE_NIP_17_WARNING_DIALOG, settings.hideNIP17WarningDialog)
-                    putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, settings.hideBlockAlertDialog)
-                    putBoolean(PrefKeys.USE_PROXY, settings.proxy != null)
-                    putInt(PrefKeys.PROXY_PORT, settings.proxyPort)
-                    putBoolean(PrefKeys.WARN_ABOUT_REPORTS, settings.warnAboutPostsWithReports)
-                    putBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, settings.filterSpamFromStrangers)
-
-                    val regularMap =
-                        settings.lastReadPerRoute.value.mapValues {
-                            it.value.value
+                        if (settings.backupContactList != null) {
+                            putString(
+                                PrefKeys.LATEST_CONTACT_LIST,
+                                Event.mapper.writeValueAsString(settings.backupContactList),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_CONTACT_LIST)
                         }
 
-                    putString(
-                        PrefKeys.LAST_READ_PER_ROUTE,
-                        Event.mapper.writeValueAsString(regularMap),
-                    )
-                    putStringSet(PrefKeys.HAS_DONATED_IN_VERSION, settings.hasDonatedInVersion.value)
+                        if (settings.backupUserMetadata != null) {
+                            putString(
+                                PrefKeys.LATEST_USER_METADATA,
+                                Event.mapper.writeValueAsString(settings.backupUserMetadata),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_USER_METADATA)
+                        }
 
-                    if (settings.showSensitiveContent.value == null) {
-                        remove(PrefKeys.SHOW_SENSITIVE_CONTENT)
-                    } else {
-                        putBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, settings.showSensitiveContent.value!!)
-                    }
+                        if (settings.backupDMRelayList != null) {
+                            putString(
+                                PrefKeys.LATEST_DM_RELAY_LIST,
+                                Event.mapper.writeValueAsString(settings.backupDMRelayList),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_DM_RELAY_LIST)
+                        }
 
-                    putString(
-                        PrefKeys.PENDING_ATTESTATIONS,
-                        Event.mapper.writeValueAsString(settings.pendingAttestations.value),
-                    )
-                }.apply()
+                        if (settings.backupNIP65RelayList != null) {
+                            putString(
+                                PrefKeys.LATEST_NIP65_RELAY_LIST,
+                                Event.mapper.writeValueAsString(settings.backupNIP65RelayList),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_NIP65_RELAY_LIST)
+                        }
+
+                        if (settings.backupSearchRelayList != null) {
+                            putString(
+                                PrefKeys.LATEST_SEARCH_RELAY_LIST,
+                                Event.mapper.writeValueAsString(settings.backupSearchRelayList),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_SEARCH_RELAY_LIST)
+                        }
+
+                        if (settings.backupMuteList != null) {
+                            putString(
+                                PrefKeys.LATEST_MUTE_LIST,
+                                Event.mapper.writeValueAsString(settings.backupMuteList),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_MUTE_LIST)
+                        }
+
+                        if (settings.backupPrivateHomeRelayList != null) {
+                            putString(
+                                PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST,
+                                Event.mapper.writeValueAsString(settings.backupPrivateHomeRelayList),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST)
+                        }
+
+                        putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, settings.hideDeleteRequestDialog)
+                        putBoolean(PrefKeys.HIDE_NIP_17_WARNING_DIALOG, settings.hideNIP17WarningDialog)
+                        putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, settings.hideBlockAlertDialog)
+
+                        // migrating from previous design
+                        remove(PrefKeys.USE_PROXY)
+                        remove(PrefKeys.PROXY_PORT)
+
+                        putString(PrefKeys.TOR_SETTINGS, Event.mapper.writeValueAsString(settings.torSettings.toSettings()))
+
+                        putBoolean(PrefKeys.WARN_ABOUT_REPORTS, settings.warnAboutPostsWithReports)
+                        putBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, settings.filterSpamFromStrangers)
+
+                        val regularMap =
+                            settings.lastReadPerRoute.value.mapValues {
+                                it.value.value
+                            }
+
+                        putString(
+                            PrefKeys.LAST_READ_PER_ROUTE,
+                            Event.mapper.writeValueAsString(regularMap),
+                        )
+                        putStringSet(PrefKeys.HAS_DONATED_IN_VERSION, settings.hasDonatedInVersion.value)
+
+                        if (settings.showSensitiveContent.value == null) {
+                            remove(PrefKeys.SHOW_SENSITIVE_CONTENT)
+                        } else {
+                            putBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, settings.showSensitiveContent.value!!)
+                        }
+
+                        putString(
+                            PrefKeys.PENDING_ATTESTATIONS,
+                            Event.mapper.writeValueAsString(settings.pendingAttestations.value),
+                        )
+                    }.apply()
+            }
         }
     }
 
@@ -528,8 +548,28 @@ object LocalPreferences {
                 val hideBlockAlertDialog = getBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, false)
                 val hideNIP17WarningDialog = getBoolean(PrefKeys.HIDE_NIP_17_WARNING_DIALOG, false)
                 val useProxy = getBoolean(PrefKeys.USE_PROXY, false)
-                val proxyPort = getInt(PrefKeys.PROXY_PORT, 9050)
-                val proxy = HttpClientManager.initProxy(useProxy, "127.0.0.1", proxyPort)
+
+                val torSettings =
+                    if (useProxy) {
+                        // old settings, means Orbot
+                        TorSettings(
+                            TorType.EXTERNAL,
+                            getInt(PrefKeys.PROXY_PORT, 9050),
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                        )
+                    } else {
+                        parseOrNull<TorSettings>(PrefKeys.TOR_SETTINGS) ?: TorSettings()
+                    }
 
                 val showSensitiveContent =
                     if (contains(PrefKeys.SHOW_SENSITIVE_CONTENT)) {
@@ -550,6 +590,7 @@ object LocalPreferences {
 
                 return@with AccountSettings(
                     keyPair = keyPair,
+                    transientAccount = false,
                     externalSignerPackageName = externalSignerPackageName,
                     localRelays = localRelays,
                     localRelayServers = localRelayServers,
@@ -575,8 +616,7 @@ object LocalPreferences {
                     backupSearchRelayList = latestSearchRelayList,
                     backupPrivateHomeRelayList = latestPrivateHomeRelayList,
                     backupMuteList = latestMuteList,
-                    proxy = proxy,
-                    proxyPort = proxyPort,
+                    torSettings = TorSettingsFlow.build(torSettings),
                     showSensitiveContent = MutableStateFlow(showSensitiveContent),
                     warnAboutPostsWithReports = warnAboutReports,
                     filterSpamFromStrangers = filterSpam,

amethyst/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt

@@ -48,11 +48,17 @@ import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrVideoDataSource
+import com.vitorpamplona.amethyst.service.ots.OkHttpBlockstreamExplorer
+import com.vitorpamplona.amethyst.service.ots.OkHttpCalendarBuilder
+import com.vitorpamplona.amethyst.ui.tor.TorManager
+import com.vitorpamplona.amethyst.ui.tor.TorType
 import com.vitorpamplona.ammolite.relays.Client
 import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.bechToBytes
 import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
 import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.events.OtsEvent
+import com.vitorpamplona.quartz.ots.OpenTimestamps
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -88,8 +94,27 @@ class ServiceManager(
         val myAccount = account
 
         // Resets Proxy Use
-        HttpClientManager.setDefaultProxy(account?.settings?.proxy)
-        HttpClientManager.setDefaultUserAgent("Amethyst/${BuildConfig.VERSION_NAME}")
+        if (myAccount != null) {
+            when (myAccount.settings.torSettings.torType.value) {
+                TorType.INTERNAL -> {
+                    Log.d("TorManager", "Relays Service Connected ${TorManager.socksPort()}")
+                    HttpClientManager.setDefaultProxyOnPort(TorManager.socksPort())
+                }
+                TorType.EXTERNAL -> HttpClientManager.setDefaultProxyOnPort(myAccount.settings.torSettings.externalSocksPort.value)
+                else -> HttpClientManager.setDefaultProxy(null)
+            }
+
+            OtsEvent.otsInstance =
+                OpenTimestamps(
+                    OkHttpBlockstreamExplorer(myAccount::shouldUseTorForMoneyOperations),
+                    OkHttpCalendarBuilder(myAccount::shouldUseTorForMoneyOperations),
+                )
+        } else {
+            OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer { false }, OkHttpCalendarBuilder { false })
+
+            HttpClientManager.setDefaultProxy(null)
+        }
+
         LocalCache.antiSpam.active = account?.settings?.filterSpamFromStrangers ?: true
         Coil.setImageLoader {
             Amethyst.instance
@@ -106,22 +131,23 @@ class ServiceManager(
                     if (BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "benchmark") {
                         this.logger(DebugLogger())
                     }
-                }.okHttpClient { HttpClientManager.getHttpClient() }
-                .precision(Precision.INEXACT)
+                }.okHttpClient {
+                    myAccount?.shouldUseTorForImageDownload()?.let { HttpClientManager.getHttpClient(it) }
+                        ?: HttpClientManager.getHttpClient(false)
+                }.precision(Precision.INEXACT)
                 .respectCacheHeaders(false)
                 .build()
         }
 
         if (myAccount != null) {
-            val relaySet = myAccount.connectToRelays.value
-            Log.d("Relay", "Service Manager Connect Connecting ${relaySet.size}")
+            val relaySet = myAccount.connectToRelaysWithProxy.value
             Client.reconnect(relaySet)
 
             collectorJob?.cancel()
             collectorJob = null
             collectorJob =
                 scope.launch {
-                    myAccount.connectToRelaysFlow.collectLatest {
+                    myAccount.connectToRelaysWithProxy.collectLatest {
                         delay(500)
                         if (isStarted) {
                             Client.reconnect(it, onlyIfChanged = true)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -31,13 +31,16 @@ import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.NostrLnZapPaymentResponseDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.ui.tor.TorType
 import com.vitorpamplona.ammolite.relays.Client
 import com.vitorpamplona.ammolite.relays.Constants
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.Relay
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
+import com.vitorpamplona.ammolite.relays.RelaySetupInfoToConnect
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.HexKey
@@ -115,6 +118,7 @@ import kotlinx.coroutines.flow.combineTransform
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transformLatest
@@ -405,6 +409,51 @@ class Account(
                 ).toTypedArray(),
             )
 
+    val connectToRelaysWithProxy =
+        combineTransform(
+            connectToRelays,
+            settings.torSettings.torType,
+            settings.torSettings.onionRelaysViaTor,
+            settings.torSettings.trustedRelaysViaTor,
+        ) { relays, torType, useTorForOnionRelays, useTorForTrustedRelays ->
+            emit(
+                relays
+                    .map {
+                        RelaySetupInfoToConnect(
+                            it.url,
+                            torType != TorType.OFF && checkLocalHostOnionAndThen(it.url, useTorForOnionRelays, useTorForTrustedRelays),
+                            it.read,
+                            it.write,
+                            it.feedTypes,
+                        )
+                    }.toTypedArray(),
+            )
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                normalizeAndCombineRelayListsWithFallbacks(
+                    kind3Relays(),
+                    getDMRelayList(),
+                    getSearchRelayList(),
+                    getPrivateOutboxRelayList(),
+                    getNIP65RelayList(),
+                ).map {
+                    RelaySetupInfoToConnect(
+                        it.url,
+                        settings.torSettings.torType.value != TorType.OFF &&
+                            checkLocalHostOnionAndThen(
+                                it.url,
+                                settings.torSettings.onionRelaysViaTor.value,
+                                settings.torSettings.trustedRelaysViaTor.value,
+                            ),
+                        it.read,
+                        it.write,
+                        it.feedTypes,
+                    )
+                }.toTypedArray(),
+            )
+
     fun buildFollowLists(latestContactList: ContactListEvent?): LiveFollowLists {
         // makes sure the output include only valid p tags
         val verifiedFollowingUsers = latestContactList?.verifiedFollowKeySet() ?: emptySet()
@@ -425,6 +474,36 @@ class Account(
         )
     }
 
+    fun normalizeDMRelayListWithBackup(note: Note): Set<String> {
+        val event = note.event as? ChatMessageRelayListEvent ?: settings.backupDMRelayList
+        return event?.relays()?.map { RelayUrlFormatter.normalize(it) }?.toSet() ?: emptySet()
+    }
+
+    val normalizedDmRelaySet =
+        getDMRelayListFlow()
+            .map { normalizeDMRelayListWithBackup(it.note) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                normalizeDMRelayListWithBackup(getDMRelayListNote()),
+            )
+
+    fun normalizePrivateOutboxRelayListWithBackup(note: Note): Set<String> {
+        val event = note.event as? PrivateOutboxRelayListEvent ?: settings.backupPrivateHomeRelayList
+        return event?.relays()?.map { RelayUrlFormatter.normalize(it) }?.toSet() ?: emptySet()
+    }
+
+    val normalizedPrivateOutBoxRelaySet =
+        getPrivateOutboxRelayListFlow()
+            .map { normalizePrivateOutboxRelayListWithBackup(it.note) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                normalizePrivateOutboxRelayListWithBackup(getPrivateOutboxRelayListNote()),
+            )
+
     @OptIn(ExperimentalCoroutinesApi::class)
     val liveKind3FollowsFlow: Flow<LiveFollowLists> =
         userProfile().flow().follows.stateFlow.transformLatest {
@@ -562,6 +641,13 @@ class Account(
     fun authorsPerRelay(
         followsNIP65RelayLists: List<Note>,
         defaultRelayList: List<String>,
+        torType: TorType,
+    ): Map<String, List<HexKey>> = authorsPerRelay(followsNIP65RelayLists, defaultRelayList, torType != TorType.OFF)
+
+    fun authorsPerRelay(
+        followsNIP65RelayLists: List<Note>,
+        defaultRelayList: List<String>,
+        acceptOnion: Boolean,
     ): Map<String, List<HexKey>> {
         checkNotInMainThread()
 
@@ -595,7 +681,7 @@ class Account(
                         }
                     }
                 }.toMap(),
-            hasOnionConnection = settings.proxy != null,
+            hasOnionConnection = acceptOnion,
         )
     }
 
@@ -611,12 +697,13 @@ class Account(
             }
 
     val liveHomeListAuthorsPerRelayFlow: Flow<Map<String, List<HexKey>>?> by lazy {
-        combineTransform(liveHomeFollowListAdvertizedRelayListFlow, connectToRelays) { adverisedRelayList, existing ->
+        combineTransform(liveHomeFollowListAdvertizedRelayListFlow, connectToRelays, settings.torSettings.torType) { adverisedRelayList, existing, torStatus ->
             if (adverisedRelayList != null) {
                 emit(
                     authorsPerRelay(
                         adverisedRelayList.map { it.note },
                         existing.filter { it.feedTypes.contains(FeedType.FOLLOWS) && it.read }.map { it.url },
+                        torStatus,
                     ),
                 )
             } else {
@@ -632,6 +719,7 @@ class Account(
             authorsPerRelay(
                 liveHomeFollowLists.value?.usersPlusMe?.map { getNIP65RelayListNote(it) } ?: emptyList(),
                 connectToRelays.value.filter { it.feedTypes.contains(FeedType.FOLLOWS) && it.read }.map { it.url },
+                settings.torSettings.torType.value,
             ).ifEmpty { null },
         )
     }
@@ -692,9 +780,15 @@ class Account(
             }
 
     val liveStoriesListAuthorsPerRelayFlow: Flow<Map<String, List<String>>?> by lazy {
-        combineTransform(liveStoriesFollowListAdvertizedRelayListFlow, connectToRelays) { adverisedRelayList, existing ->
+        combineTransform(liveStoriesFollowListAdvertizedRelayListFlow, connectToRelays, settings.torSettings.torType) { adverisedRelayList, existing, torState ->
             if (adverisedRelayList != null) {
-                emit(authorsPerRelay(adverisedRelayList.map { it.note }, existing.filter { it.feedTypes.contains(FeedType.FOLLOWS) && it.read }.map { it.url }))
+                emit(
+                    authorsPerRelay(
+                        adverisedRelayList.map { it.note },
+                        existing.filter { it.feedTypes.contains(FeedType.FOLLOWS) && it.read }.map { it.url },
+                        torState,
+                    ),
+                )
             } else {
                 emit(null)
             }
@@ -708,6 +802,7 @@ class Account(
             authorsPerRelay(
                 liveStoriesFollowLists.value?.usersPlusMe?.map { getNIP65RelayListNote(it) } ?: emptyList(),
                 connectToRelays.value.filter { it.feedTypes.contains(FeedType.FOLLOWS) && it.read }.map { it.url },
+                settings.torSettings.torType.value,
             ).ifEmpty { null },
         )
     }
@@ -746,9 +841,15 @@ class Account(
             }
 
     val liveDiscoveryListAuthorsPerRelayFlow: Flow<Map<String, List<String>>?> by lazy {
-        combineTransform(liveDiscoveryFollowListAdvertizedRelayListFlow, connectToRelays) { adverisedRelayList, existing ->
+        combineTransform(liveDiscoveryFollowListAdvertizedRelayListFlow, connectToRelays, settings.torSettings.torType) { adverisedRelayList, existing, torState ->
             if (adverisedRelayList != null) {
-                emit(authorsPerRelay(adverisedRelayList.map { it.note }, existing.filter { it.read }.map { it.url }))
+                emit(
+                    authorsPerRelay(
+                        adverisedRelayList.map { it.note },
+                        existing.filter { it.read }.map { it.url },
+                        torState,
+                    ),
+                )
             } else {
                 emit(null)
             }
@@ -762,6 +863,7 @@ class Account(
             authorsPerRelay(
                 liveDiscoveryFollowLists.value?.usersPlusMe?.map { getNIP65RelayListNote(it) } ?: emptyList(),
                 connectToRelays.value.filter { it.read }.map { it.url },
+                settings.torSettings.torType.value,
             ).ifEmpty { null },
         )
     }
@@ -1192,10 +1294,16 @@ class Account(
 
                 LocalCache.consume(event, zappedNote) { it.response(signer) { onResponse(it) } }
 
-                Client.send(
+                Client.sendSingle(
                     signedEvent = event,
-                    relay = nip47.relayUri,
-                    feedTypes = wcListener.feedTypes,
+                    relayTemplate =
+                        RelaySetupInfoToConnect(
+                            url = nip47.relayUri,
+                            forceProxy = shouldUseTorForTrustedRelays(), // this is trusted.
+                            read = true,
+                            write = true,
+                            feedTypes = wcListener.feedTypes,
+                        ),
                     onDone = { wcListener.destroy() },
                 )
 
@@ -1645,7 +1753,7 @@ class Account(
     fun consumeAndSendNip95(
         data: FileStorageEvent,
         signedEvent: FileStorageHeaderEvent,
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
     ): Note? {
         if (!isWriteable()) return null
 
@@ -1671,7 +1779,7 @@ class Account(
     fun sendNip95(
         data: FileStorageEvent,
         signedEvent: FileStorageHeaderEvent,
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
     ) {
         Client.send(data, relayList = relayList)
         Client.send(signedEvent, relayList = relayList)
@@ -1679,7 +1787,7 @@ class Account(
 
     fun sendHeader(
         signedEvent: FileHeaderEvent,
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
         onReady: (Note) -> Unit,
     ) {
         Client.send(signedEvent, relayList = relayList)
@@ -1723,7 +1831,7 @@ class Account(
         alt: String?,
         sensitiveContent: Boolean,
         originalHash: String? = null,
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
         onReady: (Note) -> Unit,
     ) {
         if (!isWriteable()) return
@@ -1758,7 +1866,7 @@ class Account(
         zapReceiver: List<ZapSplitSetup>? = null,
         wantsToMarkAsSensitive: Boolean,
         zapRaiserAmount: Long? = null,
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
         geohash: String? = null,
         nip94attachments: List<Event>? = null,
         draftTag: String?,
@@ -1796,13 +1904,7 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, emptyList(), signer) { draftEvent ->
-                        val newRelayList = getPrivateOutboxRelayList()?.relays()
-                        if (newRelayList != null) {
-                            Client.sendPrivately(draftEvent, newRelayList)
-                        } else {
-                            Client.send(draftEvent, relayList = relayList)
-                        }
-                        LocalCache.justConsume(draftEvent, null)
+                        sendDraftEvent(draftEvent)
                     }
                 }
             } else {
@@ -1831,7 +1933,7 @@ class Account(
         root: String?,
         directMentions: Set<HexKey>,
         forkedFrom: Event?,
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
         draftTag: String?,
@@ -1865,13 +1967,7 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, signer) { draftEvent ->
-                        val newRelayList = getPrivateOutboxRelayList()?.relays()
-                        if (newRelayList != null) {
-                            Client.sendPrivately(draftEvent, newRelayList)
-                        } else {
-                            Client.send(draftEvent, relayList = relayList)
-                        }
-                        LocalCache.justConsume(draftEvent, null)
+                        sendDraftEvent(draftEvent)
                     }
                 }
             } else {
@@ -1905,7 +2001,7 @@ class Account(
         root: String,
         directMentions: Set<HexKey>,
         forkedFrom: Event?,
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
         draftTag: String?,
@@ -1937,13 +2033,7 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, signer) { draftEvent ->
-                        val newRelayList = getPrivateOutboxRelayList()?.relays()
-                        if (newRelayList != null) {
-                            Client.sendPrivately(draftEvent, newRelayList)
-                        } else {
-                            Client.send(draftEvent, relayList = relayList)
-                        }
-                        LocalCache.justConsume(draftEvent, null)
+                        sendDraftEvent(draftEvent)
                     }
                 }
             } else {
@@ -1972,7 +2062,18 @@ class Account(
             val noteEvent = note.event
             if (noteEvent is DraftEvent) {
                 noteEvent.createDeletedEvent(signer) {
-                    Client.sendPrivately(it, relayList = note.relays.map { it.url })
+                    Client.sendPrivately(
+                        it,
+                        note.relays.map { it.url }.map {
+                            RelaySetupInfoToConnect(
+                                it,
+                                shouldUseTorForClean(it),
+                                false,
+                                true,
+                                emptySet(),
+                            )
+                        },
+                    )
                     LocalCache.justConsume(it, null)
                 }
             }
@@ -1992,7 +2093,7 @@ class Account(
         root: String?,
         directMentions: Set<HexKey>,
         forkedFrom: Event?,
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
         draftTag: String?,
@@ -2026,13 +2127,7 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, signer) { draftEvent ->
-                        val newRelayList = getPrivateOutboxRelayList()?.relays()
-                        if (newRelayList != null) {
-                            Client.sendPrivately(draftEvent, newRelayList)
-                        } else {
-                            Client.send(draftEvent, relayList = relayList)
-                        }
-                        LocalCache.justConsume(draftEvent, null)
+                        sendDraftEvent(draftEvent)
                     }
                 }
             } else {
@@ -2060,7 +2155,7 @@ class Account(
         originalNote: Note,
         notify: HexKey?,
         summary: String? = null,
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
     ) {
         if (!isWriteable()) return
 
@@ -2090,7 +2185,7 @@ class Account(
         zapReceiver: List<ZapSplitSetup>? = null,
         wantsToMarkAsSensitive: Boolean,
         zapRaiserAmount: Long? = null,
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
         draftTag: String?,
@@ -2124,13 +2219,7 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, signer) { draftEvent ->
-                        val newRelayList = getPrivateOutboxRelayList()?.relays()
-                        if (newRelayList != null) {
-                            Client.sendPrivately(draftEvent, newRelayList)
-                        } else {
-                            Client.send(draftEvent, relayList = relayList)
-                        }
-                        LocalCache.justConsume(draftEvent, null)
+                        sendDraftEvent(draftEvent)
                     }
                 }
             } else {
@@ -2183,13 +2272,7 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, signer) { draftEvent ->
-                        val newRelayList = getPrivateOutboxRelayList()?.relays()
-                        if (newRelayList != null) {
-                            Client.sendPrivately(draftEvent, newRelayList)
-                        } else {
-                            Client.send(draftEvent)
-                        }
-                        LocalCache.justConsume(draftEvent, null)
+                        sendDraftEvent(draftEvent)
                     }
                 }
             } else {
@@ -2235,13 +2318,7 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, signer) { draftEvent ->
-                        val newRelayList = getPrivateOutboxRelayList()?.relays()
-                        if (newRelayList != null) {
-                            Client.sendPrivately(draftEvent, newRelayList)
-                        } else {
-                            Client.send(draftEvent)
-                        }
-                        LocalCache.justConsume(draftEvent, null)
+                        sendDraftEvent(draftEvent)
                     }
                 }
             } else {
@@ -2314,13 +2391,7 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, emptyList(), signer) { draftEvent ->
-                        val newRelayList = getPrivateOutboxRelayList()?.relays()
-                        if (newRelayList != null) {
-                            Client.sendPrivately(draftEvent, newRelayList)
-                        } else {
-                            Client.send(draftEvent)
-                        }
-                        LocalCache.justConsume(draftEvent, null)
+                        sendDraftEvent(draftEvent)
                     }
                 }
             } else {
@@ -2367,13 +2438,7 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it.msg, emptyList(), signer) { draftEvent ->
-                        val newRelayList = getPrivateOutboxRelayList()?.relays()
-                        if (newRelayList != null) {
-                            Client.sendPrivately(draftEvent, newRelayList)
-                        } else {
-                            Client.send(draftEvent)
-                        }
-                        LocalCache.justConsume(draftEvent, null)
+                        sendDraftEvent(draftEvent)
                     }
                 }
             } else {
@@ -2382,6 +2447,26 @@ class Account(
         }
     }
 
+    fun sendDraftEvent(draftEvent: DraftEvent) {
+        val relayList =
+            normalizedPrivateOutBoxRelaySet.value.map {
+                RelaySetupInfoToConnect(
+                    it,
+                    shouldUseTorForClean(it),
+                    true,
+                    true,
+                    emptySet(),
+                )
+            }
+
+        if (relayList.isNotEmpty()) {
+            Client.sendPrivately(draftEvent, relayList)
+        } else {
+            Client.send(draftEvent)
+        }
+        LocalCache.justConsume(draftEvent, null)
+    }
+
     fun broadcastPrivately(signedEvents: NIP17Factory.Result) {
         val mine = signedEvents.wraps.filter { (it.recipientPubKey() == signer.pubKey) }
 
@@ -2415,7 +2500,16 @@ class Account(
                         LocalCache
                             .getAddressableNoteIfExists(ChatMessageRelayListEvent.createAddressTag(receiver))
                             ?.event as? ChatMessageRelayListEvent
-                    )?.relays()?.ifEmpty { null }
+                    )?.relays()?.ifEmpty { null }?.map {
+                        val normalizedUrl = RelayUrlFormatter.normalize(it)
+                        RelaySetupInfoToConnect(
+                            normalizedUrl,
+                            shouldUseTorForClean(normalizedUrl),
+                            false,
+                            true,
+                            feedTypes = setOf(FeedType.PRIVATE_DMS),
+                        )
+                    }
 
                 if (relayList != null) {
                     Client.sendPrivately(signedEvent = wrap, relayList = relayList)
@@ -2868,7 +2962,22 @@ class Account(
         onReady: (event: NIP90ContentDiscoveryRequestEvent) -> Unit,
     ) {
         NIP90ContentDiscoveryRequestEvent.create(dvmPublicKey, signer.pubKey, getReceivingRelays(), signer) {
-            val relayList = (LocalCache.getAddressableNoteIfExists(AdvertisedRelayListEvent.createAddressTag(dvmPublicKey))?.event as? AdvertisedRelayListEvent)?.readRelays()
+            val relayList =
+                (
+                    LocalCache
+                        .getAddressableNoteIfExists(
+                            AdvertisedRelayListEvent.createAddressTag(dvmPublicKey),
+                        )?.event as? AdvertisedRelayListEvent
+                )?.readRelays()?.ifEmpty { null }?.map {
+                    val normalizedUrl = RelayUrlFormatter.normalize(it)
+                    RelaySetupInfoToConnect(
+                        normalizedUrl,
+                        shouldUseTorForClean(normalizedUrl),
+                        true,
+                        true,
+                        setOf(FeedType.GLOBAL),
+                    )
+                }
 
             if (relayList != null) {
                 Client.sendPrivately(it, relayList)
@@ -3267,6 +3376,116 @@ class Account(
 
     fun markDonatedInThisVersion() = settings.markDonatedInThisVersion(BuildConfig.VERSION_NAME)
 
+    fun httpClientForCoil() = HttpClientManager.getHttpClient(shouldUseTorForImageDownload())
+
+    fun httpClientForRelay(dirtyUrl: String) = HttpClientManager.getHttpClient(shouldUseTorForDirty(dirtyUrl))
+
+    fun httpClientForPreviewUrl(url: String) = HttpClientManager.getHttpClient(shouldUseTorForPreviewUrl(url))
+
+    fun shouldUseTorForImageDownload() =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> settings.torSettings.imagesViaTor.value
+            TorType.EXTERNAL -> settings.torSettings.imagesViaTor.value
+        }
+
+    fun shouldUseTorForVideoDownload() =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> settings.torSettings.videosViaTor.value
+            TorType.EXTERNAL -> settings.torSettings.videosViaTor.value
+        }
+
+    fun shouldUseTorForVideoDownload(url: String) =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.videosViaTor.value)
+            TorType.EXTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.videosViaTor.value)
+        }
+
+    fun shouldUseTorForPreviewUrl(url: String) =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.urlPreviewsViaTor.value)
+            TorType.EXTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.urlPreviewsViaTor.value)
+        }
+
+    fun shouldUseTorForTrustedRelays() =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> settings.torSettings.trustedRelaysViaTor.value
+            TorType.EXTERNAL -> settings.torSettings.trustedRelaysViaTor.value
+        }
+
+    fun shouldUseTorForDirty(dirtyUrl: String) = shouldUseTorForClean(RelayUrlFormatter.normalize(dirtyUrl))
+
+    fun shouldUseTorForClean(normalizedUrl: String) =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> shouldUseTor(normalizedUrl)
+            TorType.EXTERNAL -> shouldUseTor(normalizedUrl)
+        }
+
+    private fun checkLocalHostOnionAndThen(
+        normalizedUrl: String,
+        final: Boolean,
+    ): Boolean = checkLocalHostOnionAndThen(normalizedUrl, settings.torSettings.onionRelaysViaTor.value, final)
+
+    private fun checkLocalHostOnionAndThen(
+        normalizedUrl: String,
+        isOnionRelaysActive: Boolean,
+        final: Boolean,
+    ): Boolean =
+        if (isLocalHost(normalizedUrl)) {
+            false
+        } else if (isOnionUrl(normalizedUrl)) {
+            isOnionRelaysActive
+        } else {
+            final
+        }
+
+    private fun shouldUseTor(normalizedUrl: String): Boolean =
+        if (isLocalHost(normalizedUrl)) {
+            false
+        } else if (isOnionUrl(normalizedUrl)) {
+            settings.torSettings.onionRelaysViaTor.value
+        } else if (isDMRelay(normalizedUrl)) {
+            settings.torSettings.dmRelaysViaTor.value
+        } else if (isTrustedRelay(normalizedUrl)) {
+            settings.torSettings.trustedRelaysViaTor.value
+        } else {
+            settings.torSettings.newRelaysViaTor.value
+        }
+
+    fun shouldUseTorForMoneyOperations(url: String) =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.moneyOperationsViaTor.value)
+            TorType.EXTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.moneyOperationsViaTor.value)
+        }
+
+    fun shouldUseTorForNIP05(url: String) =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.nip05VerificationsViaTor.value)
+            TorType.EXTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.nip05VerificationsViaTor.value)
+        }
+
+    fun shouldUseTorForNIP96(url: String) =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.nip96UploadsViaTor.value)
+            TorType.EXTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.nip96UploadsViaTor.value)
+        }
+
+    fun isLocalHost(url: String) = url.contains("//127.0.0.1") || url.contains("//localhost")
+
+    fun isOnionUrl(url: String) = url.contains(".onion")
+
+    fun isDMRelay(url: String) = url in normalizedDmRelaySet.value
+
+    fun isTrustedRelay(url: String): Boolean = connectToRelays.value.any { it.url == url } || url == settings.zapPaymentRequest?.relayUri
+
     init {
         Log.d("AccountRegisterObservers", "Init")
         settings.backupContactList?.let {

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt

@@ -24,9 +24,10 @@ import android.content.res.Resources
 import androidx.compose.runtime.Stable
 import androidx.core.os.ConfigurationCompat
 import com.vitorpamplona.amethyst.service.Nip96MediaServers
+import com.vitorpamplona.amethyst.ui.tor.TorSettings
+import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
 import com.vitorpamplona.ammolite.relays.Constants
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
-import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
@@ -50,7 +51,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
-import java.net.Proxy
 import java.util.Locale
 
 val DefaultChannels =
@@ -113,6 +113,7 @@ val KIND3_FOLLOWS = " All Follows "
 @Stable
 class AccountSettings(
     val keyPair: KeyPair,
+    val transientAccount: Boolean = false,
     var externalSignerPackageName: String? = null,
     var localRelays: Set<RelaySetupInfo> = Constants.defaultRelays.toSet(),
     var localRelayServers: Set<String> = setOf(),
@@ -138,8 +139,7 @@ class AccountSettings(
     var backupSearchRelayList: SearchRelayListEvent? = null,
     var backupMuteList: MuteListEvent? = null,
     var backupPrivateHomeRelayList: PrivateOutboxRelayListEvent? = null,
-    var proxy: Proxy? = null,
-    var proxyPort: Int = 9050,
+    val torSettings: TorSettingsFlow = TorSettingsFlow(),
     val showSensitiveContent: MutableStateFlow<Boolean?> = MutableStateFlow(null),
     var warnAboutPostsWithReports: Boolean = true,
     var filterSpamFromStrangers: Boolean = true,
@@ -149,6 +149,10 @@ class AccountSettings(
 ) {
     val saveable = MutableStateFlow(AccountSettingsUpdater(this))
 
+    class AccountSettingsUpdater(
+        val accountSettings: AccountSettings,
+    )
+
     fun saveAccountSettings() {
         saveable.update { AccountSettingsUpdater(this) }
     }
@@ -243,28 +247,25 @@ class AccountSettings(
     // ---
     // proxy settings
     // ---
-
-    fun isProxyEnabled() = proxy != null
-
-    fun updateProxy(
-        enabled: Boolean,
-        portNumber: String,
-    ) {
-        val port = portNumber.toIntOrNull() ?: return
-        if (proxyPort != port || isProxyEnabled() != enabled) {
-            proxyPort = portNumber.toInt()
-            proxy = HttpClientManager.initProxy(enabled, "127.0.0.1", proxyPort)
+    fun setTorSettings(newTorSettings: TorSettings): Boolean {
+        if (torSettings.update(newTorSettings)) {
             saveAccountSettings()
+            return true
+        } else {
+            return false
         }
     }
 
     // ---
     // language services
     // ---
-    fun addDontTranslateFrom(languageCode: String) {
+    fun toggleDontTranslateFrom(languageCode: String) {
         if (!dontTranslateFrom.contains(languageCode)) {
             dontTranslateFrom = dontTranslateFrom.plus(languageCode)
             saveAccountSettings()
+        } else {
+            dontTranslateFrom = dontTranslateFrom.minus(languageCode)
+            saveAccountSettings()
         }
     }
 
@@ -286,6 +287,12 @@ class AccountSettings(
         if (key !in languagePreferences) {
             languagePreferences = languagePreferences + Pair(key, preference)
             saveAccountSettings()
+        } else {
+            if (languagePreferences.get(key) == preference) {
+                languagePreferences = languagePreferences.minus(key)
+            } else {
+                languagePreferences = languagePreferences + Pair(key, preference)
+            }
         }
     }
 
@@ -517,7 +524,3 @@ class AccountSettings(
             false
         }
 }
-
-class AccountSettingsUpdater(
-    val accountSettings: AccountSettings,
-)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt

@@ -116,6 +116,7 @@ import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteModificationEvent
 import com.vitorpamplona.quartz.events.TorrentCommentEvent
 import com.vitorpamplona.quartz.events.TorrentEvent
+import com.vitorpamplona.quartz.events.VerificationState
 import com.vitorpamplona.quartz.events.VideoHorizontalEvent
 import com.vitorpamplona.quartz.events.VideoVerticalEvent
 import com.vitorpamplona.quartz.events.WikiNoteEvent
@@ -1093,7 +1094,7 @@ object LocalCache {
         if (version.event?.id() == event.id()) return
 
         // makes sure the OTS has a valid certificate
-        if (event.cacheVerify() == null) return // no valid OTS
+        if (event.cacheVerify() is VerificationState.Error) return // no valid OTS
 
         if (version.event == null) {
             version.loadEvent(event, author, emptyList())
@@ -2155,7 +2156,7 @@ object LocalCache {
         notes.forEach { _, item ->
             val noteEvent = item.event
             if ((noteEvent is OtsEvent && noteEvent.isTaggedEvent(note.idHex) && !noteEvent.isExpirationBefore(time))) {
-                noteEvent.verifiedTime?.let { stampedTime ->
+                (noteEvent.cacheVerify() as? VerificationState.Verified)?.verifiedTime?.let { stampedTime ->
                     if (minTime == null || stampedTime < (minTime ?: Long.MAX_VALUE)) {
                         minTime = stampedTime
                     }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/MiniFhir.kt

@@ -94,16 +94,31 @@ class VisionPrescription(
     var dateWritten: String? = null,
     var prescriber: Reference? = Reference(),
     var lensSpecification: List<LensSpecification> = arrayListOf(),
-) : Resource(resourceType, id)
+) : Resource(resourceType, id) {
+    fun glasses() = lensSpecification.filter { it.product == "lens" }
+
+    fun contacts() = lensSpecification.filter { it.product == "contacts" }
+
+    fun glassesRightEyes() = lensSpecification.filter { it.product == "lens" && it.eye == "right" }
+
+    fun glassesLeftEyes() = lensSpecification.filter { it.product == "lens" && it.eye == "left" }
+
+    fun contactsRightEyes() = lensSpecification.filter { it.product == "contacts" && it.eye == "right" }
+
+    fun contactsLeftEyes() = lensSpecification.filter { it.product == "contacts" && it.eye == "left" }
+}
 
 @Stable
 class LensSpecification(
+    var product: String? = null,
     var eye: String? = null,
     var sphere: Double? = null,
     var cylinder: Double? = null,
     var axis: Double? = null,
+    var pd: Double? = null,
+    var interAdd: Double? = null,
     var add: Double? = null,
-    var prism: List<Prism> = arrayListOf(),
+    var prism: Prism? = null,
     // contact lenses
     var power: Double? = null,
     var backCurve: Double? = null,

amethyst/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt

@@ -22,9 +22,7 @@ package com.vitorpamplona.amethyst.model
 
 import android.util.LruCache
 import androidx.compose.runtime.Stable
-import com.vitorpamplona.amethyst.service.previews.BahaUrlPreview
-import com.vitorpamplona.amethyst.service.previews.IUrlPreviewCallback
-import com.vitorpamplona.amethyst.service.previews.UrlInfoItem
+import com.vitorpamplona.amethyst.service.previews.UrlPreview
 import com.vitorpamplona.amethyst.ui.components.UrlPreviewState
 
 @Stable
@@ -34,6 +32,7 @@ object UrlCachedPreviewer {
 
     suspend fun previewInfo(
         url: String,
+        forceProxy: Boolean,
         onReady: suspend (UrlPreviewState) -> Unit,
     ) {
         cache[url]?.let {
@@ -41,39 +40,37 @@ object UrlCachedPreviewer {
             return
         }
 
-        BahaUrlPreview(
+        UrlPreview().fetch(
             url,
-            object : IUrlPreviewCallback {
-                override suspend fun onComplete(urlInfo: UrlInfoItem) {
-                    cache[url]?.let {
-                        if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {
-                            onReady(it)
-                            return
-                        }
-                    }
-
-                    val state =
-                        if (urlInfo.fetchComplete() && urlInfo.url == url) {
-                            UrlPreviewState.Loaded(urlInfo)
-                        } else {
-                            UrlPreviewState.Empty
-                        }
-
-                    cache.put(url, state)
-                    onReady(state)
-                }
-
-                override suspend fun onFailed(throwable: Throwable) {
-                    cache[url]?.let {
+            forceProxy,
+            onComplete = { urlInfo ->
+                cache[url]?.let {
+                    if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {
                         onReady(it)
-                        return
+                        return@fetch
+                    }
+                }
+
+                val state =
+                    if (urlInfo.fetchComplete() && urlInfo.url == url) {
+                        UrlPreviewState.Loaded(urlInfo)
+                    } else {
+                        UrlPreviewState.Empty
                     }
 
-                    val state = UrlPreviewState.Error(throwable.message ?: "Error Loading url preview")
-                    cache.put(url, state)
-                    onReady(state)
-                }
+                cache.put(url, state)
+                onReady(state)
             },
-        ).fetchUrlPreview()
+            onFailed = { throwable ->
+                cache[url]?.let {
+                    onReady(it)
+                    return@fetch
+                }
+
+                val state = UrlPreviewState.Error(throwable.message ?: "Error Loading url preview")
+                cache.put(url, state)
+                onReady(state)
+            },
+        )
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt

@@ -218,6 +218,7 @@ class CashuProcessor {
     suspend fun melt(
         token: CashuToken,
         lud16: String,
+        forceProxy: (url: String) -> Boolean,
         onSuccess: (String, String) -> Unit,
         onError: (String, String) -> Unit,
         context: Context,
@@ -231,10 +232,12 @@ class CashuProcessor {
                     // Make invoice and leave room for fees
                     milliSats = token.totalAmount * 1000,
                     message = "Calculate Fees for Cashu",
+                    forceProxy = forceProxy,
                     onSuccess = { baseInvoice ->
                         feeCalculator(
                             token.mint,
                             baseInvoice,
+                            forceProxy = forceProxy,
                             onSuccess = { fees ->
                                 LightningAddressResolver()
                                     .lnAddressInvoice(
@@ -242,8 +245,9 @@ class CashuProcessor {
                                         // Make invoice and leave room for fees
                                         milliSats = (token.totalAmount - fees) * 1000,
                                         message = "Redeem Cashu",
+                                        forceProxy = forceProxy,
                                         onSuccess = { invoice ->
-                                            meltInvoice(token, invoice, fees, onSuccess, onError, context)
+                                            meltInvoice(token, invoice, fees, forceProxy, onSuccess, onError, context)
                                         },
                                         onProgress = {},
                                         onError = onError,
@@ -264,6 +268,7 @@ class CashuProcessor {
     fun feeCalculator(
         mintAddress: String,
         invoice: String,
+        forceProxy: (String) -> Boolean,
         onSuccess: (Int) -> Unit,
         onError: (String, String) -> Unit,
         context: Context,
@@ -271,8 +276,8 @@ class CashuProcessor {
         checkNotInMainThread()
 
         try {
-            val client = HttpClientManager.getHttpClient()
             val url = "$mintAddress/checkfees" // Melt cashu tokens at Mint
+            val client = HttpClientManager.getHttpClient(forceProxy(url))
 
             val factory = Event.mapper.nodeFactory
 
@@ -329,13 +334,14 @@ class CashuProcessor {
         token: CashuToken,
         invoice: String,
         fees: Int,
+        forceProxy: (String) -> Boolean,
         onSuccess: (String, String) -> Unit,
         onError: (String, String) -> Unit,
         context: Context,
     ) {
         try {
-            val client = HttpClientManager.getHttpClient()
             val url = token.mint + "/melt" // Melt cashu tokens at Mint
+            val client = HttpClientManager.getHttpClient(forceProxy(url))
 
             val factory = Event.mapper.nodeFactory
 

amethyst/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt

@@ -48,11 +48,12 @@ class FileHeader(
             fileUrl: String,
             mimeType: String?,
             dimPrecomputed: String?,
+            forceProxy: Boolean,
             onReady: (FileHeader) -> Unit,
             onError: (String) -> Unit,
         ) {
             try {
-                val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl)
+                val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl, forceProxy)
 
                 if (imageData != null) {
                     prepare(imageData, mimeType, dimPrecomputed, onReady, onError)

amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip05NostrAddressVerifier.kt

@@ -44,6 +44,7 @@ class Nip05NostrAddressVerifier {
 
     suspend fun fetchNip05Json(
         nip05: String,
+        forceProxy: (String) -> Boolean,
         onSuccess: suspend (String) -> Unit,
         onError: (String) -> Unit,
     ) = withContext(Dispatchers.IO) {
@@ -65,7 +66,7 @@ class Nip05NostrAddressVerifier {
                     .build()
             // Fetchers MUST ignore any HTTP redirects given by the /.well-known/nostr.json endpoint.
             HttpClientManager
-                .getHttpClient()
+                .getHttpClient(forceProxy(url))
                 .newBuilder()
                 .followRedirects(false)
                 .build()
@@ -90,6 +91,7 @@ class Nip05NostrAddressVerifier {
 
     suspend fun verifyNip05(
         nip05: String,
+        forceProxy: (String) -> Boolean,
         onSuccess: suspend (String) -> Unit,
         onError: (String) -> Unit,
     ) {
@@ -100,6 +102,7 @@ class Nip05NostrAddressVerifier {
 
         fetchNip05Json(
             nip05,
+            forceProxy,
             onSuccess = {
                 checkNotInMainThread()
 
@@ -126,7 +129,7 @@ class Nip05NostrAddressVerifier {
                 val hexKey = nip05url?.get("names")?.get(user)?.asText()
 
                 if (hexKey == null) {
-                    onError("Username not found in the NIP05 JSON")
+                    onError("Username not found in the NIP05 JSON [$nip05]")
                 } else {
                     onSuccess(hexKey)
                 }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip11RelayInfoRetriever.kt

@@ -60,6 +60,7 @@ object Nip11CachedRetriever {
 
     suspend fun loadRelayInfo(
         dirtyUrl: String,
+        forceProxy: Boolean,
         onInfo: (Nip11RelayInformation) -> Unit,
         onError: (String, Nip11Retriever.ErrorCode, String?) -> Unit,
     ) {
@@ -74,23 +75,24 @@ object Nip11CachedRetriever {
                 if (TimeUtils.now() - doc.time < TimeUtils.ONE_MINUTE) {
                     // just wait.
                 } else {
-                    retrieve(url, dirtyUrl, onInfo, onError)
+                    retrieve(url, dirtyUrl, forceProxy, onInfo, onError)
                 }
             } else if (doc is RetrieveResultError) {
                 if (TimeUtils.now() - doc.time < TimeUtils.ONE_HOUR) {
                     onError(dirtyUrl, doc.error, null)
                 } else {
-                    retrieve(url, dirtyUrl, onInfo, onError)
+                    retrieve(url, dirtyUrl, forceProxy, onInfo, onError)
                 }
             }
         } else {
-            retrieve(url, dirtyUrl, onInfo, onError)
+            retrieve(url, dirtyUrl, forceProxy, onInfo, onError)
         }
     }
 
     private suspend fun retrieve(
         url: String,
         dirtyUrl: String,
+        forceProxy: Boolean,
         onInfo: (Nip11RelayInformation) -> Unit,
         onError: (String, Nip11Retriever.ErrorCode, String?) -> Unit,
     ) {
@@ -98,6 +100,7 @@ object Nip11CachedRetriever {
         retriever.loadRelayInfo(
             url = url,
             dirtyUrl = dirtyUrl,
+            forceProxy = forceProxy,
             onInfo = {
                 checkNotInMainThread()
                 relayInformationDocumentCache.put(url, RetrieveResultSuccess(it))
@@ -123,6 +126,7 @@ class Nip11Retriever {
     suspend fun loadRelayInfo(
         url: String,
         dirtyUrl: String,
+        forceProxy: Boolean,
         onInfo: (Nip11RelayInformation) -> Unit,
         onError: (String, ErrorCode, String?) -> Unit,
     ) {
@@ -136,7 +140,7 @@ class Nip11Retriever {
                     .build()
 
             HttpClientManager
-                .getHttpClientForUrl(dirtyUrl)
+                .getHttpClient(forceProxy)
                 .newCall(request)
                 .enqueue(
                     object : Callback {

amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip96MediaServers.kt

@@ -47,11 +47,14 @@ object Nip96MediaServers {
 
     val cache: MutableMap<String, Nip96Retriever.ServerInfo> = mutableMapOf()
 
-    suspend fun load(url: String): Nip96Retriever.ServerInfo {
+    suspend fun load(
+        url: String,
+        forceProxy: Boolean,
+    ): Nip96Retriever.ServerInfo {
         val cached = cache[url]
         if (cached != null) return cached
 
-        val fetched = Nip96Retriever().loadInfo(url)
+        val fetched = Nip96Retriever().loadInfo(url, forceProxy)
         cache[url] = fetched
         return fetched
     }
@@ -100,7 +103,10 @@ class Nip96Retriever {
         )
     }
 
-    suspend fun loadInfo(baseUrl: String): ServerInfo {
+    suspend fun loadInfo(
+        baseUrl: String,
+        forceProxy: Boolean,
+    ): ServerInfo {
         checkNotInMainThread()
 
         val request: Request =
@@ -110,7 +116,7 @@ class Nip96Retriever {
                 .url(baseUrl.removeSuffix("/") + "/.well-known/nostr/nip96.json")
                 .build()
 
-        HttpClientManager.getHttpClient().newCall(request).execute().use { response ->
+        HttpClientManager.getHttpClient(forceProxy).newCall(request).execute().use { response ->
             checkNotInMainThread()
             response.use {
                 val body = it.body.string()

amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip96Uploader.kt

@@ -62,6 +62,7 @@ class Nip96Uploader(
         sensitiveContent: String?,
         server: Nip96MediaServers.ServerName,
         contentResolver: ContentResolver,
+        forceProxy: (String) -> Boolean,
         onProgress: (percentage: Float) -> Unit,
         context: Context,
     ): PartialEvent {
@@ -69,6 +70,7 @@ class Nip96Uploader(
             Nip96Retriever()
                 .loadInfo(
                     server.baseUrl,
+                    forceProxy(server.baseUrl),
                 )
 
         return uploadImage(
@@ -79,6 +81,7 @@ class Nip96Uploader(
             sensitiveContent,
             serverInfo,
             contentResolver,
+            forceProxy,
             onProgress,
             context,
         )
@@ -92,6 +95,7 @@ class Nip96Uploader(
         sensitiveContent: String?,
         server: Nip96Retriever.ServerInfo,
         contentResolver: ContentResolver,
+        forceProxy: (String) -> Boolean,
         onProgress: (percentage: Float) -> Unit,
         context: Context,
     ): PartialEvent {
@@ -118,6 +122,7 @@ class Nip96Uploader(
             alt,
             sensitiveContent,
             server,
+            forceProxy,
             onProgress,
             context,
         )
@@ -130,6 +135,7 @@ class Nip96Uploader(
         alt: String?,
         sensitiveContent: String?,
         server: Nip96Retriever.ServerInfo,
+        forceProxy: (String) -> Boolean,
         onProgress: (percentage: Float) -> Unit,
         context: Context,
     ): PartialEvent {
@@ -139,7 +145,7 @@ class Nip96Uploader(
         val extension =
             contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
 
-        val client = HttpClientManager.getHttpClient()
+        val client = HttpClientManager.getHttpClient(forceProxy(server.apiUrl))
         val requestBuilder = Request.Builder()
 
         val requestBody: RequestBody =
@@ -182,7 +188,7 @@ class Nip96Uploader(
                     val result = parseResults(str)
 
                     if (!result.processingUrl.isNullOrBlank()) {
-                        return waitProcessing(result, server, onProgress)
+                        return waitProcessing(result, server, forceProxy, onProgress)
                     } else if (result.status == "success" && result.nip94Event != null) {
                         return result.nip94Event
                     } else {
@@ -222,12 +228,13 @@ class Nip96Uploader(
         hash: String,
         contentType: String?,
         server: Nip96Retriever.ServerInfo,
+        forceProxy: (String) -> Boolean,
         context: Context,
     ): Boolean {
         val extension =
             contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
 
-        val client = HttpClientManager.getHttpClient()
+        val client = HttpClientManager.getHttpClient(forceProxy(server.apiUrl))
 
         val requestBuilder = Request.Builder()
 
@@ -261,9 +268,9 @@ class Nip96Uploader(
     private suspend fun waitProcessing(
         result: Nip96Result,
         server: Nip96Retriever.ServerInfo,
+        forceProxy: (String) -> Boolean,
         onProgress: (percentage: Float) -> Unit,
     ): PartialEvent {
-        val client = HttpClientManager.getHttpClient()
         var currentResult = result
 
         while (!result.processingUrl.isNullOrBlank() && (currentResult.percentage ?: 100) < 100) {
@@ -276,6 +283,7 @@ class Nip96Uploader(
                     .url(result.processingUrl)
                     .build()
 
+            val client = HttpClientManager.getHttpClient(forceProxy(result.processingUrl))
             client.newCall(request).execute().use {
                 if (it.isSuccessful) {
                     it.body.use { currentResult = parseResults(it.string()) }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt

@@ -494,10 +494,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
 
         if (this::account.isInitialized) {
             account.createAuthEvent(relay, challenge) {
-                Client.send(
-                    it,
-                    relay.url,
-                )
+                Client.sendIfExists(it, relay)
             }
         }
     }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/OnlineCheck.kt

@@ -49,7 +49,10 @@ object OnlineChecker {
         return false
     }
 
-    fun isOnline(url: String?): Boolean {
+    fun isOnline(
+        url: String?,
+        forceProxy: Boolean,
+    ): Boolean {
         checkNotInMainThread()
 
         if (url.isNullOrBlank()) return false
@@ -74,7 +77,7 @@ object OnlineChecker {
 
                     val client =
                         HttpClientManager
-                            .getHttpClient()
+                            .getHttpClient(forceProxy)
                             .newBuilder()
                             .eventListener(EventListener.NONE)
                             .protocols(listOf(Protocol.HTTP_1_1))
@@ -93,7 +96,7 @@ object OnlineChecker {
                             .get()
                             .build()
 
-                    HttpClientManager.getHttpClient().newCall(request).execute().use {
+                    HttpClientManager.getHttpClient(forceProxy).newCall(request).execute().use {
                         checkNotInMainThread()
                         it.isSuccessful
                     }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ZapPaymentHandler.kt

@@ -27,6 +27,7 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource.user
 import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.collectSuccessfulSigningOperations
 import com.vitorpamplona.amethyst.ui.stringRes
@@ -60,6 +61,7 @@ class ZapPaymentHandler(
         message: String,
         context: Context,
         showErrorIfNoLnAddress: Boolean,
+        forceProxy: (String) -> Boolean,
         onError: (String, String) -> Unit,
         onProgress: (percent: Float) -> Unit,
         onPayViaIntent: (ImmutableList<Payable>) -> Unit,
@@ -123,7 +125,7 @@ class ZapPaymentHandler(
                 onProgress(0.05f)
             }
 
-            assembleAllInvoices(splitZapRequestPairs.toList(), amountMilliSats, message, showErrorIfNoLnAddress, onError, onProgress = {
+            assembleAllInvoices(splitZapRequestPairs.toList(), amountMilliSats, message, showErrorIfNoLnAddress, forceProxy, onError, onProgress = {
                 onProgress(it * 0.7f + 0.05f) // keeps within range.
             }, context) {
                 if (it.isEmpty()) {
@@ -169,7 +171,7 @@ class ZapPaymentHandler(
     }
 
     class SignAllZapRequestsReturn(
-        val zapRequestJson: String,
+        val zapRequestJson: String?,
         val user: User? = null,
     )
 
@@ -215,9 +217,7 @@ class ZapPaymentHandler(
                         ) + (authorRelayList ?: emptySet())
 
                     prepareZapRequestIfNeeded(note, pollOption, message, zapType, user, userRelayList) { zapRequestJson ->
-                        if (zapRequestJson != null) {
-                            onReady(SignAllZapRequestsReturn(zapRequestJson, user))
-                        }
+                        onReady(SignAllZapRequestsReturn(zapRequestJson, user))
                     }
                 }
             },
@@ -230,6 +230,7 @@ class ZapPaymentHandler(
         totalAmountMilliSats: Long,
         message: String,
         showErrorIfNoLnAddress: Boolean,
+        forceProxy: (String) -> Boolean,
         onError: (String, String) -> Unit,
         onProgress: (percent: Float) -> Unit,
         context: Context,
@@ -247,6 +248,7 @@ class ZapPaymentHandler(
                     zapValue = calculateZapValue(totalAmountMilliSats, splitZapRequestPair.first.weight, totalWeight),
                     message = message,
                     showErrorIfNoLnAddress = showErrorIfNoLnAddress,
+                    forceProxy = forceProxy,
                     onError = onError,
                     onProgressStep = { percentStepForThisPayment ->
                         progressAllPayments += percentStepForThisPayment / invoices.size
@@ -312,10 +314,11 @@ class ZapPaymentHandler(
 
     private fun assembleInvoice(
         splitSetup: ZapSplitSetup,
-        nostrZapRequest: String,
+        nostrZapRequest: String?,
         zapValue: Long,
         message: String,
         showErrorIfNoLnAddress: Boolean = true,
+        forceProxy: (String) -> Boolean,
         onError: (String, String) -> Unit,
         onProgressStep: (percent: Float) -> Unit,
         context: Context,
@@ -339,6 +342,7 @@ class ZapPaymentHandler(
                     milliSats = zapValue,
                     message = message,
                     nostrRequest = nostrZapRequest,
+                    forceProxy = forceProxy,
                     onError = onError,
                     onProgress = {
                         val step = it - progressThisPayment

amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt

@@ -36,8 +36,6 @@ import java.net.URLEncoder
 import kotlin.coroutines.cancellation.CancellationException
 
 class LightningAddressResolver {
-    val client = HttpClientManager.getHttpClient()
-
     fun assembleUrl(lnaddress: String): String? {
         val parts = lnaddress.split("@")
 
@@ -54,6 +52,7 @@ class LightningAddressResolver {
 
     private fun fetchLightningAddressJson(
         lnaddress: String,
+        forceProxy: (url: String) -> Boolean,
         onSuccess: (String) -> Unit,
         onError: (String, String) -> Unit,
         context: Context,
@@ -74,6 +73,8 @@ class LightningAddressResolver {
             return
         }
 
+        val client = HttpClientManager.getHttpClient(forceProxy(url))
+
         try {
             val request: Request =
                 Request
@@ -121,6 +122,7 @@ class LightningAddressResolver {
         milliSats: Long,
         message: String,
         nostrRequest: String? = null,
+        forceProxy: (url: String) -> Boolean,
         onSuccess: (String) -> Unit,
         onError: (String, String) -> Unit,
         context: Context,
@@ -137,6 +139,8 @@ class LightningAddressResolver {
             url += "&nostr=$encodedNostrRequest"
         }
 
+        val client = HttpClientManager.getHttpClient(forceProxy(url))
+
         val request: Request =
             Request
                 .Builder()
@@ -161,6 +165,7 @@ class LightningAddressResolver {
         milliSats: Long,
         message: String,
         nostrRequest: String? = null,
+        forceProxy: (url: String) -> Boolean,
         onSuccess: (String) -> Unit,
         onError: (String, String) -> Unit,
         onProgress: (percent: Float) -> Unit,
@@ -170,6 +175,7 @@ class LightningAddressResolver {
 
         fetchLightningAddressJson(
             lnaddress,
+            forceProxy,
             onSuccess = { lnAddressJson ->
                 onProgress(0.4f)
 
@@ -210,6 +216,7 @@ class LightningAddressResolver {
                         milliSats,
                         message,
                         if (allowsNostr) nostrRequest else null,
+                        forceProxy,
                         onSuccess = {
                             onProgress(0.6f)
 

amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt

@@ -24,6 +24,7 @@ import android.app.NotificationManager
 import android.content.Context
 import android.util.Log
 import androidx.core.content.ContextCompat
+import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.AccountSettings
@@ -42,6 +43,7 @@ import com.vitorpamplona.quartz.events.LnZapRequestEvent
 import com.vitorpamplona.quartz.events.PrivateDmEvent
 import com.vitorpamplona.quartz.events.SealedGossipEvent
 import com.vitorpamplona.quartz.signers.NostrSigner
+import com.vitorpamplona.quartz.signers.NostrSignerExternal
 import com.vitorpamplona.quartz.utils.TimeUtils
 import java.math.BigDecimal
 import kotlin.coroutines.cancellation.CancellationException
@@ -84,6 +86,12 @@ class EventNotificationConsumer(
         // TODO: Modify the external launcher to launch as different users.
         // Right now it only registers if Amber has already approved this signature
         val signer = account.createSigner()
+        if (signer is NostrSignerExternal) {
+            signer.launcher.registerLauncher(
+                launcher = { },
+                contentResolver = Amethyst.instance::contentResolverFn,
+            )
+        }
 
         pushWrappedEvent.unwrapThrowing(signer) { notificationEvent ->
             val consumed = LocalCache.hasConsumed(notificationEvent)

amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt

@@ -22,11 +22,13 @@ package com.vitorpamplona.amethyst.service.notifications
 
 import android.util.Log
 import com.vitorpamplona.amethyst.AccountInfo
+import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.model.AccountSettings
 import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.events.RelayAuthEvent
+import com.vitorpamplona.quartz.signers.NostrSignerExternal
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -71,6 +73,13 @@ class RegisterAccounts(
                                     val signer = accountRelayPair.first.createSigner()
                                     // TODO: Modify the external launcher to launch as different users.
                                     // Right now it only registers if Amber has already approved this signature
+                                    if (signer is NostrSignerExternal) {
+                                        signer.launcher.registerLauncher(
+                                            launcher = { },
+                                            contentResolver = Amethyst.instance::contentResolverFn,
+                                        )
+                                    }
+
                                     RelayAuthEvent.create(accountRelayPair.second, notificationToken, signer) { result ->
                                         continuation.resume(result)
                                     }
@@ -157,7 +166,8 @@ class RegisterAccounts(
                     .post(body)
                     .build()
 
-            val client = HttpClientManager.getHttpClient()
+            // Always try via Tor for Amethyst.
+            val client = HttpClientManager.getHttpClient(true)
 
             val isSucess = client.newCall(request).execute().use { it.isSuccessful }
             Log.i(tag, "Server registration $isSucess")

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpBlockstreamExplorer.kt

@@ -21,6 +21,7 @@
 package com.vitorpamplona.amethyst.service.ots
 
 import android.util.Log
+import android.util.LruCache
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.ammolite.service.HttpClientManager
@@ -29,7 +30,12 @@ import com.vitorpamplona.quartz.ots.BlockHeader
 import com.vitorpamplona.quartz.ots.exceptions.UrlException
 import okhttp3.Request
 
-class OkHttpBlockstreamExplorer : BitcoinExplorer {
+class OkHttpBlockstreamExplorer(
+    val forceProxy: (String) -> Boolean,
+) : BitcoinExplorer {
+    private val cacheHeaders = LruCache<String, BlockHeader>(100)
+    private val cacheHeights = LruCache<Int, String>(100)
+
     /**
      * Retrieve the block information from the block hash.
      *
@@ -38,8 +44,13 @@ class OkHttpBlockstreamExplorer : BitcoinExplorer {
      * @throws Exception desc
      */
     override fun block(hash: String): BlockHeader {
-        val client = HttpClientManager.getHttpClient()
-        val url = "$BLOCKSTREAM_API_URL/block/$hash"
+        cacheHeaders.get(hash)?.let {
+            return it
+        }
+
+        val usingTor = forceProxy(BLOCKSTREAM_API_URL)
+        val url = "${getAPI(usingTor)}/block/$hash"
+        val client = HttpClientManager.getHttpClient(forceProxy(url))
 
         val request =
             Request
@@ -59,6 +70,9 @@ class OkHttpBlockstreamExplorer : BitcoinExplorer {
                 blockHeader.setTime(jsonObject["timestamp"].asInt().toString())
                 blockHeader.blockHash = hash
                 Log.d("OkHttpBlockstreamExplorer", "$BLOCKSTREAM_API_URL/block/$hash")
+
+                cacheHeaders.put(hash, blockHeader)
+
                 return blockHeader
             } else {
                 throw UrlException("Couldn't open $url: " + it.message + " " + it.code)
@@ -75,9 +89,13 @@ class OkHttpBlockstreamExplorer : BitcoinExplorer {
      */
     @Throws(Exception::class)
     override fun blockHash(height: Int): String {
-        val client = HttpClientManager.getHttpClient()
+        cacheHeights[height]?.let {
+            return it
+        }
 
-        val url = "$BLOCKSTREAM_API_URL/block-height/$height"
+        val usingTor = forceProxy(BLOCKSTREAM_API_URL)
+        val url = "${getAPI(usingTor)}/block-height/$height"
+        val client = HttpClientManager.getHttpClient(usingTor)
 
         val request =
             Request
@@ -92,14 +110,24 @@ class OkHttpBlockstreamExplorer : BitcoinExplorer {
                 val blockHash = it.body.string()
 
                 Log.d("OkHttpBlockstreamExplorer", "$url $blockHash")
+
+                cacheHeights.put(height, blockHash)
                 return blockHash
             } else {
-                throw UrlException(it.message)
+                throw UrlException("Couldn't open $url: " + it.message + " " + it.code)
             }
         }
     }
 
     companion object {
         private const val BLOCKSTREAM_API_URL = "https://blockstream.info/api"
+        private const val MEMPOOL_API_URL = "https://mempool.space/api/"
+
+        fun getAPI(usingTor: Boolean) =
+            if (usingTor) {
+                MEMPOOL_API_URL
+            } else {
+                BLOCKSTREAM_API_URL
+            }
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendar.kt

@@ -38,6 +38,7 @@ import okhttp3.RequestBody.Companion.toRequestBody
  */
 class OkHttpCalendar(
     val url: String,
+    val forceProxy: Boolean,
 ) : ICalendar {
     /**
      * Submitting a digest to remote calendar. Returns a com.eternitywall.ots.Timestamp committing to that digest.
@@ -51,7 +52,7 @@ class OkHttpCalendar(
     @Throws(ExceededSizeException::class, UrlException::class, DeserializationException::class)
     override fun submit(digest: ByteArray): Timestamp {
         try {
-            val client = HttpClientManager.getHttpClient()
+            val client = HttpClientManager.getHttpClient(forceProxy)
             val url = "$url/digest"
 
             val mediaType = "application/x-www-form-urlencoded; charset=utf-8".toMediaType()
@@ -102,7 +103,7 @@ class OkHttpCalendar(
     )
     override fun getTimestamp(commitment: ByteArray): Timestamp {
         try {
-            val client = HttpClientManager.getHttpClient()
+            val client = HttpClientManager.getHttpClient(forceProxy)
             val url = url + "/timestamp/" + Hex.encode(commitment)
 
             val request =

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarAsyncSubmit.kt

@@ -36,6 +36,7 @@ import java.util.concurrent.BlockingQueue
 class OkHttpCalendarAsyncSubmit(
     private val url: String,
     private val digest: ByteArray,
+    private val forceProxy: Boolean,
 ) : ICalendarAsyncSubmit {
     private var queue: BlockingQueue<Optional<Timestamp>>? = null
 
@@ -45,7 +46,7 @@ class OkHttpCalendarAsyncSubmit(
 
     @Throws(Exception::class)
     override fun call(): Optional<Timestamp> {
-        val client = HttpClientManager.getHttpClient()
+        val client = HttpClientManager.getHttpClient(forceProxy)
         val url = "$url/digest"
 
         val mediaType = "application/x-www-form-urlencoded; charset=utf-8".toMediaType()

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarBuilder.kt

@@ -24,11 +24,13 @@ import com.vitorpamplona.quartz.ots.CalendarBuilder
 import com.vitorpamplona.quartz.ots.ICalendar
 import com.vitorpamplona.quartz.ots.ICalendarAsyncSubmit
 
-class OkHttpCalendarBuilder : CalendarBuilder {
-    override fun newSyncCalendar(url: String): ICalendar = OkHttpCalendar(url)
+class OkHttpCalendarBuilder(
+    val forceProxy: (String) -> Boolean,
+) : CalendarBuilder {
+    override fun newSyncCalendar(url: String): ICalendar = OkHttpCalendar(url, forceProxy(url))
 
     override fun newAsyncCalendar(
         url: String,
         digest: ByteArray,
-    ): ICalendarAsyncSubmit = OkHttpCalendarAsyncSubmit(url, digest)
+    ): ICalendarAsyncSubmit = OkHttpCalendarAsyncSubmit(url, digest, forceProxy(url))
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/CustomMediaSourceFactory.kt

@@ -28,17 +28,17 @@ import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy
 import com.vitorpamplona.amethyst.Amethyst
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import okhttp3.OkHttpClient
 
 /**
  * HLS LiveStreams cannot use cache.
  */
 @UnstableApi
-class CustomMediaSourceFactory : MediaSource.Factory {
-    private var cachingFactory: MediaSource.Factory =
-        DefaultMediaSourceFactory(Amethyst.instance.videoCache.get(HttpClientManager.getHttpClient()))
-    private var nonCachingFactory: MediaSource.Factory =
-        DefaultMediaSourceFactory(OkHttpDataSource.Factory(HttpClientManager.getHttpClient()))
+class CustomMediaSourceFactory(
+    val okHttpClient: OkHttpClient,
+) : MediaSource.Factory {
+    private var cachingFactory: MediaSource.Factory = DefaultMediaSourceFactory(Amethyst.instance.videoCache.get(okHttpClient))
+    private var nonCachingFactory: MediaSource.Factory = DefaultMediaSourceFactory(OkHttpDataSource.Factory(okHttpClient))
 
     override fun setDrmSessionManagerProvider(drmSessionManagerProvider: DrmSessionManagerProvider): MediaSource.Factory {
         cachingFactory.setDrmSessionManagerProvider(drmSessionManagerProvider)

amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt

@@ -30,6 +30,7 @@ import androidx.media3.common.Player
 import androidx.media3.common.Player.PositionInfo
 import androidx.media3.common.Player.STATE_IDLE
 import androidx.media3.common.Player.STATE_READY
+import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.session.MediaSession
 import com.vitorpamplona.amethyst.ui.MainActivity
@@ -40,7 +41,8 @@ import kotlinx.coroutines.launch
 import kotlin.math.abs
 
 class MultiPlayerPlaybackManager(
-    private val dataSourceFactory: androidx.media3.exoplayer.source.MediaSource.Factory? = null,
+    @UnstableApi
+    val dataSourceFactory: CustomMediaSourceFactory,
     private val cachedPositions: VideoViewedPositionCache,
 ) {
     // protects from LruCache killing playing sessions

amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackClientController.kt

@@ -38,6 +38,7 @@ object PlaybackClientController {
         controllerID: String,
         videoUri: String,
         callbackUri: String?,
+        proxyPort: Int? = 0,
         context: Context,
         onReady: (MediaController) -> Unit,
     ) {
@@ -48,6 +49,9 @@ object PlaybackClientController {
             bundle.putString("id", controllerID)
             bundle.putString("uri", videoUri)
             bundle.putString("callbackUri", callbackUri)
+            proxyPort?.let {
+                bundle.putInt("proxyPort", it)
+            }
 
             var session = cache.get(context.hashCode())
             if (session == null) {

amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackService.kt

@@ -30,18 +30,47 @@ import com.vitorpamplona.ammolite.service.HttpClientManager
 
 class PlaybackService : MediaSessionService() {
     private var videoViewedPositionCache = VideoViewedPositionCache()
-
-    private var managerAllInOne: MultiPlayerPlaybackManager? = null
+    private var managerAllInOneNoProxy: MultiPlayerPlaybackManager? = null
+    private var managerAllInOneProxy: MultiPlayerPlaybackManager? = null
 
     @OptIn(UnstableApi::class)
-    fun lazyDS(): MultiPlayerPlaybackManager {
-        managerAllInOne?.let {
-            return it
-        }
+    fun lazyDS(proxyPort: Int): MultiPlayerPlaybackManager {
+        if (proxyPort <= 0) {
+            // no proxy
+            managerAllInOneNoProxy?.let {
+                return it
+            }
 
-        val newInstance = MultiPlayerPlaybackManager(CustomMediaSourceFactory(), videoViewedPositionCache)
-        managerAllInOne = newInstance
-        return newInstance
+            // creates new
+            val okHttp = HttpClientManager.getHttpClient(false)
+            val newInstance = MultiPlayerPlaybackManager(CustomMediaSourceFactory(okHttp), videoViewedPositionCache)
+            managerAllInOneNoProxy = newInstance
+            return newInstance
+        } else {
+            // with proxy, check if the port is the same.
+            managerAllInOneProxy?.let {
+                val okHttp = HttpClientManager.getHttpClient(true)
+                if (okHttp == it.dataSourceFactory.okHttpClient.proxy) {
+                    return it
+                }
+
+                val toDestroyAllInOne = managerAllInOneProxy
+
+                val newInstance = MultiPlayerPlaybackManager(CustomMediaSourceFactory(okHttp), videoViewedPositionCache)
+
+                managerAllInOneProxy = newInstance
+
+                toDestroyAllInOne?.releaseAppPlayers()
+
+                return newInstance
+            }
+
+            // creates new
+            val okHttp = HttpClientManager.getHttpClient(true)
+            val newInstance = MultiPlayerPlaybackManager(CustomMediaSourceFactory(okHttp), videoViewedPositionCache)
+            managerAllInOneProxy = newInstance
+            return newInstance
+        }
     }
 
     // Create your Player and MediaSession in the onCreate lifecycle event
@@ -50,18 +79,6 @@ class PlaybackService : MediaSessionService() {
         super.onCreate()
 
         Log.d("Lifetime Event", "PlaybackService.onCreate")
-
-        // Stop all videos and recreates all managers when the proxy changes.
-        HttpClientManager.proxyChangeListeners.add(this@PlaybackService::onProxyUpdated)
-    }
-
-    @OptIn(UnstableApi::class)
-    private fun onProxyUpdated() {
-        val toDestroyAllInOne = managerAllInOne
-
-        managerAllInOne = MultiPlayerPlaybackManager(CustomMediaSourceFactory(), videoViewedPositionCache)
-
-        toDestroyAllInOne?.releaseAppPlayers()
     }
 
     override fun onTaskRemoved(rootIntent: Intent?) {
@@ -73,9 +90,8 @@ class PlaybackService : MediaSessionService() {
     override fun onDestroy() {
         Log.d("Lifetime Event", "PlaybackService.onDestroy")
 
-        HttpClientManager.proxyChangeListeners.remove(this@PlaybackService::onProxyUpdated)
-
-        managerAllInOne?.releaseAppPlayers()
+        managerAllInOneProxy?.releaseAppPlayers()
+        managerAllInOneNoProxy?.releaseAppPlayers()
 
         super.onDestroy()
     }
@@ -88,14 +104,28 @@ class PlaybackService : MediaSessionService() {
         super.onUpdateNotification(session, startInForegroundRequired)
 
         // Overrides the notification with any player actually playing
-        managerAllInOne?.playingContent()?.forEach {
+        managerAllInOneProxy?.playingContent()?.forEach {
             if (it.player.isPlaying) {
                 super.onUpdateNotification(it, startInForegroundRequired)
             }
         }
 
         // Overrides again with playing with audio
-        managerAllInOne?.playingContent()?.forEach {
+        managerAllInOneProxy?.playingContent()?.forEach {
+            if (it.player.isPlaying && it.player.volume > 0) {
+                super.onUpdateNotification(it, startInForegroundRequired)
+            }
+        }
+
+        // Overrides the notification with any player actually playing
+        managerAllInOneNoProxy?.playingContent()?.forEach {
+            if (it.player.isPlaying) {
+                super.onUpdateNotification(it, startInForegroundRequired)
+            }
+        }
+
+        // Overrides again with playing with audio
+        managerAllInOneNoProxy?.playingContent()?.forEach {
             if (it.player.isPlaying && it.player.volume > 0) {
                 super.onUpdateNotification(it, startInForegroundRequired)
             }
@@ -108,8 +138,9 @@ class PlaybackService : MediaSessionService() {
         val id = controllerInfo.connectionHints.getString("id") ?: return null
         val uri = controllerInfo.connectionHints.getString("uri") ?: return null
         val callbackUri = controllerInfo.connectionHints.getString("callbackUri")
+        val proxyPort = controllerInfo.connectionHints.getInt("proxyPort")
 
-        val manager = lazyDS()
+        val manager = lazyDS(proxyPort)
 
         return manager.getMediaSession(
             id,

amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoCache.kt

@@ -65,9 +65,8 @@ class VideoCache {
             CacheDataSource
                 .Factory()
                 .setCache(simpleCache)
-                .setUpstreamDataSourceFactory(
-                    OkHttpDataSource.Factory(client),
-                ).setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+                .setUpstreamDataSourceFactory(OkHttpDataSource.Factory(client))
+                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
     }
 
     fun get(client: OkHttpClient): CacheDataSource.Factory {

amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/HtmlParser.kt

@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) 2024 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.service.previews
+
+import com.vitorpamplona.amethyst.commons.preview.MetaTag
+import com.vitorpamplona.amethyst.commons.preview.MetaTagsParser
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.MediaType
+import okio.BufferedSource
+import okio.ByteString.Companion.decodeHex
+import okio.Options
+import java.nio.charset.Charset
+
+class HtmlParser {
+    companion object {
+        val ATTRIBUTE_VALUE_CHARSET = "charset"
+        val ATTRIBUTE_VALUE_HTTP_EQUIV = "http-equiv"
+        val CONTENT = "content"
+
+        // taken from okhttp
+        private val UNICODE_BOMS =
+            Options.of(
+                // UTF-8
+                "efbbbf".decodeHex(),
+                // UTF-16BE
+                "feff".decodeHex(),
+                // UTF-16LE
+                "fffe".decodeHex(),
+                // UTF-32BE
+                "0000ffff".decodeHex(),
+                // UTF-32LE
+                "ffff0000".decodeHex(),
+            )
+
+        private val RE_CONTENT_TYPE_CHARSET = Regex("""charset=([^;]+)""")
+    }
+
+    suspend fun parseHtml(
+        source: BufferedSource,
+        type: MediaType,
+    ): Sequence<MetaTag> =
+        withContext(Dispatchers.IO) {
+            // sniff charset from Content-Type header or BOM
+            val sniffedCharset = type.charset() ?: source.readBomAsCharset()
+            if (sniffedCharset != null) {
+                val content = source.readByteArray().toString(sniffedCharset)
+                return@withContext MetaTagsParser.parse(content)
+            }
+
+            // if sniffing was failed, detect charset from content
+            val bodyBytes = source.readByteArray()
+            val charset = detectCharset(bodyBytes)
+            val content = bodyBytes.toString(charset)
+            return@withContext MetaTagsParser.parse(content)
+        }
+
+    private fun BufferedSource.readBomAsCharset(): Charset? =
+        when (select(UNICODE_BOMS)) {
+            0 -> Charsets.UTF_8
+            1 -> Charsets.UTF_16BE
+            2 -> Charsets.UTF_16LE
+            3 -> Charsets.UTF_32BE
+            4 -> Charsets.UTF_32LE
+            -1 -> null
+            else -> throw AssertionError()
+        }
+
+    private fun detectCharset(bodyBytes: ByteArray): Charset {
+        // try to detect charset from meta tags parsed from first 1024 bytes of body
+        val firstPart = String(bodyBytes, 0, 1024, Charset.forName("utf-8"))
+        val metaTags = MetaTagsParser.parse(firstPart)
+        metaTags.forEach { meta ->
+            val charsetAttr = meta.attr(ATTRIBUTE_VALUE_CHARSET)
+            if (charsetAttr.isNotEmpty()) {
+                runCatching { Charset.forName(charsetAttr) }.getOrNull()?.let {
+                    return it
+                }
+            }
+            if (meta.attr(ATTRIBUTE_VALUE_HTTP_EQUIV).lowercase() == "content-type") {
+                RE_CONTENT_TYPE_CHARSET
+                    .find(meta.attr(CONTENT))
+                    ?.let {
+                        runCatching { Charset.forName(it.groupValues[1]) }.getOrNull()
+                    }?.let {
+                        return it
+                    }
+            }
+        }
+        // defaults to UTF-8
+        return Charset.forName("utf-8")
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/IUrlPreviewCallback.kt

@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2024 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.service.previews
-
-interface IUrlPreviewCallback {
-    suspend fun onComplete(urlInfo: UrlInfoItem)
-
-    suspend fun onFailed(throwable: Throwable)
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/OpenGraphParser.kt

@@ -0,0 +1,127 @@
+/**
+ * Copyright (c) 2024 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.service.previews
+
+import com.vitorpamplona.amethyst.commons.preview.MetaTag
+
+class OpenGraphParser {
+    class Result(
+        val title: String,
+        val description: String,
+        val image: String,
+    )
+
+    companion object {
+        val ATTRIBUTE_VALUE_PROPERTY = "property"
+        val ATTRIBUTE_VALUE_NAME = "name"
+        val ATTRIBUTE_VALUE_ITEMPROP = "itemprop"
+
+        // for <meta itemprop=... to get title
+        private val META_X_TITLE =
+            arrayOf(
+                "og:title",
+                "twitter:title",
+                "title",
+            )
+
+        // for <meta itemprop=... to get description
+        private val META_X_DESCRIPTION =
+            arrayOf(
+                "og:description",
+                "twitter:description",
+                "description",
+            )
+
+        // for <meta itemprop=... to get image
+        private val META_X_IMAGE =
+            arrayOf(
+                "og:image",
+                "twitter:image",
+                "image",
+            )
+
+        private val CONTENT = "content"
+    }
+
+    fun extractUrlInfo(metaTags: Sequence<MetaTag>): Result {
+        var title: String = ""
+        var description: String = ""
+        var image: String = ""
+
+        metaTags.forEach {
+            when (it.attr(ATTRIBUTE_VALUE_PROPERTY)) {
+                in META_X_TITLE ->
+                    if (title.isEmpty()) {
+                        title = it.attr(CONTENT)
+                    }
+
+                in META_X_DESCRIPTION ->
+                    if (description.isEmpty()) {
+                        description = it.attr(CONTENT)
+                    }
+
+                in META_X_IMAGE ->
+                    if (image.isEmpty()) {
+                        image = it.attr(CONTENT)
+                    }
+            }
+
+            when (it.attr(ATTRIBUTE_VALUE_NAME)) {
+                in META_X_TITLE ->
+                    if (title.isEmpty()) {
+                        title = it.attr(CONTENT)
+                    }
+
+                in META_X_DESCRIPTION ->
+                    if (description.isEmpty()) {
+                        description = it.attr(CONTENT)
+                    }
+
+                in META_X_IMAGE ->
+                    if (image.isEmpty()) {
+                        image = it.attr(CONTENT)
+                    }
+            }
+
+            when (it.attr(ATTRIBUTE_VALUE_ITEMPROP)) {
+                in META_X_TITLE ->
+                    if (title.isEmpty()) {
+                        title = it.attr(CONTENT)
+                    }
+
+                in META_X_DESCRIPTION ->
+                    if (description.isEmpty()) {
+                        description = it.attr(CONTENT)
+                    }
+
+                in META_X_IMAGE ->
+                    if (image.isEmpty()) {
+                        image = it.attr(CONTENT)
+                    }
+            }
+
+            if (title.isNotEmpty() && description.isNotEmpty() && image.isNotEmpty()) {
+                return Result(title, description, image)
+            }
+        }
+        return Result(title, description, image)
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreview.kt

@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2024 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.service.previews
+
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.ammolite.service.HttpClientManager
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.Request
+
+class UrlPreview {
+    suspend fun fetch(
+        url: String,
+        forceProxy: Boolean,
+        onComplete: suspend (urlInfo: UrlInfoItem) -> Unit,
+        onFailed: suspend (t: Throwable) -> Unit,
+    ) = try {
+        onComplete(getDocument(url, forceProxy))
+    } catch (t: Throwable) {
+        if (t is CancellationException) throw t
+        onFailed(t)
+    }
+
+    suspend fun getDocument(
+        url: String,
+        forceProxy: Boolean,
+    ): UrlInfoItem =
+        withContext(Dispatchers.IO) {
+            val request =
+                Request
+                    .Builder()
+                    .url(url)
+                    .get()
+                    .build()
+            HttpClientManager.getHttpClient(forceProxy).newCall(request).execute().use {
+                checkNotInMainThread()
+                if (it.isSuccessful) {
+                    val mimeType =
+                        it.headers["Content-Type"]?.toMediaType()
+                            ?: throw IllegalArgumentException("Website returned unknown mimetype: ${it.headers["Content-Type"]}")
+                    if (mimeType.type == "text" && mimeType.subtype == "html") {
+                        val data = OpenGraphParser().extractUrlInfo(HtmlParser().parseHtml(it.body.source(), mimeType))
+                        UrlInfoItem(url, data.title, data.description, data.image, mimeType)
+                    } else if (mimeType.type == "image") {
+                        UrlInfoItem(url, image = url, mimeType = mimeType)
+                    } else if (mimeType.type == "video") {
+                        UrlInfoItem(url, image = url, mimeType = mimeType)
+                    } else {
+                        throw IllegalArgumentException("Website returned unknown encoding for previews: $mimeType")
+                    }
+                } else {
+                    throw IllegalArgumentException("Website returned: " + it.code)
+                }
+            }
+        }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreviewUtils.kt

@@ -1,244 +0,0 @@
-/**
- * Copyright (c) 2024 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.service.previews
-
-import com.vitorpamplona.amethyst.commons.preview.MetaTag
-import com.vitorpamplona.amethyst.commons.preview.MetaTagsParser
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.ammolite.service.HttpClientManager
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import okhttp3.MediaType
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.Request
-import okio.BufferedSource
-import okio.ByteString.Companion.decodeHex
-import okio.Options
-import java.nio.charset.Charset
-
-private const val ATTRIBUTE_VALUE_PROPERTY = "property"
-private const val ATTRIBUTE_VALUE_NAME = "name"
-private const val ATTRIBUTE_VALUE_ITEMPROP = "itemprop"
-private const val ATTRIBUTE_VALUE_CHARSET = "charset"
-private const val ATTRIBUTE_VALUE_HTTP_EQUIV = "http-equiv"
-
-// for <meta itemprop=... to get title
-private val META_X_TITLE =
-    arrayOf(
-        "og:title",
-        "twitter:title",
-        "title",
-    )
-
-// for <meta itemprop=... to get description
-private val META_X_DESCRIPTION =
-    arrayOf(
-        "og:description",
-        "twitter:description",
-        "description",
-    )
-
-// for <meta itemprop=... to get image
-private val META_X_IMAGE =
-    arrayOf(
-        "og:image",
-        "twitter:image",
-        "image",
-    )
-
-private const val CONTENT = "content"
-
-suspend fun getDocument(
-    url: String,
-    timeOut: Int = 30000,
-): UrlInfoItem =
-    withContext(Dispatchers.IO) {
-        val request: Request =
-            Request
-                .Builder()
-                .url(url)
-                .get()
-                .build()
-        HttpClientManager.getHttpClient().newCall(request).execute().use {
-            checkNotInMainThread()
-            if (it.isSuccessful) {
-                val mimeType =
-                    it.headers["Content-Type"]?.toMediaType()
-                        ?: throw IllegalArgumentException(
-                            "Website returned unknown mimetype: ${it.headers["Content-Type"]}",
-                        )
-                if (mimeType.type == "text" && mimeType.subtype == "html") {
-                    parseHtml(url, it.body.source(), mimeType)
-                } else if (mimeType.type == "image") {
-                    UrlInfoItem(url, image = url, mimeType = mimeType)
-                } else if (mimeType.type == "video") {
-                    UrlInfoItem(url, image = url, mimeType = mimeType)
-                } else {
-                    throw IllegalArgumentException(
-                        "Website returned unknown encoding for previews: $mimeType",
-                    )
-                }
-            } else {
-                throw IllegalArgumentException("Website returned: " + it.code)
-            }
-        }
-    }
-
-suspend fun parseHtml(
-    url: String,
-    source: BufferedSource,
-    type: MediaType,
-): UrlInfoItem =
-    withContext(Dispatchers.IO) {
-        // sniff charset from Content-Type header or BOM
-        val sniffedCharset = type.charset() ?: source.readBomAsCharset()
-        if (sniffedCharset != null) {
-            val metaTags = MetaTagsParser.parse(source.readByteArray().toString(sniffedCharset))
-            return@withContext extractUrlInfo(url, metaTags, type)
-        }
-
-        // if sniffing was failed, detect charset from content
-        val bodyBytes = source.readByteArray()
-        val charset = detectCharset(bodyBytes)
-        val metaTags = MetaTagsParser.parse(bodyBytes.toString(charset))
-        return@withContext extractUrlInfo(url, metaTags, type)
-    }
-
-// taken from okhttp
-private val UNICODE_BOMS =
-    Options.of(
-        // UTF-8
-        "efbbbf".decodeHex(),
-        // UTF-16BE
-        "feff".decodeHex(),
-        // UTF-16LE
-        "fffe".decodeHex(),
-        // UTF-32BE
-        "0000ffff".decodeHex(),
-        // UTF-32LE
-        "ffff0000".decodeHex(),
-    )
-
-private fun BufferedSource.readBomAsCharset(): Charset? =
-    when (select(UNICODE_BOMS)) {
-        0 -> Charsets.UTF_8
-        1 -> Charsets.UTF_16BE
-        2 -> Charsets.UTF_16LE
-        3 -> Charsets.UTF_32BE
-        4 -> Charsets.UTF_32LE
-        -1 -> null
-        else -> throw AssertionError()
-    }
-
-private val RE_CONTENT_TYPE_CHARSET = Regex("""charset=([^;]+)""")
-
-private fun detectCharset(bodyBytes: ByteArray): Charset {
-    // try to detect charset from meta tags parsed from first 1024 bytes of body
-    val firstPart = String(bodyBytes, 0, 1024, Charset.forName("utf-8"))
-    val metaTags = MetaTagsParser.parse(firstPart)
-    metaTags.forEach { meta ->
-        val charsetAttr = meta.attr(ATTRIBUTE_VALUE_CHARSET)
-        if (charsetAttr.isNotEmpty()) {
-            runCatching { Charset.forName(charsetAttr) }.getOrNull()?.let {
-                return it
-            }
-        }
-        if (meta.attr(ATTRIBUTE_VALUE_HTTP_EQUIV).lowercase() == "content-type") {
-            RE_CONTENT_TYPE_CHARSET
-                .find(meta.attr(CONTENT))
-                ?.let {
-                    runCatching { Charset.forName(it.groupValues[1]) }.getOrNull()
-                }?.let {
-                    return it
-                }
-        }
-    }
-    // defaults to UTF-8
-    return Charset.forName("utf-8")
-}
-
-private fun extractUrlInfo(
-    url: String,
-    metaTags: Sequence<MetaTag>,
-    type: MediaType,
-): UrlInfoItem {
-    var title: String = ""
-    var description: String = ""
-    var image: String = ""
-
-    metaTags.forEach {
-        when (it.attr(ATTRIBUTE_VALUE_PROPERTY)) {
-            in META_X_TITLE ->
-                if (title.isEmpty()) {
-                    title = it.attr(CONTENT)
-                }
-
-            in META_X_DESCRIPTION ->
-                if (description.isEmpty()) {
-                    description = it.attr(CONTENT)
-                }
-
-            in META_X_IMAGE ->
-                if (image.isEmpty()) {
-                    image = it.attr(CONTENT)
-                }
-        }
-
-        when (it.attr(ATTRIBUTE_VALUE_NAME)) {
-            in META_X_TITLE ->
-                if (title.isEmpty()) {
-                    title = it.attr(CONTENT)
-                }
-
-            in META_X_DESCRIPTION ->
-                if (description.isEmpty()) {
-                    description = it.attr(CONTENT)
-                }
-
-            in META_X_IMAGE ->
-                if (image.isEmpty()) {
-                    image = it.attr(CONTENT)
-                }
-        }
-
-        when (it.attr(ATTRIBUTE_VALUE_ITEMPROP)) {
-            in META_X_TITLE ->
-                if (title.isEmpty()) {
-                    title = it.attr(CONTENT)
-                }
-
-            in META_X_DESCRIPTION ->
-                if (description.isEmpty()) {
-                    description = it.attr(CONTENT)
-                }
-
-            in META_X_IMAGE ->
-                if (image.isEmpty()) {
-                    image = it.attr(CONTENT)
-                }
-        }
-
-        if (title.isNotEmpty() && description.isNotEmpty() && image.isNotEmpty()) {
-            return UrlInfoItem(url, title, description, image, type)
-        }
-    }
-    return UrlInfoItem(url, title, description, image, type)
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt

@@ -49,6 +49,7 @@ import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
+import com.vitorpamplona.amethyst.ui.tor.TorManager
 import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.Nip19Bech32
 import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
@@ -109,6 +110,8 @@ class MainActivity : AppCompatActivity() {
             checkLanguage(locales.get(0).language)
         }
 
+        TorManager.startTor(this)
+
         Log.d("Lifetime Event", "MainActivity.onResume")
 
         // starts muted every time
@@ -155,6 +158,8 @@ class MainActivity : AppCompatActivity() {
         (getSystemService(ConnectivityManager::class.java) as ConnectivityManager)
             .unregisterNetworkCallback(networkCallback)
 
+        TorManager.stopTor(this)
+
         super.onPause()
     }
 
@@ -319,7 +324,7 @@ fun uriToRoute(uri: String?): String? =
                 uri?.let {
                     Nip47WalletConnect.parse(it)
                     val encodedUri = URLEncoder.encode(it, StandardCharsets.UTF_8.toString())
-                    Route.Home.base + "?nip47=" + encodedUri
+                    Route.NIP47Setup.base + "?nip47=" + encodedUri
                 }
             } catch (e: Exception) {
                 if (e is CancellationException) throw e

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostViewModel.kt

@@ -107,11 +107,11 @@ open class EditPostViewModel : ViewModel() {
         editedFromNote = edit
     }
 
-    fun sendPost(relayList: List<RelaySetupInfo>? = null) {
+    fun sendPost(relayList: List<RelaySetupInfo>) {
         viewModelScope.launch(Dispatchers.IO) { innerSendPost(relayList) }
     }
 
-    suspend fun innerSendPost(relayList: List<RelaySetupInfo>? = null) {
+    suspend fun innerSendPost(relayList: List<RelaySetupInfo>) {
         if (accountViewModel == null) {
             cancel()
             return
@@ -193,6 +193,7 @@ open class EditPostViewModel : ViewModel() {
                                                 sensitiveContent = if (sensitiveContent) "" else null,
                                                 server = server.server,
                                                 contentResolver = contentResolver,
+                                                forceProxy = account?.let { it::shouldUseTorForNIP96 } ?: { false },
                                                 onProgress = {},
                                                 context = context,
                                             )
@@ -202,6 +203,7 @@ open class EditPostViewModel : ViewModel() {
                                         localContentType = contentType,
                                         alt = alt,
                                         sensitiveContent = sensitiveContent,
+                                        forceProxy = account?.let { it::shouldUseTorForNIP96 } ?: { false },
                                         onError = {
                                             onError(stringRes(context, R.string.failed_to_upload_media_no_details), it)
                                         },
@@ -318,6 +320,7 @@ open class EditPostViewModel : ViewModel() {
         localContentType: String?,
         alt: String?,
         sensitiveContent: Boolean,
+        forceProxy: (String) -> Boolean,
         onError: (String) -> Unit = {},
         context: Context,
     ) {
@@ -356,6 +359,7 @@ open class EditPostViewModel : ViewModel() {
             fileUrl = imageUrl,
             mimeType = remoteMimeType ?: localContentType,
             dimPrecomputed = dim,
+            forceProxy = forceProxy(imageUrl),
             onReady = { header: FileHeader ->
                 account?.createHeader(imageUrl, magnet, header, alt, sensitiveContent, originalHash) { event ->
                     isUploadingImage = false

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageDownloader.kt

@@ -27,7 +27,10 @@ import java.net.HttpURLConnection
 import java.net.URL
 
 class ImageDownloader {
-    suspend fun waitAndGetImage(imageUrl: String): ByteArray? {
+    suspend fun waitAndGetImage(
+        imageUrl: String,
+        forceProxy: Boolean,
+    ): ByteArray? {
         var imageData: ByteArray? = null
         var tentatives = 0
 
@@ -35,11 +38,12 @@ class ImageDownloader {
         while (imageData == null && tentatives < 15) {
             imageData =
                 try {
+                    // TODO: Migrate to OkHttp
                     HttpURLConnection.setFollowRedirects(true)
                     var url = URL(imageUrl)
                     var huc =
-                        if (HttpClientManager.getDefaultProxy() != null) {
-                            url.openConnection(HttpClientManager.getDefaultProxy()) as HttpURLConnection
+                        if (forceProxy) {
+                            url.openConnection(HttpClientManager.getCurrentProxy()) as HttpURLConnection
                         } else {
                             url.openConnection() as HttpURLConnection
                         }
@@ -52,8 +56,8 @@ class ImageDownloader {
                         // open the new connnection again
                         url = URL(newUrl)
                         huc =
-                            if (HttpClientManager.getDefaultProxy() != null) {
-                                url.openConnection(HttpClientManager.getDefaultProxy()) as HttpURLConnection
+                            if (forceProxy) {
+                                url.openConnection(HttpClientManager.getCurrentProxy()) as HttpURLConnection
                             } else {
                                 url.openConnection() as HttpURLConnection
                             }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/MediaSaverToDisk.kt

@@ -46,9 +46,10 @@ import okio.source
 import java.io.File
 import java.util.UUID
 
-object ImageSaver {
-    fun saveImage(
+object MediaSaverToDisk {
+    fun saveDownloadingIfNeeded(
         videoUri: String?,
+        forceProxy: Boolean,
         mimeType: String?,
         localContext: Context,
         onSuccess: () -> Any?,
@@ -56,14 +57,15 @@ object ImageSaver {
     ) {
         if (videoUri != null) {
             if (!videoUri.startsWith("file")) {
-                saveImage(
+                downloadAndSave(
                     context = localContext,
+                    forceProxy = forceProxy,
                     url = videoUri,
                     onSuccess = onSuccess,
                     onError = onError,
                 )
             } else {
-                saveImage(
+                save(
                     context = localContext,
                     localFile = videoUri.toUri().toFile(),
                     mimeType = mimeType,
@@ -79,13 +81,14 @@ object ImageSaver {
      *
      * @see PICTURES_SUBDIRECTORY
      */
-    fun saveImage(
+    fun downloadAndSave(
         url: String,
+        forceProxy: Boolean,
         context: Context,
         onSuccess: () -> Any?,
         onError: (Throwable) -> Any?,
     ) {
-        val client = HttpClientManager.getHttpClient()
+        val client = HttpClientManager.getHttpClient(forceProxy)
 
         val request =
             Request
@@ -142,7 +145,7 @@ object ImageSaver {
             )
     }
 
-    fun saveImage(
+    fun save(
         localFile: File,
         mimeType: String?,
         context: Context,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt

@@ -78,7 +78,7 @@ open class NewMediaModel : ViewModel() {
 
     fun upload(
         context: Context,
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
         mediaQuality: Int,
         onError: (String) -> Unit = {},
     ) {
@@ -136,6 +136,7 @@ open class NewMediaModel : ViewModel() {
                                                 sensitiveContent = if (sensitiveContent) "" else null,
                                                 server = serverToUse.server,
                                                 contentResolver = contentResolver,
+                                                forceProxy = account?.let { it::shouldUseTorForNIP96 } ?: { false },
                                                 onProgress = { percent: Float ->
                                                     uploadingPercentage.value = 0.2f + (0.2f * percent)
                                                 },
@@ -148,6 +149,7 @@ open class NewMediaModel : ViewModel() {
                                         alt = alt,
                                         sensitiveContent = sensitiveContent,
                                         relayList = relayList,
+                                        forceProxy = account?.let { it::shouldUseTorForNIP96 } ?: { false },
                                         onError = onError,
                                         context,
                                     )
@@ -190,7 +192,8 @@ open class NewMediaModel : ViewModel() {
         localContentType: String?,
         alt: String,
         sensitiveContent: Boolean,
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
+        forceProxy: (String) -> Boolean,
         onError: (String) -> Unit = {},
         context: Context,
     ) {
@@ -233,7 +236,7 @@ open class NewMediaModel : ViewModel() {
         uploadingDescription.value = "Downloading"
         uploadingPercentage.value = 0.60f
 
-        val imageData: ByteArray? = ImageDownloader().waitAndGetImage(imageUrl)
+        val imageData: ByteArray? = ImageDownloader().waitAndGetImage(imageUrl, forceProxy(imageUrl))
 
         if (imageData != null) {
             uploadingPercentage.value = 0.80f
@@ -284,7 +287,7 @@ open class NewMediaModel : ViewModel() {
         mimeType: String?,
         alt: String,
         sensitiveContent: Boolean,
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
         onError: (String) -> Unit = {},
         context: Context,
     ) {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt

@@ -105,7 +105,9 @@ fun NewMediaView(
 
     var showRelaysDialog by remember { mutableStateOf(false) }
     var relayList = remember { accountViewModel.account.activeWriteRelays().toImmutableList() }
-    var mediaQualitySlider by remember { mutableIntStateOf(1) } // 0 = Low, 1 = Medium, 2 = High
+
+    // 0 = Low, 1 = Medium, 2 = High, 3=UNCOMPRESSED
+    var mediaQualitySlider by remember { mutableIntStateOf(1) }
 
     Dialog(
         onDismissRequest = { onClose() },
@@ -208,7 +210,7 @@ fun NewMediaView(
                                     text = stringRes(context, R.string.media_compression_quality_explainer),
                                     style = MaterialTheme.typography.bodySmall,
                                     color = Color.Gray,
-                                    maxLines = 4,
+                                    maxLines = 5,
                                     overflow = TextOverflow.Ellipsis,
                                 )
                             }
@@ -225,6 +227,7 @@ fun NewMediaView(
                                                 0 -> stringRes(R.string.media_compression_quality_low)
                                                 1 -> stringRes(R.string.media_compression_quality_medium)
                                                 2 -> stringRes(R.string.media_compression_quality_high)
+                                                3 -> stringRes(R.string.media_compression_quality_uncompressed)
                                                 else -> stringRes(R.string.media_compression_quality_medium)
                                             },
                                         modifier = Modifier.align(Alignment.Center),
@@ -234,8 +237,8 @@ fun NewMediaView(
                                 Slider(
                                     value = mediaQualitySlider.toFloat(),
                                     onValueChange = { mediaQualitySlider = it.toInt() },
-                                    valueRange = 0f..2f,
-                                    steps = 1,
+                                    valueRange = 0f..3f,
+                                    steps = 2,
                                 )
                             }
                         }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt

@@ -27,6 +27,8 @@ import android.os.Build
 import android.util.Log
 import android.util.Size
 import android.widget.Toast
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.border
@@ -56,6 +58,7 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Bolt
+import androidx.compose.material.icons.filled.CameraAlt
 import androidx.compose.material.icons.filled.CurrencyBitcoin
 import androidx.compose.material.icons.filled.LocationOff
 import androidx.compose.material.icons.filled.LocationOn
@@ -118,6 +121,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
@@ -197,6 +201,7 @@ fun NewPostView(
     accountViewModel: AccountViewModel,
     nav: INav,
 ) {
+    val lifecycleOwner = LocalLifecycleOwner.current
     val postViewModel: NewPostViewModel = viewModel()
     postViewModel.wantsDirectMessage = enableMessageInterface
 
@@ -206,6 +211,9 @@ fun NewPostView(
     val scope = rememberCoroutineScope()
     var showRelaysDialog by remember { mutableStateOf(false) }
     var relayList = remember { accountViewModel.account.activeWriteRelays().toImmutableList() }
+    var showCamera by remember {
+        mutableStateOf(true)
+    }
 
     LaunchedEffect(key1 = postViewModel.draftTag) {
         launch(Dispatchers.IO) {
@@ -563,7 +571,6 @@ fun NewPostView(
 @Composable
 private fun BottomRowActions(postViewModel: NewPostViewModel) {
     val scrollState = rememberScrollState()
-
     Row(
         modifier =
             Modifier
@@ -580,6 +587,12 @@ private fun BottomRowActions(postViewModel: NewPostViewModel) {
             postViewModel.selectImage(it)
         }
 
+        TakePictureButton(
+            onPictureTaken = {
+                postViewModel.selectImage(it)
+            },
+        )
+
         if (postViewModel.canUsePoll) {
             // These should be hashtag recommendations the user selects in the future.
             // val hashtag = stringRes(R.string.poll_hashtag)
@@ -625,6 +638,59 @@ private fun BottomRowActions(postViewModel: NewPostViewModel) {
     }
 }
 
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun TakePictureButton(onPictureTaken: (Uri) -> Unit) {
+    var imageUri by remember { mutableStateOf<Uri?>(null) }
+    val scope = rememberCoroutineScope()
+    val launcher =
+        rememberLauncherForActivityResult(
+            contract = ActivityResultContracts.TakePicture(),
+        ) { success ->
+            if (success) {
+                imageUri?.let {
+                    onPictureTaken(it)
+                }
+            }
+        }
+    val context = LocalContext.current
+    val cameraPermissionState =
+        rememberPermissionState(
+            Manifest.permission.CAMERA,
+            onPermissionResult = {
+                if (it) {
+                    scope.launch(Dispatchers.IO) {
+                        imageUri = getPhotoUri(context)
+                        imageUri?.let { uri -> launcher.launch(uri) }
+                    }
+                }
+            },
+        )
+
+    Box {
+        IconButton(
+            modifier = Modifier.align(Alignment.Center),
+            onClick = {
+                if (cameraPermissionState.status.isGranted) {
+                    scope.launch(Dispatchers.IO) {
+                        imageUri = getPhotoUri(context)
+                        imageUri?.let { uri -> launcher.launch(uri) }
+                    }
+                } else {
+                    cameraPermissionState.launchPermissionRequest()
+                }
+            },
+        ) {
+            Icon(
+                imageVector = Icons.Default.CameraAlt,
+                contentDescription = stringRes(id = R.string.upload_image),
+                modifier = Modifier.height(25.dp),
+                tint = MaterialTheme.colorScheme.onBackground,
+            )
+        }
+    }
+}
+
 @Composable
 private fun PollField(postViewModel: NewPostViewModel) {
     val optionsList = postViewModel.pollOptions
@@ -1669,7 +1735,9 @@ fun ImageVideoDescription(
     }
     var message by remember { mutableStateOf("") }
     var sensitiveContent by remember { mutableStateOf(false) }
-    var mediaQualitySlider by remember { mutableIntStateOf(1) } // 0 = Low, 1 = Medium, 2 = High
+
+    // 0 = Low, 1 = Medium, 2 = High, 3=UNCOMPRESSED
+    var mediaQualitySlider by remember { mutableIntStateOf(1) }
 
     Column(
         modifier =
@@ -1869,7 +1937,7 @@ fun ImageVideoDescription(
                         text = stringRes(R.string.media_compression_quality_explainer),
                         style = MaterialTheme.typography.bodySmall,
                         color = Color.Gray,
-                        maxLines = 4,
+                        maxLines = 5,
                         overflow = TextOverflow.Ellipsis,
                     )
                 }
@@ -1887,6 +1955,7 @@ fun ImageVideoDescription(
                                     0 -> stringRes(R.string.media_compression_quality_low)
                                     1 -> stringRes(R.string.media_compression_quality_medium)
                                     2 -> stringRes(R.string.media_compression_quality_high)
+                                    3 -> stringRes(R.string.media_compression_quality_uncompressed)
                                     else -> stringRes(R.string.media_compression_quality_medium)
                                 },
                             modifier = Modifier.align(Alignment.Center),
@@ -1896,8 +1965,8 @@ fun ImageVideoDescription(
                     Slider(
                         value = mediaQualitySlider.toFloat(),
                         onValueChange = { mediaQualitySlider = it.toInt() },
-                        valueRange = 0f..2f,
-                        steps = 1,
+                        valueRange = 0f..3f,
+                        steps = 2,
                     )
                 }
             }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt

@@ -473,7 +473,7 @@ open class NewPostViewModel : ViewModel() {
         urlPreview = findUrlInMessage()
     }
 
-    fun sendPost(relayList: List<RelaySetupInfo>? = null) {
+    fun sendPost(relayList: List<RelaySetupInfo>) {
         viewModelScope.launch(Dispatchers.IO) {
             innerSendPost(relayList, null)
             accountViewModel?.deleteDraft(draftTag)
@@ -481,18 +481,18 @@ open class NewPostViewModel : ViewModel() {
         }
     }
 
-    fun sendDraft(relayList: List<RelaySetupInfo>? = null) {
+    fun sendDraft(relayList: List<RelaySetupInfo>) {
         viewModelScope.launch {
             sendDraftSync(relayList)
         }
     }
 
-    suspend fun sendDraftSync(relayList: List<RelaySetupInfo>? = null) {
+    suspend fun sendDraftSync(relayList: List<RelaySetupInfo>) {
         innerSendPost(relayList, draftTag)
     }
 
     private suspend fun innerSendPost(
-        relayList: List<RelaySetupInfo>? = null,
+        relayList: List<RelaySetupInfo>,
         localDraft: String?,
     ) = withContext(Dispatchers.IO) {
         if (accountViewModel == null) {
@@ -879,6 +879,7 @@ open class NewPostViewModel : ViewModel() {
                                                 sensitiveContent = if (sensitiveContent) "" else null,
                                                 server = server.server,
                                                 contentResolver = contentResolver,
+                                                forceProxy = account?.let { it::shouldUseTorForNIP96 } ?: { false },
                                                 onProgress = {},
                                                 context = context,
                                             )
@@ -888,6 +889,7 @@ open class NewPostViewModel : ViewModel() {
                                         localContentType = contentType,
                                         alt = alt,
                                         sensitiveContent = sensitiveContent,
+                                        forceProxy = account?.let { it::shouldUseTorForNIP96 } ?: { false },
                                         onError = {
                                             onError(stringRes(context, R.string.failed_to_upload_media_no_details), it)
                                         },
@@ -1146,6 +1148,7 @@ open class NewPostViewModel : ViewModel() {
         localContentType: String?,
         alt: String?,
         sensitiveContent: Boolean,
+        forceProxy: (String) -> Boolean,
         onError: (message: String) -> Unit,
         context: Context,
     ) {
@@ -1184,6 +1187,7 @@ open class NewPostViewModel : ViewModel() {
             fileUrl = imageUrl,
             mimeType = remoteMimeType ?: localContentType,
             dimPrecomputed = dim,
+            forceProxy = forceProxy(imageUrl),
             onReady = { header: FileHeader ->
                 account?.createHeader(imageUrl, magnet, header, alt, sensitiveContent, originalHash) { event ->
                     isUploadingImage = false

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt

@@ -187,6 +187,7 @@ class NewUserMetadataViewModel : ViewModel() {
                                         sensitiveContent = null,
                                         server = account.settings.defaultFileServer,
                                         contentResolver = contentResolver,
+                                        forceProxy = account::shouldUseTorForNIP96,
                                         onProgress = {},
                                         context = context,
                                     )

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/SaveToGallery.kt

@@ -1,164 +0,0 @@
-/**
- * Copyright (c) 2024 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.ui.actions
-
-import android.Manifest
-import android.os.Build
-import android.widget.Toast
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.platform.LocalContext
-import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.google.accompanist.permissions.isGranted
-import com.google.accompanist.permissions.rememberPermissionState
-import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
-import kotlinx.coroutines.launch
-import java.io.File
-
-/**
- * A button to save the remote image to the gallery. May require a storage permission.
- *
- * @param url URL of the image
- */
-@OptIn(ExperimentalPermissionsApi::class)
-@Composable
-fun SaveToGallery(url: String) {
-    val localContext = LocalContext.current
-    val scope = rememberCoroutineScope()
-
-    fun saveImage() {
-        ImageSaver.saveImage(
-            context = localContext,
-            url = url,
-            onSuccess = {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            localContext,
-                            stringRes(localContext, R.string.image_saved_to_the_gallery),
-                            Toast.LENGTH_SHORT,
-                        ).show()
-                }
-            },
-            onError = {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            localContext,
-                            stringRes(localContext, R.string.failed_to_save_the_image),
-                            Toast.LENGTH_SHORT,
-                        ).show()
-                }
-            },
-        )
-    }
-
-    val writeStoragePermissionState =
-        rememberPermissionState(
-            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-        ) { isGranted ->
-            if (isGranted) {
-                saveImage()
-            }
-        }
-
-    OutlinedButton(
-        onClick = {
-            if (
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ||
-                writeStoragePermissionState.status.isGranted
-            ) {
-                saveImage()
-            } else {
-                writeStoragePermissionState.launchPermissionRequest()
-            }
-        },
-    ) {
-        Text(text = stringRes(id = R.string.save))
-    }
-}
-
-@OptIn(ExperimentalPermissionsApi::class)
-@Composable
-fun SaveToGallery(
-    localFile: File,
-    mimeType: String?,
-) {
-    val localContext = LocalContext.current
-    val scope = rememberCoroutineScope()
-
-    fun saveImage() {
-        ImageSaver.saveImage(
-            context = localContext,
-            localFile = localFile,
-            mimeType = mimeType,
-            onSuccess = {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            localContext,
-                            stringRes(localContext, R.string.image_saved_to_the_gallery),
-                            Toast.LENGTH_SHORT,
-                        ).show()
-                }
-            },
-            onError = {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            localContext,
-                            stringRes(localContext, R.string.failed_to_save_the_image),
-                            Toast.LENGTH_SHORT,
-                        ).show()
-                }
-            },
-        )
-    }
-
-    val writeStoragePermissionState =
-        rememberPermissionState(
-            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-        ) { isGranted ->
-            if (isGranted) {
-                saveImage()
-            }
-        }
-
-    OutlinedButton(
-        onClick = {
-            if (
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ||
-                writeStoragePermissionState.status.isGranted
-            ) {
-                saveImage()
-            } else {
-                writeStoragePermissionState.launchPermissionRequest()
-            }
-        },
-        shape = ButtonBorder,
-    ) {
-        Text(text = stringRes(id = R.string.save))
-    }
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/UploadFromGallery.kt

@@ -20,8 +20,10 @@
  */
 package com.vitorpamplona.amethyst.ui.actions
 
+import android.content.Context
 import android.net.Uri
 import android.os.Build
+import android.os.Environment
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.animateFloat
@@ -52,6 +54,7 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.core.content.FileProvider
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
@@ -60,6 +63,10 @@ import com.vitorpamplona.amethyst.ui.GetMediaActivityResultContract
 import com.vitorpamplona.amethyst.ui.stringRes
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
 import java.util.concurrent.atomic.AtomicBoolean
 
 @OptIn(ExperimentalPermissionsApi::class)
@@ -125,6 +132,23 @@ private fun UploadBoxButton(
     }
 }
 
+fun getPhotoUri(context: Context): Uri {
+    val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
+    val storageDir: File? = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
+    return File
+        .createTempFile(
+            "JPEG_${timeStamp}_",
+            ".jpg",
+            storageDir,
+        ).let {
+            FileProvider.getUriForFile(
+                context,
+                "${context.packageName}.provider",
+                it,
+            )
+        }
+}
+
 val DefaultAnimationColors =
     listOf(
         Color(0xFF5851D8),

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoModel.kt

@@ -64,6 +64,7 @@ abstract class BasicRelaySetupInfoModel : ViewModel() {
             _relays.value.forEach { item ->
                 Nip11CachedRetriever.loadRelayInfo(
                     dirtyUrl = item.url,
+                    forceProxy = account.shouldUseTorForDirty(item.url),
                     onInfo = {
                         togglePaidRelay(item, it.limitation?.payment_required ?: false)
                     },

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListViewModel.kt

@@ -80,6 +80,7 @@ class Kind3RelayListViewModel : ViewModel() {
             _relays.value.forEach { item ->
                 Nip11CachedRetriever.loadRelayInfo(
                     dirtyUrl = item.url,
+                    forceProxy = account.shouldUseTorForDirty(item.url),
                     onInfo = {
                         togglePaidRelay(item, it.limitation?.payment_required ?: false)
                     },

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Nip65RelayListViewModel.kt

@@ -83,6 +83,7 @@ class Nip65RelayListViewModel : ViewModel() {
             _homeRelays.value.forEach { item ->
                 Nip11CachedRetriever.loadRelayInfo(
                     dirtyUrl = item.url,
+                    forceProxy = account.shouldUseTorForDirty(item.url),
                     onInfo = {
                         toggleHomePaidRelay(item, it.limitation?.payment_required ?: false)
                     },
@@ -93,6 +94,7 @@ class Nip65RelayListViewModel : ViewModel() {
             _notificationRelays.value.forEach { item ->
                 Nip11CachedRetriever.loadRelayInfo(
                     dirtyUrl = item.url,
+                    forceProxy = account.shouldUseTorForDirty(item.url),
                     onInfo = {
                         toggleNotifPaidRelay(item, it.limitation?.payment_required ?: false)
                     },

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt

@@ -85,15 +85,14 @@ fun CashuPreview(
     cashutoken: String,
     accountViewModel: AccountViewModel,
 ) {
+    @Suppress("ProduceStateDoesNotAssignValue")
     val cashuData by produceState(
         initialValue = CachedCashuProcessor.cached(cashutoken),
         key1 = cashutoken,
     ) {
-        withContext(Dispatchers.IO) {
-            val newToken = CachedCashuProcessor.parse(cashutoken)
-            if (value != newToken) {
-                value = newToken
-            }
+        val newToken = withContext(Dispatchers.Default) { CachedCashuProcessor.parse(cashutoken) }
+        if (value != newToken) {
+            value = newToken
         }
     }
 
@@ -116,7 +115,11 @@ fun CashuPreview(
     accountViewModel: AccountViewModel,
 ) {
     tokens.forEach {
-        CashuPreviewNew(it, accountViewModel::meltCashu, accountViewModel::toast)
+        CashuPreviewNew(
+            it,
+            accountViewModel::meltCashu,
+            accountViewModel::toast,
+        )
     }
 }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableBox.kt

@@ -25,13 +25,12 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.Role
-import com.vitorpamplona.amethyst.ui.theme.Size24dp
+import com.vitorpamplona.amethyst.ui.theme.ripple24dp
 
 @Composable
 fun ClickableBox(
@@ -43,7 +42,7 @@ fun ClickableBox(
         modifier.clickable(
             role = Role.Button,
             interactionSource = remember { MutableInteractionSource() },
-            indication = rememberRipple(bounded = false, radius = Size24dp),
+            indication = ripple24dp,
             onClick = onClick,
         ),
         contentAlignment = Alignment.Center,
@@ -64,7 +63,7 @@ fun ClickableBox(
         modifier.combinedClickable(
             role = Role.Button,
             interactionSource = remember { MutableInteractionSource() },
-            indication = rememberRipple(bounded = false, radius = Size24dp),
+            indication = ripple24dp,
             onClick = onClick,
             onLongClick = onLongClick,
         ),

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoicePreview.kt

@@ -69,13 +69,12 @@ fun LoadValueFromInvoice(
     lnbcWord: String,
     inner: @Composable (invoiceAmount: InvoiceAmount?) -> Unit,
 ) {
+    @Suppress("ProduceStateDoesNotAssignValue")
     val lnInvoice by
         produceState(initialValue = CachedLnInvoiceParser.cached(lnbcWord), key1 = lnbcWord) {
-            withContext(Dispatchers.IO) {
-                val newLnInvoice = CachedLnInvoiceParser.parse(lnbcWord)
-                if (value != newLnInvoice) {
-                    value = newLnInvoice
-                }
+            val newLnInvoice = withContext(Dispatchers.Default) { CachedLnInvoiceParser.parse(lnbcWord) }
+            if (value != newLnInvoice) {
+                value = newLnInvoice
             }
         }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/LoadUrlPreview.kt

@@ -41,6 +41,7 @@ fun LoadUrlPreview(
     if (!accountViewModel.settings.showUrlPreview.value) {
         ClickableUrl(urlText, url)
     } else {
+        @Suppress("ProduceStateDoesNotAssignValue")
         val urlPreviewState by
             produceState(
                 initialValue = UrlCachedPreviewer.cache.get(url) ?: UrlPreviewState.Loading,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/MediaCompressor.kt

@@ -24,7 +24,6 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.net.Uri
 import android.util.Log
-import android.webkit.MimeTypeMap
 import androidx.core.net.toUri
 import com.abedelazizshe.lightcompressorlibrary.CompressionListener
 import com.abedelazizshe.lightcompressorlibrary.VideoCompressor
@@ -33,11 +32,11 @@ import com.abedelazizshe.lightcompressorlibrary.config.AppSpecificStorageConfigu
 import com.abedelazizshe.lightcompressorlibrary.config.Configuration
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.ui.components.util.MediaCompressorFileUtils
 import id.zelory.compressor.Compressor
 import id.zelory.compressor.constraint.default
 import kotlinx.coroutines.CancellationException
 import java.io.File
-import java.io.FileOutputStream
 import java.util.UUID
 
 class MediaCompressor {
@@ -49,138 +48,139 @@ class MediaCompressor {
         onError: (Int) -> Unit,
         mediaQuality: CompressorQuality,
     ) {
+        // Skip compression if user selected uncompressed
+        if (mediaQuality == CompressorQuality.UNCOMPRESSED) {
+            Log.d("MediaCompressor", "UNCOMPRESSED quality selected, skipping compression.")
+            onReady(uri, contentType, null)
+            return
+        }
+
         checkNotInMainThread()
 
-        if (contentType?.startsWith("video", true) == true) {
-            val videoQuality =
-                when (mediaQuality) {
-                    CompressorQuality.VERY_LOW -> VideoQuality.VERY_LOW
-                    CompressorQuality.LOW -> VideoQuality.LOW
-                    CompressorQuality.MEDIUM -> VideoQuality.MEDIUM
-                    CompressorQuality.HIGH -> VideoQuality.HIGH
-                    CompressorQuality.VERY_HIGH -> VideoQuality.VERY_HIGH
-                }
-            Log.d("MediaCompressor", "Using video compression $mediaQuality")
-            VideoCompressor.start(
-                // => This is required
-                context = applicationContext,
-                // => Source can be provided as content uris
-                uris = listOf(uri),
-                isStreamable = false,
-                // THIS STORAGE
-                // sharedStorageConfiguration = SharedStorageConfiguration(
-                //    saveAt = SaveLocation.movies, // => default is movies
-                //    videoName = "compressed_video" // => required name
-                // ),
-                // OR AND NOT BOTH
-                appSpecificStorageConfiguration = AppSpecificStorageConfiguration(),
-                configureWith =
-                    Configuration(
-                        quality = videoQuality,
-                        // => required name
-                        videoNames = listOf(UUID.randomUUID().toString()),
-                    ),
-                listener =
-                    object : CompressionListener {
-                        override fun onProgress(
-                            index: Int,
-                            percent: Float,
-                        ) {}
-
-                        override fun onStart(index: Int) {
-                            // Compression start
-                        }
-
-                        override fun onSuccess(
-                            index: Int,
-                            size: Long,
-                            path: String?,
-                        ) {
-                            if (path != null) {
-                                onReady(Uri.fromFile(File(path)), contentType, size)
-                            } else {
-                                onError(R.string.compression_returned_null)
-                            }
-                        }
-
-                        override fun onFailure(
-                            index: Int,
-                            failureMessage: String,
-                        ) {
-                            // keeps going with original video
-                            onReady(uri, contentType, null)
-                        }
-
-                        override fun onCancelled(index: Int) {
-                            onError(R.string.compression_cancelled)
-                        }
-                    },
-            )
-        } else if (
-            contentType?.startsWith("image", true) == true &&
-            !contentType.contains("gif") &&
-            !contentType.contains("svg")
-        ) {
-            val imageQuality =
-                when (mediaQuality) {
-                    CompressorQuality.VERY_LOW -> 40
-                    CompressorQuality.LOW -> 50
-                    CompressorQuality.MEDIUM -> 60
-                    CompressorQuality.HIGH -> 80
-                    CompressorQuality.VERY_HIGH -> 90
-                }
-            try {
-                Log.d("MediaCompressor", "Using image compression $mediaQuality")
-                val compressedImageFile =
-                    Compressor.compress(applicationContext, from(uri, contentType, applicationContext)) {
-                        default(width = 640, format = Bitmap.CompressFormat.JPEG, quality = imageQuality)
-                    }
-                onReady(compressedImageFile.toUri(), contentType, compressedImageFile.length())
-            } catch (e: Exception) {
-                if (e is CancellationException) throw e
-                e.printStackTrace()
-                onReady(uri, contentType, null)
-            }
-        } else {
-            onReady(uri, contentType, null)
+        // branch into compression based on content type
+        when {
+            contentType?.startsWith("video", ignoreCase = true) == true ->
+                compressVideo(uri, contentType, applicationContext, onReady, onError, mediaQuality)
+            contentType?.startsWith("image", ignoreCase = true) == true &&
+                !contentType.contains("gif") &&
+                !contentType.contains("svg") ->
+                compressImage(uri, contentType, applicationContext, onReady, onError, mediaQuality)
+            else -> onReady(uri, contentType, null)
         }
     }
 
-    fun from(
-        uri: Uri?,
+    private fun compressVideo(
+        uri: Uri,
+        contentType: String?,
+        applicationContext: Context,
+        onReady: (Uri, String?, Long?) -> Unit,
+        onError: (Int) -> Unit,
+        mediaQuality: CompressorQuality,
+    ) {
+        val videoQuality =
+            when (mediaQuality) {
+                CompressorQuality.VERY_LOW -> VideoQuality.VERY_LOW
+                CompressorQuality.LOW -> VideoQuality.LOW
+                CompressorQuality.MEDIUM -> VideoQuality.MEDIUM
+                CompressorQuality.HIGH -> VideoQuality.HIGH
+                CompressorQuality.VERY_HIGH -> VideoQuality.VERY_HIGH
+                else -> VideoQuality.MEDIUM
+            }
+
+        Log.d("MediaCompressor", "Using video compression $mediaQuality")
+
+        VideoCompressor.start(
+            // => This is required
+            context = applicationContext,
+            // => Source can be provided as content uris
+            uris = listOf(uri),
+            isStreamable = false,
+            // THIS STORAGE
+            // sharedStorageConfiguration = SharedStorageConfiguration(
+            //    saveAt = SaveLocation.movies, // => default is movies
+            //    videoName = "compressed_video" // => required name
+            // ),
+            // OR AND NOT BOTH
+            appSpecificStorageConfiguration = AppSpecificStorageConfiguration(),
+            configureWith =
+                Configuration(
+                    quality = videoQuality,
+                    // => required name
+                    videoNames = listOf(UUID.randomUUID().toString()),
+                ),
+            listener =
+                object : CompressionListener {
+                    override fun onProgress(
+                        index: Int,
+                        percent: Float,
+                    ) {
+                    }
+
+                    override fun onStart(index: Int) {}
+
+                    override fun onSuccess(
+                        index: Int,
+                        size: Long,
+                        path: String?,
+                    ) {
+                        if (path != null) {
+                            Log.d("MediaCompressor", "Video compression success. Compressed size [$size]")
+                            onReady(Uri.fromFile(File(path)), contentType, size)
+                        } else {
+                            Log.d("MediaCompressor", "Video compression successful, but returned null path")
+                            onError(R.string.compression_returned_null)
+                        }
+                    }
+
+                    override fun onFailure(
+                        index: Int,
+                        failureMessage: String,
+                    ) {
+                        Log.d("MediaCompressor", "Video compression failed: $failureMessage")
+                        // keeps going with original video
+                        onReady(uri, contentType, null)
+                    }
+
+                    override fun onCancelled(index: Int) {
+                        onError(R.string.compression_cancelled)
+                    }
+                },
+        )
+    }
+
+    private suspend fun compressImage(
+        uri: Uri,
         contentType: String?,
         context: Context,
-    ): File {
-        val extension =
-            contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
-
-        val inputStream = context.contentResolver.openInputStream(uri!!)
-        val fileName: String = UUID.randomUUID().toString() + ".$extension"
-        val splitName: Array<String> = splitFileName(fileName)
-        val tempFile = File.createTempFile(splitName[0], splitName[1])
-        inputStream?.use { input ->
-            FileOutputStream(tempFile).use { output ->
-                val buffer = ByteArray(1024 * 50)
-                var read: Int = input.read(buffer)
-                while (read != -1) {
-                    output.write(buffer, 0, read)
-                    read = input.read(buffer)
-                }
+        onReady: (Uri, String?, Long?) -> Unit,
+        onError: (Int) -> Unit,
+        mediaQuality: CompressorQuality,
+    ) {
+        val imageQuality =
+            when (mediaQuality) {
+                CompressorQuality.VERY_LOW -> 40
+                CompressorQuality.LOW -> 50
+                CompressorQuality.MEDIUM -> 60
+                CompressorQuality.HIGH -> 80
+                CompressorQuality.VERY_HIGH -> 90
+                else -> 60
             }
-        }
 
-        return tempFile
-    }
-
-    private fun splitFileName(fileName: String): Array<String> {
-        var name = fileName
-        var extension = ""
-        val i = fileName.lastIndexOf(".")
-        if (i != -1) {
-            name = fileName.substring(0, i)
-            extension = fileName.substring(i)
+        try {
+            Log.d("MediaCompressor", "Using image compression $mediaQuality")
+            val tempFile = MediaCompressorFileUtils.from(uri, context)
+            val compressedImageFile =
+                Compressor.compress(context, tempFile) {
+                    default(width = 640, format = Bitmap.CompressFormat.JPEG, quality = imageQuality)
+                }
+            Log.d("MediaCompressor", "Image compression success. Original size [${tempFile.length()}], new size [${compressedImageFile.length()}]")
+            onReady(compressedImageFile.toUri(), contentType, compressedImageFile.length())
+        } catch (e: Exception) {
+            Log.d("MediaCompressor", "Image compression failed: ${e.message}")
+            if (e is CancellationException) throw e
+            e.printStackTrace()
+            onReady(uri, contentType, null)
         }
-        return arrayOf(name, extension)
     }
 
     fun intToCompressorQuality(mediaQualityFloat: Int): CompressorQuality =
@@ -188,6 +188,7 @@ class MediaCompressor {
             0 -> CompressorQuality.LOW
             1 -> CompressorQuality.MEDIUM
             2 -> CompressorQuality.HIGH
+            3 -> CompressorQuality.UNCOMPRESSED
             else -> CompressorQuality.MEDIUM
         }
 
@@ -196,6 +197,7 @@ class MediaCompressor {
             CompressorQuality.LOW -> 0
             CompressorQuality.MEDIUM -> 1
             CompressorQuality.HIGH -> 2
+            CompressorQuality.UNCOMPRESSED -> 3
             else -> 1
         }
 }
@@ -206,4 +208,5 @@ enum class CompressorQuality {
     MEDIUM,
     HIGH,
     VERY_HIGH,
+    UNCOMPRESSED,
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt

@@ -30,7 +30,6 @@ import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.VideoView
 import androidx.annotation.OptIn
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.LinearEasing
@@ -101,7 +100,7 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.compose.GenericBaseCache
 import com.vitorpamplona.amethyst.commons.compose.produceCachedState
 import com.vitorpamplona.amethyst.service.playback.PlaybackClientController
-import com.vitorpamplona.amethyst.ui.actions.ImageSaver
+import com.vitorpamplona.amethyst.ui.actions.MediaSaverToDisk
 import com.vitorpamplona.amethyst.ui.note.DownloadForOfflineIcon
 import com.vitorpamplona.amethyst.ui.note.LyricsIcon
 import com.vitorpamplona.amethyst.ui.note.LyricsOffIcon
@@ -120,6 +119,7 @@ import com.vitorpamplona.amethyst.ui.theme.Size75dp
 import com.vitorpamplona.amethyst.ui.theme.VolumeBottomIconSize
 import com.vitorpamplona.amethyst.ui.theme.imageModifier
 import com.vitorpamplona.amethyst.ui.theme.videoGalleryModifier
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
@@ -369,6 +369,7 @@ fun VideoViewInner(
                 videoUri = videoUri,
                 defaultToStart = defaultToStart,
                 nostrUriCallback = nostrUriCallback,
+                proxyPort = HttpClientManager.getCurrentProxyPort(accountViewModel.account.shouldUseTorForVideoDownload(videoUri)),
             ) { controller, keepPlaying ->
                 RenderVideoPlayer(
                     videoUri = videoUri,
@@ -459,6 +460,7 @@ fun GetMediaItem(
 fun GetVideoController(
     mediaItem: State<MediaItem>,
     videoUri: String,
+    proxyPort: Int?,
     defaultToStart: Boolean = false,
     nostrUriCallback: String? = null,
     inner: @Composable (controller: MediaController, keepPlaying: MutableState<Boolean>) -> Unit,
@@ -502,6 +504,7 @@ fun GetVideoController(
                         uid,
                         videoUri,
                         nostrUriCallback,
+                        proxyPort,
                         context,
                     ) {
                         scope.launch(Dispatchers.Main) {
@@ -590,6 +593,7 @@ fun GetVideoController(
                                     uid,
                                     videoUri,
                                     nostrUriCallback,
+                                    proxyPort,
                                     context,
                                 ) {
                                     scope.launch(Dispatchers.Main) {
@@ -751,6 +755,7 @@ private fun RenderVideoPlayer(
                             ViewGroup.LayoutParams.MATCH_PARENT,
                             ViewGroup.LayoutParams.WRAP_CONTENT,
                         )
+                    setShowBuffering(PlayerView.SHOW_BUFFERING_ALWAYS)
                     setBackgroundColor(Color.Transparent.toArgb())
                     setShutterBackgroundColor(Color.Transparent.toArgb())
                     controllerAutoShow = false
@@ -828,7 +833,7 @@ private fun RenderVideoPlayer(
 
             if (!videoUri.endsWith(".m3u8")) {
                 AnimatedSaveButton(controllerVisible, Modifier.align(Alignment.TopEnd).padding(end = Size110dp)) { context ->
-                    saveImage(videoUri, mimeType, context, accountViewModel)
+                    saveMediaToGallery(videoUri, mimeType, context, accountViewModel)
                 }
 
                 AnimatedShareButton(controllerVisible, Modifier.align(Alignment.TopEnd).padding(end = Size165dp)) { popupExpanded, toggle ->
@@ -1205,21 +1210,22 @@ fun SaveButton(onSaveClick: (localContext: Context) -> Unit) {
     }
 }
 
-private fun saveImage(
+private fun saveMediaToGallery(
     videoUri: String?,
     mimeType: String?,
     localContext: Context,
     accountViewModel: AccountViewModel,
 ) {
-    ImageSaver.saveImage(
+    MediaSaverToDisk.saveDownloadingIfNeeded(
         videoUri = videoUri,
+        forceProxy = accountViewModel.account.shouldUseTorForVideoDownload(),
         mimeType = mimeType,
         localContext = localContext,
         onSuccess = {
-            accountViewModel.toast(R.string.image_saved_to_the_gallery, R.string.image_saved_to_the_gallery)
+            accountViewModel.toast(R.string.video_saved_to_the_gallery, R.string.video_saved_to_the_gallery)
         },
         onError = {
-            accountViewModel.toast(R.string.failed_to_save_the_image, null, it)
+            accountViewModel.toast(R.string.failed_to_save_the_video, null, it)
         },
     )
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentDialog.kt

@@ -80,7 +80,7 @@ import com.vitorpamplona.amethyst.commons.richtext.MediaPreloadedContent
 import com.vitorpamplona.amethyst.commons.richtext.MediaUrlContent
 import com.vitorpamplona.amethyst.commons.richtext.MediaUrlImage
 import com.vitorpamplona.amethyst.commons.richtext.MediaUrlVideo
-import com.vitorpamplona.amethyst.ui.actions.ImageSaver
+import com.vitorpamplona.amethyst.ui.actions.MediaSaverToDisk
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.Size10dp
@@ -261,7 +261,7 @@ private fun DialogContent(
                     val writeStoragePermissionState =
                         rememberPermissionState(Manifest.permission.WRITE_EXTERNAL_STORAGE) { isGranted ->
                             if (isGranted) {
-                                saveImage(myContent, localContext, accountViewModel)
+                                saveMediaToGallery(myContent, localContext, accountViewModel)
                             }
                         }
 
@@ -271,7 +271,7 @@ private fun DialogContent(
                                 Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ||
                                 writeStoragePermissionState.status.isGranted
                             ) {
-                                saveImage(myContent, localContext, accountViewModel)
+                                saveMediaToGallery(myContent, localContext, accountViewModel)
                             } else {
                                 writeStoragePermissionState.launchPermissionRequest()
                             }
@@ -291,33 +291,46 @@ private fun DialogContent(
     }
 }
 
-private fun saveImage(
+private fun saveMediaToGallery(
     content: BaseMediaContent,
     localContext: Context,
     accountViewModel: AccountViewModel,
 ) {
+    val isImage = content is MediaUrlImage && content is MediaLocalImage
+
+    val success = if (isImage) R.string.image_saved_to_the_gallery else R.string.video_saved_to_the_gallery
+    val failure = if (isImage) R.string.failed_to_save_the_image else R.string.failed_to_save_the_video
+
     if (content is MediaUrlContent) {
-        ImageSaver.saveImage(
+        val useTor =
+            if (isImage) {
+                accountViewModel.account.shouldUseTorForImageDownload()
+            } else {
+                accountViewModel.account.shouldUseTorForVideoDownload()
+            }
+
+        MediaSaverToDisk.downloadAndSave(
             content.url,
+            forceProxy = useTor,
             localContext,
             onSuccess = {
-                accountViewModel.toast(R.string.image_saved_to_the_gallery, R.string.image_saved_to_the_gallery)
+                accountViewModel.toast(success, success)
             },
             onError = {
-                accountViewModel.toast(R.string.failed_to_save_the_image, null, it)
+                accountViewModel.toast(failure, null, it)
             },
         )
     } else if (content is MediaPreloadedContent) {
         content.localFile?.let {
-            ImageSaver.saveImage(
+            MediaSaverToDisk.save(
                 it,
                 content.mimeType,
                 localContext,
                 onSuccess = {
-                    accountViewModel.toast(R.string.image_saved_to_the_gallery, R.string.image_saved_to_the_gallery)
+                    accountViewModel.toast(success, success)
                 },
                 onError = {
-                    accountViewModel.toast(R.string.failed_to_save_the_image, null, it)
+                    accountViewModel.toast(failure, null, it)
                 },
             )
         }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt

@@ -126,6 +126,7 @@ fun ZoomableContentView(
 
     val isLandscapeMode = DeviceUtils.isLandscapeMetric(LocalContext.current)
     val isFoldableOrLarge = DeviceUtils.windowIsLarge(windowSize = currentWindowSize, isInLandscapeMode = isLandscapeMode)
+    val isOrientationLocked = DeviceUtils.screenOrientationIsLocked(LocalContext.current)
 
     val contentScale =
         if (isFiniteHeight) {
@@ -160,7 +161,7 @@ fun ZoomableContentView(
                         nostrUriCallback = content.uri,
                         onDialog = {
                             dialogOpen = true
-                            // if (!isFoldableOrLarge) {
+                            // if (!isFoldableOrLarge && !isOrientationLocked) {
                             //    DeviceUtils.changeDeviceOrientation(isLandscapeMode, activity)
                             // }
                         },
@@ -200,7 +201,7 @@ fun ZoomableContentView(
             images,
             onDismiss = {
                 dialogOpen = false
-                // if (!isFoldableOrLarge) DeviceUtils.changeDeviceOrientation(isLandscapeMode, activity)
+                // if (!isFoldableOrLarge && !isOrientationLocked) DeviceUtils.changeDeviceOrientation(isLandscapeMode, activity)
             },
             accountViewModel,
         )

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/util/DeviceUtils.kt

@@ -23,6 +23,8 @@ package com.vitorpamplona.amethyst.ui.components.util
 import android.app.Activity
 import android.content.Context
 import android.content.pm.ActivityInfo
+import android.content.pm.PackageManager
+import android.provider.Settings
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.window.core.layout.WindowHeightSizeClass
@@ -38,6 +40,31 @@ object DeviceUtils {
      */
     fun isLandscapeMetric(context: Context): Boolean = context.resources.displayMetrics.heightPixels < context.resources.displayMetrics.widthPixels
 
+    /**
+     * Checks if the device's orientation is set to locked.
+     *
+     * Credits: NewPipe devs
+     */
+    fun screenOrientationIsLocked(context: Context): Boolean {
+        // 1: Screen orientation changes using accelerometer
+        // 0: Screen orientation is locked
+        // if the accelerometer sensor is missing completely, assume locked orientation
+        return (
+            Settings.System.getInt(
+                context.contentResolver,
+                Settings.System.ACCELEROMETER_ROTATION,
+                0,
+            ) == 0 ||
+                !context.packageManager.hasSystemFeature(PackageManager.FEATURE_SENSOR_ACCELEROMETER)
+        )
+    }
+
+    /**
+     * Changes the device's orientation. This works even if the device's orientation
+     * is set to locked.
+     * Thus, to prevent unwanted behaviour,
+     * it's use can be guarded by conditions such as [screenOrientationIsLocked].
+     */
     fun changeDeviceOrientation(
         isInLandscape: Boolean,
         currentActivity: Activity,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/util/MediaCompressorFileUtils.kt

@@ -18,27 +18,39 @@
  * 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.service.previews
+package com.vitorpamplona.amethyst.ui.components.util
 
-import kotlinx.coroutines.CancellationException
+import android.content.Context
+import android.net.Uri
+import android.webkit.MimeTypeMap
+import java.io.File
+import java.io.FileOutputStream
+import java.io.InputStream
+import java.io.OutputStream
+import java.util.UUID
 
-class BahaUrlPreview(
-    val url: String,
-    var callback: IUrlPreviewCallback?,
-) {
-    suspend fun fetchUrlPreview(timeOut: Int = 30000) =
-        try {
-            fetch(timeOut)
-        } catch (t: Throwable) {
-            if (t is CancellationException) throw t
-            callback?.onFailed(t)
+object MediaCompressorFileUtils {
+    fun from(
+        uri: Uri,
+        context: Context,
+    ): File {
+        val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(context.contentResolver.getType(uri)) ?: ""
+        val suffix = if (extension.isNotEmpty()) ".$extension" else ""
+        val tempFile = File.createTempFile(UUID.randomUUID().toString(), suffix)
+
+        context.contentResolver.openInputStream(uri)?.use { inputStream ->
+            FileOutputStream(tempFile).use { outputStream ->
+                copyStream(inputStream, outputStream)
+            }
         }
 
-    private suspend fun fetch(timeOut: Int = 30000) {
-        callback?.onComplete(getDocument(url, timeOut))
+        return tempFile
     }
 
-    fun cleanUp() {
-        callback = null
+    private fun copyStream(
+        input: InputStream,
+        output: OutputStream,
+    ) {
+        input.copyTo(output, bufferSize = 1024 * 50)
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/VideoFeedFilter.kt

@@ -72,7 +72,7 @@ class VideoFeedFilter(
                 (noteEvent is FileStorageHeaderEvent && noteEvent.isOneOf(SUPPORTED_VIDEO_FEED_MIME_TYPES_SET))
         ) &&
             params.match(noteEvent) &&
-            account.isAcceptable(it)
+            (params.isHiddenList || account.isAcceptable(it))
     }
 
     fun buildFilterParams(account: Account): FilterByListParams =

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/FeedContentState.kt

@@ -21,7 +21,11 @@
 package com.vitorpamplona.amethyst.ui.feeds
 
 import android.util.Log
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
@@ -54,6 +58,8 @@ class FeedContentState(
 
     private var lastFeedKey: String? = null
 
+    override val isRefreshing: MutableState<Boolean> = mutableStateOf(false)
+
     fun sendToTop() {
         if (scrolltoTopPending) return
 
@@ -72,16 +78,21 @@ class FeedContentState(
     fun refreshSuspended() {
         checkNotInMainThread()
 
-        lastFeedKey = localFilter.feedKey()
-        val notes = localFilter.loadTop().distinctBy { it.idHex }.toImmutableList()
+        isRefreshing.value = true
+        try {
+            lastFeedKey = localFilter.feedKey()
+            val notes = localFilter.loadTop().distinctBy { it.idHex }.toImmutableList()
 
-        val oldNotesState = _feedContent.value
-        if (oldNotesState is FeedState.Loaded) {
-            if (!equalImmutableLists(notes, oldNotesState.feed.value.list)) {
+            val oldNotesState = _feedContent.value
+            if (oldNotesState is FeedState.Loaded) {
+                if (!equalImmutableLists(notes, oldNotesState.feed.value.list)) {
+                    updateFeed(notes)
+                }
+            } else {
                 updateFeed(notes)
             }
-        } else {
-            updateFeed(notes)
+        } finally {
+            isRefreshing.value = false
         }
     }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/InvalidatableContent.kt

@@ -20,6 +20,10 @@
  */
 package com.vitorpamplona.amethyst.ui.feeds
 
+import androidx.compose.runtime.MutableState
+
 interface InvalidatableContent {
     fun invalidateData(ignoreIfDoing: Boolean = false)
+
+    val isRefreshing: MutableState<Boolean>
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/RememberForeverStates.kt

@@ -20,7 +20,6 @@
  */
 package com.vitorpamplona.amethyst.ui.feeds
 
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.grid.LazyGridState
 import androidx.compose.foundation.pager.PagerState
@@ -115,20 +114,35 @@ fun rememberForeverLazyListState(
     return scrollState
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun rememberForeverPagerState(
     key: String,
     initialFirstVisibleItemIndex: Int = 0,
     initialFirstVisibleItemScrollOffset: Float = 0.0f,
     pageCount: () -> Int,
+): PagerState =
+    rememberForeverPagerState(key, initialFirstVisibleItemIndex, initialFirstVisibleItemScrollOffset, pageCount) { initialPage, initialPageOffsetFraction, pageCount ->
+        rememberPagerState(initialPage, initialPageOffsetFraction, pageCount)
+    }
+
+@Composable
+fun rememberForeverPagerState(
+    key: String,
+    initialFirstVisibleItemIndex: Int = 0,
+    initialFirstVisibleItemScrollOffset: Float = 0.0f,
+    pageCount: () -> Int,
+    rememberPagerStateFunction: @Composable (
+        initialPage: Int,
+        initialPageOffsetFraction: Float,
+        pageCount: () -> Int,
+    ) -> PagerState,
 ): PagerState {
     val savedValue = savedScrollStates[key]
     val savedIndex = savedValue?.index ?: initialFirstVisibleItemIndex
     val savedOffset = savedValue?.scrollOffsetFraction ?: initialFirstVisibleItemScrollOffset
 
     val scrollState =
-        rememberPagerState(
+        rememberPagerStateFunction(
             savedIndex,
             savedOffset,
             pageCount,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AccountSwitchBottomSheet.kt

@@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
@@ -40,18 +39,14 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -59,8 +54,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.vitorpamplona.amethyst.AccountInfo
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.R
@@ -69,17 +63,17 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
-import com.vitorpamplona.amethyst.ui.note.ArrowBackIcon
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedOff.LoginOrSignupScreen
+import com.vitorpamplona.amethyst.ui.screen.loggedOff.AddAccountDialog
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.AccountPictureModifier
 import com.vitorpamplona.amethyst.ui.theme.Size10dp
 import com.vitorpamplona.amethyst.ui.theme.Size55dp
 import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.forEach
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -88,13 +82,6 @@ fun AccountSwitchBottomSheet(
     accountViewModel: AccountViewModel,
     accountStateViewModel: AccountStateViewModel,
 ) {
-    val accounts by
-        produceState(initialValue = LocalPreferences.cachedAccounts()) {
-            if (value == null) {
-                value = LocalPreferences.allSavedAccounts()
-            }
-        }
-
     var popupExpanded by remember { mutableStateOf(false) }
     val scrollState = rememberScrollState()
 
@@ -109,7 +96,7 @@ fun AccountSwitchBottomSheet(
         ) {
             Text(stringRes(R.string.account_switch_select_account), fontWeight = FontWeight.Bold)
         }
-        accounts?.forEach { acc -> DisplayAccount(acc, accountViewModel, accountStateViewModel) }
+        DisplayAllAccounts(accountViewModel, accountStateViewModel)
         Row(
             modifier =
                 Modifier
@@ -125,38 +112,26 @@ fun AccountSwitchBottomSheet(
     }
 
     if (popupExpanded) {
-        Dialog(
-            onDismissRequest = { popupExpanded = false },
-            properties = DialogProperties(usePlatformDefaultWidth = false),
-        ) {
-            Surface(modifier = Modifier.fillMaxSize()) {
-                Box {
-                    LoginOrSignupScreen(accountStateViewModel, isFirstLogin = false)
-                    TopAppBar(
-                        title = {
-                            Text(text = stringRes(R.string.account_switch_add_account_dialog_title))
-                        },
-                        navigationIcon = {
-                            IconButton(onClick = { popupExpanded = false }) { ArrowBackIcon() }
-                        },
-                        colors =
-                            TopAppBarDefaults.topAppBarColors(
-                                containerColor = MaterialTheme.colorScheme.surface,
-                            ),
-                    )
-                }
-            }
-        }
+        AddAccountDialog(null, accountStateViewModel) { popupExpanded = false }
     }
 }
 
+@Composable
+private fun DisplayAllAccounts(
+    accountViewModel: AccountViewModel,
+    accountStateViewModel: AccountStateViewModel,
+) {
+    val accounts by LocalPreferences.accountsFlow().collectAsStateWithLifecycle()
+    accounts?.forEach { acc -> DisplayAccount(acc, accountViewModel, accountStateViewModel) }
+}
+
 @Composable
 fun DisplayAccount(
     acc: AccountInfo,
     accountViewModel: AccountViewModel,
     accountStateViewModel: AccountStateViewModel,
 ) {
-    var baseUser by remember {
+    var baseUser by remember(acc) {
         mutableStateOf<User?>(
             decodePublicKeyAsHexOrNull(acc.npub)?.let {
                 LocalCache.getUserIfExists(it)

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt

@@ -141,7 +141,10 @@ private fun RenderBottomMenu(
         HorizontalDivider(
             thickness = DividerThickness,
         )
-        NavigationBar(tonalElevation = Size0dp) {
+        NavigationBar(
+            containerColor = MaterialTheme.colorScheme.background,
+            tonalElevation = Size0dp,
+        ) {
             bottomNavigationItems.forEach { item ->
                 HasNewItemsIcon(item == selectedRoute, item, accountViewModel, nav)
             }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt

@@ -41,7 +41,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.util.Consumer
 import androidx.navigation.NavBackStackEntry
-import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import com.vitorpamplona.amethyst.R
@@ -68,11 +67,14 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.HomeScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.NotificationScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.ProfileScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.search.SearchScreen
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.NIP47SetupScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.SecurityFiltersScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.SettingsScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.threadview.ThreadScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.video.VideoScreen
+import com.vitorpamplona.amethyst.ui.screen.loggedOff.AddAccountDialog
 import com.vitorpamplona.amethyst.ui.uriToRoute
+import com.vitorpamplona.quartz.encoders.Nip19Bech32
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.net.URLDecoder
@@ -99,24 +101,7 @@ fun AppNavigation(
             enterTransition = { fadeIn(animationSpec = tween(200)) },
             exitTransition = { fadeOut(animationSpec = tween(200)) },
         ) {
-            composable(
-                Route.Home.route,
-                Route.Home.arguments,
-            ) {
-                val nip47 = it.arguments?.getString("nip47")
-
-                HomeScreen(accountViewModel, nav, nip47)
-
-                if (nip47 != null) {
-                    LaunchedEffect(key1 = Unit) {
-                        launch {
-                            delay(1000)
-                            it.arguments?.remove("nip47")
-                        }
-                    }
-                }
-            }
-
+            composable(Route.Home.route) { HomeScreen(accountViewModel, nav) }
             composable(Route.Message.route) { ChatroomListScreen(accountViewModel, nav) }
             composable(Route.Video.route) { VideoScreen(accountViewModel, nav) }
             composable(Route.Discover.route) { DiscoverScreen(accountViewModel, nav) }
@@ -281,10 +266,23 @@ fun AppNavigation(
                     nav,
                 )
             }
+
+            composable(
+                Route.NIP47Setup.route,
+                Route.NIP47Setup.arguments,
+                enterTransition = { slideInHorizontallyFromEnd },
+                exitTransition = { scaleOut },
+                popEnterTransition = { scaleIn },
+                popExitTransition = { slideOutHorizontallyToEnd },
+            ) {
+                val nip47 = it.arguments?.getString("nip47")
+
+                NIP47SetupScreen(accountViewModel, nav, nip47)
+            }
         }
     }
 
-    NavigateIfIntentRequested(nav.controller, accountViewModel)
+    NavigateIfIntentRequested(nav, accountViewModel, accountStateViewModel)
 
     DisplayErrorMessages(accountViewModel)
     DisplayNotifyMessages(accountViewModel, nav)
@@ -292,10 +290,12 @@ fun AppNavigation(
 
 @Composable
 private fun NavigateIfIntentRequested(
-    navController: NavHostController,
+    nav: Nav,
     accountViewModel: AccountViewModel,
+    accountStateViewModel: AccountStateViewModel,
 ) {
     val activity = LocalContext.current.getActivity()
+    var newAccount by remember { mutableStateOf<String?>(null) }
 
     var currentIntentNextPage by remember {
         mutableStateOf(
@@ -314,15 +314,19 @@ private fun NavigateIfIntentRequested(
         LaunchedEffect(intentNextPage) {
             if (actionableNextPage != null) {
                 actionableNextPage?.let {
-                    val currentRoute = getRouteWithArguments(navController)
+                    val currentRoute = getRouteWithArguments(nav.controller)
                     if (!isSameRoute(currentRoute, it)) {
-                        navController.navigate(it) {
-                            popUpTo(Route.Home.route)
-                            launchSingleTop = true
-                        }
+                        nav.newStack(it)
                     }
                     actionableNextPage = null
                 }
+            } else if (intentNextPage.contains("ncryptsec1")) {
+                // login functions
+                Nip19Bech32.tryParseAndClean(intentNextPage)?.let {
+                    newAccount = it
+                }
+
+                actionableNextPage = null
             } else {
                 accountViewModel.toast(
                     R.string.invalid_nip19_uri,
@@ -337,20 +341,23 @@ private fun NavigateIfIntentRequested(
 
     val scope = rememberCoroutineScope()
 
-    DisposableEffect(activity) {
+    DisposableEffect(nav, activity) {
         val consumer =
             Consumer<Intent> { intent ->
-                val uri = intent?.data?.toString()
+                val uri = intent.data?.toString()
                 if (!uri.isNullOrBlank()) {
+                    // navigation functions
                     val newPage = uriToRoute(uri)
 
                     if (newPage != null) {
-                        val currentRoute = getRouteWithArguments(navController)
+                        val currentRoute = getRouteWithArguments(nav.controller)
                         if (!isSameRoute(currentRoute, newPage)) {
-                            navController.navigate(newPage) {
-                                popUpTo(Route.Home.route)
-                                launchSingleTop = true
-                            }
+                            nav.newStack(newPage)
+                        }
+                    } else if (uri.contains("ncryptsec")) {
+                        // login functions
+                        Nip19Bech32.tryParseAndClean(uri)?.let {
+                            newAccount = it
                         }
                     } else {
                         scope.launch {
@@ -367,6 +374,10 @@ private fun NavigateIfIntentRequested(
         activity.addOnNewIntentListener(consumer)
         onDispose { activity.removeOnNewIntentListener(consumer) }
     }
+
+    if (newAccount != null) {
+        AddAccountDialog(newAccount, accountStateViewModel) { newAccount = null }
+    }
 }
 
 fun Context.getActivity(): MainActivity {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt

@@ -20,11 +20,9 @@
  */
 package com.vitorpamplona.amethyst.ui.navigation
 
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -47,7 +45,8 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Send
 import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material3.AlertDialog
+import androidx.compose.material.icons.outlined.CloudUpload
+import androidx.compose.material.icons.outlined.GroupAdd
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -55,7 +54,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalDrawerSheet
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
@@ -69,6 +67,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
@@ -97,7 +96,6 @@ import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
 import com.vitorpamplona.amethyst.ui.note.LoadStatuses
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountBackupDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.ConnectOrbotDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.qrcode.ShowQRDialog
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
@@ -113,6 +111,7 @@ import com.vitorpamplona.amethyst.ui.theme.bannerModifier
 import com.vitorpamplona.amethyst.ui.theme.drawerSpacing
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.profileContentHeaderModifier
+import com.vitorpamplona.amethyst.ui.tor.ConnectTorDialog
 import com.vitorpamplona.ammolite.relays.RelayPool
 import com.vitorpamplona.ammolite.relays.RelayPoolStatus
 import com.vitorpamplona.quartz.encoders.ATag
@@ -442,16 +441,8 @@ fun ListContent(
     var editMediaServers by remember { mutableStateOf(false) }
 
     var backupDialogOpen by remember { mutableStateOf(false) }
-    var checked by remember { mutableStateOf(accountViewModel.account.settings.proxy != null) }
-    var disconnectTorDialog by remember { mutableStateOf(false) }
+
     var conectOrbotDialogOpen by remember { mutableStateOf(false) }
-    val proxyPort =
-        remember {
-            mutableStateOf(
-                accountViewModel.account.settings.proxyPort
-                    .toString(),
-            )
-        }
 
     val context = LocalContext.current
 
@@ -490,7 +481,7 @@ fun ListContent(
 
         IconRow(
             title = stringRes(R.string.media_servers),
-            icon = androidx.media3.ui.R.drawable.exo_icon_repeat_all,
+            icon = Icons.Outlined.CloudUpload,
             tint = MaterialTheme.colorScheme.onBackground,
             onClick = {
                 nav.closeDrawer()
@@ -506,6 +497,16 @@ fun ListContent(
             route = Route.BlockedUsers.route,
         )
 
+        IconRow(
+            title = stringRes(R.string.privacy_options),
+            icon = R.drawable.ic_tor,
+            tint = MaterialTheme.colorScheme.onBackground,
+            onClick = {
+                nav.closeDrawer()
+                conectOrbotDialogOpen = true
+            },
+        )
+
         accountViewModel.account.settings.keyPair.privKey?.let {
             IconRow(
                 title = stringRes(R.string.backup_keys),
@@ -518,31 +519,8 @@ fun ListContent(
             )
         }
 
-        IconRow(
-            title =
-                if (checked) {
-                    stringRes(R.string.disconnect_from_your_orbot_setup)
-                } else {
-                    stringRes(R.string.connect_via_tor_short)
-                },
-            icon = R.drawable.ic_tor,
-            tint = MaterialTheme.colorScheme.onBackground,
-            onLongClick = {
-                nav.closeDrawer()
-                conectOrbotDialogOpen = true
-            },
-            onClick = {
-                if (checked) {
-                    disconnectTorDialog = true
-                } else {
-                    nav.closeDrawer()
-                    conectOrbotDialogOpen = true
-                }
-            },
-        )
-
         NavigationRow(
-            title = stringRes(R.string.settings),
+            title = stringRes(R.string.preferences),
             icon = Route.Settings.icon,
             tint = MaterialTheme.colorScheme.onBackground,
             nav = nav,
@@ -553,7 +531,7 @@ fun ListContent(
 
         IconRow(
             title = stringRes(R.string.drawer_accounts),
-            icon = R.drawable.manage_accounts,
+            icon = Icons.Outlined.GroupAdd,
             tint = MaterialTheme.colorScheme.onBackground,
             onClick = openSheet,
         )
@@ -569,13 +547,14 @@ fun ListContent(
         AccountBackupDialog(accountViewModel, onClose = { backupDialogOpen = false })
     }
     if (conectOrbotDialogOpen) {
-        ConnectOrbotDialog(
+        ConnectTorDialog(
+            torSettings =
+                accountViewModel.account.settings.torSettings
+                    .toSettings(),
             onClose = { conectOrbotDialogOpen = false },
-            onPost = {
+            onPost = { torSettings ->
                 conectOrbotDialogOpen = false
-                disconnectTorDialog = false
-                checked = true
-                accountViewModel.enableTor(true, proxyPort)
+                accountViewModel.setTorSettings(torSettings)
             },
             onError = {
                 accountViewModel.toast(
@@ -583,33 +562,6 @@ fun ListContent(
                     it,
                 )
             },
-            proxyPort,
-        )
-    }
-
-    if (disconnectTorDialog) {
-        AlertDialog(
-            title = { Text(text = stringRes(R.string.do_you_really_want_to_disable_tor_title)) },
-            text = { Text(text = stringRes(R.string.do_you_really_want_to_disable_tor_text)) },
-            onDismissRequest = { disconnectTorDialog = false },
-            confirmButton = {
-                TextButton(
-                    onClick = {
-                        disconnectTorDialog = false
-                        checked = false
-                        accountViewModel.enableTor(false, proxyPort)
-                    },
-                ) {
-                    Text(text = stringRes(R.string.yes))
-                }
-            },
-            dismissButton = {
-                TextButton(
-                    onClick = { disconnectTorDialog = false },
-                ) {
-                    Text(text = stringRes(R.string.no))
-                }
-            },
         )
     }
 }
@@ -665,22 +617,19 @@ fun NavigationRow(
     )
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun IconRow(
     title: String,
     icon: Int,
     tint: Color,
     onClick: () -> Unit,
-    onLongClick: (() -> Unit)? = null,
 ) {
     Row(
         modifier =
             Modifier
                 .fillMaxWidth()
-                .combinedClickable(
+                .clickable(
                     onClick = onClick,
-                    onLongClick = onLongClick,
                 ),
     ) {
         Row(
@@ -702,6 +651,41 @@ fun IconRow(
     }
 }
 
+@Composable
+fun IconRow(
+    title: String,
+    icon: ImageVector,
+    tint: Color,
+    onClick: () -> Unit,
+) {
+    Row(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .clickable(
+                    onClickLabel = title,
+                    onClick = onClick,
+                ),
+    ) {
+        Row(
+            modifier = IconRowModifier,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                imageVector = icon,
+                null,
+                modifier = Size22Modifier,
+                tint = tint,
+            )
+            Text(
+                modifier = IconRowTextModifier,
+                text = title,
+                fontSize = Font18SP,
+            )
+        }
+    }
+}
+
 @Composable
 fun IconRowRelays(
     accountViewModel: AccountViewModel,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/INav.kt

@@ -111,7 +111,7 @@ class Nav(
         upTo: String,
     ) {
         scope.launch {
-            controller.navigate(route) { popUpTo(route) { inclusive = true } }
+            controller.navigate(route) { popUpTo(upTo) { inclusive = true } }
         }
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt

@@ -52,18 +52,10 @@ sealed class Route(
 ) {
     object Home :
         Route(
-            route = "Home?nip47={nip47}",
+            route = "Home",
             icon = R.drawable.ic_home,
             notifSize = Modifier.size(Size25dp),
             iconSize = Modifier.size(Size24dp),
-            arguments =
-                listOf(
-                    navArgument("nip47") {
-                        type = NavType.StringType
-                        nullable = true
-                        defaultValue = null
-                    },
-                ).toImmutableList(),
             contentDescriptor = R.string.route_home,
         )
 
@@ -92,9 +84,6 @@ sealed class Route(
         Route(
             route = "Discover",
             icon = R.drawable.ic_sensors,
-            // hasNewItems = { accountViewModel, newNotes ->
-            //    DiscoverLatestItem.hasNewItems(accountViewModel, newNotes)
-            // },
             contentDescriptor = R.string.route_discover,
         )
 
@@ -217,6 +206,20 @@ sealed class Route(
             route = "Settings",
             icon = R.drawable.ic_settings,
         )
+
+    object NIP47Setup :
+        Route(
+            route = "NIP47Setup?nip47={nip47}",
+            icon = R.drawable.ic_home,
+            arguments =
+                listOf(
+                    navArgument("nip47") {
+                        type = NavType.StringType
+                        nullable = true
+                        defaultValue = null
+                    },
+                ).toImmutableList(),
+        )
 }
 
 fun getRouteWithArguments(navController: NavHostController): String? {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ChannelCardCompose.kt

@@ -79,7 +79,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.LiveFlag
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.OfflineFlag
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.ScheduledFlag
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.dvms.observeAppDefinition
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.CheckIfUrlIsOnline
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.CheckIfVideoIsOnline
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.equalImmutableLists
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.showAmountAxis
 import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
@@ -480,7 +480,7 @@ fun RenderLiveActivityThumb(
                             if (url.isNullOrBlank()) {
                                 LiveFlag()
                             } else {
-                                CheckIfUrlIsOnline(url, accountViewModel) { isOnline ->
+                                CheckIfVideoIsOnline(url, accountViewModel) { isOnline ->
                                     if (isOnline) {
                                         LiveFlag()
                                     } else {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Loaders.kt

@@ -73,6 +73,7 @@ fun LoadDecryptedContentOrNull(
     accountViewModel: AccountViewModel,
     inner: @Composable (String?) -> Unit,
 ) {
+    @Suppress("ProduceStateDoesNotAssignValue")
     val decryptedContent by
         produceState(initialValue = accountViewModel.cachedDecrypt(note), key1 = note.event?.id()) {
             accountViewModel.decrypt(note) {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt

@@ -229,6 +229,7 @@ fun DecryptAndRenderZapGallery(
     accountViewModel: AccountViewModel,
     nav: INav,
 ) {
+    @Suppress("ProduceStateDoesNotAssignValue")
     val zapEvents by
         produceState(initialValue = accountViewModel.cachedDecryptAmountMessageInGroup(multiSetCard.zapEvents)) {
             accountViewModel.decryptAmountMessageInGroup(multiSetCard.zapEvents) { value = it }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt

@@ -206,6 +206,7 @@ fun NoteQuickActionMenu(
     if (editDraftDialog.value) {
         NewPostView(
             onClose = {
+                onDismiss()
                 editDraftDialog.value = false
             },
             accountViewModel = accountViewModel,
@@ -427,7 +428,6 @@ private fun RenderMainPopup(
                             Icons.Default.Edit,
                             stringRes(R.string.edit_draft),
                         ) {
-                            onDismiss()
                             onWantsToEditDraft()
                         }
                     } else {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt

@@ -38,7 +38,6 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Bolt
 import androidx.compose.material.icons.outlined.Bolt
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.CircularProgressIndicator
@@ -85,6 +84,7 @@ import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import com.vitorpamplona.amethyst.ui.theme.ripple24dp
 import com.vitorpamplona.quartz.events.EmptyTagList
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
 import com.vitorpamplona.quartz.events.toImmutableListOfLists
@@ -357,7 +357,7 @@ fun ZapVote(
             Modifier.combinedClickable(
                 role = Role.Button,
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(bounded = false, radius = 24.dp),
+                indication = ripple24dp,
                 onClick = {
                     if (!accountViewModel.isWriteable()) {
                         accountViewModel.toast(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt

@@ -24,8 +24,10 @@ import android.content.Context
 import android.content.Intent
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ContentTransform
 import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.core.MutableTransitionState
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
@@ -48,7 +50,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.CardDefaults
@@ -90,6 +91,7 @@ import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupProperties
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
@@ -129,7 +131,6 @@ import com.vitorpamplona.amethyst.ui.theme.Size19Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size20dp
 import com.vitorpamplona.amethyst.ui.theme.Size22Modifier
-import com.vitorpamplona.amethyst.ui.theme.Size24dp
 import com.vitorpamplona.amethyst.ui.theme.Size28Modifier
 import com.vitorpamplona.amethyst.ui.theme.SmallBorder
 import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonColumn
@@ -137,6 +138,7 @@ import com.vitorpamplona.amethyst.ui.theme.TinyBorders
 import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.reactionBox
+import com.vitorpamplona.amethyst.ui.theme.ripple24dp
 import com.vitorpamplona.amethyst.ui.theme.selectedReactionBoxModifier
 import com.vitorpamplona.quartz.encoders.Nip30CustomEmoji
 import com.vitorpamplona.quartz.events.BaseTextNoteEvent
@@ -147,6 +149,7 @@ import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlin.math.roundToInt
 
@@ -893,6 +896,7 @@ fun ObserveLikeIcon(
 ) {
     val reactionsState by baseNote.live().reactions.observeAsState()
 
+    @Suppress("ProduceStateDoesNotAssignValue")
     val reactionType by
         produceState(initialValue = null as String?, key1 = reactionsState) {
             val newReactionType = accountViewModel.loadReactionTo(reactionsState?.note)
@@ -1008,7 +1012,7 @@ fun ZapReaction(
             iconSizeModifier.combinedClickable(
                 role = Role.Button,
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(bounded = false, radius = Size24dp),
+                indication = ripple24dp,
                 onClick = {
                     zapClick(
                         baseNote,
@@ -1227,6 +1231,7 @@ fun ObserveZapAmountText(
     val zapsState by baseNote.live().zaps.observeAsState()
 
     if (zapsState?.note?.zapPayments?.isNotEmpty() == true) {
+        @Suppress("ProduceStateDoesNotAssignValue")
         val zapAmountTxt by
             produceState(initialValue = showAmount(baseNote.zapsAmount), key1 = zapsState) {
                 zapsState?.note?.let {
@@ -1324,23 +1329,52 @@ fun ReactionChoicePopup(
         .collectAsStateWithLifecycle()
     val toRemove = remember { baseNote.reactedBy(accountViewModel.userProfile()).toImmutableSet() }
 
+    // Define animation specs
+    val animationDuration = 250
+    val fadeAnimationSpec = tween<Float>(durationMillis = animationDuration)
+
+    // Prevent multiple calls to onDismiss()
+    var dismissed by remember { mutableStateOf(false) }
+
+    val visibilityState = remember { MutableTransitionState(false).apply { targetState = true } }
+    LaunchedEffect(visibilityState.targetState) {
+        if (!visibilityState.targetState && !dismissed) {
+            delay(animationDuration.toLong())
+            dismissed = true
+            onDismiss()
+        }
+    }
+
     Popup(
         alignment = Alignment.BottomCenter,
         offset = IntOffset(0, iconSizePx),
-        onDismissRequest = { onDismiss() },
+        onDismissRequest = { visibilityState.targetState = false },
+        properties = PopupProperties(focusable = true),
     ) {
-        ReactionChoicePopupContent(
-            reactions,
-            toRemove = toRemove,
-            onClick = { reactionType ->
-                accountViewModel.reactToOrDelete(
-                    baseNote,
-                    reactionType,
-                )
-                onDismiss()
-            },
-            onChangeAmount,
-        )
+        AnimatedVisibility(
+            visibleState = visibilityState,
+            enter =
+                slideInVertically(
+                    initialOffsetY = { it / 2 },
+                ) + fadeIn(animationSpec = fadeAnimationSpec),
+            exit =
+                slideOutVertically(
+                    targetOffsetY = { it / 2 },
+                ) + fadeOut(animationSpec = fadeAnimationSpec),
+        ) {
+            ReactionChoicePopupContent(
+                reactions,
+                toRemove = toRemove,
+                onClick = { reactionType ->
+                    accountViewModel.reactToOrDelete(
+                        baseNote,
+                        reactionType,
+                    )
+                    visibilityState.targetState = false
+                },
+                onChangeAmount,
+            )
+        }
     }
 }
 
@@ -1502,58 +1536,87 @@ fun ZapAmountChoicePopup(
 
     val yOffset = with(LocalDensity.current) { -popupYOffset.toPx().toInt() }
 
+    // Define animation specs
+    val animationDuration = 250
+    val fadeAnimationSpec = tween<Float>(durationMillis = animationDuration)
+
+    // Prevent multiple calls to onDismiss()
+    var dismissed by remember { mutableStateOf(false) }
+
+    val visibilityState = remember { MutableTransitionState(false).apply { targetState = true } }
+    LaunchedEffect(visibilityState.targetState) {
+        if (!visibilityState.targetState && !dismissed) {
+            delay(animationDuration.toLong())
+            dismissed = true
+            onDismiss()
+        }
+    }
+
     Popup(
         alignment = Alignment.BottomCenter,
         offset = IntOffset(0, yOffset),
-        onDismissRequest = { onDismiss() },
+        onDismissRequest = { visibilityState.targetState = false },
+        properties = PopupProperties(focusable = true),
     ) {
-        FlowRow(horizontalArrangement = Arrangement.Center) {
-            zapAmountChoices.forEach { amountInSats ->
-                Button(
-                    modifier = Modifier.padding(horizontal = 3.dp),
-                    onClick = {
-                        accountViewModel.zap(
-                            baseNote,
-                            amountInSats * 1000,
-                            null,
-                            zapMessage,
-                            context,
-                            true,
-                            onError,
-                            onProgress,
-                            onPayViaIntent,
-                        )
-                        onDismiss()
-                    },
-                    shape = ButtonBorder,
-                    colors =
-                        ButtonDefaults.buttonColors(
-                            containerColor = MaterialTheme.colorScheme.primary,
-                        ),
-                ) {
-                    Text(
-                        "⚡ ${showAmount(amountInSats.toBigDecimal().setScale(1))}",
-                        color = Color.White,
-                        textAlign = TextAlign.Center,
-                        modifier =
-                            Modifier.combinedClickable(
-                                onClick = {
-                                    accountViewModel.zap(
-                                        baseNote,
-                                        amountInSats * 1000,
-                                        null,
-                                        zapMessage,
-                                        context,
-                                        true,
-                                        onError,
-                                        onProgress,
-                                        onPayViaIntent,
-                                    )
-                                    onDismiss()
-                                },
-                                onLongClick = { onChangeAmount() },
+        AnimatedVisibility(
+            visibleState = visibilityState,
+            enter =
+                slideInVertically(
+                    initialOffsetY = { it / 2 },
+                ) + fadeIn(animationSpec = fadeAnimationSpec),
+            exit =
+                slideOutVertically(
+                    targetOffsetY = { it / 2 },
+                ) + fadeOut(animationSpec = fadeAnimationSpec),
+        ) {
+            FlowRow(horizontalArrangement = Arrangement.Center) {
+                zapAmountChoices.forEach { amountInSats ->
+                    Button(
+                        modifier = Modifier.padding(horizontal = 3.dp),
+                        onClick = {
+                            accountViewModel.zap(
+                                baseNote,
+                                amountInSats * 1000,
+                                null,
+                                zapMessage,
+                                context,
+                                true,
+                                onError,
+                                onProgress,
+                                onPayViaIntent,
+                            )
+                            visibilityState.targetState = false
+                        },
+                        shape = ButtonBorder,
+                        colors =
+                            ButtonDefaults.buttonColors(
+                                containerColor = MaterialTheme.colorScheme.primary,
                             ),
-                    )
+                    ) {
+                        Text(
+                            "⚡ ${showAmount(amountInSats.toBigDecimal().setScale(1))}",
+                            color = Color.White,
+                            textAlign = TextAlign.Center,
+                            modifier =
+                                Modifier.combinedClickable(
+                                    onClick = {
+                                        accountViewModel.zap(
+                                            baseNote,
+                                            amountInSats * 1000,
+                                            null,
+                                            zapMessage,
+                                            context,
+                                            true,
+                                            onError,
+                                            onProgress,
+                                            onPayViaIntent,
+                                        )
+                                        visibilityState.targetState = false
+                                    },
+                                    onLongClick = { onChangeAmount() },
+                                ),
+                        )
+                    }
                 }
             }
         }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt

@@ -23,6 +23,7 @@ package com.vitorpamplona.amethyst.ui.note
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
@@ -65,6 +66,7 @@ import com.vitorpamplona.amethyst.ui.theme.Size17dp
 import com.vitorpamplona.amethyst.ui.theme.StdStartPadding
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.relayIconModifier
+import com.vitorpamplona.amethyst.ui.theme.ripple24dp
 import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
 
 @Composable
@@ -120,6 +122,7 @@ fun RenderRelay(
     accountViewModel: AccountViewModel,
     nav: INav,
 ) {
+    @Suppress("ProduceStateDoesNotAssignValue")
     val relayInfo by
         produceState(
             initialValue = Nip11CachedRetriever.getFromCache(relay.url),
@@ -154,6 +157,8 @@ fun RenderRelay(
             Modifier
                 .size(Size17dp)
                 .combinedClickable(
+                    indication = ripple24dp,
+                    interactionSource = MutableInteractionSource(),
                     onLongClick = {
                         clipboardManager.setText(AnnotatedString(relay.url))
                     },

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt

@@ -31,7 +31,6 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
-import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
@@ -164,14 +163,10 @@ class UpdateZapAmountViewModel(
                     null
                 }
 
-            val relayUrl =
-                walletConnectRelay.text
-                    .ifBlank { null }
-                    ?.let { RelayUrlFormatter.normalize(it) }
-
+            val relayUrl = walletConnectRelay.text.ifBlank { null }?.let { RelayUrlFormatter.normalize(it) }
             val privKeyHex = walletConnectSecret.text.ifBlank { null }?.let { decodePrivateKeyAsHexOrNull(it) }
 
-            if (pubkeyHex != null) {
+            if (pubkeyHex != null && relayUrl != null) {
                 accountSettings.changeZapPaymentRequest(
                     Nip47WalletConnect.Nip47URI(
                         pubkeyHex,
@@ -224,16 +219,66 @@ fun UpdateZapAmountDialog(
     onClose: () -> Unit,
     nip47uri: String? = null,
     accountViewModel: AccountViewModel,
+) {
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                dismissOnClickOutside = false,
+                decorFitsSystemWindows = false,
+            ),
+    ) {
+        Surface(
+            modifier = Modifier.fillMaxWidth(),
+        ) {
+            Column {
+                val postViewModel: UpdateZapAmountViewModel =
+                    viewModel(
+                        key = "UpdateZapAmountViewModel",
+                        factory = UpdateZapAmountViewModel.Factory(accountViewModel.account.settings),
+                    )
+
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    CloseButton(
+                        onPress = {
+                            postViewModel.cancel()
+                            onClose()
+                        },
+                    )
+
+                    SaveButton(
+                        onPost = {
+                            postViewModel.sendPost()
+                            onClose()
+                        },
+                        isActive = postViewModel.hasChanged(),
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                UpdateZapAmountContent(postViewModel, onClose, nip47uri, accountViewModel)
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun UpdateZapAmountContent(
+    postViewModel: UpdateZapAmountViewModel,
+    onClose: () -> Unit,
+    nip47uri: String? = null,
+    accountViewModel: AccountViewModel,
 ) {
     val context = LocalContext.current
     val clipboardManager = LocalClipboardManager.current
 
-    val postViewModel: UpdateZapAmountViewModel =
-        viewModel(
-            key = "UpdateZapAmountViewModel",
-            factory = UpdateZapAmountViewModel.Factory(accountViewModel.account.settings),
-        )
-
     val uri = LocalUriHandler.current
 
     val zapTypes =
@@ -286,337 +331,295 @@ fun UpdateZapAmountDialog(
         }
     }
 
-    Dialog(
-        onDismissRequest = { onClose() },
-        properties =
-            DialogProperties(
-                usePlatformDefaultWidth = false,
-                dismissOnClickOutside = false,
-                decorFitsSystemWindows = false,
-            ),
+    Column(
+        modifier =
+            Modifier
+                .padding(10.dp)
+                .fillMaxWidth()
+                .imePadding()
+                .verticalScroll(rememberScrollState()),
     ) {
-        Surface(
+        FlowRow(
             modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.Center,
         ) {
-            Column(modifier = Modifier.padding(10.dp).imePadding()) {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically,
+            postViewModel.amountSet.forEach { amountInSats ->
+                Button(
+                    modifier = Modifier.padding(horizontal = 3.dp),
+                    shape = ButtonBorder,
+                    colors =
+                        ButtonDefaults.buttonColors(
+                            containerColor = MaterialTheme.colorScheme.primary,
+                        ),
+                    onClick = { postViewModel.removeAmount(amountInSats) },
                 ) {
-                    CloseButton(
-                        onPress = {
-                            postViewModel.cancel()
-                            onClose()
-                        },
-                    )
-
-                    SaveButton(
-                        onPost = {
-                            postViewModel.sendPost()
-                            onClose()
-                        },
-                        isActive = postViewModel.hasChanged(),
+                    Text(
+                        "⚡ ${
+                            showAmount(
+                                amountInSats.toBigDecimal().setScale(1),
+                            )
+                        } ✖",
+                        color = Color.White,
+                        textAlign = TextAlign.Center,
                     )
                 }
+            }
+        }
 
-                Spacer(modifier = Modifier.height(10.dp))
+        Spacer(modifier = Modifier.height(10.dp))
 
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                ) {
-                    Column(
-                        modifier = Modifier.verticalScroll(rememberScrollState()),
-                    ) {
-                        Row(modifier = Modifier.fillMaxWidth()) {
-                            Column(modifier = Modifier.animateContentSize()) {
-                                FlowRow(
-                                    modifier = Modifier.fillMaxWidth(),
-                                    horizontalArrangement = Arrangement.Center,
-                                ) {
-                                    postViewModel.amountSet.forEach { amountInSats ->
-                                        Button(
-                                            modifier = Modifier.padding(horizontal = 3.dp),
-                                            shape = ButtonBorder,
-                                            colors =
-                                                ButtonDefaults.buttonColors(
-                                                    containerColor = MaterialTheme.colorScheme.primary,
-                                                ),
-                                            onClick = { postViewModel.removeAmount(amountInSats) },
-                                        ) {
-                                            Text(
-                                                "⚡ ${
-                                                    showAmount(
-                                                        amountInSats.toBigDecimal().setScale(1),
-                                                    )
-                                                } ✖",
-                                                color = Color.White,
-                                                textAlign = TextAlign.Center,
-                                            )
-                                        }
-                                    }
-                                }
-                            }
-                        }
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedTextField(
+                label = { Text(text = stringRes(R.string.new_amount_in_sats)) },
+                value = postViewModel.nextAmount,
+                onValueChange = { postViewModel.nextAmount = it },
+                keyboardOptions =
+                    KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.None,
+                        keyboardType = KeyboardType.Number,
+                    ),
+                placeholder = {
+                    Text(
+                        text = "100, 1000, 5000",
+                        color = MaterialTheme.colorScheme.placeholderText,
+                    )
+                },
+                singleLine = true,
+                modifier = Modifier.padding(end = 10.dp).weight(1f),
+            )
 
-                        Spacer(modifier = Modifier.height(10.dp))
+            Button(
+                onClick = { postViewModel.addAmount() },
+                shape = ButtonBorder,
+                colors =
+                    ButtonDefaults.buttonColors(
+                        containerColor = MaterialTheme.colorScheme.primary,
+                    ),
+            ) {
+                Text(text = stringRes(R.string.add), color = Color.White)
+            }
+        }
 
-                        Row(
-                            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            OutlinedTextField(
-                                label = { Text(text = stringRes(R.string.new_amount_in_sats)) },
-                                value = postViewModel.nextAmount,
-                                onValueChange = { postViewModel.nextAmount = it },
-                                keyboardOptions =
-                                    KeyboardOptions.Default.copy(
-                                        capitalization = KeyboardCapitalization.None,
-                                        keyboardType = KeyboardType.Number,
-                                    ),
-                                placeholder = {
-                                    Text(
-                                        text = "100, 1000, 5000",
-                                        color = MaterialTheme.colorScheme.placeholderText,
-                                    )
-                                },
-                                singleLine = true,
-                                modifier = Modifier.padding(end = 10.dp).weight(1f),
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            TextSpinner(
+                label = stringRes(id = R.string.zap_type_explainer),
+                placeholder =
+                    zapTypes.filter { it.first == accountViewModel.defaultZapType() }.first().second,
+                options = zapOptions,
+                onSelect = { postViewModel.selectedZapType = zapTypes[it].first },
+                modifier = Modifier.weight(1f).padding(end = 5.dp),
+            )
+        }
+
+        HorizontalDivider(
+            modifier = Modifier.padding(vertical = 10.dp),
+            thickness = DividerThickness,
+        )
+
+        var qrScanning by remember { mutableStateOf(false) }
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                stringRes(id = R.string.wallet_connect_service),
+                Modifier.weight(1f),
+            )
+
+            IconButton(
+                onClick = {
+                    onClose()
+                    runCatching { uri.openUri("https://nwc.getalby.com/apps/new?c=Amethyst") }
+                },
+            ) {
+                Icon(
+                    painter = painterResource(R.drawable.alby),
+                    contentDescription = stringRes(id = R.string.accessibility_navigate_to_alby),
+                    modifier = Modifier.size(24.dp),
+                    tint = Color.Unspecified,
+                )
+            }
+
+            IconButton(
+                onClick = {
+                    clipboardManager.getText()?.let { postViewModel.copyFromClipboard(it.text) }
+                },
+            ) {
+                Icon(
+                    Icons.Outlined.ContentPaste,
+                    contentDescription = stringRes(id = R.string.paste_from_clipboard),
+                    modifier = Modifier.size(24.dp),
+                    tint = MaterialTheme.colorScheme.primary,
+                )
+            }
+
+            IconButton(onClick = { qrScanning = true }) {
+                Icon(
+                    painter = painterResource(R.drawable.ic_qrcode),
+                    contentDescription = stringRes(id = R.string.accessibility_scan_qr_code),
+                    modifier = Modifier.size(24.dp),
+                    tint = MaterialTheme.colorScheme.primary,
+                )
+            }
+        }
+
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(bottom = 5.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                stringRes(id = R.string.wallet_connect_service_explainer),
+                Modifier.weight(1f),
+                color = MaterialTheme.colorScheme.placeholderText,
+                fontSize = Font14SP,
+            )
+        }
+
+        if (qrScanning) {
+            SimpleQrCodeScanner {
+                qrScanning = false
+                if (!it.isNullOrEmpty()) {
+                    try {
+                        postViewModel.updateNIP47(it)
+                    } catch (e: IllegalArgumentException) {
+                        if (e.message != null) {
+                            accountViewModel.toast(
+                                stringRes(context, R.string.error_parsing_nip47_title),
+                                stringRes(context, R.string.error_parsing_nip47, it, e.message!!),
                             )
-
-                            Button(
-                                onClick = { postViewModel.addAmount() },
-                                shape = ButtonBorder,
-                                colors =
-                                    ButtonDefaults.buttonColors(
-                                        containerColor = MaterialTheme.colorScheme.primary,
-                                    ),
-                            ) {
-                                Text(text = stringRes(R.string.add), color = Color.White)
-                            }
-                        }
-
-                        Row(
-                            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            TextSpinner(
-                                label = stringRes(id = R.string.zap_type_explainer),
-                                placeholder =
-                                    zapTypes.filter { it.first == accountViewModel.defaultZapType() }.first().second,
-                                options = zapOptions,
-                                onSelect = { postViewModel.selectedZapType = zapTypes[it].first },
-                                modifier = Modifier.weight(1f).padding(end = 5.dp),
-                            )
-                        }
-
-                        HorizontalDivider(
-                            modifier = Modifier.padding(vertical = 10.dp),
-                            thickness = DividerThickness,
-                        )
-
-                        var qrScanning by remember { mutableStateOf(false) }
-
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Text(
-                                stringRes(id = R.string.wallet_connect_service),
-                                Modifier.weight(1f),
-                            )
-
-                            IconButton(
-                                onClick = {
-                                    onClose()
-                                    runCatching { uri.openUri("https://nwc.getalby.com/apps/new?c=Amethyst") }
-                                },
-                            ) {
-                                Icon(
-                                    painter = painterResource(R.drawable.alby),
-                                    contentDescription = stringRes(id = R.string.accessibility_navigate_to_alby),
-                                    modifier = Modifier.size(24.dp),
-                                    tint = Color.Unspecified,
-                                )
-                            }
-
-                            IconButton(
-                                onClick = {
-                                    clipboardManager.getText()?.let { postViewModel.copyFromClipboard(it.text) }
-                                },
-                            ) {
-                                Icon(
-                                    Icons.Outlined.ContentPaste,
-                                    contentDescription = stringRes(id = R.string.paste_from_clipboard),
-                                    modifier = Modifier.size(24.dp),
-                                    tint = MaterialTheme.colorScheme.primary,
-                                )
-                            }
-
-                            IconButton(onClick = { qrScanning = true }) {
-                                Icon(
-                                    painter = painterResource(R.drawable.ic_qrcode),
-                                    contentDescription = stringRes(id = R.string.accessibility_scan_qr_code),
-                                    modifier = Modifier.size(24.dp),
-                                    tint = MaterialTheme.colorScheme.primary,
-                                )
-                            }
-                        }
-
-                        Row(
-                            modifier = Modifier.fillMaxWidth().padding(bottom = 5.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Text(
-                                stringRes(id = R.string.wallet_connect_service_explainer),
-                                Modifier.weight(1f),
-                                color = MaterialTheme.colorScheme.placeholderText,
-                                fontSize = Font14SP,
-                            )
-                        }
-
-                        if (qrScanning) {
-                            SimpleQrCodeScanner {
-                                qrScanning = false
-                                if (!it.isNullOrEmpty()) {
-                                    try {
-                                        postViewModel.updateNIP47(it)
-                                    } catch (e: IllegalArgumentException) {
-                                        if (e.message != null) {
-                                            accountViewModel.toast(
-                                                stringRes(context, R.string.error_parsing_nip47_title),
-                                                stringRes(context, R.string.error_parsing_nip47, it, e.message!!),
-                                            )
-                                        } else {
-                                            accountViewModel.toast(
-                                                stringRes(context, R.string.error_parsing_nip47_title),
-                                                stringRes(context, R.string.error_parsing_nip47_no_error, it),
-                                            )
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        Row(
-                            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            OutlinedTextField(
-                                label = { Text(text = stringRes(R.string.wallet_connect_service_pubkey)) },
-                                value = postViewModel.walletConnectPubkey,
-                                onValueChange = { postViewModel.walletConnectPubkey = it },
-                                keyboardOptions =
-                                    KeyboardOptions.Default.copy(
-                                        capitalization = KeyboardCapitalization.None,
-                                    ),
-                                placeholder = {
-                                    Text(
-                                        text = "npub, hex",
-                                        color = MaterialTheme.colorScheme.placeholderText,
-                                    )
-                                },
-                                singleLine = true,
-                                modifier = Modifier.weight(1f),
-                            )
-                        }
-
-                        Row(
-                            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            OutlinedTextField(
-                                label = { Text(text = stringRes(R.string.wallet_connect_service_relay)) },
-                                modifier = Modifier.weight(1f),
-                                value = postViewModel.walletConnectRelay,
-                                onValueChange = { postViewModel.walletConnectRelay = it },
-                                placeholder = {
-                                    Text(
-                                        text = "wss://relay.server.com",
-                                        color = MaterialTheme.colorScheme.placeholderText,
-                                        maxLines = 1,
-                                    )
-                                },
-                                singleLine = true,
-                            )
-                        }
-
-                        var showPassword by remember { mutableStateOf(false) }
-
-                        val context = LocalContext.current
-
-                        val keyguardLauncher =
-                            rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
-                                if (result.resultCode == Activity.RESULT_OK) {
-                                    showPassword = true
-                                }
-                            }
-
-                        val authTitle = stringRes(id = R.string.wallet_connect_service_show_secret)
-
-                        Row(
-                            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            OutlinedTextField(
-                                label = { Text(text = stringRes(R.string.wallet_connect_service_secret)) },
-                                modifier = Modifier.weight(1f),
-                                value = postViewModel.walletConnectSecret,
-                                onValueChange = { postViewModel.walletConnectSecret = it },
-                                keyboardOptions =
-                                    KeyboardOptions(
-                                        autoCorrect = false,
-                                        keyboardType = KeyboardType.Password,
-                                        imeAction = ImeAction.Go,
-                                    ),
-                                placeholder = {
-                                    Text(
-                                        text = stringRes(R.string.wallet_connect_service_secret_placeholder),
-                                        color = MaterialTheme.colorScheme.placeholderText,
-                                    )
-                                },
-                                trailingIcon = {
-                                    IconButton(
-                                        onClick = {
-                                            if (!showPassword) {
-                                                authenticate(
-                                                    title = authTitle,
-                                                    context = context,
-                                                    keyguardLauncher = keyguardLauncher,
-                                                    onApproved = { showPassword = true },
-                                                    onError = { title, message -> accountViewModel.toast(title, message) },
-                                                )
-                                            } else {
-                                                showPassword = false
-                                            }
-                                        },
-                                    ) {
-                                        Icon(
-                                            imageVector =
-                                                if (showPassword) {
-                                                    Icons.Outlined.VisibilityOff
-                                                } else {
-                                                    Icons.Outlined.Visibility
-                                                },
-                                            contentDescription =
-                                                if (showPassword) {
-                                                    stringRes(R.string.show_password)
-                                                } else {
-                                                    stringRes(
-                                                        R.string.hide_password,
-                                                    )
-                                                },
-                                        )
-                                    }
-                                },
-                                visualTransformation =
-                                    if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
+                        } else {
+                            accountViewModel.toast(
+                                stringRes(context, R.string.error_parsing_nip47_title),
+                                stringRes(context, R.string.error_parsing_nip47_no_error, it),
                             )
                         }
                     }
                 }
             }
         }
+
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedTextField(
+                label = { Text(text = stringRes(R.string.wallet_connect_service_pubkey)) },
+                value = postViewModel.walletConnectPubkey,
+                onValueChange = { postViewModel.walletConnectPubkey = it },
+                keyboardOptions =
+                    KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.None,
+                    ),
+                placeholder = {
+                    Text(
+                        text = "npub, hex",
+                        color = MaterialTheme.colorScheme.placeholderText,
+                    )
+                },
+                singleLine = true,
+                modifier = Modifier.weight(1f),
+            )
+        }
+
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedTextField(
+                label = { Text(text = stringRes(R.string.wallet_connect_service_relay)) },
+                modifier = Modifier.weight(1f),
+                value = postViewModel.walletConnectRelay,
+                onValueChange = { postViewModel.walletConnectRelay = it },
+                placeholder = {
+                    Text(
+                        text = "wss://relay.server.com",
+                        color = MaterialTheme.colorScheme.placeholderText,
+                        maxLines = 1,
+                    )
+                },
+                singleLine = true,
+            )
+        }
+
+        var showPassword by remember { mutableStateOf(false) }
+
+        val context = LocalContext.current
+
+        val keyguardLauncher =
+            rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
+                if (result.resultCode == Activity.RESULT_OK) {
+                    showPassword = true
+                }
+            }
+
+        val authTitle = stringRes(id = R.string.wallet_connect_service_show_secret)
+
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedTextField(
+                label = { Text(text = stringRes(R.string.wallet_connect_service_secret)) },
+                modifier = Modifier.weight(1f),
+                value = postViewModel.walletConnectSecret,
+                onValueChange = { postViewModel.walletConnectSecret = it },
+                keyboardOptions =
+                    KeyboardOptions(
+                        autoCorrect = false,
+                        keyboardType = KeyboardType.Password,
+                        imeAction = ImeAction.Go,
+                    ),
+                placeholder = {
+                    Text(
+                        text = stringRes(R.string.wallet_connect_service_secret_placeholder),
+                        color = MaterialTheme.colorScheme.placeholderText,
+                    )
+                },
+                trailingIcon = {
+                    IconButton(
+                        onClick = {
+                            if (!showPassword) {
+                                authenticate(
+                                    title = authTitle,
+                                    context = context,
+                                    keyguardLauncher = keyguardLauncher,
+                                    onApproved = { showPassword = true },
+                                    onError = { title, message -> accountViewModel.toast(title, message) },
+                                )
+                            } else {
+                                showPassword = false
+                            }
+                        },
+                    ) {
+                        Icon(
+                            imageVector =
+                                if (showPassword) {
+                                    Icons.Outlined.VisibilityOff
+                                } else {
+                                    Icons.Outlined.Visibility
+                                },
+                            contentDescription =
+                                if (showPassword) {
+                                    stringRes(R.string.show_password)
+                                } else {
+                                    stringRes(
+                                        R.string.hide_password,
+                                    )
+                                },
+                        )
+                    }
+                },
+                visualTransformation =
+                    if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
+            )
+        }
     }
 }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayReward.kt

@@ -71,6 +71,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.math.BigDecimal
@@ -180,18 +181,21 @@ class AddBountyAmountViewModel : ViewModel() {
 
         if (newValue != null) {
             viewModelScope.launch {
-                account?.sendPost(
-                    message = newValue.toString(),
-                    replyTo = listOfNotNull(bounty),
-                    mentions = listOfNotNull(bounty?.author),
-                    tags = listOf("bounty-added-reward"),
-                    wantsToMarkAsSensitive = false,
-                    replyingTo = null,
-                    root = null,
-                    directMentions = setOf(),
-                    forkedFrom = null,
-                    draftTag = null,
-                )
+                account?.let {
+                    it.sendPost(
+                        message = newValue.toString(),
+                        replyTo = listOfNotNull(bounty),
+                        mentions = listOfNotNull(bounty?.author),
+                        tags = listOf("bounty-added-reward"),
+                        wantsToMarkAsSensitive = false,
+                        replyingTo = null,
+                        root = null,
+                        directMentions = setOf(),
+                        forkedFrom = null,
+                        draftTag = null,
+                        relayList = it.activeWriteRelays().toImmutableList(),
+                    )
+                }
 
                 nextAmount = TextFieldValue("")
             }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayUncitedHashtags.kt

@@ -57,6 +57,7 @@ fun DisplayUncitedHashtags(
     callbackUri: String? = null,
     nav: INav,
 ) {
+    @Suppress("ProduceStateDoesNotAssignValue")
     val unusedHashtags by
         produceState(initialValue = emptyList<String>()) {
             val tagsInEvent = event.hashtags()

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/ZapTheDevsCard.kt

@@ -90,6 +90,7 @@ import com.vitorpamplona.amethyst.ui.theme.imageModifier
 import com.vitorpamplona.quartz.events.Event
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -289,7 +290,7 @@ fun ZapDonationButton(
     animationSize: Dp = 14.dp,
     nav: INav,
 ) {
-    var wantsToZap by remember { mutableStateOf<List<Long>?>(null) }
+    var wantsToZap by remember { mutableStateOf<ImmutableList<Long>?>(null) }
     var showErrorMessageDialog by remember { mutableStateOf<String?>(null) }
     var wantsToPay by
         remember(baseNote) {
@@ -313,7 +314,7 @@ fun ZapDonationButton(
                 onZappingProgress = { progress: Float ->
                     scope.launch { zappingProgress = progress }
                 },
-                onMultipleChoices = { options -> wantsToZap = options },
+                onMultipleChoices = { options -> wantsToZap = options.toImmutableList() },
                 onError = { _, message ->
                     scope.launch {
                         zappingProgress = 0f
@@ -325,9 +326,10 @@ fun ZapDonationButton(
         },
         modifier = Modifier.fillMaxWidth(),
     ) {
-        if (wantsToZap != null) {
+        wantsToZap?.let {
             ZapAmountChoicePopup(
                 baseNote = baseNote,
+                zapAmountChoices = it,
                 popupYOffset = iconSize,
                 accountViewModel = accountViewModel,
                 onDismiss = {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/LiveActivity.kt

@@ -59,8 +59,8 @@ import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.LiveFlag
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.ScheduledFlag
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.CheckIfUrlIsOnline
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.CrossfadeCheckIfUrlIsOnline
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.CheckIfVideoIsOnline
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.CrossfadeCheckIfVideoIsOnline
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.mockAccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.equalImmutableLists
 import com.vitorpamplona.amethyst.ui.stringRes
@@ -159,7 +159,7 @@ fun RenderLiveActivityEventInner(
         CrossfadeIfEnabled(targetState = status, label = "RenderLiveActivityEventInner", accountViewModel = accountViewModel) {
             when (it) {
                 LiveActivitiesEvent.STATUS_LIVE -> {
-                    media?.let { CrossfadeCheckIfUrlIsOnline(it, accountViewModel) { LiveFlag() } }
+                    media?.let { CrossfadeCheckIfVideoIsOnline(it, accountViewModel) { LiveFlag() } }
                 }
 
                 LiveActivitiesEvent.STATUS_PLANNED -> {
@@ -171,7 +171,7 @@ fun RenderLiveActivityEventInner(
 
     media?.let { media ->
         if (status == LiveActivitiesEvent.STATUS_LIVE) {
-            CheckIfUrlIsOnline(media, accountViewModel) { isOnline ->
+            CheckIfVideoIsOnline(media, accountViewModel) { isOnline ->
                 if (isOnline) {
                     Row(
                         verticalAlignment = Alignment.CenterVertically,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/MedicalData.kt

@@ -45,6 +45,8 @@ import com.vitorpamplona.amethyst.model.LensSpecification
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.Patient
 import com.vitorpamplona.amethyst.model.Practitioner
+import com.vitorpamplona.amethyst.model.Prism
+import com.vitorpamplona.amethyst.model.Reference
 import com.vitorpamplona.amethyst.model.Resource
 import com.vitorpamplona.amethyst.model.VisionPrescription
 import com.vitorpamplona.amethyst.model.findReferenceInDb
@@ -58,10 +60,12 @@ import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.FhirResourceEvent
 import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.text.DecimalFormat
 import java.text.NumberFormat
+import kotlin.math.abs
 
 @Preview
 @Composable
@@ -74,6 +78,97 @@ fun RenderEyeGlassesPrescriptionPreview() {
     RenderFhirResource(prescriptionEvent)
 }
 
+@Preview
+@Composable
+fun RenderEyeGlassesPrescription2Preview() {
+    val vision =
+        VisionPrescription(
+            id = "1",
+            status = null,
+            created = null,
+            patient = Reference(),
+            encounter = Reference(),
+            dateWritten = null,
+            prescriber = Reference(),
+            lensSpecification =
+                listOf(
+                    LensSpecification(
+                        product = "lens",
+                        eye = "right",
+                        sphere = -1.00,
+                        cylinder = -2.00,
+                        axis = 180.0,
+                        pd = 31.0,
+                        interAdd = 1.50,
+                        add = 1.75,
+                        prism = Prism(12.0, "down"),
+                        power = null,
+                        diameter = null,
+                        color = null,
+                        brand = null,
+                        note = null,
+                    ),
+                    LensSpecification(
+                        product = "lens",
+                        eye = "left",
+                        sphere = -1.00,
+                        cylinder = -2.00,
+                        axis = 180.0,
+                        pd = 31.0,
+                        interAdd = 1.50,
+                        add = 1.75,
+                        prism = Prism(12.0, "down"),
+                        power = null,
+                        diameter = null,
+                        color = null,
+                        brand = null,
+                        note = null,
+                    ),
+                    LensSpecification(
+                        product = "contacts",
+                        eye = "right",
+                        sphere = -1.00,
+                        cylinder = -2.00,
+                        axis = 180.0,
+                        pd = null,
+                        interAdd = null,
+                        add = null,
+                        prism = null,
+                        backCurve = 12.0,
+                        power = 1.2,
+                        diameter = 1.2,
+                        color = "blue",
+                        brand = "Blue Glasses",
+                        note = "note",
+                    ),
+                    LensSpecification(
+                        product = "contacts",
+                        eye = "left",
+                        sphere = -1.00,
+                        cylinder = -2.00,
+                        axis = 180.0,
+                        pd = null,
+                        interAdd = null,
+                        add = null,
+                        prism = null,
+                        backCurve = 12.0,
+                        power = 1.2,
+                        diameter = 1.2,
+                        color = "blue",
+                        brand = "Blue Glasses",
+                        note = "note",
+                    ),
+                ),
+        )
+
+    val db =
+        mapOf(
+            "1" to vision,
+        ).toImmutableMap()
+
+    RenderEyeGlassesPrescription(vision, db)
+}
+
 @Composable
 fun RenderFhirResource(
     baseNote: Note,
@@ -87,6 +182,7 @@ fun RenderFhirResource(
 
 @Composable
 fun RenderFhirResource(event: FhirResourceEvent) {
+    @Suppress("ProduceStateDoesNotAssignValue")
     val state by produceState(initialValue = FhirElementDatabase(), key1 = event) {
         withContext(Dispatchers.Default) {
             parseResourceBundleOrNull(event.content)?.let {
@@ -98,7 +194,7 @@ fun RenderFhirResource(event: FhirResourceEvent) {
     state.baseResource?.let { resource ->
         when (resource) {
             is Bundle -> {
-                val vision = resource.entry.filterIsInstance(VisionPrescription::class.java)
+                val vision = resource.entry.filterIsInstance<VisionPrescription>()
 
                 vision.firstOrNull()?.let {
                     RenderEyeGlassesPrescription(it, state.localDb)
@@ -124,11 +220,25 @@ fun RenderEyeGlassesPrescription(
                 .fillMaxWidth()
                 .padding(horizontal = Size10dp),
     ) {
-        val rightEye = visionPrescription.lensSpecification.firstOrNull { it.eye == "right" }
-        val leftEye = visionPrescription.lensSpecification.firstOrNull { it.eye == "left" }
+        val glassesRightEye = visionPrescription.glassesRightEyes().firstOrNull()
+        val glassesLeftEye = visionPrescription.glassesLeftEyes().firstOrNull()
+
+        val contactsRightEye = visionPrescription.contactsRightEyes().firstOrNull()
+        val contactsLeftEye = visionPrescription.contactsLeftEyes().firstOrNull()
+
+        val isGlasses = glassesRightEye != null || glassesLeftEye != null
+        val isContacts = contactsRightEye != null || contactsLeftEye != null
 
         Text(
-            "Eyeglasses Prescription",
+            if (isGlasses && isContacts) {
+                "Vision Prescription"
+            } else if (isGlasses) {
+                "Glasses Prescription"
+            } else if (isContacts) {
+                "Contact Lenses Prescription"
+            } else {
+                "Empty Prescription"
+            },
             modifier = Modifier.padding(4.dp).fillMaxWidth(),
             textAlign = TextAlign.Center,
         )
@@ -154,17 +264,36 @@ fun RenderEyeGlassesPrescription(
 
         Spacer(DoubleVertSpacer)
 
-        RenderEyeGlassesPrescriptionHeaderRow()
-        HorizontalDivider(thickness = DividerThickness)
-
-        rightEye?.let {
-            RenderEyeGlassesPrescriptionRow(data = it)
+        if (isGlasses) {
+            RenderEyeGlassesPrescriptionHeaderRow()
             HorizontalDivider(thickness = DividerThickness)
+
+            glassesRightEye?.let {
+                RenderEyeGlassesPrescriptionRow(data = it)
+                HorizontalDivider(thickness = DividerThickness)
+            }
+
+            glassesLeftEye?.let {
+                RenderEyeGlassesPrescriptionRow(data = it)
+                HorizontalDivider(thickness = DividerThickness)
+            }
         }
 
-        leftEye?.let {
-            RenderEyeGlassesPrescriptionRow(data = it)
+        Spacer(DoubleVertSpacer)
+
+        if (isContacts) {
+            RenderEyeContactsPrescriptionHeaderRow()
             HorizontalDivider(thickness = DividerThickness)
+
+            contactsRightEye?.let {
+                RenderEyeContactsPrescriptionRow(data = it)
+                HorizontalDivider(thickness = DividerThickness)
+            }
+
+            contactsLeftEye?.let {
+                RenderEyeContactsPrescriptionRow(data = it)
+                HorizontalDivider(thickness = DividerThickness)
+            }
         }
 
         visionPrescription.prescriber?.reference?.let {
@@ -210,7 +339,7 @@ fun RenderEyeGlassesPrescriptionHeaderRow() {
         )
         VerticalDivider(thickness = DividerThickness)
         Text(
-            text = "Add",
+            text = "PD",
             textAlign = TextAlign.Right,
             modifier = Modifier.padding(4.dp).weight(1f),
         )
@@ -219,14 +348,15 @@ fun RenderEyeGlassesPrescriptionHeaderRow() {
 
 @Composable
 fun RenderEyeGlassesPrescriptionRow(data: LensSpecification) {
+    val numberFormat = DecimalFormat("##.00")
+    val pdFormat = DecimalFormat("##.0")
+    val integerFormat = DecimalFormat("###")
+
     Row(
         modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
         horizontalArrangement = Arrangement.Center,
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        val numberFormat = DecimalFormat("##.00")
-        val integerFormat = DecimalFormat("###")
-
         Text(
             text = data.eye?.capitalize() ?: "Unknown",
             modifier = Modifier.padding(4.dp).weight(1f),
@@ -249,11 +379,241 @@ fun RenderEyeGlassesPrescriptionRow(data: LensSpecification) {
         )
         VerticalDivider(thickness = DividerThickness)
         Text(
-            text = formatOrBlank(data.add, numberFormat),
+            text = formatOrBlank(data.pd, pdFormat),
             textAlign = TextAlign.Right,
             modifier = Modifier.padding(4.dp).weight(1f),
         )
     }
+
+    if (data.interAdd != null) {
+        Row(
+            modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
+            horizontalArrangement = Arrangement.Center,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                text = "",
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+            VerticalDivider(thickness = DividerThickness)
+
+            if (data.interAdd != null) {
+                Text(
+                    text = "Inter Add:",
+                    textAlign = TextAlign.Right,
+                    modifier = Modifier.padding(4.dp).weight(2f),
+                )
+
+                Text(
+                    text = formatOrBlank(data.interAdd, numberFormat),
+                    textAlign = TextAlign.Right,
+                    modifier = Modifier.padding(4.dp).weight(2f),
+                )
+            }
+        }
+    }
+
+    if (data.add != null) {
+        Row(
+            modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
+            horizontalArrangement = Arrangement.Center,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                text = "",
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+            VerticalDivider(thickness = DividerThickness)
+
+            if (data.add != null) {
+                Text(
+                    text = "Add:",
+                    textAlign = TextAlign.Right,
+                    modifier = Modifier.padding(4.dp).weight(2f),
+                )
+
+                Text(
+                    text = formatOrBlank(data.add, numberFormat),
+                    textAlign = TextAlign.Right,
+                    modifier = Modifier.padding(4.dp).weight(2f),
+                )
+            }
+        }
+    }
+
+    if (data.prism?.amount != null || data.prism?.base != null) {
+        Row(
+            modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
+            horizontalArrangement = Arrangement.Center,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                text = "",
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+            VerticalDivider(thickness = DividerThickness)
+
+            Text(
+                text = "Prism:",
+                textAlign = TextAlign.Right,
+                modifier = Modifier.padding(4.dp).weight(2f),
+            )
+
+            Text(
+                text = formatOrBlank(data.prism?.amount, numberFormat),
+                textAlign = TextAlign.Right,
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+
+            Text(
+                text = data.prism?.base ?: "",
+                textAlign = TextAlign.Right,
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+        }
+    }
+}
+
+@Composable
+fun RenderEyeContactsPrescriptionHeaderRow() {
+    Row(
+        modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
+        horizontalArrangement = Arrangement.SpaceBetween,
+    ) {
+        Text(
+            text = "Eye",
+            modifier = Modifier.padding(4.dp).weight(1f),
+        )
+        VerticalDivider(thickness = DividerThickness)
+        Text(
+            text = "Sph",
+            textAlign = TextAlign.Right,
+            modifier = Modifier.padding(4.dp).weight(1f),
+        )
+        Text(
+            text = "Cyl",
+            textAlign = TextAlign.Right,
+            modifier = Modifier.padding(4.dp).weight(1f),
+        )
+        Text(
+            text = "Axis",
+            textAlign = TextAlign.Right,
+            modifier = Modifier.padding(4.dp).weight(1f),
+        )
+    }
+}
+
+@Composable
+fun RenderEyeContactsPrescriptionRow(data: LensSpecification) {
+    val numberFormat = DecimalFormat("##.00")
+    val integerFormat = DecimalFormat("###")
+
+    Row(
+        modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
+        horizontalArrangement = Arrangement.Center,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = data.eye?.capitalize() ?: "Unknown",
+            modifier = Modifier.padding(4.dp).weight(1f),
+        )
+        VerticalDivider(thickness = DividerThickness)
+        Text(
+            text = formatOrBlank(data.sphere, numberFormat),
+            textAlign = TextAlign.Right,
+            modifier = Modifier.padding(4.dp).weight(1f),
+        )
+        Text(
+            text = formatOrBlank(data.cylinder, numberFormat),
+            textAlign = TextAlign.Right,
+            modifier = Modifier.padding(4.dp).weight(1f),
+        )
+        Text(
+            text = formatOrBlank(data.axis, integerFormat),
+            textAlign = TextAlign.Right,
+            modifier = Modifier.padding(4.dp).weight(1f),
+        )
+    }
+
+    if (data.backCurve != null || data.diameter != null) {
+        Row(
+            modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
+            horizontalArrangement = Arrangement.Center,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                text = "",
+                textAlign = TextAlign.Right,
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+            VerticalDivider(thickness = DividerThickness)
+            Text(
+                text = "",
+                textAlign = TextAlign.Right,
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+            Text(
+                text = "Curve:",
+                textAlign = TextAlign.Right,
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+            Text(
+                text = formatOrBlank(data.backCurve, numberFormat),
+                textAlign = TextAlign.Right,
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+        }
+    }
+
+    if (data.backCurve != null || data.diameter != null) {
+        Row(
+            modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
+            horizontalArrangement = Arrangement.Center,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                text = "",
+                textAlign = TextAlign.Right,
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+            VerticalDivider(thickness = DividerThickness)
+            Text(
+                text = "",
+                textAlign = TextAlign.Right,
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+            Text(
+                text = "Diameter:",
+                textAlign = TextAlign.Right,
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+            Text(
+                text = formatOrBlank(data.diameter, numberFormat),
+                textAlign = TextAlign.Right,
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+        }
+    }
+
+    if (data.brand != null) {
+        Row(
+            modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
+            horizontalArrangement = Arrangement.Center,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                text = "",
+                textAlign = TextAlign.Right,
+                modifier = Modifier.padding(4.dp).weight(1f),
+            )
+            VerticalDivider(thickness = DividerThickness)
+            Text(
+                text = data.brand ?: "",
+                textAlign = TextAlign.Right,
+                modifier = Modifier.padding(4.dp).weight(3f),
+            )
+        }
+    }
 }
 
 fun formatOrBlank(
@@ -261,6 +621,6 @@ fun formatOrBlank(
     numberFormat: NumberFormat,
 ): String {
     if (amount == null) return ""
-    if (Math.abs(amount) < 0.01) return ""
+    if (abs(amount) < 0.01) return ""
     return numberFormat.format(amount)
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt

@@ -88,7 +88,7 @@ fun AccountScreen(
                     modifier = Modifier.fillMaxSize(),
                     color = MaterialTheme.colorScheme.background,
                 ) {
-                    LoginOrSignupScreen(accountStateViewModel, isFirstLogin = true)
+                    LoginOrSignupScreen(null, accountStateViewModel, isFirstLogin = true)
                 }
             }
             is AccountState.LoggedIn -> {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt

@@ -27,15 +27,17 @@ import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.AccountInfo
 import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.LocalPreferences
+import com.vitorpamplona.amethyst.LocalPreferences.currentAccount
 import com.vitorpamplona.amethyst.model.AccountSettings
 import com.vitorpamplona.amethyst.model.DefaultChannels
 import com.vitorpamplona.amethyst.model.DefaultDMRelayList
 import com.vitorpamplona.amethyst.model.DefaultNIP65List
 import com.vitorpamplona.amethyst.model.DefaultSearchRelayList
 import com.vitorpamplona.amethyst.service.Nip05NostrAddressVerifier
+import com.vitorpamplona.amethyst.ui.tor.TorSettings
+import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
 import com.vitorpamplona.ammolite.relays.Client
 import com.vitorpamplona.ammolite.relays.Constants
-import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.crypto.CryptoUtils
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.Hex
@@ -92,8 +94,8 @@ class AccountStateViewModel : ViewModel() {
 
     suspend fun loginAndStartUI(
         key: String,
-        useProxy: Boolean,
-        proxyPort: Int,
+        torSettings: TorSettings,
+        transientAccount: Boolean,
         loginWithExternalSigner: Boolean = false,
         packageName: String = "",
     ) = withContext(Dispatchers.IO) {
@@ -108,11 +110,14 @@ class AccountStateViewModel : ViewModel() {
                 is Nip19Bech32.NEmbed -> null
                 is Nip19Bech32.NRelay -> null
                 is Nip19Bech32.NAddress -> null
-                else -> null
+                else ->
+                    try {
+                        if (loginWithExternalSigner) Hex.decode(key) else null
+                    } catch (e: Exception) {
+                        null
+                    }
             }
 
-        val proxy = HttpClientManager.initProxy(useProxy, "127.0.0.1", proxyPort)
-
         if (loginWithExternalSigner && pubKeyParsed == null) {
             throw Exception("Invalid key while trying to login with external signer")
         }
@@ -121,33 +126,33 @@ class AccountStateViewModel : ViewModel() {
             if (loginWithExternalSigner) {
                 AccountSettings(
                     keyPair = KeyPair(pubKey = pubKeyParsed),
+                    transientAccount = transientAccount,
                     externalSignerPackageName = packageName.ifBlank { "com.greenart7c3.nostrsigner" },
-                    proxy = proxy,
-                    proxyPort = proxyPort,
+                    torSettings = TorSettingsFlow.build(torSettings),
                 )
             } else if (key.startsWith("nsec")) {
                 AccountSettings(
                     keyPair = KeyPair(privKey = key.bechToBytes()),
-                    proxy = proxy,
-                    proxyPort = proxyPort,
+                    transientAccount = transientAccount,
+                    torSettings = TorSettingsFlow.build(torSettings),
                 )
             } else if (key.contains(" ") && CryptoUtils.isValidMnemonic(key)) {
                 AccountSettings(
                     keyPair = KeyPair(privKey = CryptoUtils.privateKeyFromMnemonic(key)),
-                    proxy = proxy,
-                    proxyPort = proxyPort,
+                    transientAccount = transientAccount,
+                    torSettings = TorSettingsFlow.build(torSettings),
                 )
             } else if (pubKeyParsed != null) {
                 AccountSettings(
                     keyPair = KeyPair(pubKey = pubKeyParsed),
-                    proxy = proxy,
-                    proxyPort = proxyPort,
+                    transientAccount = transientAccount,
+                    torSettings = TorSettingsFlow.build(torSettings),
                 )
             } else {
                 AccountSettings(
                     keyPair = KeyPair(Hex.decode(key)),
-                    proxy = proxy,
-                    proxyPort = proxyPort,
+                    transientAccount = transientAccount,
+                    torSettings = TorSettingsFlow.build(torSettings),
                 )
             }
 
@@ -192,8 +197,8 @@ class AccountStateViewModel : ViewModel() {
     fun login(
         key: String,
         password: String,
-        useProxy: Boolean,
-        proxyPort: Int,
+        torSettings: TorSettings,
+        transientAccount: Boolean,
         loginWithExternalSigner: Boolean = false,
         packageName: String = "",
         onError: (String?) -> Unit,
@@ -213,72 +218,69 @@ class AccountStateViewModel : ViewModel() {
                     onError("Could not decrypt key with provided password")
                     Log.e("Login", "Could not decrypt ncryptsec")
                 } else {
-                    loginSync(newKey, useProxy, proxyPort, loginWithExternalSigner, packageName) {
-                        onError(null)
-                    }
+                    loginSync(newKey, torSettings, transientAccount, loginWithExternalSigner, packageName, onError)
                 }
             } else if (EMAIL_PATTERN.matcher(key).matches()) {
                 Nip05NostrAddressVerifier().verifyNip05(
                     key,
+                    forceProxy = { false },
                     onSuccess = { publicKey ->
-                        loginSync(Hex.decode(publicKey).toNpub(), useProxy, proxyPort, loginWithExternalSigner, packageName) {
-                            onError(null)
-                        }
+                        loginSync(Hex.decode(publicKey).toNpub(), torSettings, transientAccount, loginWithExternalSigner, packageName, onError)
                     },
                     onError = {
                         onError(it)
                     },
                 )
             } else {
-                loginSync(key, useProxy, proxyPort, loginWithExternalSigner, packageName) {
-                    onError(null)
-                }
+                loginSync(key, torSettings, transientAccount, loginWithExternalSigner, packageName, onError)
             }
         }
     }
 
     fun login(
         key: String,
-        useProxy: Boolean,
-        proxyPort: Int,
+        torSettings: TorSettings,
+        transientAccount: Boolean,
         loginWithExternalSigner: Boolean = false,
         packageName: String = "",
-        onError: () -> Unit,
+        onError: (String) -> Unit,
     ) {
         viewModelScope.launch(Dispatchers.IO) {
-            loginSync(key, useProxy, proxyPort, loginWithExternalSigner, packageName, onError)
+            loginSync(key, torSettings, transientAccount, loginWithExternalSigner, packageName, onError)
         }
     }
 
     suspend fun loginSync(
         key: String,
-        useProxy: Boolean,
-        proxyPort: Int,
+        torSettings: TorSettings,
+        transientAccount: Boolean,
         loginWithExternalSigner: Boolean = false,
         packageName: String = "",
-        onError: () -> Unit,
+        onError: (String) -> Unit,
     ) {
         try {
-            loginAndStartUI(key, useProxy, proxyPort, loginWithExternalSigner, packageName)
+            loginAndStartUI(key, torSettings, transientAccount, loginWithExternalSigner, packageName)
         } catch (e: Exception) {
             if (e is CancellationException) throw e
             Log.e("Login", "Could not sign in", e)
-            onError()
+            onError("Could not sign in: " + e.message)
         }
     }
 
     fun newKey(
-        useProxy: Boolean,
-        proxyPort: Int,
+        torSettings: TorSettings,
         name: String? = null,
     ) {
         viewModelScope.launch(Dispatchers.IO) {
+            _accountContent.update { AccountState.Loading }
+
             val keyPair = KeyPair()
             val tempSigner = NostrSignerSync(keyPair)
 
             val accountSettings =
                 AccountSettings(
                     keyPair = keyPair,
+                    transientAccount = false,
                     backupUserMetadata = MetadataEvent.newUser(name, tempSigner),
                     backupContactList =
                         ContactListEvent.createFromScratch(
@@ -293,8 +295,7 @@ class AccountStateViewModel : ViewModel() {
                     backupNIP65RelayList = AdvertisedRelayListEvent.create(DefaultNIP65List, tempSigner),
                     backupDMRelayList = ChatMessageRelayListEvent.create(DefaultDMRelayList, tempSigner),
                     backupSearchRelayList = SearchRelayListEvent.create(DefaultSearchRelayList, tempSigner),
-                    proxy = HttpClientManager.initProxy(useProxy, "127.0.0.1", proxyPort),
-                    proxyPort = proxyPort,
+                    torSettings = TorSettingsFlow.build(torSettings),
                 )
 
             // saves to local preferences
@@ -321,11 +322,30 @@ class AccountStateViewModel : ViewModel() {
         }
     }
 
+    fun currentAccount() =
+        when (val state = _accountContent.value) {
+            is AccountState.LoggedIn ->
+                state.accountSettings.keyPair.pubKey
+                    .toNpub()
+
+            is AccountState.LoggedInViewOnly ->
+                state.accountSettings.keyPair.pubKey
+                    .toNpub()
+
+            else -> null
+        }
+
     fun logOff(accountInfo: AccountInfo) {
         viewModelScope.launch(Dispatchers.IO) {
-            prepareLogoutOrSwitch()
-            LocalPreferences.updatePrefsForLogout(accountInfo)
-            tryLoginExistingAccount()
+            if (accountInfo.npub == currentAccount()) {
+                // log off and relogin with the 0 account
+                prepareLogoutOrSwitch()
+                LocalPreferences.updatePrefsForLogout(accountInfo)
+                tryLoginExistingAccount()
+            } else {
+                // delete without login off
+                LocalPreferences.updatePrefsForLogout(accountInfo)
+            }
         }
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt

@@ -260,6 +260,8 @@ abstract class FeedViewModel(
     InvalidatableContent {
     val feedState = FeedContentState(localFilter, viewModelScope)
 
+    override val isRefreshing = feedState.isRefreshing
+
     fun sendToTop() = feedState.sendToTop()
 
     suspend fun sentToTop() = feedState.sentToTop()

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/SharedPreferencesViewModel.kt

@@ -22,6 +22,7 @@ package com.vitorpamplona.amethyst.ui.screen
 
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.derivedStateOf
@@ -31,6 +32,7 @@ import androidx.compose.runtime.setValue
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.window.layout.DisplayFeature
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.model.BooleanType
@@ -240,3 +242,10 @@ class SharedPreferencesViewModel : ViewModel() {
         }
     }
 }
+
+@Composable
+fun mockSharedPreferencesViewModel(): SharedPreferencesViewModel {
+    val sharedPreferencesViewModel: SharedPreferencesViewModel = viewModel()
+    sharedPreferencesViewModel.init()
+    return sharedPreferencesViewModel
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt

@@ -21,6 +21,7 @@
 package com.vitorpamplona.amethyst.ui.screen
 
 import android.util.Log
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
@@ -107,19 +108,27 @@ open class UserFeedViewModel(
         viewModelScope.launch(Dispatchers.Default) { refreshSuspended() }
     }
 
+    override val isRefreshing: MutableState<Boolean> = mutableStateOf(false)
+
     private fun refreshSuspended() {
         checkNotInMainThread()
 
-        val notes = dataSource.loadTop().toImmutableList()
+        try {
+            isRefreshing.value = true
 
-        val oldNotesState = _feedContent.value
-        if (oldNotesState is UserFeedState.Loaded) {
-            // Using size as a proxy for has changed.
-            if (!equalImmutableLists(notes, oldNotesState.feed.value)) {
+            val notes = dataSource.loadTop().toImmutableList()
+
+            val oldNotesState = _feedContent.value
+            if (oldNotesState is UserFeedState.Loaded) {
+                // Using size as a proxy for has changed.
+                if (!equalImmutableLists(notes, oldNotesState.feed.value)) {
+                    updateFeed(notes)
+                }
+            } else {
                 updateFeed(notes)
             }
-        } else {
-            updateFeed(notes)
+        } finally {
+            isRefreshing.value = false
         }
     }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt

@@ -26,7 +26,6 @@ import android.util.Log
 import android.util.LruCache
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
@@ -69,6 +68,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.CardFeedState
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.CombinedZap
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.showAmountAxis
 import com.vitorpamplona.amethyst.ui.stringRes
+import com.vitorpamplona.amethyst.ui.tor.TorSettings
 import com.vitorpamplona.ammolite.relays.BundledInsert
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.ATag
@@ -708,6 +708,7 @@ class AccountViewModel(
                     message = message,
                     context = context,
                     showErrorIfNoLnAddress = showErrorIfNoLnAddress,
+                    forceProxy = account::shouldUseTorForMoneyOperations,
                     onError = onError,
                     onProgress = {
                         onProgress(it)
@@ -956,7 +957,9 @@ class AccountViewModel(
         url: String,
         onResult: suspend (UrlPreviewState) -> Unit,
     ) {
-        viewModelScope.launch(Dispatchers.IO) { UrlCachedPreviewer.previewInfo(url, onResult) }
+        viewModelScope.launch(Dispatchers.IO) {
+            UrlCachedPreviewer.previewInfo(url, account.shouldUseTorForPreviewUrl(url), onResult)
+        }
     }
 
     suspend fun loadReactionTo(note: Note?): String? {
@@ -976,6 +979,7 @@ class AccountViewModel(
             Nip05NostrAddressVerifier()
                 .verifyNip05(
                     nip05,
+                    forceProxy = account::shouldUseTorForNIP05,
                     onSuccess = {
                         // Marks user as verified
                         if (it == pubkeyHex) {
@@ -1008,7 +1012,12 @@ class AccountViewModel(
         onError: (String, Nip11Retriever.ErrorCode, String?) -> Unit,
     ) {
         viewModelScope.launch(Dispatchers.IO) {
-            Nip11CachedRetriever.loadRelayInfo(dirtyUrl, onInfo, onError)
+            Nip11CachedRetriever.loadRelayInfo(
+                dirtyUrl,
+                account.shouldUseTorForDirty(dirtyUrl),
+                onInfo,
+                onError,
+            )
         }
     }
 
@@ -1157,11 +1166,13 @@ class AccountViewModel(
         }
     }
 
-    fun checkIsOnline(
-        media: String?,
+    fun checkVideoIsOnline(
+        videoUrl: String,
         onDone: (Boolean) -> Unit,
     ) {
-        viewModelScope.launch(Dispatchers.IO) { onDone(OnlineChecker.isOnline(media)) }
+        viewModelScope.launch(Dispatchers.IO) {
+            onDone(OnlineChecker.isOnline(videoUrl, account.shouldUseTorForVideoDownload(videoUrl)))
+        }
     }
 
     fun loadAndMarkAsRead(
@@ -1222,13 +1233,12 @@ class AccountViewModel(
         }
     }
 
-    fun enableTor(
-        checked: Boolean,
-        portNumber: MutableState<String>,
-    ) {
+    fun setTorSettings(newTorSettings: TorSettings) {
         viewModelScope.launch(Dispatchers.IO) {
-            account.settings.updateProxy(checked, portNumber.value)
-            Amethyst.instance.serviceManager.forceRestart()
+            // Only restart relay connections if port or type changes
+            if (account.settings.setTorSettings(newTorSettings)) {
+                Amethyst.instance.serviceManager.forceRestart()
+            }
         }
     }
 
@@ -1350,6 +1360,7 @@ class AccountViewModel(
                     .melt(
                         token,
                         lud16,
+                        forceProxy = account::shouldUseTorForMoneyOperations,
                         onSuccess = { title, message -> onDone(title, message) },
                         onError = { title, message -> onDone(title, message) },
                         context,
@@ -1535,6 +1546,7 @@ class AccountViewModel(
                         milliSats,
                         message,
                         null,
+                        forceProxy = account::shouldUseTorForMoneyOperations,
                         onSuccess = onSuccess,
                         onError = onError,
                         onProgress = onProgress,
@@ -1549,6 +1561,7 @@ class AccountViewModel(
                             milliSats,
                             message,
                             zapRequest.toJson(),
+                            forceProxy = account::shouldUseTorForMoneyOperations,
                             onSuccess = onSuccess,
                             onError = onError,
                             onProgress = onProgress,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ConnectOrbotDialog.kt

@@ -1,183 +0,0 @@
-/**
- * Copyright (c) 2024 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.ui.screen.loggedIn
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import com.halilibo.richtext.commonmark.CommonmarkAstNodeParser
-import com.halilibo.richtext.commonmark.MarkdownParseOptions
-import com.halilibo.richtext.markdown.BasicMarkdown
-import com.halilibo.richtext.ui.material3.RichText
-import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.ui.actions.CloseButton
-import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
-import com.vitorpamplona.amethyst.ui.theme.RichTextDefaults
-import com.vitorpamplona.amethyst.ui.theme.placeholderText
-import kotlinx.coroutines.CancellationException
-
-@Composable
-fun ConnectOrbotDialog(
-    onClose: () -> Unit,
-    onPost: () -> Unit,
-    onError: (String) -> Unit,
-    portNumber: MutableState<String>,
-) {
-    Dialog(
-        onDismissRequest = onClose,
-        properties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false),
-    ) {
-        Surface {
-            Column(
-                modifier = Modifier.padding(10.dp),
-            ) {
-                Row(
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.fillMaxWidth(),
-                ) {
-                    CloseButton(onPress = { onClose() })
-
-                    val toastMessage = stringRes(R.string.invalid_port_number)
-
-                    UseOrbotButton(
-                        onPost = {
-                            try {
-                                Integer.parseInt(portNumber.value)
-                            } catch (e: Exception) {
-                                if (e is CancellationException) throw e
-                                onError(toastMessage)
-                                return@UseOrbotButton
-                            }
-
-                            onPost()
-                        },
-                        isActive = true,
-                    )
-                }
-
-                Column(
-                    modifier = Modifier.padding(30.dp),
-                ) {
-                    val myMarkDownStyle =
-                        RichTextDefaults.copy(
-                            stringStyle =
-                                RichTextDefaults.stringStyle?.copy(
-                                    linkStyle =
-                                        SpanStyle(
-                                            textDecoration = TextDecoration.Underline,
-                                            color = MaterialTheme.colorScheme.primary,
-                                        ),
-                                ),
-                        )
-
-                    Row {
-                        val content1 = stringRes(R.string.connect_through_your_orbot_setup_markdown)
-
-                        val astNode1 =
-                            remember {
-                                CommonmarkAstNodeParser(MarkdownParseOptions.MarkdownWithLinks).parse(content1)
-                            }
-
-                        RichText(
-                            style = myMarkDownStyle,
-                            renderer = null,
-                        ) {
-                            BasicMarkdown(astNode1)
-                        }
-                    }
-
-                    Spacer(modifier = Modifier.height(15.dp))
-
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.Center,
-                    ) {
-                        OutlinedTextField(
-                            value = portNumber.value,
-                            onValueChange = { portNumber.value = it },
-                            keyboardOptions =
-                                KeyboardOptions.Default.copy(
-                                    capitalization = KeyboardCapitalization.None,
-                                    keyboardType = KeyboardType.Number,
-                                ),
-                            label = { Text(text = stringRes(R.string.orbot_socks_port)) },
-                            placeholder = {
-                                Text(
-                                    text = "9050",
-                                    color = MaterialTheme.colorScheme.placeholderText,
-                                )
-                            },
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun UseOrbotButton(
-    onPost: () -> Unit = {},
-    isActive: Boolean,
-    modifier: Modifier = Modifier,
-) {
-    Button(
-        modifier = modifier,
-        onClick = {
-            if (isActive) {
-                onPost()
-            }
-        },
-        shape = ButtonBorder,
-        colors =
-            ButtonDefaults.buttonColors(
-                containerColor = if (isActive) MaterialTheme.colorScheme.primary else Color.Gray,
-            ),
-    ) {
-        Text(text = stringRes(R.string.use_orbot), color = Color.White)
-    }
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChannelFabColumn.kt

@@ -20,6 +20,12 @@
  */
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -38,6 +44,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
@@ -76,46 +83,56 @@ fun ChannelFabColumn(
     }
 
     Column {
-        if (isOpen) {
-            FloatingActionButton(
-                onClick = {
-                    wantsToSendNewMessage = true
-                    isOpen = false
-                },
-                modifier = Size55Modifier,
-                shape = CircleShape,
-                containerColor = MaterialTheme.colorScheme.primary,
-            ) {
-                Text(
-                    text = stringRes(R.string.messages_new_message),
-                    color = Color.White,
-                    textAlign = TextAlign.Center,
-                    fontSize = Font12SP,
-                )
+        AnimatedVisibility(
+            visible = isOpen,
+            enter = slideInVertically(initialOffsetY = { it / 2 }) + fadeIn(),
+            exit = slideOutVertically(targetOffsetY = { it / 2 }) + fadeOut(),
+        ) {
+            Column {
+                FloatingActionButton(
+                    onClick = {
+                        wantsToSendNewMessage = true
+                        isOpen = false
+                    },
+                    modifier = Size55Modifier,
+                    shape = CircleShape,
+                    containerColor = MaterialTheme.colorScheme.primary,
+                ) {
+                    Text(
+                        text = stringRes(R.string.messages_new_message),
+                        color = Color.White,
+                        textAlign = TextAlign.Center,
+                        fontSize = Font12SP,
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(20.dp))
+
+                FloatingActionButton(
+                    onClick = {
+                        wantsToCreateChannel = true
+                        isOpen = false
+                    },
+                    modifier = Size55Modifier,
+                    shape = CircleShape,
+                    containerColor = MaterialTheme.colorScheme.primary,
+                ) {
+                    Text(
+                        text = stringRes(R.string.messages_create_public_chat),
+                        color = Color.White,
+                        textAlign = TextAlign.Center,
+                        fontSize = Font12SP,
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(20.dp))
             }
-
-            Spacer(modifier = Modifier.height(20.dp))
-
-            FloatingActionButton(
-                onClick = {
-                    wantsToCreateChannel = true
-                    isOpen = false
-                },
-                modifier = Size55Modifier,
-                shape = CircleShape,
-                containerColor = MaterialTheme.colorScheme.primary,
-            ) {
-                Text(
-                    text = stringRes(R.string.messages_create_public_chat),
-                    color = Color.White,
-                    textAlign = TextAlign.Center,
-                    fontSize = Font12SP,
-                )
-            }
-
-            Spacer(modifier = Modifier.height(20.dp))
         }
 
+        val rotationDegree by animateFloatAsState(
+            targetValue = if (isOpen) 45f else 0f,
+        )
+
         FloatingActionButton(
             onClick = { isOpen = !isOpen },
             modifier = Size55Modifier,
@@ -125,7 +142,10 @@ fun ChannelFabColumn(
             Icon(
                 imageVector = Icons.Outlined.Add,
                 contentDescription = stringRes(R.string.messages_create_public_private_chat_description),
-                modifier = Modifier.size(26.dp),
+                modifier =
+                    Modifier.size(26.dp).graphicsLayer {
+                        rotationZ = rotationDegree
+                    },
                 tint = Color.White,
             )
         }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChannelScreen.kt

@@ -140,7 +140,7 @@ import com.vitorpamplona.amethyst.ui.note.timeAgoShort
 import com.vitorpamplona.amethyst.ui.screen.NostrChannelFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.DisappearingScaffold
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.CrossfadeCheckIfUrlIsOnline
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.CrossfadeCheckIfVideoIsOnline
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.equalImmutableLists
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
@@ -769,7 +769,7 @@ fun ShowVideoStreaming(
                 val url = remember(streamingInfo) { event.streaming() }
 
                 url?.let {
-                    CrossfadeCheckIfUrlIsOnline(url, accountViewModel) {
+                    CrossfadeCheckIfVideoIsOnline(url, accountViewModel) {
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
                             horizontalArrangement = Arrangement.Center,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomMessageCompose.kt

@@ -532,6 +532,7 @@ private fun RenderReply(
     onWantsToEditDraft: (Note) -> Unit,
 ) {
     Row(verticalAlignment = Alignment.CenterVertically) {
+        @Suppress("ProduceStateDoesNotAssignValue")
         val replyTo =
             produceState(initialValue = note.replyTo?.lastOrNull()) {
                 accountViewModel.unwrapIfNeeded(value) {
@@ -776,7 +777,7 @@ fun UserDisplayNameLayout(
     picture: @Composable () -> Unit,
     name: @Composable () -> Unit,
 ) {
-    Box(chatAuthorBox, contentAlignment = Alignment.Center) {
+    Box(chatAuthorBox, contentAlignment = Alignment.TopEnd) {
         picture()
     }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/HomeScreen.kt

@@ -63,7 +63,6 @@ import com.vitorpamplona.amethyst.ui.feeds.rememberForeverPagerState
 import com.vitorpamplona.amethyst.ui.navigation.AppBottomBar
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.navigation.Route
-import com.vitorpamplona.amethyst.ui.note.UpdateZapAmountDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.DisappearingScaffold
 import com.vitorpamplona.amethyst.ui.stringRes
@@ -78,10 +77,7 @@ import kotlinx.coroutines.launch
 fun HomeScreen(
     accountViewModel: AccountViewModel,
     nav: INav,
-    nip47: String? = null,
 ) {
-    ResolveNIP47(nip47, accountViewModel)
-
     HomeScreen(
         newThreadsFeedState = accountViewModel.feedStates.homeNewThreads,
         repliesFeedState = accountViewModel.feedStates.homeReplies,
@@ -139,18 +135,6 @@ private fun AssembleHomeTabs(
     inner(pagerState, tabs)
 }
 
-@Composable
-fun ResolveNIP47(
-    nip47: String?,
-    accountViewModel: AccountViewModel,
-) {
-    var wantsToAddNip47 by remember(nip47) { mutableStateOf(nip47) }
-
-    if (wantsToAddNip47 != null) {
-        UpdateZapAmountDialog({ wantsToAddNip47 = null }, wantsToAddNip47, accountViewModel)
-    }
-}
-
 @Composable
 private fun WatchLifeCycleChanges(accountViewModel: AccountViewModel) {
     val lifeCycleOwner = LocalLifecycleOwner.current
@@ -169,7 +153,6 @@ private fun WatchLifeCycleChanges(accountViewModel: AccountViewModel) {
 }
 
 @Composable
-@OptIn(ExperimentalFoundationApi::class)
 private fun HomePages(
     pagerState: PagerState,
     tabs: ImmutableList<TabItem>,
@@ -273,7 +256,7 @@ fun HomeFeedEmpty(onRefresh: () -> Unit) {
 }
 
 @Composable
-fun CheckIfUrlIsOnline(
+fun CheckIfVideoIsOnline(
     url: String,
     accountViewModel: AccountViewModel,
     whenOnline: @Composable (Boolean) -> Unit,
@@ -285,7 +268,7 @@ fun CheckIfUrlIsOnline(
     }
 
     LaunchedEffect(key1 = url) {
-        accountViewModel.checkIsOnline(url) { isOnline ->
+        accountViewModel.checkVideoIsOnline(url) { isOnline ->
             if (online != isOnline) {
                 online = isOnline
             }
@@ -296,7 +279,7 @@ fun CheckIfUrlIsOnline(
 }
 
 @Composable
-fun CrossfadeCheckIfUrlIsOnline(
+fun CrossfadeCheckIfVideoIsOnline(
     url: String,
     accountViewModel: AccountViewModel,
     whenOnline: @Composable () -> Unit,
@@ -308,7 +291,7 @@ fun CrossfadeCheckIfUrlIsOnline(
     }
 
     LaunchedEffect(key1 = url) {
-        accountViewModel.checkIsOnline(url) { isOnline ->
+        accountViewModel.checkVideoIsOnline(url) { isOnline ->
             if (online != isOnline) {
                 online = isOnline
             }