Merge branch 'vitorpamplona:main' into profiles-list-management

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

@@ -117,10 +117,11 @@ class Amethyst : Application() {
     // Connects the NostrClient class with okHttp
     val websocketBuilder =
         OkHttpWebSocket.Builder { url ->
+            val useTor = torProxySettingsAnchor.useProxy(url)
             if (torProxySettingsAnchor.isDM(url)) {
-                okHttpClientForRelaysForDms.getHttpClient(torProxySettingsAnchor.useProxy(url))
+                okHttpClientForRelaysForDms.getHttpClient(useTor)
             } else {
-                okHttpClientForRelays.getHttpClient(torProxySettingsAnchor.useProxy(url))
+                okHttpClientForRelays.getHttpClient(useTor)
             }
         }
 

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

@@ -341,7 +341,14 @@ fun UpdateZapAmountContent(
 
             IconButton(
                 onClick = {
-                    clipboardManager.getText()?.let { postViewModel.copyFromClipboard(it.text) }
+                    val uri = clipboardManager.getText()?.text
+                    try {
+                        uri?.let {
+                            postViewModel.copyFromClipboard(it)
+                        }
+                    } catch (e: IllegalArgumentException) {
+                        accountViewModel.toastManager.toast(R.string.invalid_nip47_uri_title, R.string.invalid_nip47_uri_description)
+                    }
                 },
             ) {
                 Icon(

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

@@ -1485,7 +1485,7 @@ class AccountViewModel(
         dvmPublicKey: User,
         onReady: (event: Note) -> Unit,
     ) {
-        viewModelScope.launch(Dispatchers.IO) {
+        runIOCatching {
             account.requestDVMContentDiscovery(dvmPublicKey) {
                 onReady(LocalCache.getOrCreateNote(it.id))
             }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorSettings.kt

@@ -27,7 +27,7 @@ class TorSettings(
     val externalSocksPort: Int = 9050,
     val onionRelaysViaTor: Boolean = true,
     val dmRelaysViaTor: Boolean = true,
-    val newRelaysViaTor: Boolean = true,
+    val newRelaysViaTor: Boolean = false,
     val trustedRelaysViaTor: Boolean = false,
     val urlPreviewsViaTor: Boolean = false,
     val profilePicsViaTor: Boolean = false,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorSettingsFlow.kt

@@ -27,7 +27,7 @@ class TorSettingsFlow(
     val externalSocksPort: MutableStateFlow<Int> = MutableStateFlow(9050),
     val onionRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
     val dmRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
-    val newRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
+    val newRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
     val trustedRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
     val urlPreviewsViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
     val profilePicsViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),

amethyst/src/main/res/values/strings.xml

@@ -787,6 +787,10 @@
 
     <string name="paste_from_clipboard">Paste from clipboard</string>
 
+    <string name="invalid_nip47_uri_title">Invalid NIP-47 URI</string>
+    <string name="invalid_nip47_uri_description">The URI %1$s is not a valid NIP-47 login URI.</string>
+
+
     <string name="language_description">For the App\'s Interface</string>
     <string name="theme_description">Dark, Light or System theme</string>
     <string name="automatically_load_images_gifs_description">Automatically load images and GIFs</string>

quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/MetadataEvent.kt

@@ -117,7 +117,7 @@ class MetadataEvent(
             lnURL?.let { addIfNotBlank(currentMetadata, Lud06Tag.TAG_NAME, it.trim()) }
 
             return eventTemplate(KIND, currentMetadata.toString(), createdAt) {
-                alt("User profile for ${currentMetadata.get("name").asText() ?: "Anonymous"}")
+                alt("User profile for ${currentMetadata.get("name")?.asText() ?: "Anonymous"}")
 
                 // For https://github.com/nostr-protocol/nips/pull/1770
                 currentMetadata.get(NameTag.TAG_NAME)?.asText()?.let { name(it) }
@@ -132,7 +132,7 @@ class MetadataEvent(
                 currentMetadata.get(Lud06Tag.TAG_NAME)?.asText()?.let { lud06(it) }
 
                 twitter?.let { twitterClaim(it) }
-                    ?: mastodon?.let { mastodonClaim(it) }
+                mastodon?.let { mastodonClaim(it) }
                 github?.let { githubClaim(it) }
 
                 initializer()

quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/Response.kt

@@ -37,9 +37,9 @@ class PayInvoiceSuccessResponse(
     val result: PayInvoiceResultParams? = null,
 ) : Response("pay_invoice") {
     class PayInvoiceResultParams(
-        val preimage: String,
+        val preimage: String? = null,
     ) {
-        fun countMemory(): Long = pointerSizeInBytes + preimage.bytesUsedInMemory()
+        fun countMemory(): Long = pointerSizeInBytes + (preimage?.bytesUsedInMemory() ?: 0)
     }
 
     override fun countMemory(): Long = pointerSizeInBytes + (result?.countMemory() ?: 0)
@@ -49,8 +49,8 @@ class PayInvoiceErrorResponse(
     val error: PayInvoiceErrorParams? = null,
 ) : Response("pay_invoice") {
     class PayInvoiceErrorParams(
-        val code: ErrorType?,
+        val code: ErrorType? = null,
-        val message: String?,
+        val message: String? = null,
     ) {
         fun countMemory(): Long = pointerSizeInBytes + pointerSizeInBytes + (message?.bytesUsedInMemory() ?: 0)
     }