Moves Wallet Connect to Quartz

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

@@ -33,7 +33,6 @@ import com.vitorpamplona.amethyst.model.DefaultReactions
 import com.vitorpamplona.amethyst.model.DefaultZapAmounts
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
-import com.vitorpamplona.amethyst.model.Nip47URI
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.model.Settings
 import com.vitorpamplona.amethyst.model.ThemeType
@@ -44,6 +43,7 @@ import com.vitorpamplona.amethyst.service.HttpClientManager
 import com.vitorpamplona.amethyst.service.Nip96MediaServers
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.quartz.crypto.KeyPair
+import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
 import com.vitorpamplona.quartz.encoders.hexToByteArray
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.encoders.toNpub
@@ -523,7 +523,7 @@ object LocalPreferences {
                 val zapPaymentRequestServer =
                     try {
                         getString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, null)?.let {
-                            Event.mapper.readValue<Nip47URI?>(it)
+                            Event.mapper.readValue<Nip47WalletConnect.Nip47URI?>(it)
                         }
                     } catch (e: Throwable) {
                         if (e is CancellationException) throw e

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

@@ -44,6 +44,7 @@ import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
 import com.vitorpamplona.quartz.encoders.hexToByteArray
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.events.BookmarkListEvent
@@ -172,7 +173,7 @@ class Account(
     var defaultStoriesFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
     var defaultNotificationFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
     var defaultDiscoveryFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
-    var zapPaymentRequest: Nip47URI? = null,
+    var zapPaymentRequest: Nip47WalletConnect.Nip47URI? = null,
     var hideDeleteRequestDialog: Boolean = false,
     var hideBlockAlertDialog: Boolean = false,
     var hideNIP24WarningDialog: Boolean = false,
@@ -2038,7 +2039,7 @@ class Account(
         saveable.invalidateData()
     }
 
-    fun changeZapPaymentRequest(newServer: Nip47URI?) {
+    fun changeZapPaymentRequest(newServer: Nip47WalletConnect.Nip47URI?) {
         zapPaymentRequest = newServer
         live.invalidateData()
         saveable.invalidateData()

app/src/main/java/com/vitorpamplona/amethyst/model/Nip47URI.kt

@@ -1,25 +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.model
-
-import com.vitorpamplona.quartz.encoders.HexKey
-
-data class Nip47URI(val pubKeyHex: HexKey, val relayUri: String?, val secret: HexKey?)

app/src/main/java/com/vitorpamplona/amethyst/service/Nip47WalletConnectParser.kt

@@ -1,55 +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.note
-
-import android.net.Uri
-import com.vitorpamplona.amethyst.model.Nip47URI
-import com.vitorpamplona.quartz.encoders.decodePublicKey
-import com.vitorpamplona.quartz.encoders.toHexKey
-import kotlinx.coroutines.CancellationException
-
-// Rename to the corect nip number when ready.
-object Nip47WalletConnectParser {
-    fun parse(uri: String): Nip47URI {
-        // nostrwalletconnect://b889ff5b1513b641e2a139f661a661364979c5beee91842f8f0ef42ab558e9d4?relay=wss%3A%2F%2Frelay.damus.io&metadata=%7B%22name%22%3A%22Example%22%7D
-
-        val url = Uri.parse(uri)
-
-        if (url.scheme != "nostrwalletconnect" && url.scheme != "nostr+walletconnect") {
-            throw IllegalArgumentException("Not a Wallet Connect QR Code")
-        }
-
-        val pubkey = url.host ?: throw IllegalArgumentException("Hostname cannot be null")
-
-        val pubkeyHex =
-            try {
-                decodePublicKey(pubkey).toHexKey()
-            } catch (e: Exception) {
-                if (e is CancellationException) throw e
-                throw IllegalArgumentException("Hostname is not a valid Nostr Pubkey")
-            }
-
-        val relay = url.getQueryParameter("relay")
-        val secret = url.getQueryParameter("secret")
-
-        return Nip47URI(pubkeyHex, relay, secret)
-    }
-}

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

@@ -52,12 +52,12 @@ import com.vitorpamplona.amethyst.ui.components.DEFAULT_MUTED_SETTING
 import com.vitorpamplona.amethyst.ui.components.keepPlayingMutex
 import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.navigation.debugState
-import com.vitorpamplona.amethyst.ui.note.Nip47WalletConnectParser
 import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.SharedPreferencesViewModel
 import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
 import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ChannelMetadataEvent
@@ -341,7 +341,7 @@ fun uriToRoute(uri: String?): String? {
         }
             ?: try {
                 uri?.let {
-                    Nip47WalletConnectParser.parse(it)
+                    Nip47WalletConnect.parse(it)
                     val encodedUri = URLEncoder.encode(it, StandardCharsets.UTF_8.toString())
                     Route.Home.base + "?nip47=" + encodedUri
                 }

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

@@ -87,7 +87,6 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.Nip47URI
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.actions.SaveButton
 import com.vitorpamplona.amethyst.ui.qrcode.SimpleQrCodeScanner
@@ -99,6 +98,7 @@ import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
 import com.vitorpamplona.quartz.encoders.decodePublicKey
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.events.LnZapEvent
@@ -176,7 +176,7 @@ class UpdateZapAmountViewModel(val account: Account) : ViewModel() {
 
             if (pubkeyHex != null) {
                 account?.changeZapPaymentRequest(
-                    Nip47URI(
+                    Nip47WalletConnect.Nip47URI(
                         pubkeyHex,
                         relayUrl,
                         privKeyHex,
@@ -207,7 +207,7 @@ class UpdateZapAmountViewModel(val account: Account) : ViewModel() {
     }
 
     fun updateNIP47(uri: String) {
-        val contact = Nip47WalletConnectParser.parse(uri)
+        val contact = Nip47WalletConnect.parse(uri)
         if (contact != null) {
             walletConnectPubkey = TextFieldValue(contact.pubKeyHex)
             walletConnectRelay = TextFieldValue(contact.relayUri ?: "")