v0.77.0

New Crowdin Translations

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,32 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 34
-        versionCode 296
-        versionName "0.76.2"
+        versionCode 297
+        versionName "0.77.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt

@@ -2,7 +2,8 @@ package com.vitorpamplona.amethyst.service.notifications
 
 import com.vitorpamplona.amethyst.AccountInfo
 
-class PushNotificationUtils {
-    fun init(accounts: List<AccountInfo>) {
+object PushNotificationUtils {
+    var hasInit: Boolean = true
+    suspend fun init(accounts: List<AccountInfo>) {
     }
 }

app/src/main/AndroidManifest.xml

@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools">
     <queries>
         <package android:name="org.torproject.android"/>
+        <package android:name="com.greenart7c3.nostrsigner"/>
+        <package android:name="com.greenart7c3.nostrsigner.debug"/>
     </queries>
 
     <!-- Doesn't require a camera -->

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

@@ -35,7 +35,8 @@ private const val DEBUG_PREFERENCES_NAME = "debug_prefs"
 @Immutable
 data class AccountInfo(
     val npub: String,
-    val hasPrivKey: Boolean = false
+    val hasPrivKey: Boolean,
+    val loggedInWithExternalSigner: Boolean
 )
 
 private object PrefKeys {
@@ -74,6 +75,7 @@ private object PrefKeys {
     const val THEME = "theme"
     const val PREFERRED_LANGUAGE = "preferred_Language"
     const val AUTOMATICALLY_LOAD_URL_PREVIEW = "automatically_load_url_preview"
+    const val LOGIN_WITH_EXTERNAL_SIGNER = "login_with_external_signer"
     val LAST_READ: (String) -> String = { route -> "last_read_route_$route" }
 }
 
@@ -82,7 +84,7 @@ object LocalPreferences {
 
     private var _currentAccount: String? = null
 
-    private fun currentAccount(): String? {
+    fun currentAccount(): String? {
         if (_currentAccount == null) {
             _currentAccount = encryptedPreferences().getString(PrefKeys.CURRENT_ACCOUNT, null)
         }
@@ -201,7 +203,11 @@ object LocalPreferences {
 
     fun allSavedAccounts(): List<AccountInfo> {
         return savedAccounts().map { npub ->
-            AccountInfo(npub = npub)
+            AccountInfo(
+                npub,
+                hasPrivKey(npub),
+                getLoggedInWithExternalSigner(npub)
+            )
         }
     }
 
@@ -245,6 +251,7 @@ object LocalPreferences {
             } else {
                 putBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, account.showSensitiveContent!!)
             }
+            putBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, account.loginWithExternalSigner)
         }.apply()
 
         val globalPrefs = encryptedPreferences()
@@ -276,17 +283,19 @@ object LocalPreferences {
     }
 
     fun getTheme(): Int {
-        encryptedPreferences().apply {
-            return getInt(PrefKeys.THEME, 0)
-        }
+        return encryptedPreferences().getInt(PrefKeys.THEME, 0)
     }
 
     fun getPreferredLanguage(): String {
-        var language = ""
-        encryptedPreferences().apply {
-            language = getString(PrefKeys.PREFERRED_LANGUAGE, "") ?: ""
-        }
-        return language
+        return encryptedPreferences().getString(PrefKeys.PREFERRED_LANGUAGE, "") ?: ""
+    }
+
+    private fun getLoggedInWithExternalSigner(npub: String): Boolean {
+        return encryptedPreferences(npub).getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)
+    }
+
+    private fun hasPrivKey(npub: String): Boolean {
+        return (encryptedPreferences(npub).getString(PrefKeys.NOSTR_PRIVKEY, "") ?: "").isNotBlank()
     }
 
     fun loadFromEncryptedStorage(): Account? {
@@ -363,6 +372,7 @@ object LocalPreferences {
             val useProxy = getBoolean(PrefKeys.USE_PROXY, false)
             val proxyPort = getInt(PrefKeys.PROXY_PORT, 9050)
             val proxy = HttpClient.initProxy(useProxy, "127.0.0.1", proxyPort)
+            val loginWithExternalSigner = getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)
 
             val showSensitiveContent = if (contains(PrefKeys.SHOW_SENSITIVE_CONTENT)) {
                 getBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, false)
@@ -431,7 +441,8 @@ object LocalPreferences {
                 warnAboutPostsWithReports = warnAboutReports,
                 filterSpamFromStrangers = filterSpam,
                 lastReadPerRoute = lastReadPerRoute,
-                settings = settings
+                settings = settings,
+                loginWithExternalSigner = loginWithExternalSigner
             )
 
             return a

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

@@ -12,6 +12,7 @@ import coil.disk.DiskCache
 import coil.util.DebugLogger
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
 import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
@@ -35,15 +36,21 @@ import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
 import java.io.File
 
 object ServiceManager {
+    var shouldPauseService: Boolean = true // to not open amber in a loop trying to use auth relays and registering for notifications
+    private var isStarted: Boolean = false // to not open amber in a loop trying to use auth relays and registering for notifications
     private var account: Account? = null
 
     fun start(account: Account, context: Context) {
         this.account = account
+        ExternalSignerUtils.account = account
         start(context)
     }
 
     @Synchronized
     fun start(context: Context) {
+        if (isStarted && account != null) {
+            return
+        }
         Log.d("ServiceManager", "Starting Relay Services")
 
         val myAccount = account
@@ -88,6 +95,7 @@ object ServiceManager {
             NostrSingleEventDataSource.start()
             NostrSingleChannelDataSource.start()
             NostrSingleUserDataSource.start()
+            isStarted = true
         }
     }
 
@@ -113,6 +121,7 @@ object ServiceManager {
         NostrVideoDataSource.stop()
 
         Client.disconnect()
+        isStarted = false
     }
 
     fun cleanObservers() {

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

@@ -3,6 +3,8 @@ package com.vitorpamplona.amethyst.model
 import android.util.Log
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.LocalPreferences
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledInsert
@@ -11,6 +13,7 @@ import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.HexValidator
 import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.encoders.bechToBytes
 import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.events.*
@@ -206,6 +209,14 @@ object LocalCache {
         val user = getOrCreateUser(event.pubKey)
         if (user.latestBookmarkList == null || event.createdAt > user.latestBookmarkList!!.createdAt) {
             if (event.dTag() == "bookmark") {
+                val loggedInUser = LocalPreferences.currentAccount()
+                val hexKey = loggedInUser?.bechToBytes()
+                if (hexKey != null) {
+                    val pubKey = Hex.encode(hexKey)
+                    if (pubKey == event.pubKey) {
+                        ExternalSignerUtils.content.remove(event.id)
+                    }
+                }
                 user.updateBookmark(event)
             }
             // Log.d("MT", "New User Metadata ${oldUser.pubkeyDisplayHex} ${oldUser.toBestDisplayName()}")

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

@@ -0,0 +1,307 @@
+package com.vitorpamplona.amethyst.service
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.util.Log
+import android.util.LruCache
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ServiceManager
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.ui.MainActivity
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.toNpub
+import com.vitorpamplona.quartz.events.EventInterface
+import com.vitorpamplona.quartz.events.LnZapRequestEvent
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+
+enum class SignerType {
+    SIGN_EVENT,
+    NIP04_ENCRYPT,
+    NIP04_DECRYPT,
+    NIP44_ENCRYPT,
+    NIP44_DECRYPT,
+    GET_PUBLIC_KEY,
+    DECRYPT_ZAP_EVENT
+}
+
+object ExternalSignerUtils {
+    val content = LruCache<String, String>(10)
+    var isActivityRunning: Boolean = false
+    val cachedDecryptedContent = mutableMapOf<HexKey, String>()
+    lateinit var account: Account
+    private lateinit var activityResultLauncher: ActivityResultLauncher<Intent>
+    private lateinit var decryptResultLauncher: ActivityResultLauncher<Intent>
+    private lateinit var blockListResultLauncher: ActivityResultLauncher<Intent>
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun requestRejectedToast() {
+        GlobalScope.launch(Dispatchers.Main) {
+            Toast.makeText(
+                Amethyst.instance,
+                Amethyst.instance.getString(R.string.sign_request_rejected),
+                Toast.LENGTH_SHORT
+            ).show()
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun default() {
+        isActivityRunning = false
+        ServiceManager.shouldPauseService = true
+        GlobalScope.launch(Dispatchers.IO) {
+            isActivityRunning = false
+            ServiceManager.shouldPauseService = true
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun start(activity: MainActivity) {
+        activityResultLauncher = activity.registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) {
+            if (it.resultCode != Activity.RESULT_OK) {
+                requestRejectedToast()
+            } else {
+                val event = it.data?.getStringExtra("signature") ?: ""
+                val id = it.data?.getStringExtra("id") ?: ""
+                if (id.isNotBlank()) {
+                    content.put(id, event)
+                }
+            }
+            default()
+        }
+
+        decryptResultLauncher = activity.registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) {
+            if (it.resultCode != Activity.RESULT_OK) {
+                requestRejectedToast()
+            } else {
+                val event = it.data?.getStringExtra("signature") ?: ""
+                val id = it.data?.getStringExtra("id") ?: ""
+                if (id.isNotBlank()) {
+                    content.put(id, event)
+                    cachedDecryptedContent[id] = event
+                }
+            }
+            default()
+        }
+
+        blockListResultLauncher = activity.registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) {
+            if (it.resultCode != Activity.RESULT_OK) {
+                requestRejectedToast()
+            } else {
+                val decryptedContent = it.data?.getStringExtra("signature") ?: ""
+                val id = it.data?.getStringExtra("id") ?: ""
+                if (id.isNotBlank()) {
+                    cachedDecryptedContent[id] = decryptedContent
+                    account.live.invalidateData()
+                }
+            }
+            default()
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun openSigner(
+        data: String,
+        type: SignerType,
+        intentResult: ActivityResultLauncher<Intent>,
+        pubKey: HexKey,
+        id: String
+    ) {
+        try {
+            ServiceManager.shouldPauseService = false
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:$data"))
+            val signerType = when (type) {
+                SignerType.SIGN_EVENT -> "sign_event"
+                SignerType.NIP04_ENCRYPT -> "nip04_encrypt"
+                SignerType.NIP04_DECRYPT -> "nip04_decrypt"
+                SignerType.NIP44_ENCRYPT -> "nip44_encrypt"
+                SignerType.NIP44_DECRYPT -> "nip44_decrypt"
+                SignerType.GET_PUBLIC_KEY -> "get_public_key"
+                SignerType.DECRYPT_ZAP_EVENT -> "decrypt_zap_event"
+            }
+            intent.putExtra("type", signerType)
+            intent.putExtra("pubKey", pubKey)
+            intent.putExtra("id", id)
+            if (type !== SignerType.GET_PUBLIC_KEY) {
+                intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
+            }
+            intent.`package` = "com.greenart7c3.nostrsigner"
+            intentResult.launch(intent)
+        } catch (e: Exception) {
+            Log.e("Signer", "Error opening Signer app", e)
+            GlobalScope.launch(Dispatchers.Main) {
+                Toast.makeText(
+                    Amethyst.instance,
+                    Amethyst.instance.getString(R.string.error_opening_external_signer),
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+        }
+    }
+
+    fun openSigner(event: EventInterface, columnName: String = "signature") {
+        checkNotInMainThread()
+
+        val result = getDataFromResolver(SignerType.SIGN_EVENT, arrayOf(event.toJson(), event.pubKey()), columnName)
+        if (result !== null) {
+            content.put(event.id(), result)
+            return
+        }
+
+        ServiceManager.shouldPauseService = false
+        isActivityRunning = true
+        openSigner(
+            event.toJson(),
+            SignerType.SIGN_EVENT,
+            activityResultLauncher,
+            "",
+            event.id()
+        )
+        while (isActivityRunning) {
+            Thread.sleep(100)
+        }
+    }
+
+    fun decryptBlockList(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            cachedDecryptedContent[id] = result
+            return
+        }
+        isActivityRunning = true
+        openSigner(
+            encryptedContent,
+            signerType,
+            blockListResultLauncher,
+            pubKey,
+            id
+        )
+    }
+
+    fun getDataFromResolver(signerType: SignerType, data: Array<out String>, columnName: String = "signature"): String? {
+        val localData = if (signerType !== SignerType.GET_PUBLIC_KEY) {
+            data.toList().plus(account.keyPair.pubKey.toNpub()).toTypedArray()
+        } else {
+            data
+        }
+
+        Amethyst.instance.contentResolver.query(
+            Uri.parse("content://com.greenart7c3.nostrsigner.$signerType"),
+            localData,
+            null,
+            null,
+            null
+        ).use {
+            if (it !== null) {
+                if (it.moveToFirst()) {
+                    val index = it.getColumnIndex(columnName)
+                    return it.getString(index)
+                }
+            }
+        }
+        return null
+    }
+
+    fun decrypt(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            cachedDecryptedContent[id] = result
+            return
+        }
+
+        isActivityRunning = true
+        openSigner(
+            encryptedContent,
+            signerType,
+            decryptResultLauncher,
+            pubKey,
+            id
+        )
+        while (isActivityRunning) {
+            // do nothing
+        }
+    }
+
+    fun decryptDM(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            cachedDecryptedContent[id] = result
+            return
+        }
+        openSigner(
+            encryptedContent,
+            signerType,
+            decryptResultLauncher,
+            pubKey,
+            id
+        )
+    }
+
+    fun decryptBookmark(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            cachedDecryptedContent[id] = result
+            return
+        }
+        openSigner(
+            encryptedContent,
+            signerType,
+            decryptResultLauncher,
+            pubKey,
+            id
+        )
+    }
+
+    fun encrypt(decryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_ENCRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(decryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            return
+        }
+
+        isActivityRunning = true
+        openSigner(
+            decryptedContent,
+            signerType,
+            activityResultLauncher,
+            pubKey,
+            id
+        )
+        while (isActivityRunning) {
+            Thread.sleep(100)
+        }
+    }
+
+    fun decryptZapEvent(event: LnZapRequestEvent) {
+        val result = getDataFromResolver(SignerType.DECRYPT_ZAP_EVENT, arrayOf(event.toJson(), event.pubKey))
+        if (result !== null) {
+            content.put(event.id, result)
+            cachedDecryptedContent[event.id] = result
+            return
+        }
+        openSigner(
+            event.toJson(),
+            SignerType.DECRYPT_ZAP_EVENT,
+            decryptResultLauncher,
+            event.pubKey,
+            event.id
+        )
+    }
+}

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

@@ -8,17 +8,26 @@ import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import com.vitorpamplona.quartz.events.*
+import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.events.BadgeAwardEvent
 import com.vitorpamplona.quartz.events.BadgeProfilesEvent
 import com.vitorpamplona.quartz.events.BookmarkListEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ContactListEvent
+import com.vitorpamplona.quartz.events.EmojiPackSelectionEvent
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.GenericRepostEvent
+import com.vitorpamplona.quartz.events.GiftWrapEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.events.PeopleListEvent
+import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.ReactionEvent
 import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.RepostEvent
+import com.vitorpamplona.quartz.events.SealedGossipEvent
+import com.vitorpamplona.quartz.events.StatusEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 
 object NostrAccountDataSource : NostrDataSource("AccountData") {
@@ -143,6 +152,20 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                     event.cachedGift(privateKey)?.let {
                         this.consume(it, relay)
                     }
+                } else if (account.loginWithExternalSigner) {
+                    var cached = ExternalSignerUtils.cachedDecryptedContent[event.id]
+                    if (cached == null) {
+                        ExternalSignerUtils.decrypt(
+                            event.content,
+                            event.pubKey,
+                            event.id,
+                            SignerType.NIP44_DECRYPT
+                        )
+                        cached = ExternalSignerUtils.cachedDecryptedContent[event.id] ?: ""
+                    }
+                    event.cachedGift(account.keyPair.pubKey, cached)?.let {
+                        this.consume(it, relay)
+                    }
                 }
             }
 
@@ -152,6 +175,20 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                     event.cachedGossip(privateKey)?.let {
                         LocalCache.justConsume(it, relay)
                     }
+                } else if (account.loginWithExternalSigner) {
+                    var cached = ExternalSignerUtils.cachedDecryptedContent[event.id]
+                    if (cached == null) {
+                        ExternalSignerUtils.decrypt(
+                            event.content,
+                            event.pubKey,
+                            event.id,
+                            SignerType.NIP44_DECRYPT
+                        )
+                        cached = ExternalSignerUtils.cachedDecryptedContent[event.id] ?: ""
+                    }
+                    event.cachedGossip(account.keyPair.pubKey, cached)?.let {
+                        LocalCache.justConsume(it, relay)
+                    }
                 }
 
                 // Don't store sealed gossips to avoid rebroadcasting by mistake.
@@ -181,7 +218,6 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
 
         if (this::account.isInitialized) {
             val event = account.createAuthEvent(relay, challenge)
-
             if (event != null) {
                 Client.send(
                     event,

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

@@ -44,7 +44,7 @@ class NostrLnZapPaymentResponseDataSource(
     override fun auth(relay: Relay, challenge: String) {
         super.auth(relay, challenge)
 
-        val event = RelayAuthEvent.create(relay.url, challenge, authSigningKey)
+        val event = RelayAuthEvent.create(relay.url, challenge, "", authSigningKey)
         Client.send(
             event,
             relay.url

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

@@ -0,0 +1,17 @@
+package com.vitorpamplona.amethyst.service
+
+import android.content.Context
+
+object PackageUtils {
+    private fun isPackageInstalled(context: Context, target: String): Boolean {
+        return context.packageManager.getInstalledApplications(0).find { info -> info.packageName == target } != null
+    }
+
+    fun isOrbotInstalled(context: Context): Boolean {
+        return isPackageInstalled(context, "org.torproject.android")
+    }
+
+    fun isAmberInstalled(context: Context): Boolean {
+        return isPackageInstalled(context, "com.greenart7c3.nostrsigner")
+    }
+}

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

@@ -7,6 +7,8 @@ import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
+import com.vitorpamplona.amethyst.service.SignerType
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendDMNotification
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendZapNotification
 import com.vitorpamplona.amethyst.ui.note.showAmount
@@ -32,27 +34,56 @@ class EventNotificationConsumer(private val applicationContext: Context) {
         // Test with all logged in accounts
         LocalPreferences.allSavedAccounts().forEach {
             val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
-            if (acc != null && acc.keyPair.privKey != null) {
+            if (acc != null && (acc.keyPair.privKey != null || acc.loginWithExternalSigner)) {
                 consumeIfMatchesAccount(event, acc)
             }
         }
     }
 
     private suspend fun consumeIfMatchesAccount(pushWrappedEvent: GiftWrapEvent, account: Account) {
-        val key = account.keyPair.privKey ?: return
-        pushWrappedEvent.unwrap(key)?.let { notificationEvent ->
-            if (!LocalCache.justVerify(notificationEvent)) return // invalid event
-            if (LocalCache.notes[notificationEvent.id] != null) return // already processed
+        val key = account.keyPair.privKey
+        if (account.loginWithExternalSigner) {
+            var cached = ExternalSignerUtils.cachedDecryptedContent[pushWrappedEvent.id]
+            if (cached == null) {
+                ExternalSignerUtils.decrypt(
+                    pushWrappedEvent.content,
+                    pushWrappedEvent.pubKey,
+                    pushWrappedEvent.id,
+                    SignerType.NIP44_DECRYPT
+                )
+                cached = ExternalSignerUtils.cachedDecryptedContent[pushWrappedEvent.id] ?: ""
+            }
+            pushWrappedEvent.unwrap(cached)?.let { notificationEvent ->
+                if (!LocalCache.justVerify(notificationEvent)) return // invalid event
+                if (LocalCache.notes[notificationEvent.id] != null) return // already processed
 
-            LocalCache.justConsume(notificationEvent, null)
+                LocalCache.justConsume(notificationEvent, null)
 
-            unwrapAndConsume(notificationEvent, account)?.let { innerEvent ->
-                if (innerEvent is PrivateDmEvent) {
-                    notify(innerEvent, account)
-                } else if (innerEvent is LnZapEvent) {
-                    notify(innerEvent, account)
-                } else if (innerEvent is ChatMessageEvent) {
-                    notify(innerEvent, account)
+                unwrapAndConsume(notificationEvent, account)?.let { innerEvent ->
+                    if (innerEvent is PrivateDmEvent) {
+                        notify(innerEvent, account)
+                    } else if (innerEvent is LnZapEvent) {
+                        notify(innerEvent, account)
+                    } else if (innerEvent is ChatMessageEvent) {
+                        notify(innerEvent, account)
+                    }
+                }
+            }
+        } else if (key != null) {
+            pushWrappedEvent.unwrap(key)?.let { notificationEvent ->
+                if (!LocalCache.justVerify(notificationEvent)) return // invalid event
+                if (LocalCache.notes[notificationEvent.id] != null) return // already processed
+
+                LocalCache.justConsume(notificationEvent, null)
+
+                unwrapAndConsume(notificationEvent, account)?.let { innerEvent ->
+                    if (innerEvent is PrivateDmEvent) {
+                        notify(innerEvent, account)
+                    } else if (innerEvent is LnZapEvent) {
+                        notify(innerEvent, account)
+                    } else if (innerEvent is ChatMessageEvent) {
+                        notify(innerEvent, account)
+                    }
                 }
             }
         }
@@ -63,17 +94,54 @@ class EventNotificationConsumer(private val applicationContext: Context) {
 
         return when (event) {
             is GiftWrapEvent -> {
-                val key = account.keyPair.privKey ?: return null
-                event.cachedGift(key)?.let {
-                    unwrapAndConsume(it, account)
+                val key = account.keyPair.privKey
+                if (key != null) {
+                    event.cachedGift(key)?.let {
+                        unwrapAndConsume(it, account)
+                    }
+                } else if (account.loginWithExternalSigner) {
+                    var cached = ExternalSignerUtils.cachedDecryptedContent[event.id]
+                    if (cached == null) {
+                        ExternalSignerUtils.decrypt(
+                            event.content,
+                            event.pubKey,
+                            event.id,
+                            SignerType.NIP44_DECRYPT
+                        )
+                        cached = ExternalSignerUtils.cachedDecryptedContent[event.id] ?: ""
+                    }
+                    event.cachedGift(account.keyPair.pubKey, cached)?.let {
+                        unwrapAndConsume(it, account)
+                    }
+                } else {
+                    null
                 }
             }
             is SealedGossipEvent -> {
-                val key = account.keyPair.privKey ?: return null
-                event.cachedGossip(key)?.let {
-                    // this is not verifiable
-                    LocalCache.justConsume(it, null)
-                    it
+                val key = account.keyPair.privKey
+                if (key != null) {
+                    event.cachedGossip(key)?.let {
+                        // this is not verifiable
+                        LocalCache.justConsume(it, null)
+                        it
+                    }
+                } else if (account.loginWithExternalSigner) {
+                    var cached = ExternalSignerUtils.cachedDecryptedContent[event.id]
+                    if (cached == null) {
+                        ExternalSignerUtils.decrypt(
+                            event.content,
+                            event.pubKey,
+                            event.id,
+                            SignerType.NIP44_DECRYPT
+                        )
+                        cached = ExternalSignerUtils.cachedDecryptedContent[event.id] ?: ""
+                    }
+                    event.cachedGossip(account.keyPair.pubKey, cached)?.let {
+                        LocalCache.justConsume(it, null)
+                        it
+                    }
+                } else {
+                    null
                 }
             }
             else -> {

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

@@ -36,7 +36,7 @@ class RegisterAccounts(
         }
     }
 
-    private fun postRegistrationEvent(events: List<RelayAuthEvent>) {
+    fun postRegistrationEvent(events: List<RelayAuthEvent>) {
         try {
             val jsonObject = """{
                 "events": [ ${events.joinToString(", ") { it.toJson() }} ]

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

@@ -23,6 +23,7 @@ import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
 import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
 import com.vitorpamplona.amethyst.service.notifications.PushNotificationUtils
 import com.vitorpamplona.amethyst.ui.components.DefaultMutedSetting
@@ -51,6 +52,8 @@ import java.nio.charset.StandardCharsets
 class MainActivity : AppCompatActivity() {
     @RequiresApi(Build.VERSION_CODES.R)
     override fun onCreate(savedInstanceState: Bundle?) {
+        ExternalSignerUtils.start(this)
+
         super.onCreate(savedInstanceState)
 
         LocalPreferences.migrateSingleUserPrefs()
@@ -99,11 +102,13 @@ class MainActivity : AppCompatActivity() {
 
         // Only starts after login
         GlobalScope.launch(Dispatchers.IO) {
-            ServiceManager.start(this@MainActivity)
+            if (ServiceManager.shouldPauseService) {
+                ServiceManager.start(this@MainActivity)
+            }
         }
 
         GlobalScope.launch(Dispatchers.IO) {
-            PushNotificationUtils().init(LocalPreferences.allSavedAccounts())
+            PushNotificationUtils.init(LocalPreferences.allSavedAccounts())
         }
     }
 
@@ -113,7 +118,9 @@ class MainActivity : AppCompatActivity() {
         debugState(this)
         // }
 
-        ServiceManager.pause()
+        if (ServiceManager.shouldPauseService) {
+            ServiceManager.pause()
+        }
         super.onPause()
     }
 
@@ -145,8 +152,10 @@ class MainActivity : AppCompatActivity() {
             Log.d("NETWORKCALLBACK", "onAvailable: Disconnecting and connecting again")
             // Only starts after login
             GlobalScope.launch(Dispatchers.IO) {
-                ServiceManager.pause()
-                ServiceManager.start(this@MainActivity)
+                if (ServiceManager.shouldPauseService) {
+                    ServiceManager.pause()
+                    ServiceManager.start(this@MainActivity)
+                }
             }
         }
 
@@ -176,7 +185,9 @@ class MainActivity : AppCompatActivity() {
             Log.d("NETWORKCALLBACK", "onLost: Disconnecting and pausing relay's connection")
             // Only starts after login
             GlobalScope.launch(Dispatchers.IO) {
-                ServiceManager.pause()
+                if (ServiceManager.shouldPauseService) {
+                    ServiceManager.pause()
+                }
             }
         }
     }

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

@@ -92,24 +92,32 @@ open class NewMediaModel : ViewModel() {
                     } else {
                         uploadingPercentage.value = 0.2f
                         uploadingDescription.value = "Uploading"
-                        ImageUploader.uploadImage(
-                            uri = fileUri,
-                            contentType = contentType,
-                            size = size,
-                            server = serverToUse,
-                            contentResolver = contentResolver,
-                            onSuccess = { imageUrl, mimeType ->
-                                createNIP94Record(imageUrl, mimeType, description, sensitiveContent, relayList = relayList)
-                            },
-                            onError = {
-                                isUploadingImage = false
-                                uploadingPercentage.value = 0.00f
-                                uploadingDescription.value = null
-                                viewModelScope.launch {
-                                    imageUploadingError.emit("Failed to upload the image / video")
+                        viewModelScope.launch(Dispatchers.IO) {
+                            ImageUploader.uploadImage(
+                                uri = fileUri,
+                                contentType = contentType,
+                                size = size,
+                                server = serverToUse,
+                                contentResolver = contentResolver,
+                                onSuccess = { imageUrl, mimeType ->
+                                    createNIP94Record(
+                                        imageUrl,
+                                        mimeType,
+                                        description,
+                                        sensitiveContent,
+                                        relayList = relayList
+                                    )
+                                },
+                                onError = {
+                                    isUploadingImage = false
+                                    uploadingPercentage.value = 0.00f
+                                    uploadingDescription.value = null
+                                    viewModelScope.launch {
+                                        imageUploadingError.emit("Failed to upload the image / video")
+                                    }
                                 }
-                            }
-                        )
+                            )
+                        }
                     }
                 },
                 onError = {

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt

@@ -17,6 +17,7 @@ import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -37,6 +38,7 @@ import kotlinx.coroutines.withContext
 fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
     val postViewModel: NewUserMetadataViewModel = viewModel()
     val context = LocalContext.current
+    val scope = rememberCoroutineScope()
 
     LaunchedEffect(Unit) {
         postViewModel.load(account)
@@ -82,7 +84,9 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 }
 
                 Column(
-                    modifier = Modifier.padding(10.dp).verticalScroll(rememberScrollState())
+                    modifier = Modifier
+                        .padding(10.dp)
+                        .verticalScroll(rememberScrollState())
                 ) {
                     Row(
                         modifier = Modifier.fillMaxWidth(1f),

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

@@ -124,7 +124,6 @@ class NewUserMetadataViewModel : ViewModel() {
         viewModelScope.launch(Dispatchers.IO) {
             account.sendNewUserMetadata(writer.buffer.toString(), newClaims)
         }
-
         clear()
     }
 
@@ -183,23 +182,25 @@ class NewUserMetadataViewModel : ViewModel() {
             contentResolver.getType(galleryUri),
             context.applicationContext,
             onReady = { fileUri, contentType, size ->
-                ImageUploader.uploadImage(
-                    uri = fileUri,
-                    contentType = contentType,
-                    size = size,
-                    server = account.defaultFileServer,
-                    contentResolver = contentResolver,
-                    onSuccess = { imageUrl, mimeType ->
-                        onUploading(false)
-                        onUploaded(imageUrl)
-                    },
-                    onError = {
-                        onUploading(false)
-                        viewModelScope.launch {
-                            imageUploadingError.emit("Failed to upload the image / video")
+                viewModelScope.launch(Dispatchers.IO) {
+                    ImageUploader.uploadImage(
+                        uri = fileUri,
+                        contentType = contentType,
+                        size = size,
+                        server = account.defaultFileServer,
+                        contentResolver = contentResolver,
+                        onSuccess = { imageUrl, mimeType ->
+                            onUploading(false)
+                            onUploaded(imageUrl)
+                        },
+                        onError = {
+                            onUploading(false)
+                            viewModelScope.launch {
+                                imageUploadingError.emit("Failed to upload the image / video")
+                            }
                         }
-                    }
-                )
+                    )
+                }
             },
             onError = {
                 onUploading(false)

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/BookmarkPrivateFeedFilter.kt

@@ -3,6 +3,8 @@ package com.vitorpamplona.amethyst.ui.dal
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
+import com.vitorpamplona.quartz.encoders.toHexKey
 
 object BookmarkPrivateFeedFilter : FeedFilter<Note>() {
     lateinit var account: Account
@@ -12,18 +14,44 @@ object BookmarkPrivateFeedFilter : FeedFilter<Note>() {
     }
 
     override fun feed(): List<Note> {
-        val privKey = account.keyPair.privKey ?: return emptyList()
-
         val bookmarks = account.userProfile().latestBookmarkList
 
-        val notes = bookmarks?.privateTaggedEvents(privKey)
-            ?.mapNotNull { LocalCache.checkGetOrCreateNote(it) } ?: emptyList()
+        if (account.loginWithExternalSigner) {
+            val id = bookmarks?.id
+            if (id != null) {
+                val decryptedContent = ExternalSignerUtils.cachedDecryptedContent[id]
+                if (decryptedContent == null) {
+                    ExternalSignerUtils.decryptBookmark(
+                        bookmarks.content,
+                        account.keyPair.pubKey.toHexKey(),
+                        id
+                    )
+                } else {
+                    bookmarks.decryptedContent = decryptedContent
+                }
+            }
+            val decryptedContent = ExternalSignerUtils.cachedDecryptedContent[id] ?: ""
 
-        val addresses = bookmarks?.privateTaggedAddresses(privKey)
-            ?.map { LocalCache.getOrCreateAddressableNote(it) } ?: emptyList()
+            val notes = bookmarks?.privateTaggedEvents(decryptedContent)
+                ?.mapNotNull { LocalCache.checkGetOrCreateNote(it) } ?: emptyList()
+            val addresses = bookmarks?.privateTaggedAddresses(decryptedContent)
+                ?.map { LocalCache.getOrCreateAddressableNote(it) } ?: emptyList()
 
-        return notes.plus(addresses).toSet()
-            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
-            .reversed()
+            return notes.plus(addresses).toSet()
+                .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
+                .reversed()
+        } else {
+            val privKey = account.keyPair.privKey ?: return emptyList()
+
+            val notes = bookmarks?.privateTaggedEvents(privKey)
+                ?.mapNotNull { LocalCache.checkGetOrCreateNote(it) } ?: emptyList()
+
+            val addresses = bookmarks?.privateTaggedAddresses(privKey)
+                ?.map { LocalCache.getOrCreateAddressableNote(it) } ?: emptyList()
+
+            return notes.plus(addresses).toSet()
+                .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
+                .reversed()
+        }
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HiddenAccountsFeedFilter.kt

@@ -14,7 +14,18 @@ class HiddenAccountsFeedFilter(val account: Account) : FeedFilter<User>() {
     }
 
     override fun feed(): List<User> {
-        return account.getBlockList()
+        val blockList = account.getBlockList()
+        val decryptedContent = blockList?.decryptedContent ?: ""
+        if (account.loginWithExternalSigner) {
+            if (decryptedContent.isEmpty()) return emptyList()
+
+            return blockList
+                ?.publicAndPrivateUsers(decryptedContent)
+                ?.map { LocalCache.getOrCreateUser(it) }
+                ?: emptyList()
+        }
+
+        return blockList
             ?.publicAndPrivateUsers(account.keyPair.privKey)
             ?.map { LocalCache.getOrCreateUser(it) }
             ?: emptyList()

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

@@ -17,6 +17,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -36,6 +37,8 @@ import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.actions.PostButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 class AddBountyAmountViewModel : ViewModel() {
     private var account: Account? = null
@@ -80,6 +83,7 @@ class AddBountyAmountViewModel : ViewModel() {
 fun AddBountyAmountDialog(bounty: Note, accountViewModel: AccountViewModel, onClose: () -> Unit) {
     val postViewModel: AddBountyAmountViewModel = viewModel()
     postViewModel.load(accountViewModel.account, bounty)
+    val scope = rememberCoroutineScope()
 
     Dialog(
         onDismissRequest = { onClose() },
@@ -89,7 +93,11 @@ fun AddBountyAmountDialog(bounty: Note, accountViewModel: AccountViewModel, onCl
         )
     ) {
         Surface() {
-            Column(modifier = Modifier.padding(10.dp).width(IntrinsicSize.Min)) {
+            Column(
+                modifier = Modifier
+                    .padding(10.dp)
+                    .width(IntrinsicSize.Min)
+            ) {
                 Row(
                     horizontalArrangement = Arrangement.SpaceBetween,
                     verticalAlignment = Alignment.CenterVertically,
@@ -102,8 +110,10 @@ fun AddBountyAmountDialog(bounty: Note, accountViewModel: AccountViewModel, onCl
 
                     PostButton(
                         onPost = {
-                            postViewModel.sendPost()
-                            onClose()
+                            scope.launch(Dispatchers.IO) {
+                                postViewModel.sendPost()
+                                onClose()
+                            }
                         },
                         isActive = postViewModel.hasChanged()
                     )

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

@@ -256,11 +256,10 @@ private fun UserRoomCompose(
             note.createdAt()
         }
     }
-
     val content by remember(note) {
-        derivedStateOf {
+        mutableStateOf(
             accountViewModel.decrypt(note)
-        }
+        )
     }
 
     WatchNotificationChanges(note, route, accountViewModel) { newHasNewMessages ->

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

@@ -627,7 +627,7 @@ private fun RenderRegularTextNote(
     nav: (String) -> Unit
 ) {
     val tags = remember(note.event) { note.event?.tags()?.toImmutableListOfLists() ?: ImmutableListOfLists() }
-    val eventContent = remember { accountViewModel.decrypt(note) }
+    val eventContent by remember { mutableStateOf(accountViewModel.decrypt(note)) }
     val modifier = remember { Modifier.padding(top = 5.dp) }
 
     if (eventContent != null) {
@@ -636,7 +636,7 @@ private fun RenderRegularTextNote(
             accountViewModel = accountViewModel
         ) {
             TranslatableRichTextViewer(
-                content = eventContent,
+                content = eventContent!!,
                 canPreview = canPreview,
                 modifier = modifier,
                 tags = tags,

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

@@ -1623,10 +1623,8 @@ private fun RenderPrivateMessage(
     val noteEvent = note.event as? PrivateDmEvent ?: return
 
     val withMe = remember { noteEvent.with(accountViewModel.userProfile().pubkeyHex) }
-
     if (withMe) {
-        val eventContent = remember { accountViewModel.decrypt(note) }
-
+        val eventContent by remember { mutableStateOf(accountViewModel.decrypt(note)) }
         val hashtags = remember(note.event?.id()) { note.event?.hashtags()?.toImmutableList() ?: persistentListOf() }
         val modifier = remember(note.event?.id()) { Modifier.fillMaxWidth() }
         val isAuthorTheLoggedUser = remember(note.event?.id()) { accountViewModel.isLoggedUser(note.author) }
@@ -1636,7 +1634,7 @@ private fun RenderPrivateMessage(
         if (eventContent != null) {
             if (makeItShort && isAuthorTheLoggedUser) {
                 Text(
-                    text = eventContent,
+                    text = eventContent!!,
                     color = MaterialTheme.colors.placeholderText,
                     maxLines = 2,
                     overflow = TextOverflow.Ellipsis
@@ -1647,7 +1645,7 @@ private fun RenderPrivateMessage(
                     accountViewModel = accountViewModel
                 ) {
                     TranslatableRichTextViewer(
-                        content = eventContent,
+                        content = eventContent!!,
                         canPreview = canPreview && !makeItShort,
                         modifier = modifier,
                         tags = tags,
@@ -1657,7 +1655,7 @@ private fun RenderPrivateMessage(
                     )
                 }
 
-                DisplayUncitedHashtags(hashtags, eventContent, nav)
+                DisplayUncitedHashtags(hashtags, eventContent!!, nav)
             }
         }
     } else {

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

@@ -307,7 +307,7 @@ fun ZapVote(
             // interactionSource = remember { MutableInteractionSource() },
             // indication = rememberRipple(bounded = false, radius = 24.dp),
             onClick = {
-                if (!accountViewModel.isWriteable()) {
+                if (!accountViewModel.isWriteable() && !accountViewModel.loggedInWithExternalSigner()) {
                     scope.launch {
                         Toast
                             .makeText(

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

@@ -546,12 +546,16 @@ fun ReplyReaction(
             if (accountViewModel.isWriteable()) {
                 onPress()
             } else {
-                scope.launch {
-                    Toast.makeText(
-                        context,
-                        context.getString(R.string.login_with_a_private_key_to_be_able_to_reply),
-                        Toast.LENGTH_SHORT
-                    ).show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    onPress()
+                } else {
+                    scope.launch {
+                        Toast.makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_reply),
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
                 }
             }
         }
@@ -655,12 +659,22 @@ fun BoostReaction(
                     wantsToBoost = true
                 }
             } else {
-                scope.launch {
-                    Toast.makeText(
-                        context,
-                        context.getString(R.string.login_with_a_private_key_to_be_able_to_boost_posts),
-                        Toast.LENGTH_SHORT
-                    ).show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    if (accountViewModel.hasBoosted(baseNote)) {
+                        scope.launch(Dispatchers.IO) {
+                            accountViewModel.deleteBoostsTo(baseNote)
+                        }
+                    } else {
+                        wantsToBoost = true
+                    }
+                } else {
+                    scope.launch {
+                        Toast.makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_boost_posts),
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
                 }
             }
         }
@@ -678,6 +692,11 @@ fun BoostReaction(
                 onQuote = {
                     wantsToBoost = false
                     onQuotePress()
+                },
+                onRepost = {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.boost(baseNote)
+                    }
                 }
             )
         }
@@ -741,6 +760,20 @@ fun LikeReaction(
                     context,
                     onMultipleChoices = {
                         wantsToReact = true
+                    },
+                    onWantsToSignReaction = {
+                        if (accountViewModel.account.reactionChoices.size == 1) {
+                            scope.launch(Dispatchers.IO) {
+                                val reaction = accountViewModel.account.reactionChoices.first()
+                                if (accountViewModel.hasReactedTo(baseNote, reaction)) {
+                                    accountViewModel.deleteReactionTo(baseNote, reaction)
+                                } else {
+                                    accountViewModel.reactTo(baseNote, reaction)
+                                }
+                            }
+                        } else if (accountViewModel.account.reactionChoices.size > 1) {
+                            wantsToReact = true
+                        }
                     }
                 )
             },
@@ -860,7 +893,8 @@ private fun likeClick(
     accountViewModel: AccountViewModel,
     scope: CoroutineScope,
     context: Context,
-    onMultipleChoices: () -> Unit
+    onMultipleChoices: () -> Unit,
+    onWantsToSignReaction: () -> Unit
 ) {
     if (accountViewModel.account.reactionChoices.isEmpty()) {
         scope.launch {
@@ -873,14 +907,18 @@ private fun likeClick(
                 .show()
         }
     } else if (!accountViewModel.isWriteable()) {
-        scope.launch {
-            Toast
-                .makeText(
-                    context,
-                    context.getString(R.string.login_with_a_private_key_to_like_posts),
-                    Toast.LENGTH_SHORT
-                )
-                .show()
+        if (accountViewModel.loggedInWithExternalSigner()) {
+            onWantsToSignReaction()
+        } else {
+            scope.launch {
+                Toast
+                    .makeText(
+                        context,
+                        context.getString(R.string.login_with_a_private_key_to_like_posts),
+                        Toast.LENGTH_SHORT
+                    )
+                    .show()
+            }
         }
     } else if (accountViewModel.account.reactionChoices.size == 1) {
         scope.launch(Dispatchers.IO) {
@@ -1084,7 +1122,7 @@ private fun zapClick(
                 )
                 .show()
         }
-    } else if (!accountViewModel.isWriteable()) {
+    } else if (!accountViewModel.isWriteable() && !accountViewModel.loggedInWithExternalSigner()) {
         scope.launch {
             Toast
                 .makeText(
@@ -1224,7 +1262,7 @@ private fun DrawViewCount(
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-private fun BoostTypeChoicePopup(baseNote: Note, iconSize: Dp, accountViewModel: AccountViewModel, onDismiss: () -> Unit, onQuote: () -> Unit) {
+private fun BoostTypeChoicePopup(baseNote: Note, iconSize: Dp, accountViewModel: AccountViewModel, onDismiss: () -> Unit, onQuote: () -> Unit, onRepost: () -> Unit) {
     val iconSizePx = with(LocalDensity.current) {
         -iconSize.toPx().toInt()
     }
@@ -1239,8 +1277,13 @@ private fun BoostTypeChoicePopup(baseNote: Note, iconSize: Dp, accountViewModel:
             Button(
                 modifier = Modifier.padding(horizontal = 3.dp),
                 onClick = {
-                    scope.launch(Dispatchers.IO) {
-                        accountViewModel.boost(baseNote)
+                    if (accountViewModel.isWriteable()) {
+                        scope.launch(Dispatchers.IO) {
+                            accountViewModel.boost(baseNote)
+                            onDismiss()
+                        }
+                    } else {
+                        onRepost()
                         onDismiss()
                     }
                 },
@@ -1423,7 +1466,7 @@ fun ZapAmountChoicePopup(
     onPayViaIntent: (ImmutableList<ZapPaymentHandler.Payable>) -> Unit
 ) {
     val context = LocalContext.current
-
+    val scope = rememberCoroutineScope()
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
     val zapMessage = ""

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

@@ -43,11 +43,13 @@ import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ReportNoteDialog
 import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.toHexKey
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -409,11 +411,15 @@ fun NoteDropDownMenu(note: Note, popupExpanded: MutableState<Boolean>, accountVi
         val scope = rememberCoroutineScope()
 
         if (!state.isFollowingAuthor) {
-            DropdownMenuItem(onClick = {
-                accountViewModel.follow(
-                    note.author ?: return@DropdownMenuItem
-                ); onDismiss()
-            }) {
+            DropdownMenuItem(
+                onClick = {
+                    val author = note.author ?: return@DropdownMenuItem
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.follow(author)
+                        onDismiss()
+                    }
+                }
+            ) {
                 Text(stringResource(R.string.follow))
             }
             Divider()
@@ -469,20 +475,98 @@ fun NoteDropDownMenu(note: Note, popupExpanded: MutableState<Boolean>, accountVi
         }
         Divider()
         if (state.isPrivateBookmarkNote) {
-            DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.removePrivateBookmark(note); onDismiss() } }) {
+            DropdownMenuItem(
+                onClick = {
+                    scope.launch(Dispatchers.IO) {
+                        if (accountViewModel.loggedInWithExternalSigner()) {
+                            val bookmarks = accountViewModel.userProfile().latestBookmarkList
+                            ExternalSignerUtils.decrypt(
+                                bookmarks?.content ?: "",
+                                accountViewModel.account.keyPair.pubKey.toHexKey(),
+                                bookmarks?.id ?: ""
+                            )
+                            bookmarks?.decryptedContent = ExternalSignerUtils.cachedDecryptedContent[bookmarks?.id ?: ""] ?: ""
+                            accountViewModel.removePrivateBookmark(note, bookmarks?.decryptedContent ?: "")
+                        } else {
+                            accountViewModel.removePrivateBookmark(note)
+                            onDismiss()
+                        }
+                    }
+                }
+            ) {
                 Text(stringResource(R.string.remove_from_private_bookmarks))
             }
         } else {
-            DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.addPrivateBookmark(note); onDismiss() } }) {
+            DropdownMenuItem(
+                onClick = {
+                    scope.launch(Dispatchers.IO) {
+                        if (accountViewModel.loggedInWithExternalSigner()) {
+                            val bookmarks = accountViewModel.userProfile().latestBookmarkList
+                            ExternalSignerUtils.decrypt(
+                                bookmarks?.content ?: "",
+                                accountViewModel.account.keyPair.pubKey.toHexKey(),
+                                bookmarks?.id ?: ""
+                            )
+                            bookmarks?.decryptedContent = ExternalSignerUtils.cachedDecryptedContent[bookmarks?.id ?: ""] ?: ""
+                            accountViewModel.addPrivateBookmark(note, bookmarks?.decryptedContent ?: "")
+                        } else {
+                            accountViewModel.addPrivateBookmark(note)
+                            onDismiss()
+                        }
+                    }
+                }
+            ) {
                 Text(stringResource(R.string.add_to_private_bookmarks))
             }
         }
         if (state.isPublicBookmarkNote) {
-            DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.removePublicBookmark(note); onDismiss() } }) {
+            DropdownMenuItem(
+                onClick = {
+                    scope.launch(Dispatchers.IO) {
+                        if (accountViewModel.loggedInWithExternalSigner()) {
+                            val bookmarks = accountViewModel.userProfile().latestBookmarkList
+                            ExternalSignerUtils.decrypt(
+                                bookmarks?.content ?: "",
+                                accountViewModel.account.keyPair.pubKey.toHexKey(),
+                                bookmarks?.id ?: ""
+                            )
+                            bookmarks?.decryptedContent = ExternalSignerUtils.cachedDecryptedContent[bookmarks?.id ?: ""] ?: ""
+                            accountViewModel.removePublicBookmark(
+                                note,
+                                bookmarks?.decryptedContent ?: ""
+                            )
+                        } else {
+                            accountViewModel.removePublicBookmark(note)
+                            onDismiss()
+                        }
+                    }
+                }
+            ) {
                 Text(stringResource(R.string.remove_from_public_bookmarks))
             }
         } else {
-            DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.addPublicBookmark(note); onDismiss() } }) {
+            DropdownMenuItem(
+                onClick = {
+                    scope.launch(Dispatchers.IO) {
+                        if (accountViewModel.loggedInWithExternalSigner()) {
+                            val bookmarks = accountViewModel.userProfile().latestBookmarkList
+                            ExternalSignerUtils.decrypt(
+                                bookmarks?.content ?: "",
+                                accountViewModel.account.keyPair.pubKey.toHexKey(),
+                                bookmarks?.id ?: ""
+                            )
+                            bookmarks?.decryptedContent = ExternalSignerUtils.cachedDecryptedContent[bookmarks?.id ?: ""] ?: ""
+                            accountViewModel.addPublicBookmark(
+                                note,
+                                bookmarks?.decryptedContent ?: ""
+                            )
+                        } else {
+                            accountViewModel.addPublicBookmark(note)
+                            onDismiss()
+                        }
+                    }
+                }
+            ) {
                 Text(stringResource(R.string.add_to_public_bookmarks))
             }
         }

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

@@ -4,10 +4,24 @@ import android.content.Intent
 import android.net.Uri
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.*
+import androidx.compose.material.AlertDialog
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonColors
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Done
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -130,7 +144,6 @@ fun ZapCustomDialog(
                             onPayViaIntent = onPayViaIntent,
                             zapType = selectedZapType
                         )
-                        onClose()
                     }
                 }
 

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

@@ -173,6 +173,8 @@ fun UserActionOptions(
     baseAuthor: User,
     accountViewModel: AccountViewModel
 ) {
+    val scope = rememberCoroutineScope()
+
     WatchIsHiddenUser(baseAuthor, accountViewModel) { isHidden ->
         if (isHidden) {
             ShowUserButton {
@@ -209,14 +211,20 @@ fun ShowFollowingOrUnfollowingButton(
     if (isFollowing) {
         UnfollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.unfollow(baseAuthor)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {
@@ -227,14 +235,20 @@ fun ShowFollowingOrUnfollowingButton(
     } else {
         FollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.account.follow(baseAuthor)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {

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

@@ -45,21 +45,21 @@ class AccountStateViewModel(val context: Context) : ViewModel() {
         }
     }
 
-    fun startUI(key: String, useProxy: Boolean, proxyPort: Int) {
+    fun startUI(key: String, useProxy: Boolean, proxyPort: Int, loginWithExternalSigner: Boolean = false) {
         val parsed = Nip19.uriToRoute(key)
         val pubKeyParsed = parsed?.hex?.hexToByteArray()
         val proxy = HttpClient.initProxy(useProxy, "127.0.0.1", proxyPort)
 
         val account =
             if (key.startsWith("nsec")) {
-                Account(KeyPair(privKey = key.bechToBytes()), proxy = proxy, proxyPort = proxyPort)
+                Account(KeyPair(privKey = key.bechToBytes()), proxy = proxy, proxyPort = proxyPort, loginWithExternalSigner = loginWithExternalSigner)
             } else if (pubKeyParsed != null) {
-                Account(KeyPair(pubKey = pubKeyParsed), proxy = proxy, proxyPort = proxyPort)
+                Account(KeyPair(pubKey = pubKeyParsed), proxy = proxy, proxyPort = proxyPort, loginWithExternalSigner = loginWithExternalSigner)
             } else if (EMAIL_PATTERN.matcher(key).matches()) {
                 // Evaluate NIP-5
-                Account(KeyPair(), proxy = proxy, proxyPort = proxyPort)
+                Account(KeyPair(), proxy = proxy, proxyPort = proxyPort, loginWithExternalSigner = loginWithExternalSigner)
             } else {
-                Account(KeyPair(Hex.decode(key)), proxy = proxy, proxyPort = proxyPort)
+                Account(KeyPair(Hex.decode(key)), proxy = proxy, proxyPort = proxyPort, loginWithExternalSigner = loginWithExternalSigner)
             }
 
         LocalPreferences.updatePrefsForLogin(account)

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

@@ -97,6 +97,10 @@ class AccountViewModel(val account: Account) : ViewModel() {
         return account.isWriteable()
     }
 
+    fun loggedInWithExternalSigner(): Boolean {
+        return account.loginWithExternalSigner
+    }
+
     fun userProfile(): User {
         return account.userProfile()
     }
@@ -251,10 +255,26 @@ class AccountViewModel(val account: Account) : ViewModel() {
         account.addPrivateBookmark(note)
     }
 
+    fun addPrivateBookmark(note: Note, decryptedContent: String) {
+        account.addPrivateBookmark(note, decryptedContent)
+    }
+
+    fun addPublicBookmark(note: Note, decryptedContent: String) {
+        account.addPublicBookmark(note, decryptedContent)
+    }
+
+    fun removePublicBookmark(note: Note, decryptedContent: String) {
+        account.removePublicBookmark(note, decryptedContent)
+    }
+
     fun addPublicBookmark(note: Note) {
         account.addPublicBookmark(note)
     }
 
+    fun removePrivateBookmark(note: Note, decryptedContent: String) {
+        account.removePrivateBookmark(note, decryptedContent)
+    }
+
     fun removePrivateBookmark(note: Note) {
         account.removePrivateBookmark(note)
     }

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

@@ -171,14 +171,20 @@ fun GeoHashActionOptions(
     if (isFollowingTag) {
         UnfollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.account.unfollowGeohash(tag)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {
@@ -189,14 +195,20 @@ fun GeoHashActionOptions(
     } else {
         FollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.account.followGeohash(tag)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {

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

@@ -147,14 +147,20 @@ fun HashtagActionOptions(
     if (isFollowingTag) {
         UnfollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.account.unfollowHashtag(tag)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {
@@ -165,14 +171,20 @@ fun HashtagActionOptions(
     } else {
         FollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.account.followHashtag(tag)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {

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

@@ -9,15 +9,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.material.*
-import androidx.compose.material.DrawerValue
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.ModalBottomSheetLayout
-import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material.Scaffold
-import androidx.compose.material.rememberDrawerState
-import androidx.compose.material.rememberModalBottomSheetState
-import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
@@ -28,6 +19,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.compose.currentBackStackEntryAsState
@@ -37,12 +29,6 @@ import com.vitorpamplona.amethyst.ui.buttons.NewCommunityNoteButton
 import com.vitorpamplona.amethyst.ui.buttons.NewImageButton
 import com.vitorpamplona.amethyst.ui.buttons.NewNoteButton
 import com.vitorpamplona.amethyst.ui.navigation.*
-import com.vitorpamplona.amethyst.ui.navigation.AccountSwitchBottomSheet
-import com.vitorpamplona.amethyst.ui.navigation.AppBottomBar
-import com.vitorpamplona.amethyst.ui.navigation.AppNavigation
-import com.vitorpamplona.amethyst.ui.navigation.AppTopBar
-import com.vitorpamplona.amethyst.ui.navigation.DrawerContent
-import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.note.UserReactionsViewModel
 import com.vitorpamplona.amethyst.ui.screen.AccountState
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
@@ -251,11 +237,14 @@ fun FloatingButtons(
     navScrollToTop: (Route, Boolean) -> Unit
 ) {
     val accountState by accountStateViewModel.accountContent.collectAsState()
+    val context = LocalContext.current
 
     Crossfade(targetState = accountState, animationSpec = tween(durationMillis = 100)) { state ->
         when (state) {
             is AccountState.LoggedInViewOnly -> {
-                // Does nothing.
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    WritePermissionButtons(navEntryState, accountViewModel, nav, navScrollToTop)
+                }
             }
             is AccountState.LoggedOff -> {
                 // Does nothing.

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

@@ -621,7 +621,9 @@ private fun ProfileHeader(
                 modifier = Modifier
                     .size(30.dp)
                     .align(Alignment.Center),
-                onClick = { popupExpanded = true },
+                onClick = {
+                    popupExpanded = true
+                },
                 shape = ButtonBorder,
                 colors = ButtonDefaults
                     .buttonColors(
@@ -714,6 +716,8 @@ private fun ProfileActions(
         EditButton(accountViewModel.account)
     }
 
+    val scope = rememberCoroutineScope()
+
     WatchIsHiddenUser(baseUser, accountViewModel) { isHidden ->
         if (isHidden) {
             ShowUserButton {
@@ -744,14 +748,20 @@ private fun DisplayFollowUnfollowButton(
     if (isLoggedInFollowingUser) {
         UnfollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.account.unfollow(baseUser)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {
@@ -763,14 +773,20 @@ private fun DisplayFollowUnfollowButton(
         if (isUserFollowingLoggedIn) {
             FollowButton(R.string.follow_back) {
                 if (!accountViewModel.isWriteable()) {
-                    scope.launch {
-                        Toast
-                            .makeText(
-                                context,
-                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
-                                Toast.LENGTH_SHORT
-                            )
-                            .show()
+                    if (accountViewModel.loggedInWithExternalSigner()) {
+                        scope.launch(Dispatchers.IO) {
+                            accountViewModel.account.follow(baseUser)
+                        }
+                    } else {
+                        scope.launch {
+                            Toast
+                                .makeText(
+                                    context,
+                                    context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                    Toast.LENGTH_SHORT
+                                )
+                                .show()
+                        }
                     }
                 } else {
                     scope.launch(Dispatchers.IO) {
@@ -781,14 +797,20 @@ private fun DisplayFollowUnfollowButton(
         } else {
             FollowButton(R.string.follow) {
                 if (!accountViewModel.isWriteable()) {
-                    scope.launch {
-                        Toast
-                            .makeText(
-                                context,
-                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
-                                Toast.LENGTH_SHORT
-                            )
-                            .show()
+                    if (accountViewModel.loggedInWithExternalSigner()) {
+                        scope.launch(Dispatchers.IO) {
+                            accountViewModel.account.follow(baseUser)
+                        }
+                    } else {
+                        scope.launch {
+                            Toast
+                                .makeText(
+                                    context,
+                                    context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                    Toast.LENGTH_SHORT
+                                )
+                                .show()
+                        }
                     }
                 } else {
                     scope.launch(Dispatchers.IO) {
@@ -1688,17 +1710,21 @@ fun UserProfileDropDownMenu(user: User, popupExpanded: Boolean, onDismiss: () ->
         if (accountViewModel.userProfile() != user) {
             Divider()
             if (accountViewModel.account.isHidden(user)) {
-                DropdownMenuItem(onClick = {
-                    accountViewModel.show(user)
-                    onDismiss()
-                }) {
+                DropdownMenuItem(
+                    onClick = {
+                        accountViewModel.show(user)
+                        onDismiss()
+                    }
+                ) {
                     Text(stringResource(R.string.unblock_user))
                 }
             } else {
-                DropdownMenuItem(onClick = {
-                    accountViewModel.hide(user)
-                    onDismiss()
-                }) {
+                DropdownMenuItem(
+                    onClick = {
+                        accountViewModel.hide(user)
+                        onDismiss()
+                    }
+                ) {
                     Text(stringResource(id = R.string.block_hide_user))
                 }
             }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt

@@ -1,7 +1,10 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedOff
 
-import android.content.Context
+import android.app.Activity
 import android.util.Log
+import android.widget.Toast
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
@@ -36,13 +39,20 @@ import androidx.compose.ui.text.input.*
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ServiceManager
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
+import com.vitorpamplona.amethyst.service.PackageUtils
+import com.vitorpamplona.amethyst.service.SignerType
 import com.vitorpamplona.amethyst.ui.qrcode.SimpleQrCodeScanner
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ConnectOrbotDialog
 import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.Size35dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.util.*
 
 @OptIn(ExperimentalComposeUiApi::class)
@@ -63,6 +73,58 @@ fun LoginPage(
     val useProxy = remember { mutableStateOf(false) }
     val proxyPort = remember { mutableStateOf("9050") }
     var connectOrbotDialogOpen by remember { mutableStateOf(false) }
+    val scope = rememberCoroutineScope()
+    var loginWithExternalSigner by remember { mutableStateOf(false) }
+    val activity = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.StartActivityForResult(),
+        onResult = {
+            loginWithExternalSigner = false
+            ExternalSignerUtils.isActivityRunning = false
+            ServiceManager.shouldPauseService = true
+            if (it.resultCode != Activity.RESULT_OK) {
+                scope.launch(Dispatchers.Main) {
+                    Toast.makeText(
+                        Amethyst.instance,
+                        "Sign request rejected",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+                return@rememberLauncherForActivityResult
+            } else {
+                val event = it.data?.getStringExtra("signature") ?: ""
+                key.value = TextFieldValue(event)
+                if (!acceptedTerms.value) {
+                    termsAcceptanceIsRequired =
+                        context.getString(R.string.acceptance_of_terms_is_required)
+                }
+
+                if (key.value.text.isBlank()) {
+                    errorMessage = context.getString(R.string.key_is_required)
+                }
+
+                if (acceptedTerms.value && key.value.text.isNotBlank()) {
+                    try {
+                        accountViewModel.startUI(key.value.text, useProxy.value, proxyPort.value.toInt(), true)
+                    } catch (e: Exception) {
+                        Log.e("Login", "Could not sign in", e)
+                        errorMessage = context.getString(R.string.invalid_key)
+                    }
+                }
+            }
+        }
+    )
+
+    LaunchedEffect(loginWithExternalSigner) {
+        if (loginWithExternalSigner) {
+            ExternalSignerUtils.openSigner(
+                "",
+                SignerType.GET_PUBLIC_KEY,
+                activity,
+                "",
+                ""
+            )
+        }
+    }
 
     Column(
         modifier = Modifier
@@ -229,7 +291,7 @@ fun LoginPage(
                 }
             }
 
-            if (isPackageInstalled(context, "org.torproject.android")) {
+            if (PackageUtils.isOrbotInstalled(context)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Checkbox(
                         checked = useProxy.value,
@@ -290,6 +352,53 @@ fun LoginPage(
                     Text(text = stringResource(R.string.login))
                 }
             }
+
+            if (PackageUtils.isAmberInstalled(context)) {
+                Box(modifier = Modifier.padding(40.dp, 40.dp, 40.dp, 0.dp)) {
+                    Button(
+                        onClick = {
+                            val result = ExternalSignerUtils.getDataFromResolver(SignerType.GET_PUBLIC_KEY, arrayOf("login"), "")
+                            if (result == null) {
+                                loginWithExternalSigner = true
+                                return@Button
+                            }
+                            key.value = TextFieldValue(result)
+                            if (!acceptedTerms.value) {
+                                termsAcceptanceIsRequired =
+                                    context.getString(R.string.acceptance_of_terms_is_required)
+                            }
+
+                            if (key.value.text.isBlank()) {
+                                errorMessage = context.getString(R.string.key_is_required)
+                            }
+
+                            if (acceptedTerms.value && key.value.text.isNotBlank()) {
+                                try {
+                                    accountViewModel.startUI(
+                                        key.value.text,
+                                        useProxy.value,
+                                        proxyPort.value.toInt(),
+                                        true
+                                    )
+                                } catch (e: Exception) {
+                                    Log.e("Login", "Could not sign in", e)
+                                    errorMessage = context.getString(R.string.invalid_key)
+                                }
+                            }
+                        },
+                        shape = RoundedCornerShape(Size35dp),
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(50.dp),
+                        colors = ButtonDefaults
+                            .buttonColors(
+                                backgroundColor = if (acceptedTerms.value) MaterialTheme.colors.primary else Color.Gray
+                            )
+                    ) {
+                        Text(text = stringResource(R.string.login_with_external_signer))
+                    }
+                }
+            }
         }
 
         // The last child is glued to the bottom.
@@ -315,7 +424,3 @@ fun LoginPage(
         )
     }
 }
-
-fun isPackageInstalled(context: Context, target: String): Boolean {
-    return context.packageManager.getInstalledApplications(0).find { info -> info.packageName == target } != null
-}

app/src/main/res/values-nl/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="point_to_the_qr_code">Richt camera op de QR-Code</string>
+    <string name="point_to_the_qr_code">Richt camera op de QR-code</string>
     <string name="show_qr">Toon QR</string>
     <string name="profile_image">Profielfoto</string>
     <string name="scan_qr">Scan QR</string>
@@ -479,4 +479,21 @@
     <string name="relay_information_document_error_parse_result">Mislukt om het resultaat van %1$s te parsen: %2$s</string>
     <string name="relay_information_document_error_http_status">%1$s mislukt met code %2$s</string>
     <string name="active_for">Actief voor: </string>
+    <string name="active_for_home">Startpagina</string>
+    <string name="active_for_msg">DM\'s</string>
+    <string name="active_for_chats">Chats</string>
+    <string name="active_for_global">Globaal</string>
+    <string name="active_for_search">Zoeken</string>
+    <string name="zap_split_title">Deel en stuur Zaps door</string>
+    <string name="zap_split_explainer">Ondersteunende clients delen en sturen door naar de gebruikers toegevoegd hier in plaats van de jouwe</string>
+    <string name="zap_split_serarch_and_add_user">Zoek en voeg gebruiker toe</string>
+    <string name="zap_split_serarch_and_add_user_placeholder">Gebruikersnaam of weergavenaam</string>
+    <string name="user_x_does_not_have_a_lightning_address_setup_to_receive_sats">Gebruiker %1$s heeft geen Lightning Adress ingesteld om sats te ontvangen</string>
+    <string name="zap_split_weight">Percentage</string>
+    <string name="zap_split_weight_placeholder">25</string>
+    <string name="splitting_zaps_with">Deel zaps met</string>
+    <string name="forwarding_zaps_to">Stuur zaps door naar</string>
+    <string name="lightning_wallets_not_found2">Lightning wallets niet gevonden</string>
+    <string name="paid">Betaald</string>
+    <string name="wallet_number">Wallet %1$s</string>
 </resources>

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

@@ -537,6 +537,8 @@
     <string name="messages_new_subject_message">Explanation to members</string>
     <string name="messages_new_subject_message_placeholder">Changing the name for the new goals.</string>
 
+    <string name="paste_from_clipboard">Paste from clipboard</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>
@@ -550,6 +552,8 @@
     <string name="created_at">Created at</string>
     <string name="rules">Rules</string>
 
+    <string name="login_with_external_signer">Login with Amber</string>
+
     <string name="status_update">Update your status</string>
 
     <string name="lightning_wallets_not_found">Error parsing error message</string>
@@ -584,4 +588,6 @@
     <string name="lightning_wallets_not_found2">Lightning wallets not found</string>
     <string name="paid">Paid</string>
     <string name="wallet_number">Wallet %1$s</string>
+    <string name="error_opening_external_signer">Error opening signer app</string>
+    <string name="sign_request_rejected">Sign request rejected</string>
 </resources>

app/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt

@@ -6,8 +6,12 @@ import com.vitorpamplona.amethyst.AccountInfo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.tasks.await
 
-class PushNotificationUtils {
+object PushNotificationUtils {
+    var hasInit: Boolean = false
     suspend fun init(accounts: List<AccountInfo>) = with(Dispatchers.IO) {
+        if (hasInit) {
+            return@with
+        }
         // get user notification token provided by firebase
         try {
             RegisterAccounts(accounts).go(FirebaseMessaging.getInstance().token.await())

benchmark/src/androidTest/java/com/vitorpamplona/amethyst/benchmark/GiftWrapBenchmark.kt

@@ -34,7 +34,7 @@ class GiftWrapBenchmark {
         val events = NIP24Factory().createMsgNIP24(
             message,
             listOf(receiver.pubKey.toHexKey()),
-            sender.privKey!!
+            sender
         )
 
         Assert.assertEquals(expectedLength, events.map { it.toJson() }.joinToString("").length)
@@ -63,7 +63,7 @@ class GiftWrapBenchmark {
         val giftWrap = NIP24Factory().createMsgNIP24(
             message,
             listOf(receiver.pubKey.toHexKey()),
-            sender.privKey!!
+            sender
         ).first()
 
         val keyToUse = if (giftWrap.recipientPubKey() == sender.pubKey.toHexKey()) sender.privKey!! else receiver.privKey!!

quartz/src/main/java/com/vitorpamplona/quartz/events/BookmarkListEvent.kt

@@ -16,9 +16,37 @@ class BookmarkListEvent(
     content: String,
     sig: HexKey
 ) : GeneralListEvent(id, pubKey, createdAt, kind, tags, content, sig) {
+    var decryptedContent = ""
+
     companion object {
         const val kind = 30001
 
+        fun create(
+            name: String = "",
+            events: List<String>? = null,
+            users: List<String>? = null,
+            addresses: List<ATag>? = null,
+            content: String,
+            pubKey: HexKey,
+            createdAt: Long = TimeUtils.now()
+        ): BookmarkListEvent {
+            val tags = mutableListOf<List<String>>()
+            tags.add(listOf("d", name))
+
+            events?.forEach {
+                tags.add(listOf("e", it))
+            }
+            users?.forEach {
+                tags.add(listOf("p", it))
+            }
+            addresses?.forEach {
+                tags.add(listOf("a", it.toTag()))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            return BookmarkListEvent(id.toHexKey(), pubKey, createdAt, tags, content, "")
+        }
+
         fun create(
             name: String = "",
 
@@ -53,5 +81,11 @@ class BookmarkListEvent(
             val sig = CryptoUtils.sign(id, privateKey)
             return BookmarkListEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
         }
+
+        fun create(
+            unsignedEvent: BookmarkListEvent, signature: String
+        ): BookmarkListEvent {
+            return BookmarkListEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
+        }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/ChannelCreateEvent.kt

@@ -2,10 +2,12 @@ package com.vitorpamplona.quartz.events
 
 import android.util.Log
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.key
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 
 @Immutable
@@ -27,7 +29,7 @@ class ChannelCreateEvent(
     companion object {
         const val kind = 40
 
-        fun create(channelInfo: ChannelData?, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ChannelCreateEvent {
+        fun create(channelInfo: ChannelData?, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ChannelCreateEvent {
             val content = try {
                 if (channelInfo != null) {
                     mapper.writeValueAsString(channelInfo)
@@ -39,11 +41,15 @@ class ChannelCreateEvent(
                 ""
             }
 
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = keyPair.pubKey.toHexKey()
             val tags = emptyList<List<String>>()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return ChannelCreateEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.pubKey)
+            return ChannelCreateEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
+        }
+
+        fun create(unsignedEvent: ChannelCreateEvent, signature: String): ChannelCreateEvent {
+            return ChannelCreateEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 

quartz/src/main/java/com/vitorpamplona/quartz/events/ChannelMessageEvent.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 
 @Immutable
@@ -33,14 +34,13 @@ class ChannelMessageEvent(
             replyTos: List<String>? = null,
             mentions: List<String>? = null,
             zapReceiver: List<ZapSplitSetup>? = null,
-            privateKey: ByteArray,
+            keyPair: KeyPair,
             createdAt: Long = TimeUtils.now(),
             markAsSensitive: Boolean,
             zapRaiserAmount: Long?,
             geohash: String? = null
         ): ChannelMessageEvent {
             val content = message
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf(
                 listOf("e", channel, "", "root")
             )
@@ -63,9 +63,16 @@ class ChannelMessageEvent(
                 tags.add(listOf("g", it))
             }
 
+            val pubKey = keyPair.pubKey.toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return ChannelMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return ChannelMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
+        }
+
+        fun create(
+            unsignedEvent: ChannelMessageEvent, signature: String
+        ): ChannelMessageEvent {
+            return ChannelMessageEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/ChannelMetadataEvent.kt

@@ -5,6 +5,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 
 @Immutable
@@ -29,7 +30,7 @@ class ChannelMetadataEvent(
     companion object {
         const val kind = 41
 
-        fun create(newChannelInfo: ChannelCreateEvent.ChannelData?, originalChannelIdHex: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ChannelMetadataEvent {
+        fun create(newChannelInfo: ChannelCreateEvent.ChannelData?, originalChannelIdHex: String, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ChannelMetadataEvent {
             val content =
                 if (newChannelInfo != null) {
                     mapper.writeValueAsString(newChannelInfo)
@@ -37,11 +38,15 @@ class ChannelMetadataEvent(
                     ""
                 }
 
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = keyPair.pubKey.toHexKey()
             val tags = listOf(listOf("e", originalChannelIdHex, "", "root"))
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return ChannelMetadataEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return ChannelMetadataEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
+        }
+
+        fun create(unsignedEvent: ChannelMetadataEvent, signature: String): ChannelMetadataEvent {
+            return ChannelMetadataEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/ChatMessageEvent.kt

@@ -5,6 +5,7 @@ import androidx.compose.runtime.Stable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.toImmutableSet
@@ -61,7 +62,7 @@ class ChatMessageEvent(
             markAsSensitive: Boolean = false,
             zapRaiserAmount: Long? = null,
             geohash: String? = null,
-            privateKey: ByteArray,
+            keyPair: KeyPair,
             createdAt: Long = TimeUtils.now()
         ): ChatMessageEvent {
             val content = msg
@@ -91,10 +92,17 @@ class ChatMessageEvent(
                 tags.add(listOf("subject", it))
             }
 
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = keyPair.pubKey.toHexKey()
             val id = generateId(pubKey, createdAt, ClassifiedsEvent.kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return ChatMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return ChatMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
+        }
+
+        fun create(
+            unsignedEvent: ChatMessageEvent,
+            signature: String
+        ): ChatMessageEvent {
+            return ChatMessageEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/ContactListEvent.kt

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.decodePublicKey
@@ -98,7 +99,7 @@ class ContactListEvent(
             followCommunities: List<ATag>,
             followEvents: List<String>,
             relayUse: Map<String, ReadWrite>?,
-            privateKey: ByteArray,
+            keyPair: KeyPair,
             createdAt: Long = TimeUtils.now()
         ): ContactListEvent {
             val content = if (relayUse != null) {
@@ -130,122 +131,122 @@ class ContactListEvent(
             return create(
                 content = content,
                 tags = tags,
-                privateKey = privateKey,
+                keyPair = keyPair,
                 createdAt = createdAt
             )
         }
 
-        fun followUser(earlierVersion: ContactListEvent, pubKeyHex: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+        fun followUser(earlierVersion: ContactListEvent, pubKeyHex: String, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ContactListEvent {
             if (earlierVersion.isTaggedUser(pubKeyHex)) return earlierVersion
 
             return create(
                 content = earlierVersion.content,
                 tags = earlierVersion.tags.plus(element = listOf("p", pubKeyHex)),
-                privateKey = privateKey,
+                keyPair = keyPair,
                 createdAt = createdAt
             )
         }
 
-        fun unfollowUser(earlierVersion: ContactListEvent, pubKeyHex: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+        fun unfollowUser(earlierVersion: ContactListEvent, pubKeyHex: String, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ContactListEvent {
             if (!earlierVersion.isTaggedUser(pubKeyHex)) return earlierVersion
 
             return create(
                 content = earlierVersion.content,
                 tags = earlierVersion.tags.filter { it.size > 1 && it[1] != pubKeyHex },
-                privateKey = privateKey,
+                keyPair = keyPair,
                 createdAt = createdAt
             )
         }
 
-        fun followHashtag(earlierVersion: ContactListEvent, hashtag: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+        fun followHashtag(earlierVersion: ContactListEvent, hashtag: String, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ContactListEvent {
             if (earlierVersion.isTaggedHash(hashtag)) return earlierVersion
 
             return create(
                 content = earlierVersion.content,
                 tags = earlierVersion.tags.plus(element = listOf("t", hashtag)),
-                privateKey = privateKey,
+                keyPair = keyPair,
                 createdAt = createdAt
             )
         }
 
-        fun unfollowHashtag(earlierVersion: ContactListEvent, hashtag: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+        fun unfollowHashtag(earlierVersion: ContactListEvent, hashtag: String, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ContactListEvent {
             if (!earlierVersion.isTaggedHash(hashtag)) return earlierVersion
 
             return create(
                 content = earlierVersion.content,
                 tags = earlierVersion.tags.filter { it.size > 1 && !it[1].equals(hashtag, true) },
-                privateKey = privateKey,
+                keyPair = keyPair,
                 createdAt = createdAt
             )
         }
 
-        fun followGeohash(earlierVersion: ContactListEvent, hashtag: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+        fun followGeohash(earlierVersion: ContactListEvent, hashtag: String, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ContactListEvent {
             if (earlierVersion.isTaggedGeoHash(hashtag)) return earlierVersion
 
             return create(
                 content = earlierVersion.content,
                 tags = earlierVersion.tags.plus(element = listOf("g", hashtag)),
-                privateKey = privateKey,
+                keyPair = keyPair,
                 createdAt = createdAt
             )
         }
 
-        fun unfollowGeohash(earlierVersion: ContactListEvent, hashtag: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+        fun unfollowGeohash(earlierVersion: ContactListEvent, hashtag: String, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ContactListEvent {
             if (!earlierVersion.isTaggedGeoHash(hashtag)) return earlierVersion
 
             return create(
                 content = earlierVersion.content,
                 tags = earlierVersion.tags.filter { it.size > 1 && it[1] != hashtag },
-                privateKey = privateKey,
+                keyPair = keyPair,
                 createdAt = createdAt
             )
         }
 
-        fun followEvent(earlierVersion: ContactListEvent, idHex: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+        fun followEvent(earlierVersion: ContactListEvent, idHex: String, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ContactListEvent {
             if (earlierVersion.isTaggedEvent(idHex)) return earlierVersion
 
             return create(
                 content = earlierVersion.content,
                 tags = earlierVersion.tags.plus(element = listOf("e", idHex)),
-                privateKey = privateKey,
+                keyPair = keyPair,
                 createdAt = createdAt
             )
         }
 
-        fun unfollowEvent(earlierVersion: ContactListEvent, idHex: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+        fun unfollowEvent(earlierVersion: ContactListEvent, idHex: String, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ContactListEvent {
             if (!earlierVersion.isTaggedEvent(idHex)) return earlierVersion
 
             return create(
                 content = earlierVersion.content,
                 tags = earlierVersion.tags.filter { it.size > 1 && it[1] != idHex },
-                privateKey = privateKey,
+                keyPair = keyPair,
                 createdAt = createdAt
             )
         }
 
-        fun followAddressableEvent(earlierVersion: ContactListEvent, aTag: ATag, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+        fun followAddressableEvent(earlierVersion: ContactListEvent, aTag: ATag, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ContactListEvent {
             if (earlierVersion.isTaggedAddressableNote(aTag.toTag())) return earlierVersion
 
             return create(
                 content = earlierVersion.content,
                 tags = earlierVersion.tags.plus(element = listOfNotNull("a", aTag.toTag(), aTag.relay)),
-                privateKey = privateKey,
+                keyPair = keyPair,
                 createdAt = createdAt
             )
         }
 
-        fun unfollowAddressableEvent(earlierVersion: ContactListEvent, aTag: ATag, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+        fun unfollowAddressableEvent(earlierVersion: ContactListEvent, aTag: ATag, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ContactListEvent {
             if (!earlierVersion.isTaggedAddressableNote(aTag.toTag())) return earlierVersion
 
             return create(
                 content = earlierVersion.content,
                 tags = earlierVersion.tags.filter { it.size > 1 && it[1] != aTag.toTag() },
-                privateKey = privateKey,
+                keyPair = keyPair,
                 createdAt = createdAt
             )
         }
 
-        fun updateRelayList(earlierVersion: ContactListEvent, relayUse: Map<String, ReadWrite>?, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+        fun updateRelayList(earlierVersion: ContactListEvent, relayUse: Map<String, ReadWrite>?, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ContactListEvent {
             val content = if (relayUse != null) {
                 mapper.writeValueAsString(relayUse)
             } else {
@@ -255,16 +256,35 @@ class ContactListEvent(
             return create(
                 content = content,
                 tags = earlierVersion.tags,
-                privateKey = privateKey,
+                keyPair = keyPair,
                 createdAt = createdAt
             )
         }
 
-        fun create(content: String, tags: List<List<String>>, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+        fun create(
+            unsignedEvent: Event,
+            signature: String
+        ): ContactListEvent {
+            return ContactListEvent(
+                unsignedEvent.id,
+                unsignedEvent.pubKey,
+                unsignedEvent.createdAt,
+                unsignedEvent.tags,
+                unsignedEvent.content,
+                signature
+            )
+        }
+
+        fun create(
+            content: String,
+            tags: List<List<String>>,
+            keyPair: KeyPair,
+            createdAt: Long = TimeUtils.now()
+        ): ContactListEvent {
+            val pubKey = keyPair.pubKey.toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return ContactListEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return ContactListEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
         }
     }
 

quartz/src/main/java/com/vitorpamplona/quartz/events/DeletionEvent.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 
 @Immutable
@@ -20,13 +21,17 @@ class DeletionEvent(
     companion object {
         const val kind = 5
 
-        fun create(deleteEvents: List<String>, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): DeletionEvent {
+        fun create(deleteEvents: List<String>, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): DeletionEvent {
             val content = ""
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = keyPair.pubKey.toHexKey()
             val tags = deleteEvents.map { listOf("e", it) }
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return DeletionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return DeletionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
+        }
+
+        fun create(unsignedEvent: DeletionEvent, signature: String): DeletionEvent {
+            return DeletionEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/EmojiPackSelectionEvent.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.HexKey
 
@@ -21,11 +22,11 @@ class EmojiPackSelectionEvent(
 
         fun create(
             listOfEmojiPacks: List<ATag>?,
-            privateKey: ByteArray,
+            keyPair: KeyPair,
             createdAt: Long = TimeUtils.now()
         ): EmojiPackSelectionEvent {
             val msg = ""
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = keyPair.pubKey.toHexKey()
             val tags = mutableListOf<List<String>>()
 
             listOfEmojiPacks?.forEach {
@@ -33,8 +34,14 @@ class EmojiPackSelectionEvent(
             }
 
             val id = generateId(pubKey, createdAt, kind, tags, msg)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return EmojiPackSelectionEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return EmojiPackSelectionEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig?.toHexKey() ?: "")
+        }
+
+        fun create(
+            unsignedEvent: EmojiPackSelectionEvent, signature: String
+        ): EmojiPackSelectionEvent {
+            return EmojiPackSelectionEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/FileHeaderEvent.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 
 @Immutable
@@ -53,7 +54,7 @@ class FileHeaderEvent(
             torrentInfoHash: String? = null,
             encryptionKey: AESGCM? = null,
             sensitiveContent: Boolean? = null,
-            privateKey: ByteArray,
+            keyPair: KeyPair,
             createdAt: Long = TimeUtils.now()
         ): FileHeaderEvent {
             val tags = listOfNotNull(
@@ -76,10 +77,10 @@ class FileHeaderEvent(
             )
 
             val content = description ?: ""
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = keyPair.pubKey.toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return FileHeaderEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return FileHeaderEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/FileStorageEvent.kt

@@ -40,6 +40,21 @@ class FileStorageEvent(
             return Base64.getEncoder().encodeToString(bytes)
         }
 
+        fun create(
+            mimeType: String,
+            data: ByteArray,
+            pubKey: HexKey,
+            createdAt: Long = TimeUtils.now()
+        ): FileStorageEvent {
+            val tags = listOfNotNull(
+                listOf(TYPE, mimeType)
+            )
+
+            val content = encode(data)
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            return FileStorageEvent(id.toHexKey(), pubKey, createdAt, tags, content, "")
+        }
+
         fun create(
             mimeType: String,
             data: ByteArray,

quartz/src/main/java/com/vitorpamplona/quartz/events/FileStorageHeaderEvent.kt

@@ -39,6 +39,45 @@ class FileStorageHeaderEvent(
         private const val TORRENT_INFOHASH = "i"
         private const val BLUR_HASH = "blurhash"
 
+        fun create(
+            storageEvent: FileStorageEvent,
+            mimeType: String? = null,
+            description: String? = null,
+            hash: String? = null,
+            size: String? = null,
+            dimensions: String? = null,
+            blurhash: String? = null,
+            magnetURI: String? = null,
+            torrentInfoHash: String? = null,
+            encryptionKey: AESGCM? = null,
+            sensitiveContent: Boolean? = null,
+            pubKey: HexKey,
+            createdAt: Long = TimeUtils.now()
+        ): FileStorageHeaderEvent {
+            val tags = listOfNotNull(
+                listOf("e", storageEvent.id),
+                mimeType?.let { listOf(MIME_TYPE, mimeType) },
+                hash?.let { listOf(HASH, it) },
+                size?.let { listOf(FILE_SIZE, it) },
+                dimensions?.let { listOf(DIMENSION, it) },
+                blurhash?.let { listOf(BLUR_HASH, it) },
+                magnetURI?.let { listOf(MAGNET_URI, it) },
+                torrentInfoHash?.let { listOf(TORRENT_INFOHASH, it) },
+                encryptionKey?.let { listOf(ENCRYPTION_KEY, it.key, it.nonce) },
+                sensitiveContent?.let {
+                    if (it) {
+                        listOf("content-warning", "")
+                    } else {
+                        null
+                    }
+                }
+            )
+
+            val content = description ?: ""
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            return FileStorageHeaderEvent(id.toHexKey(), pubKey, createdAt, tags, content, "")
+        }
+
         fun create(
             storageEvent: FileStorageEvent,
             mimeType: String? = null,

quartz/src/main/java/com/vitorpamplona/quartz/events/GeneralListEvent.kt

@@ -52,15 +52,37 @@ abstract class GeneralListEvent(
         return privateTagsCache
     }
 
+    fun privateTags(content: String): List<List<String>>? {
+        if (privateTagsCache != null) {
+            return privateTagsCache
+        }
+
+        privateTagsCache = try {
+            content.let { mapper.readValue<List<List<String>>>(it) }
+        } catch (e: Throwable) {
+            Log.w("GeneralList", "Error parsing the JSON ${e.message}")
+            null
+        }
+        return privateTagsCache
+    }
+
     fun privateTagsOrEmpty(privKey: ByteArray): List<List<String>> {
         return privateTags(privKey) ?: emptyList()
     }
 
-    fun privateTaggedUsers(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "p" }?.map { it[1] }
+    fun privateTagsOrEmpty(content: String): List<List<String>> {
+        return privateTags(content) ?: emptyList()
+    }
 
+    fun privateTaggedUsers(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "p" }?.map { it[1] }
+    fun privateTaggedUsers(content: String) = privateTags(content)?.filter { it.size > 1 && it[0] == "p" }?.map { it[1] }
     fun privateHashtags(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "t" }?.map { it[1] }
+    fun privateHashtags(content: String) = privateTags(content)?.filter { it.size > 1 && it[0] == "t" }?.map { it[1] }
     fun privateGeohashes(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "g" }?.map { it[1] }
+    fun privateGeohashes(content: String) = privateTags(content)?.filter { it.size > 1 && it[0] == "g" }?.map { it[1] }
     fun privateTaggedEvents(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "e" }?.map { it[1] }
+    fun privateTaggedEvents(content: String) = privateTags(content)?.filter { it.size > 1 && it[0] == "e" }?.map { it[1] }
+
     fun privateTaggedAddresses(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "a" }?.mapNotNull {
         val aTagValue = it.getOrNull(1)
         val relay = it.getOrNull(2)
@@ -68,6 +90,13 @@ abstract class GeneralListEvent(
         if (aTagValue != null) ATag.parse(aTagValue, relay) else null
     }
 
+    fun privateTaggedAddresses(content: String) = privateTags(content)?.filter { it.firstOrNull() == "a" }?.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
+
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+    }
+
     companion object {
         fun createPrivateTags(
             privEvents: List<String>? = null,

quartz/src/main/java/com/vitorpamplona/quartz/events/GenericRepostEvent.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 
 @Immutable
@@ -28,13 +29,13 @@ class GenericRepostEvent(
     companion object {
         const val kind = 16
 
-        fun create(boostedPost: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): GenericRepostEvent {
+        fun create(boostedPost: EventInterface, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): GenericRepostEvent {
             val content = boostedPost.toJson()
 
             val replyToPost = listOf("e", boostedPost.id())
             val replyToAuthor = listOf("p", boostedPost.pubKey())
 
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = keyPair.pubKey.toHexKey()
             var tags: List<List<String>> = listOf(replyToPost, replyToAuthor)
 
             if (boostedPost is AddressableEvent) {
@@ -44,8 +45,12 @@ class GenericRepostEvent(
             tags = tags + listOf(listOf("k", "${boostedPost.kind()}"))
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return GenericRepostEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return GenericRepostEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
+        }
+
+        fun create(unsignedEvent: GenericRepostEvent, signature: String): GenericRepostEvent {
+            return GenericRepostEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/GiftWrapEvent.kt

@@ -36,6 +36,19 @@ class GiftWrapEvent(
         return myInnerEvent
     }
 
+    fun cachedGift(pubKey: ByteArray, decryptedContent: String): Event? {
+        val hex = pubKey.toHexKey()
+        if (cachedInnerEvent.contains(hex)) return cachedInnerEvent[hex]
+
+        val myInnerEvent = unwrap(decryptedContent)
+        if (myInnerEvent is WrappedEvent) {
+            myInnerEvent.host = this
+        }
+
+        cachedInnerEvent = cachedInnerEvent + Pair(hex, myInnerEvent)
+        return myInnerEvent
+    }
+
     fun unwrap(privKey: ByteArray) = try {
         plainContent(privKey)?.let { fromJson(it) }
     } catch (e: Exception) {
@@ -43,6 +56,13 @@ class GiftWrapEvent(
         null
     }
 
+    fun unwrap(decryptedContent: String) = try {
+        plainContent(decryptedContent)?.let { fromJson(it) }
+    } catch (e: Exception) {
+        // Log.e("UnwrapError", "Couldn't Decrypt the content", e)
+        null
+    }
+
     private fun plainContent(privKey: ByteArray): String? {
         if (content.isEmpty()) return null
 
@@ -60,6 +80,11 @@ class GiftWrapEvent(
         }
     }
 
+    private fun plainContent(decryptedContent: String): String? {
+        if (decryptedContent.isEmpty()) return null
+        return decryptedContent
+    }
+
     fun recipientPubKey() = tags.firstOrNull { it.size > 1 && it[0] == "p" }?.get(1)
 
     companion object {

quartz/src/main/java/com/vitorpamplona/quartz/events/HTTPAuthorizationEvent.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 
 @Immutable
@@ -23,7 +24,7 @@ class HTTPAuthorizationEvent(
             url: String,
             method: String,
             body: String? = null,
-            privateKey: ByteArray,
+            keyPair: KeyPair,
             createdAt: Long = TimeUtils.now()
         ): HTTPAuthorizationEvent {
             var hash = ""
@@ -37,10 +38,16 @@ class HTTPAuthorizationEvent(
                 listOf("payload", hash)
             )
 
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = keyPair.pubKey.toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, "")
-            val sig = CryptoUtils.sign(id, privateKey)
-            return HTTPAuthorizationEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return HTTPAuthorizationEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig?.toHexKey() ?: "")
+        }
+
+        fun create(
+            unsignedEvent: HTTPAuthorizationEvent, signature: String
+        ): HTTPAuthorizationEvent {
+            return HTTPAuthorizationEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/LiveActivitiesChatMessageEvent.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.HexKey
 
@@ -49,14 +50,13 @@ class LiveActivitiesChatMessageEvent(
             replyTos: List<String>? = null,
             mentions: List<String>? = null,
             zapReceiver: List<ZapSplitSetup>? = null,
-            privateKey: ByteArray,
+            keyPair: KeyPair,
             createdAt: Long = TimeUtils.now(),
             markAsSensitive: Boolean,
             zapRaiserAmount: Long?,
             geohash: String? = null
         ): LiveActivitiesChatMessageEvent {
             val content = message
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf(
                 listOf("a", activity.toTag(), "", "root")
             )
@@ -79,9 +79,16 @@ class LiveActivitiesChatMessageEvent(
                 tags.add(listOf("g", it))
             }
 
+            val pubKey = keyPair.pubKey.toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return LiveActivitiesChatMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return LiveActivitiesChatMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
+        }
+
+        fun create(
+            unsignedEvent: LiveActivitiesChatMessageEvent, signature: String
+        ): LiveActivitiesChatMessageEvent {
+            return LiveActivitiesChatMessageEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/LnZapPaymentResponseEvent.kt

@@ -61,6 +61,22 @@ class LnZapPaymentResponseEvent(
         }
     }
 
+    fun response(decryptedContent: String): Response? {
+        if (response != null) response
+
+        return try {
+            if (content.isNotEmpty()) {
+                response = mapper.readValue(decryptedContent, Response::class.java)
+                response
+            } else {
+                null
+            }
+        } catch (e: Exception) {
+            Log.w("LnZapPaymentResponseEvent", "Can't parse content as a payment response: $content", e)
+            null
+        }
+    }
+
     companion object {
         const val kind = 23195
     }

quartz/src/main/java/com/vitorpamplona/quartz/events/LnZapRequestEvent.kt

@@ -100,6 +100,147 @@ class LnZapRequestEvent(
             return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
 
+        fun create(
+            unsignedEvent: LnZapRequestEvent,
+            signature: String
+        ): LnZapRequestEvent {
+            return LnZapRequestEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
+        }
+
+        fun createPublic(
+            userHex: String,
+            relays: Set<String>,
+            pubKey: HexKey,
+            message: String,
+            createdAt: Long = TimeUtils.now()
+        ): LnZapRequestEvent {
+            val tags = listOf(
+                listOf("p", userHex),
+                listOf("relays") + relays
+            )
+
+            val id = generateId(pubKey, createdAt, kind, tags, message)
+            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, message, "")
+        }
+
+        fun createPublic(
+            originalNote: EventInterface,
+            relays: Set<String>,
+            pubKey: HexKey,
+            pollOption: Int?,
+            message: String,
+            toUserPubHex: String?, // Overrides in case of Zap Splits
+            createdAt: Long = TimeUtils.now()
+        ): LnZapRequestEvent {
+            var tags = listOf(
+                listOf("e", originalNote.id()),
+                listOf("p", toUserPubHex ?: originalNote.pubKey()),
+                listOf("relays") + relays
+            )
+            if (originalNote is AddressableEvent) {
+                tags = tags + listOf(listOf("a", originalNote.address().toTag()))
+            }
+            if (pollOption != null && pollOption >= 0) {
+                tags = tags + listOf(listOf(POLL_OPTION, pollOption.toString()))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, message)
+            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, message, "")
+        }
+
+        fun createPrivateZap(
+            originalNote: EventInterface,
+            relays: Set<String>,
+            pubKey: HexKey,
+            pollOption: Int?,
+            message: String,
+            toUserPubHex: String?,
+            createdAt: Long = TimeUtils.now()
+        ): LnZapRequestEvent {
+            val content = message
+            var tags = listOf(
+                listOf("e", originalNote.id()),
+                listOf("p", toUserPubHex ?: originalNote.pubKey()),
+                listOf("relays") + relays
+            )
+            if (originalNote is AddressableEvent) {
+                tags = tags + listOf(listOf("a", originalNote.address().toTag()))
+            }
+            if (pollOption != null && pollOption >= 0) {
+                tags = tags + listOf(listOf(POLL_OPTION, pollOption.toString()))
+            }
+
+            tags = tags + listOf(listOf("anon", ""))
+
+            return LnZapRequestEvent("zap", pubKey, createdAt, tags, content, "")
+        }
+
+        fun createPrivateZap(
+            userHex: String,
+            relays: Set<String>,
+            pubKey: HexKey,
+            message: String,
+            createdAt: Long = TimeUtils.now()
+        ): LnZapRequestEvent {
+            val content = message
+            var tags = listOf(
+                listOf("p", userHex),
+                listOf("relays") + relays
+            )
+            tags = tags + listOf(listOf("anon", ""))
+
+            return LnZapRequestEvent("zap", pubKey, createdAt, tags, content, "")
+        }
+
+        fun createAnonymous(
+            originalNote: EventInterface,
+            relays: Set<String>,
+            pollOption: Int?,
+            message: String,
+            toUserPubHex: String?, // Overrides in case of Zap Splits
+            createdAt: Long = TimeUtils.now()
+        ): LnZapRequestEvent {
+            var tags = listOf(
+                listOf("e", originalNote.id()),
+                listOf("p", toUserPubHex ?: originalNote.pubKey()),
+                listOf("relays") + relays
+            )
+            if (originalNote is AddressableEvent) {
+                tags = tags + listOf(listOf("a", originalNote.address().toTag()))
+            }
+            if (pollOption != null && pollOption >= 0) {
+                tags = tags + listOf(listOf(POLL_OPTION, pollOption.toString()))
+            }
+
+            tags = tags + listOf(listOf("anon", ""))
+            val privkey = CryptoUtils.privkeyCreate()
+            val pubKey = CryptoUtils.pubkeyCreate(privkey).toHexKey()
+
+            val id = generateId(pubKey, createdAt, kind, tags, message)
+            val sig = CryptoUtils.sign(id, privkey)
+            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, message, sig.toHexKey())
+        }
+
+        fun createAnonymous(
+            userHex: String,
+            relays: Set<String>,
+            message: String,
+            createdAt: Long = TimeUtils.now()
+        ): LnZapRequestEvent {
+            var tags = listOf(
+                listOf("p", userHex),
+                listOf("relays") + relays
+            )
+
+            tags = tags + listOf(listOf("anon", ""))
+            val privkey = CryptoUtils.privkeyCreate()
+            val pubKey = CryptoUtils.pubkeyCreate(privkey).toHexKey()
+
+            val id = generateId(pubKey, createdAt, kind, tags, message)
+            val sig = CryptoUtils.sign(id, privkey)
+            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, message, sig.toHexKey())
+        }
+
         fun create(
             userHex: String,
             relays: Set<String>,

quartz/src/main/java/com/vitorpamplona/quartz/events/MetadataEvent.kt

@@ -149,8 +149,7 @@ class MetadataEvent(
     companion object {
         const val kind = 0
 
-        fun create(contactMetaData: String, identities: List<IdentityClaim>, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): MetadataEvent {
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+        fun create(contactMetaData: String, identities: List<IdentityClaim>, pubKey: HexKey, privateKey: ByteArray?, createdAt: Long = TimeUtils.now()): MetadataEvent {
             val tags = mutableListOf<List<String>>()
 
             identities.forEach {
@@ -158,8 +157,12 @@ class MetadataEvent(
             }
 
             val id = generateId(pubKey, createdAt, kind, tags, contactMetaData)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return MetadataEvent(id.toHexKey(), pubKey, createdAt, tags, contactMetaData, sig.toHexKey())
+            val sig = if (privateKey == null) null else CryptoUtils.sign(id, privateKey)
+            return MetadataEvent(id.toHexKey(), pubKey, createdAt, tags, contactMetaData, sig?.toHexKey() ?: "")
+        }
+
+        fun create(unsignedEvent: MetadataEvent, signature: String): MetadataEvent {
+            return MetadataEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/NIP24Factory.kt

@@ -2,6 +2,7 @@ package com.vitorpamplona.quartz.events
 
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.HexKey
 
@@ -9,7 +10,7 @@ class NIP24Factory {
     fun createMsgNIP24(
         msg: String,
         to: List<HexKey>,
-        from: ByteArray,
+        keyPair: KeyPair,
         subject: String? = null,
         replyTos: List<String>? = null,
         mentions: List<String>? = null,
@@ -18,12 +19,12 @@ class NIP24Factory {
         zapRaiserAmount: Long? = null,
         geohash: String? = null
     ): List<GiftWrapEvent> {
-        val senderPublicKey = CryptoUtils.pubkeyCreate(from).toHexKey()
+        val senderPublicKey = keyPair.pubKey.toHexKey()
 
         val senderMessage = ChatMessageEvent.create(
             msg = msg,
             to = to,
-            privateKey = from,
+            keyPair = keyPair,
             subject = subject,
             replyTos = replyTos,
             mentions = mentions,
@@ -38,15 +39,15 @@ class NIP24Factory {
                 event = SealedGossipEvent.create(
                     event = senderMessage,
                     encryptTo = it,
-                    privateKey = from
+                    privateKey = keyPair.privKey!!
                 ),
                 recipientPubKey = it
             )
         }
     }
 
-    fun createReactionWithinGroup(content: String, originalNote: EventInterface, to: List<HexKey>, from: ByteArray): List<GiftWrapEvent> {
-        val senderPublicKey = CryptoUtils.pubkeyCreate(from).toHexKey()
+    fun createReactionWithinGroup(content: String, originalNote: EventInterface, to: List<HexKey>, from: KeyPair): List<GiftWrapEvent> {
+        val senderPublicKey = from.pubKey.toHexKey()
 
         val senderReaction = ReactionEvent.create(
             content,
@@ -59,15 +60,15 @@ class NIP24Factory {
                 event = SealedGossipEvent.create(
                     event = senderReaction,
                     encryptTo = it,
-                    privateKey = from
+                    privateKey = from.privKey!!
                 ),
                 recipientPubKey = it
             )
         }
     }
 
-    fun createReactionWithinGroup(emojiUrl: EmojiUrl, originalNote: EventInterface, to: List<HexKey>, from: ByteArray): List<GiftWrapEvent> {
-        val senderPublicKey = CryptoUtils.pubkeyCreate(from).toHexKey()
+    fun createReactionWithinGroup(emojiUrl: EmojiUrl, originalNote: EventInterface, to: List<HexKey>, from: KeyPair): List<GiftWrapEvent> {
+        val senderPublicKey = from.pubKey.toHexKey()
 
         val senderReaction = ReactionEvent.create(
             emojiUrl,
@@ -80,7 +81,7 @@ class NIP24Factory {
                 event = SealedGossipEvent.create(
                     event = senderReaction,
                     encryptTo = it,
-                    privateKey = from
+                    privateKey = from.privKey!!
                 ),
                 recipientPubKey = it
             )
@@ -90,7 +91,7 @@ class NIP24Factory {
     fun createTextNoteNIP24(
         msg: String,
         to: List<HexKey>,
-        from: ByteArray,
+        keyPair: KeyPair,
         replyTos: List<String>? = null,
         mentions: List<String>? = null,
         addresses: List<ATag>?,
@@ -103,11 +104,11 @@ class NIP24Factory {
         zapRaiserAmount: Long? = null,
         geohash: String? = null
     ): List<GiftWrapEvent> {
-        val senderPublicKey = CryptoUtils.pubkeyCreate(from).toHexKey()
+        val senderPublicKey = keyPair.pubKey.toHexKey()
 
         val senderMessage = TextNoteEvent.create(
             msg = msg,
-            privateKey = from,
+            keyPair = keyPair,
             replyTos = replyTos,
             mentions = mentions,
             zapReceiver = zapReceiver,
@@ -126,7 +127,7 @@ class NIP24Factory {
                 event = SealedGossipEvent.create(
                     event = senderMessage,
                     encryptTo = it,
-                    privateKey = from
+                    privateKey = keyPair.privKey!!
                 ),
                 recipientPubKey = it
             )

quartz/src/main/java/com/vitorpamplona/quartz/events/PeopleListEvent.kt

@@ -18,6 +18,7 @@ class PeopleListEvent(
     content: String,
     sig: HexKey
 ) : GeneralListEvent(id, pubKey, createdAt, kind, tags, content, sig) {
+    var decryptedContent: String? = null
     var publicAndPrivateUserCache: ImmutableSet<HexKey>? = null
 
     fun publicAndPrivateUsers(privateKey: ByteArray?): ImmutableSet<HexKey> {
@@ -35,6 +36,20 @@ class PeopleListEvent(
         return publicAndPrivateUserCache ?: persistentSetOf()
     }
 
+    fun publicAndPrivateUsers(decryptedContent: String): ImmutableSet<HexKey> {
+        publicAndPrivateUserCache?.let {
+            return it
+        }
+
+        val privateUserList = privateTagsOrEmpty(decryptedContent).filter { it.size > 1 && it[0] == "p" }.map { it[1] }.toSet()
+
+        val publicUserList = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }.toSet()
+
+        publicAndPrivateUserCache = (privateUserList + publicUserList).toImmutableSet()
+
+        return publicAndPrivateUserCache ?: persistentSetOf()
+    }
+
     fun isTaggedUser(idHex: String, isPrivate: Boolean, privateKey: ByteArray): Boolean {
         return if (isPrivate) {
             privateTagsOrEmpty(privKey = privateKey).any { it.size > 1 && it[0] == "p" && it[1] == idHex }
@@ -43,6 +58,14 @@ class PeopleListEvent(
         }
     }
 
+    fun isTaggedUser(idHex: String, isPrivate: Boolean, content: String): Boolean {
+        return if (isPrivate) {
+            privateTagsOrEmpty(content).any { it.size > 1 && it[0] == "p" && it[1] == idHex }
+        } else {
+            isTaggedUser(idHex)
+        }
+    }
+
     companion object {
         const val kind = 30000
         const val blockList = "mute"
@@ -65,6 +88,24 @@ class PeopleListEvent(
             }
         }
 
+        fun createListWithUser(name: String, pubKeyHex: String, isPrivate: Boolean, pubKey: HexKey, encryptedContent: String, createdAt: Long = TimeUtils.now()): PeopleListEvent {
+            return if (isPrivate) {
+                create(
+                    content = encryptedContent,
+                    tags = listOf(listOf("d", name)),
+                    pubKey = pubKey,
+                    createdAt = createdAt
+                )
+            } else {
+                create(
+                    content = "",
+                    tags = listOf(listOf("d", name), listOf("p", pubKeyHex)),
+                    pubKey = pubKey,
+                    createdAt = createdAt
+                )
+            }
+        }
+
         fun addUsers(earlierVersion: PeopleListEvent, listPubKeyHex: List<String>, isPrivate: Boolean, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): PeopleListEvent {
             return if (isPrivate) {
                 create(
@@ -94,6 +135,24 @@ class PeopleListEvent(
             }
         }
 
+        fun addUser(earlierVersion: PeopleListEvent, pubKeyHex: String, isPrivate: Boolean, pubKey: HexKey, encryptedContent: String, createdAt: Long = TimeUtils.now()): PeopleListEvent {
+            return if (isPrivate) {
+                create(
+                    content = encryptedContent,
+                    tags = earlierVersion.tags,
+                    pubKey = pubKey,
+                    createdAt = createdAt
+                )
+            } else {
+                create(
+                    content = earlierVersion.content,
+                    tags = earlierVersion.tags.plus(element = listOf("p", pubKeyHex)),
+                    pubKey = pubKey,
+                    createdAt = createdAt
+                )
+            }
+        }
+
         fun addUser(earlierVersion: PeopleListEvent, pubKeyHex: String, isPrivate: Boolean, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): PeopleListEvent {
             if (earlierVersion.isTaggedUser(pubKeyHex, isPrivate, privateKey)) return earlierVersion
 
@@ -117,6 +176,24 @@ class PeopleListEvent(
             }
         }
 
+        fun removeUser(earlierVersion: PeopleListEvent, pubKeyHex: String, isPrivate: Boolean, encryptedContent: String, pubKey: HexKey, createdAt: Long = TimeUtils.now()): PeopleListEvent {
+            return if (isPrivate) {
+                create(
+                    content = encryptedContent,
+                    tags = earlierVersion.tags.filter { it.size > 1 && it[1] != pubKeyHex },
+                    pubKey = pubKey,
+                    createdAt = createdAt
+                )
+            } else {
+                create(
+                    content = earlierVersion.content,
+                    tags = earlierVersion.tags.filter { it.size > 1 && it[1] != pubKeyHex },
+                    pubKey = pubKey,
+                    createdAt = createdAt
+                )
+            }
+        }
+
         fun removeUser(earlierVersion: PeopleListEvent, pubKeyHex: String, isPrivate: Boolean, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): PeopleListEvent {
             if (!earlierVersion.isTaggedUser(pubKeyHex, isPrivate, privateKey)) return earlierVersion
 
@@ -146,5 +223,14 @@ class PeopleListEvent(
             val sig = CryptoUtils.sign(id, privateKey)
             return PeopleListEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
+
+        fun create(content: String, tags: List<List<String>>, pubKey: HexKey, createdAt: Long = TimeUtils.now()): PeopleListEvent {
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            return PeopleListEvent(id.toHexKey(), pubKey, createdAt, tags, content, "")
+        }
+
+        fun create(unsignedEvent: PeopleListEvent, signature: String): PeopleListEvent {
+            return PeopleListEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
+        }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/PollNoteEvent.kt

@@ -45,7 +45,8 @@ class PollNoteEvent(
             replyTos: List<String>?,
             mentions: List<String>?,
             addresses: List<ATag>?,
-            privateKey: ByteArray,
+            pubKey: HexKey,
+            privateKey: ByteArray?,
             createdAt: Long = TimeUtils.now(),
             pollOptions: Map<Int, String>,
             valueMaximum: Int?,
@@ -57,7 +58,6 @@ class PollNoteEvent(
             zapRaiserAmount: Long?,
             geohash: String? = null
         ): PollNoteEvent {
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
             replyTos?.forEach {
                 tags.add(listOf("e", it))
@@ -90,8 +90,14 @@ class PollNoteEvent(
             }
 
             val id = generateId(pubKey, createdAt, kind, tags, msg)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return PollNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
+            val sig = if (privateKey == null) null else CryptoUtils.sign(id, privateKey)
+            return PollNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig?.toHexKey() ?: "")
+        }
+
+        fun create(
+            unsignedEvent: PollNoteEvent, signature: String
+        ): PollNoteEvent {
+            return PollNoteEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/PrivateDmEvent.kt

@@ -5,6 +5,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.HexValidator
 import com.vitorpamplona.quartz.encoders.Hex
@@ -86,7 +87,7 @@ class PrivateDmEvent(
             replyTos: List<String>? = null,
             mentions: List<String>? = null,
             zapReceiver: List<ZapSplitSetup>? = null,
-            privateKey: ByteArray,
+            keyPair: KeyPair,
             createdAt: Long = TimeUtils.now(),
             publishedRecipientPubKey: ByteArray? = null,
             advertiseNip18: Boolean = true,
@@ -94,12 +95,12 @@ class PrivateDmEvent(
             zapRaiserAmount: Long?,
             geohash: String? = null
         ): PrivateDmEvent {
-            val content = CryptoUtils.encryptNIP04(
-                if (advertiseNip18) { nip18Advertisement } else { "" } + msg,
-                privateKey,
+            val message = if (advertiseNip18) { nip18Advertisement } else { "" } + msg
+            val content = if (keyPair.privKey == null) message else CryptoUtils.encryptNIP04(
+                message,
+                keyPair.privKey,
                 recipientPubKey
             )
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
             publishedRecipientPubKey?.let {
                 tags.add(listOf("p", publishedRecipientPubKey.toHexKey()))
@@ -123,9 +124,17 @@ class PrivateDmEvent(
                 tags.add(listOf("g", it))
             }
 
+            val pubKey = keyPair.pubKey.toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return PrivateDmEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return PrivateDmEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
+        }
+
+        fun create(
+            unsignedEvent: PrivateDmEvent,
+            signature: String,
+        ): PrivateDmEvent {
+            return PrivateDmEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/ReactionEvent.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 
 @Immutable
@@ -22,30 +23,29 @@ class ReactionEvent(
     companion object {
         const val kind = 7
 
-        fun createWarning(originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ReactionEvent {
-            return create("\u26A0\uFE0F", originalNote, privateKey, createdAt)
+        fun createWarning(originalNote: EventInterface, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ReactionEvent {
+            return create("\u26A0\uFE0F", originalNote, keyPair, createdAt)
         }
 
-        fun createLike(originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ReactionEvent {
-            return create("+", originalNote, privateKey, createdAt)
+        fun createLike(originalNote: EventInterface, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ReactionEvent {
+            return create("+", originalNote, keyPair, createdAt)
         }
 
-        fun create(content: String, originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ReactionEvent {
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
-
+        fun create(content: String, originalNote: EventInterface, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ReactionEvent {
             var tags = listOf(listOf("e", originalNote.id()), listOf("p", originalNote.pubKey()))
             if (originalNote is AddressableEvent) {
                 tags = tags + listOf(listOf("a", originalNote.address().toTag()))
             }
 
+            val pubKey = keyPair.pubKey.toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return ReactionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return ReactionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
         }
 
-        fun create(emojiUrl: EmojiUrl, originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ReactionEvent {
+        fun create(emojiUrl: EmojiUrl, originalNote: EventInterface, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ReactionEvent {
             val content = ":${emojiUrl.code}:"
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = keyPair.pubKey.toHexKey()
 
             var tags = listOf(
                 listOf("e", originalNote.id()),
@@ -58,8 +58,12 @@ class ReactionEvent(
             }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return ReactionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return ReactionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
+        }
+
+        fun create(unsignedEvent: ReactionEvent, signature: String): ReactionEvent {
+            return ReactionEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/RelayAuthEvent.kt

@@ -21,16 +21,20 @@ class RelayAuthEvent(
     companion object {
         const val kind = 22242
 
-        fun create(relay: String, challenge: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): RelayAuthEvent {
+        fun create(relay: String, challenge: String, pubKey: HexKey, privateKey: ByteArray?, createdAt: Long = TimeUtils.now()): RelayAuthEvent {
             val content = ""
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = listOf(
                 listOf("relay", relay),
                 listOf("challenge", challenge)
             )
-            val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return RelayAuthEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val localPubKey = if (pubKey.isBlank() && privateKey != null) CryptoUtils.pubkeyCreate(privateKey).toHexKey() else pubKey
+            val id = generateId(localPubKey, createdAt, kind, tags, content)
+            val sig = if (privateKey == null) null else CryptoUtils.sign(id, privateKey)
+            return RelayAuthEvent(id.toHexKey(), localPubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
+        }
+
+        fun create(unsignedEvent: RelayAuthEvent, signature: String): RelayAuthEvent {
+            return RelayAuthEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/ReportEvent.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 
 @Immutable
@@ -56,14 +57,14 @@ class ReportEvent(
         fun create(
             reportedPost: EventInterface,
             type: ReportType,
-            privateKey: ByteArray,
+            keyPair: KeyPair,
             content: String = "",
             createdAt: Long = TimeUtils.now()
         ): ReportEvent {
             val reportPostTag = listOf("e", reportedPost.id(), type.name.lowercase())
             val reportAuthorTag = listOf("p", reportedPost.pubKey(), type.name.lowercase())
 
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = keyPair.pubKey.toHexKey()
             var tags: List<List<String>> = listOf(reportPostTag, reportAuthorTag)
 
             if (reportedPost is AddressableEvent) {
@@ -71,20 +72,20 @@ class ReportEvent(
             }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return ReportEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return ReportEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
         }
 
-        fun create(reportedUser: String, type: ReportType, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ReportEvent {
+        fun create(reportedUser: String, type: ReportType, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): ReportEvent {
             val content = ""
 
             val reportAuthorTag = listOf("p", reportedUser, type.name.lowercase())
 
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = keyPair.pubKey.toHexKey()
             val tags: List<List<String>> = listOf(reportAuthorTag)
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return ReportEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return ReportEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
         }
     }
 

quartz/src/main/java/com/vitorpamplona/quartz/events/RepostEvent.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 
 @Immutable
@@ -28,13 +29,13 @@ class RepostEvent(
     companion object {
         const val kind = 6
 
-        fun create(boostedPost: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): RepostEvent {
+        fun create(boostedPost: EventInterface, keyPair: KeyPair, createdAt: Long = TimeUtils.now()): RepostEvent {
             val content = boostedPost.toJson()
 
             val replyToPost = listOf("e", boostedPost.id())
             val replyToAuthor = listOf("p", boostedPost.pubKey())
 
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = keyPair.pubKey.toHexKey()
             var tags: List<List<String>> = listOf(replyToPost, replyToAuthor)
 
             if (boostedPost is AddressableEvent) {
@@ -42,8 +43,12 @@ class RepostEvent(
             }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return RepostEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return RepostEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig?.toHexKey() ?: "")
+        }
+
+        fun create(unsignedEvent: RepostEvent, signature: String): RepostEvent {
+            return RepostEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/SealedGossipEvent.kt

@@ -38,6 +38,20 @@ class SealedGossipEvent(
         return event
     }
 
+    fun cachedGossip(pubKey: ByteArray, decryptedContent: String): Event? {
+        val hex = pubKey.toHexKey()
+        if (cachedInnerEvent.contains(hex)) return cachedInnerEvent[hex]
+
+        val gossip = unseal(decryptedContent)
+        val event = gossip?.mergeWith(this)
+        if (event is WrappedEvent) {
+            event.host = host ?: this
+        }
+
+        cachedInnerEvent = cachedInnerEvent + Pair(hex, event)
+        return event
+    }
+
     fun unseal(privKey: ByteArray): Gossip? = try {
         plainContent(privKey)?.let { Gossip.fromJson(it) }
     } catch (e: Exception) {
@@ -45,6 +59,18 @@ class SealedGossipEvent(
         null
     }
 
+    fun unseal(decryptedContent: String): Gossip? = try {
+        plainContent(decryptedContent)?.let { Gossip.fromJson(it) }
+    } catch (e: Exception) {
+        Log.w("GossipEvent", "Fail to decrypt or parse Gossip", e)
+        null
+    }
+
+    private fun plainContent(decryptedContent: String): String? {
+        if (decryptedContent.isEmpty()) return null
+        return decryptedContent
+    }
+
     private fun plainContent(privKey: ByteArray): String? {
         if (content.isEmpty()) return null
 
@@ -95,6 +121,23 @@ class SealedGossipEvent(
             val sig = CryptoUtils.sign(id, privateKey)
             return SealedGossipEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
+
+        fun create(
+            encryptedContent: String,
+            pubKey: HexKey,
+            createdAt: Long = TimeUtils.randomWithinAWeek()
+        ): SealedGossipEvent {
+            val tags = listOf<List<String>>()
+            val id = generateId(pubKey, createdAt, kind, tags, encryptedContent)
+            return SealedGossipEvent(id.toHexKey(), pubKey, createdAt, tags, encryptedContent, "")
+        }
+
+        fun create(
+            unsignedEvent: SealedGossipEvent,
+            signature: String
+        ): SealedGossipEvent {
+            return SealedGossipEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
+        }
     }
 }
 

quartz/src/main/java/com/vitorpamplona/quartz/events/StatusEvent.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.HexKey
 
@@ -24,7 +25,7 @@ class StatusEvent(
             msg: String,
             type: String,
             expiration: Long?,
-            privateKey: ByteArray,
+            keyPair: KeyPair,
             createdAt: Long = TimeUtils.now()
         ): StatusEvent {
             val tags = mutableListOf<List<String>>()
@@ -32,36 +33,43 @@ class StatusEvent(
             tags.add(listOf("d", type))
             expiration?.let { tags.add(listOf("expiration", it.toString())) }
 
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = keyPair.pubKey.toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, msg)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return StatusEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return StatusEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig?.toHexKey() ?: "")
         }
 
         fun update(
             event: StatusEvent,
             newStatus: String,
-            privateKey: ByteArray,
+            keyPair: KeyPair,
             createdAt: Long = TimeUtils.now()
         ): StatusEvent {
             val tags = event.tags
             val pubKey = event.pubKey()
             val id = generateId(pubKey, createdAt, kind, tags, newStatus)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return StatusEvent(id.toHexKey(), pubKey, createdAt, tags, newStatus, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return StatusEvent(id.toHexKey(), pubKey, createdAt, tags, newStatus, sig?.toHexKey() ?: "")
         }
 
         fun clear(
             event: StatusEvent,
-            privateKey: ByteArray,
+            keyPair: KeyPair,
             createdAt: Long = TimeUtils.now()
         ): StatusEvent {
             val msg = ""
             val tags = event.tags.filter { it.size > 1 && it[0] == "d" }
             val pubKey = event.pubKey()
             val id = generateId(pubKey, createdAt, kind, tags, msg)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return StatusEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return StatusEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig?.toHexKey() ?: "")
+        }
+
+        fun create(
+            unsignedEvent: StatusEvent,
+            signature: String
+        ): StatusEvent {
+            return StatusEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/TextNoteEvent.kt

@@ -6,6 +6,7 @@ import com.linkedin.urls.detection.UrlDetectorOptions
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.HexKey
 
@@ -37,11 +38,9 @@ class TextNoteEvent(
             root: String?,
             directMentions: Set<HexKey>,
             geohash: String? = null,
-
-            privateKey: ByteArray,
+            keyPair: KeyPair,
             createdAt: Long = TimeUtils.now()
         ): TextNoteEvent {
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
             replyTos?.forEach {
                 if (it == replyingTo) {
@@ -96,9 +95,17 @@ class TextNoteEvent(
                 tags.add(listOf("g", it))
             }
 
+            val pubKey = keyPair.pubKey.toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, msg)
-            val sig = CryptoUtils.sign(id, privateKey)
-            return TextNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
+            val sig = if (keyPair.privKey == null) null else CryptoUtils.sign(id, keyPair.privKey)
+            return TextNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig?.toHexKey() ?: "")
+        }
+
+        fun create(
+            unsignedEvent: TextNoteEvent, signature: String
+        ): TextNoteEvent {
+
+            return TextNoteEvent(unsignedEvent.id, unsignedEvent.pubKey, unsignedEvent.createdAt, unsignedEvent.tags, unsignedEvent.content, signature)
         }
     }
 }