Merge branch 'main' of https://github.com/vitorpamplona/amethyst

Translations - Tamil tech terms updated

.idea/kotlinc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.21" />
+    <option name="version" value="1.9.0" />
   </component>
 </project>

app/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'org.jlleitschuh.gradle.ktlint' version "11.3.1"
+    id 'org.jlleitschuh.gradle.ktlint' version "11.5.0"
     id 'com.google.gms.google-services'
 }
 
@@ -13,14 +13,14 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 255
-        versionName "0.69.2"
+        versionCode 267
+        versionName "0.72.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary true
         }
-        resConfigs("ar", "cs", "eo", "es", "fa", "fr", "hu", "night", "nl", "pt-rBR", "ru", "sv-rSE", "ta", "tr", "uk", "zh", "sh-rHK", "zh-rTW", "ja")
+        resourceConfigurations += ['ar', 'cs', 'de', 'eo', 'es', 'fa', 'fr', 'hu', 'night', 'nl', 'pt-rBR', 'ru', 'sv-rSE', 'ta', 'tr', 'uk', 'zh', 'sh-rHK', 'zh-rTW', 'ja']
     }
 
     buildTypes {
@@ -37,7 +37,7 @@ android {
         }
     }
 
-    flavorDimensions "channel"
+    flavorDimensions = ["channel"]
 
     productFlavors {
         play {
@@ -73,7 +73,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.7"
+        kotlinCompilerExtensionVersion "1.5.1"
     }
 
     packagingOptions {
@@ -96,7 +96,7 @@ dependencies {
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
 
     // Navigation
-    implementation("androidx.navigation:navigation-compose:$nav_version")
+    implementation "androidx.navigation:navigation-compose:$nav_version"
 
     // Observe Live data as State
     implementation "androidx.compose.runtime:runtime-livedata:$compose_ui_version"
@@ -108,9 +108,9 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
-    implementation 'net.engawapg.lib:zoomable:1.4.2'
+    implementation "net.engawapg.lib:zoomable:1.4.3"
 
     // Biometrics
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
@@ -118,13 +118,6 @@ dependencies {
     // Bitcoin secp256k1 bindings to Android
     implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.10.1'
 
-    // Nostr Base Protocol
-    implementation('com.github.vitorpamplona.NostrPostr:nostrpostrlib:master-SNAPSHOT') {
-        exclude group:'fr.acinq.secp256k1'
-        exclude module: 'guava'
-        exclude module: 'guava-testlib'
-    }
-
     // Websockets API
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
 
@@ -160,7 +153,7 @@ dependencies {
     implementation "io.github.url-detector:url-detector:0.1.23"
 
     // For QR generation
-    implementation 'com.google.zxing:core:3.5.1'
+    implementation 'com.google.zxing:core:3.5.2'
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 
     // Markdown
@@ -177,6 +170,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.media3:media3-exoplayer-hls:1.1.0'
     implementation 'androidx.media3:media3-ui:1.1.0'
+    implementation 'androidx.media3:media3-session:1.1.0'
 
     // Local model for language identification
     playImplementation 'com.google.mlkit:language-id:17.0.4'
@@ -185,7 +179,7 @@ dependencies {
     playImplementation 'com.google.mlkit:translate:17.0.1'
 
     // PushNotifications
-    playImplementation platform('com.google.firebase:firebase-bom:32.1.1')
+    playImplementation platform('com.google.firebase:firebase-bom:32.2.0')
     playImplementation 'com.google.firebase:firebase-messaging-ktx'
 
     // Charts
@@ -197,14 +191,18 @@ dependencies {
     // immutable collections to avoid recomposition
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
 
+    // GeoHash
+    implementation 'com.github.drfonfon:android-kotlin-geohash:1.0'
+
+    // LibSodium for XChaCha encryption
+    implementation "com.goterl:lazysodium-android:5.1.0@aar"
+    implementation 'net.java.dev.jna:jna:5.13.0@aar'
+
     // Video compression lib
-    implementation 'com.github.AbedElazizShe:LightCompressor:1.2.3'
+    implementation 'com.github.AbedElazizShe:LightCompressor:1.3.1'
     // Image compression lib
     implementation 'id.zelory:compressor:3.0.1'
 
-    // Automatic memory leak detection
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
-
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'io.mockk:mockk:1.13.5'
     androidTestImplementation 'androidx.test.ext:junit:1.2.0-alpha01'

app/src/androidTest/java/com/vitorpamplona/amethyst/CryptoUtilsTest.kt

@@ -0,0 +1,102 @@
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.amethyst.model.hexToByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
+import com.vitorpamplona.amethyst.service.KeyPair
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class CryptoUtilsTest {
+
+    @Test
+    fun testGetPublicFromPrivateKey() {
+        val privateKey = "f410f88bcec6cbfda04d6a273c7b1dd8bba144cd45b71e87109cfa11dd7ed561".hexToByteArray()
+        val publicKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+        assertEquals("7d4b8806f1fd713c287235411bf95aa81b7242ead892733ec84b3f2719845be6", publicKey)
+    }
+
+    @Test
+    fun testSharedSecretCompatibilityWithCoracle() {
+        val privateKey = "f410f88bcec6cbfda04d6a273c7b1dd8bba144cd45b71e87109cfa11dd7ed561"
+        val publicKey = "765cd7cf91d3ad07423d114d5a39c61d52b2cdbc18ba055ddbbeec71fbe2aa2f"
+
+        val key = CryptoUtils.getSharedSecretNIP24(privateKey = privateKey.hexToByteArray(), pubKey = publicKey.hexToByteArray())
+
+        assertEquals("577c966f499dddd8e8dcc34e8f352e283cc177e53ae372794947e0b8ede7cfd8", key.toHexKey())
+    }
+
+    @Test
+    fun testSharedSecret() {
+        val sender = KeyPair()
+        val receiver = KeyPair()
+
+        val sharedSecret1 = CryptoUtils.getSharedSecretNIP24(sender.privKey!!, receiver.pubKey)
+        val sharedSecret2 = CryptoUtils.getSharedSecretNIP24(receiver.privKey!!, sender.pubKey)
+
+        assertEquals(sharedSecret1.toHexKey(), sharedSecret2.toHexKey())
+
+        val secretKey1 = KeyPair(privKey = sharedSecret1)
+        val secretKey2 = KeyPair(privKey = sharedSecret2)
+
+        assertEquals(secretKey1.pubKey.toHexKey(), secretKey2.pubKey.toHexKey())
+        assertEquals(secretKey1.privKey?.toHexKey(), secretKey2.privKey?.toHexKey())
+    }
+
+    @Test
+    fun encryptDecryptNIP4Test() {
+        val msg = "Hi"
+
+        val privateKey = CryptoUtils.privkeyCreate()
+        val publicKey = CryptoUtils.pubkeyCreate(privateKey)
+
+        val encrypted = CryptoUtils.encryptNIP04(msg, privateKey, publicKey)
+        val decrypted = CryptoUtils.decryptNIP04(encrypted, privateKey, publicKey)
+
+        assertEquals(msg, decrypted)
+    }
+
+    @Test
+    fun encryptDecryptNIP24Test() {
+        val msg = "Hi"
+
+        val privateKey = CryptoUtils.privkeyCreate()
+        val publicKey = CryptoUtils.pubkeyCreate(privateKey)
+
+        val encrypted = CryptoUtils.encryptNIP24(msg, privateKey, publicKey)
+        val decrypted = CryptoUtils.decryptNIP24(encrypted, privateKey, publicKey)
+
+        assertEquals(msg, decrypted)
+    }
+
+    @Test
+    fun encryptSharedSecretDecryptNIP4Test() {
+        val msg = "Hi"
+
+        val privateKey = CryptoUtils.privkeyCreate()
+        val publicKey = CryptoUtils.pubkeyCreate(privateKey)
+        val sharedSecret = CryptoUtils.getSharedSecretNIP04(privateKey, publicKey)
+
+        val encrypted = CryptoUtils.encryptNIP04(msg, sharedSecret)
+        val decrypted = CryptoUtils.decryptNIP04(encrypted, sharedSecret)
+
+        assertEquals(msg, decrypted)
+    }
+
+    @Test
+    fun encryptSharedSecretDecryptNIP24Test() {
+        val msg = "Hi"
+
+        val privateKey = CryptoUtils.privkeyCreate()
+        val publicKey = CryptoUtils.pubkeyCreate(privateKey)
+        val sharedSecret = CryptoUtils.getSharedSecretNIP24(privateKey, publicKey)
+
+        val encrypted = CryptoUtils.encryptNIP24(msg, sharedSecret)
+        val decrypted = CryptoUtils.decryptNIP24(encrypted, sharedSecret)
+
+        assertEquals(msg, decrypted)
+    }
+}

app/src/androidTest/java/com/vitorpamplona/amethyst/GiftWrapEventTest.kt

@@ -0,0 +1,561 @@
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.hexToByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
+import com.vitorpamplona.amethyst.service.KeyPair
+import com.vitorpamplona.amethyst.service.model.ChatMessageEvent
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.GiftWrapEvent
+import com.vitorpamplona.amethyst.service.model.Gossip
+import com.vitorpamplona.amethyst.service.model.NIP24Factory
+import com.vitorpamplona.amethyst.service.model.SealedGossipEvent
+import com.vitorpamplona.amethyst.service.relays.Client
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Assert.fail
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class GiftWrapEventTest {
+    @Test()
+    fun testNip24Utils() {
+        val sender = KeyPair()
+        val receiver = KeyPair()
+        val message = "Hola, que tal?"
+
+        val events = NIP24Factory().createMsgNIP24(
+            message,
+            listOf(receiver.pubKey.toHexKey()),
+            sender.privKey!!
+        )
+
+        // Simulate Receiver
+        val eventsReceiverGets = events.filter { it.isTaggedUser(receiver.pubKey.toHexKey()) }
+        eventsReceiverGets.forEach {
+            val event = it.unwrap(receiver.privKey!!)
+            if (event is SealedGossipEvent) {
+                val innerData = event.unseal(receiver.privKey!!)
+                assertEquals(message, innerData?.content)
+            } else {
+                fail("Wrong Event")
+            }
+        }
+
+        // Simulate Sender
+        val eventsSenderGets = events.filter { it.isTaggedUser(sender.pubKey.toHexKey()) }
+        eventsSenderGets.forEach {
+            val event = it.unwrap(sender.privKey!!)
+            if (event is SealedGossipEvent) {
+                val innerData = event.unseal(sender.privKey!!)
+                assertEquals(message, innerData?.content)
+            } else {
+                fail("Wrong Event")
+            }
+        }
+    }
+
+    @Test()
+    fun testNip24UtilsForGroups() {
+        val sender = KeyPair()
+        val receiver1 = KeyPair()
+        val receiver2 = KeyPair()
+        val receiver3 = KeyPair()
+        val receiver4 = KeyPair()
+        val message = "Hola, que tal?"
+
+        val receivers = listOf(
+            receiver1,
+            receiver2,
+            receiver3,
+            receiver4
+        )
+
+        val events = NIP24Factory().createMsgNIP24(
+            message,
+            receivers.map { it.pubKey.toHexKey() },
+            sender.privKey!!
+        )
+
+        // Simulate Receiver
+        receivers.forEach { receiver ->
+            val eventsReceiverGets = events.filter { it.isTaggedUser(receiver.pubKey.toHexKey()) }
+            eventsReceiverGets.forEach {
+                val event = it.unwrap(receiver.privKey!!)
+                if (event is SealedGossipEvent) {
+                    val innerData = event.unseal(receiver.privKey!!)
+                    assertEquals(message, innerData?.content)
+                } else {
+                    fail("Wrong Event")
+                }
+            }
+        }
+
+        // Simulate Sender
+        val eventsSenderGets = events.filter { it.isTaggedUser(sender.pubKey.toHexKey()) }
+        eventsSenderGets.forEach {
+            val event = it.unwrap(sender.privKey!!)
+            if (event is SealedGossipEvent) {
+                val innerData = event.unseal(sender.privKey!!)
+                assertEquals(message, innerData?.content)
+            } else {
+                fail("Wrong Event")
+            }
+        }
+    }
+
+    @Test()
+    fun testInternalsSimpleMessage() {
+        val sender = KeyPair()
+        val receiver = KeyPair()
+
+        val senderMessage = ChatMessageEvent.create(
+            msg = "Hi There!",
+            to = listOf(receiver.pubKey.toHexKey()),
+            privateKey = sender.privKey!!
+        )
+
+        // MsgFor the Receiver
+
+        val encMsgFromSenderToReceiver = SealedGossipEvent.create(
+            event = senderMessage,
+            encryptTo = receiver.pubKey.toHexKey(),
+            privateKey = sender.privKey!!
+        )
+
+        // Should expose sender
+        assertEquals(encMsgFromSenderToReceiver.pubKey, sender.pubKey.toHexKey())
+        // Should not expose receiver
+        assertTrue(encMsgFromSenderToReceiver.tags.isEmpty())
+
+        val giftWrapEventToReceiver = GiftWrapEvent.create(
+            event = encMsgFromSenderToReceiver,
+            recipientPubKey = receiver.pubKey.toHexKey()
+        )
+
+        // Should not be signed by neither sender nor receiver
+        assertNotEquals(giftWrapEventToReceiver.pubKey, sender.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventToReceiver.pubKey, receiver.pubKey.toHexKey())
+
+        // Should not include sender as recipient
+        assertNotEquals(giftWrapEventToReceiver.recipientPubKey(), sender.pubKey.toHexKey())
+
+        // Should be addressed to the receiver
+        assertEquals(giftWrapEventToReceiver.recipientPubKey(), receiver.pubKey.toHexKey())
+
+        // MsgFor the Sender
+
+        val encMsgFromSenderToSender = SealedGossipEvent.create(
+            event = senderMessage,
+            encryptTo = sender.pubKey.toHexKey(),
+            privateKey = sender.privKey!!
+        )
+
+        // Should expose sender
+        assertEquals(encMsgFromSenderToSender.pubKey, sender.pubKey.toHexKey())
+        // Should not expose receiver
+        assertTrue(encMsgFromSenderToSender.tags.isEmpty())
+
+        val giftWrapEventToSender = GiftWrapEvent.create(
+            event = encMsgFromSenderToSender,
+            recipientPubKey = sender.pubKey.toHexKey()
+        )
+
+        // Should not be signed by neither the sender, not the receiver
+        assertNotEquals(giftWrapEventToSender.pubKey, sender.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventToSender.pubKey, receiver.pubKey.toHexKey())
+
+        // Should not be addressed to the receiver
+        assertNotEquals(giftWrapEventToSender.recipientPubKey(), receiver.pubKey.toHexKey())
+        // Should be addressed to the sender
+        assertEquals(giftWrapEventToSender.recipientPubKey(), sender.pubKey.toHexKey())
+
+        // Done
+
+        println(senderMessage.toJson())
+        println(encMsgFromSenderToReceiver.toJson())
+        println(giftWrapEventToReceiver.toJson())
+        println(giftWrapEventToSender.toJson())
+
+        // Receiver's side
+        // Unwrapping
+
+        val unwrappedMsgForSenderBySender = giftWrapEventToSender.unwrap(sender.privKey!!)
+        val unwrappedMsgForReceiverBySender = giftWrapEventToReceiver.unwrap(sender.privKey!!)
+
+        assertNotNull(unwrappedMsgForSenderBySender)
+        assertNull(unwrappedMsgForReceiverBySender)
+
+        val unwrappedMsgForSenderByReceiver = giftWrapEventToSender.unwrap(receiver.privKey!!)
+        val unwrappedMsgForReceiverByReceiver = giftWrapEventToReceiver.unwrap(receiver.privKey!!)
+
+        assertNull(unwrappedMsgForSenderByReceiver)
+        assertNotNull(unwrappedMsgForReceiverByReceiver)
+
+        assertEquals(SealedGossipEvent.kind, unwrappedMsgForSenderBySender?.kind)
+        assertEquals(SealedGossipEvent.kind, unwrappedMsgForReceiverByReceiver?.kind)
+
+        assertTrue(unwrappedMsgForSenderBySender is SealedGossipEvent)
+        assertTrue(unwrappedMsgForReceiverByReceiver is SealedGossipEvent)
+
+        if (unwrappedMsgForSenderBySender is SealedGossipEvent &&
+            unwrappedMsgForReceiverByReceiver is SealedGossipEvent
+        ) {
+            val unwrappedGossipToSenderByReceiver = unwrappedMsgForSenderBySender.unseal(receiver.privKey!!)
+            val unwrappedGossipToReceiverByReceiver = unwrappedMsgForReceiverByReceiver.unseal(receiver.privKey!!)
+
+            assertNull(unwrappedGossipToSenderByReceiver)
+            assertNotNull(unwrappedGossipToReceiverByReceiver)
+
+            val unwrappedGossipToSenderBySender = unwrappedMsgForSenderBySender.unseal(sender.privKey!!)
+            val unwrappedGossipToReceiverBySender = unwrappedMsgForReceiverByReceiver.unseal(sender.privKey!!)
+
+            assertNotNull(unwrappedGossipToSenderBySender)
+            assertNull(unwrappedGossipToReceiverBySender)
+
+            assertEquals("Hi There!", unwrappedGossipToReceiverByReceiver?.content)
+            assertEquals("Hi There!", unwrappedGossipToSenderBySender?.content)
+        } else {
+            fail()
+        }
+    }
+
+    @Test()
+    fun testInternalsGroupMessage() {
+        val sender = KeyPair()
+        val receiverA = KeyPair()
+        val receiverB = KeyPair()
+
+        val senderMessage = ChatMessageEvent.create(
+            msg = "Who is going to the party tonight?",
+            to = listOf(receiverA.pubKey.toHexKey(), receiverB.pubKey.toHexKey()),
+            privateKey = sender.privKey!!
+        )
+
+        val encMsgFromSenderToReceiverA = SealedGossipEvent.create(
+            event = senderMessage,
+            encryptTo = receiverA.pubKey.toHexKey(),
+            privateKey = sender.privKey!!
+        )
+
+        val encMsgFromSenderToReceiverB = SealedGossipEvent.create(
+            event = senderMessage,
+            encryptTo = receiverB.pubKey.toHexKey(),
+            privateKey = sender.privKey!!
+        )
+
+        val encMsgFromSenderToSender = SealedGossipEvent.create(
+            event = senderMessage,
+            encryptTo = sender.pubKey.toHexKey(),
+            privateKey = sender.privKey!!
+        )
+
+        // Should expose sender
+        assertEquals(encMsgFromSenderToReceiverA.pubKey, sender.pubKey.toHexKey())
+        // Should not expose receiver
+        assertTrue(encMsgFromSenderToReceiverA.tags.isEmpty())
+
+        // Should expose sender
+        assertEquals(encMsgFromSenderToReceiverB.pubKey, sender.pubKey.toHexKey())
+        // Should not expose receiver
+        assertTrue(encMsgFromSenderToReceiverB.tags.isEmpty())
+
+        // Should expose sender
+        assertEquals(encMsgFromSenderToSender.pubKey, sender.pubKey.toHexKey())
+        // Should not expose receiver
+        assertTrue(encMsgFromSenderToSender.tags.isEmpty())
+
+        val giftWrapEventForReceiverA = GiftWrapEvent.create(
+            event = encMsgFromSenderToReceiverA,
+            recipientPubKey = receiverA.pubKey.toHexKey()
+        )
+
+        val giftWrapEventForReceiverB = GiftWrapEvent.create(
+            event = encMsgFromSenderToReceiverB,
+            recipientPubKey = receiverB.pubKey.toHexKey()
+        )
+
+        // Should not be signed by neither sender nor receiver
+        assertNotEquals(giftWrapEventForReceiverA.pubKey, sender.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventForReceiverA.pubKey, receiverA.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventForReceiverA.pubKey, receiverB.pubKey.toHexKey())
+
+        // Should not include sender as recipient
+        assertNotEquals(giftWrapEventForReceiverA.recipientPubKey(), sender.pubKey.toHexKey())
+
+        // Should be addressed to the receiver
+        assertEquals(giftWrapEventForReceiverA.recipientPubKey(), receiverA.pubKey.toHexKey())
+
+        // Should not be signed by neither sender nor receiver
+        assertNotEquals(giftWrapEventForReceiverB.pubKey, sender.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventForReceiverB.pubKey, receiverA.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventForReceiverB.pubKey, receiverB.pubKey.toHexKey())
+
+        // Should not include sender as recipient
+        assertNotEquals(giftWrapEventForReceiverB.recipientPubKey(), sender.pubKey.toHexKey())
+
+        // Should be addressed to the receiver
+        assertEquals(giftWrapEventForReceiverB.recipientPubKey(), receiverB.pubKey.toHexKey())
+
+        val giftWrapEventToSender = GiftWrapEvent.create(
+            event = encMsgFromSenderToSender,
+            recipientPubKey = sender.pubKey.toHexKey()
+        )
+
+        // Should not be signed by neither the sender, not the receiver
+        assertNotEquals(giftWrapEventToSender.pubKey, sender.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventToSender.pubKey, receiverA.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventToSender.pubKey, receiverB.pubKey.toHexKey())
+
+        // Should not be addressed to the receiver
+        assertNotEquals(giftWrapEventToSender.recipientPubKey(), receiverA.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventToSender.recipientPubKey(), receiverB.pubKey.toHexKey())
+        // Should be addressed to the sender
+        assertEquals(giftWrapEventToSender.recipientPubKey(), sender.pubKey.toHexKey())
+
+        println(senderMessage.toJson())
+        println(encMsgFromSenderToReceiverA.toJson())
+        println(encMsgFromSenderToReceiverB.toJson())
+        println(giftWrapEventForReceiverA.toJson())
+        println(giftWrapEventForReceiverB.toJson())
+        println(giftWrapEventToSender.toJson())
+
+        val unwrappedMsgForSenderBySender = giftWrapEventToSender.unwrap(sender.privKey!!)
+        val unwrappedMsgForReceiverBySenderA = giftWrapEventForReceiverA.unwrap(sender.privKey!!)
+        val unwrappedMsgForReceiverBySenderB = giftWrapEventForReceiverB.unwrap(sender.privKey!!)
+
+        assertNotNull(unwrappedMsgForSenderBySender)
+        assertNull(unwrappedMsgForReceiverBySenderA)
+        assertNull(unwrappedMsgForReceiverBySenderB)
+
+        val unwrappedMsgForSenderByReceiverA = giftWrapEventToSender.unwrap(receiverA.privKey!!)
+        val unwrappedMsgForReceiverAByReceiverA = giftWrapEventForReceiverA.unwrap(receiverA.privKey!!)
+        val unwrappedMsgForReceiverBByReceiverA = giftWrapEventForReceiverB.unwrap(receiverA.privKey!!)
+
+        assertNull(unwrappedMsgForSenderByReceiverA)
+        assertNotNull(unwrappedMsgForReceiverAByReceiverA)
+        assertNull(unwrappedMsgForReceiverBByReceiverA)
+
+        val unwrappedMsgForSenderByReceiverB = giftWrapEventToSender.unwrap(receiverB.privKey!!)
+        val unwrappedMsgForReceiverAByReceiverB = giftWrapEventForReceiverA.unwrap(receiverB.privKey!!)
+        val unwrappedMsgForReceiverBByReceiverB = giftWrapEventForReceiverB.unwrap(receiverB.privKey!!)
+
+        assertNull(unwrappedMsgForSenderByReceiverB)
+        assertNull(unwrappedMsgForReceiverAByReceiverB)
+        assertNotNull(unwrappedMsgForReceiverBByReceiverB)
+
+        assertEquals(SealedGossipEvent.kind, unwrappedMsgForSenderBySender?.kind)
+        assertEquals(SealedGossipEvent.kind, unwrappedMsgForReceiverAByReceiverA?.kind)
+        assertEquals(SealedGossipEvent.kind, unwrappedMsgForReceiverBByReceiverB?.kind)
+
+        assertTrue(unwrappedMsgForSenderBySender is SealedGossipEvent)
+        assertTrue(unwrappedMsgForReceiverAByReceiverA is SealedGossipEvent)
+        assertTrue(unwrappedMsgForReceiverBByReceiverB is SealedGossipEvent)
+
+        if (unwrappedMsgForSenderBySender is SealedGossipEvent &&
+            unwrappedMsgForReceiverAByReceiverA is SealedGossipEvent &&
+            unwrappedMsgForReceiverBByReceiverB is SealedGossipEvent
+        ) {
+            val unwrappedGossipToSenderByReceiverA = unwrappedMsgForSenderBySender.unseal(receiverA.privKey!!)
+            val unwrappedGossipToReceiverAByReceiverA = unwrappedMsgForReceiverAByReceiverA.unseal(receiverA.privKey!!)
+            val unwrappedGossipToReceiverBByReceiverA = unwrappedMsgForReceiverBByReceiverB.unseal(receiverA.privKey!!)
+
+            assertNull(unwrappedGossipToSenderByReceiverA)
+            assertNotNull(unwrappedGossipToReceiverAByReceiverA)
+            assertNull(unwrappedGossipToReceiverBByReceiverA)
+
+            val unwrappedGossipToSenderByReceiverB = unwrappedMsgForSenderBySender.unseal(receiverB.privKey!!)
+            val unwrappedGossipToReceiverAByReceiverB = unwrappedMsgForReceiverAByReceiverA.unseal(receiverB.privKey!!)
+            val unwrappedGossipToReceiverBByReceiverB = unwrappedMsgForReceiverBByReceiverB.unseal(receiverB.privKey!!)
+
+            assertNull(unwrappedGossipToSenderByReceiverB)
+            assertNull(unwrappedGossipToReceiverAByReceiverB)
+            assertNotNull(unwrappedGossipToReceiverBByReceiverB)
+
+            val unwrappedGossipToSenderBySender = unwrappedMsgForSenderBySender.unseal(sender.privKey!!)
+            val unwrappedGossipToReceiverABySender = unwrappedMsgForReceiverAByReceiverA.unseal(sender.privKey!!)
+            val unwrappedGossipToReceiverBBySender = unwrappedMsgForReceiverBByReceiverB.unseal(sender.privKey!!)
+
+            assertNotNull(unwrappedGossipToSenderBySender)
+            assertNull(unwrappedGossipToReceiverABySender)
+            assertNull(unwrappedGossipToReceiverBBySender)
+
+            assertEquals("Who is going to the party tonight?", unwrappedGossipToReceiverAByReceiverA?.content)
+            assertEquals("Who is going to the party tonight?", unwrappedGossipToReceiverBByReceiverB?.content)
+            assertEquals("Who is going to the party tonight?", unwrappedGossipToSenderBySender?.content)
+        } else {
+            fail()
+        }
+    }
+
+    @Test
+    fun testCaseFromAmethyst1() {
+        val json = """
+ {
+    "content":"{\"ciphertext\":\"AaTN5Mt7AOeMosjHeLfai89kmvW/qJ7W2VMttAwuh6hwRGV+ylJhpDbdVRhVmkCotbDjBgS6xioLrSDcdSngFOiVMHS5dTAP0MkQv09aZlBh/NgdmyfHHd24YlHPkDuF5Yb4Vmz7kq/vmjsNZvDrTen3TG2DcEoTV9GKexdMEqyBA4LsB2DLnWfpvOi0olDkGjPGSteTaU1nCdOtN8knoEKumrxwevvbygKphorvKX/j3ojMMb0AceJM6Cr6TRIvSsQnKGEv5V8qbC/uIrQoH3N108Fd/2SY2MWuyLKRnuak9F/w82MV13elq8ngyjcktLYM5yrPg5nrxZlyJsV8D7V/g/bvhoL+UmWe0XoCR5LXzy77SfIkgA1ePKEfGp5sD2CVIzXt9zHdFwGxAKZuyB4qwrRaAFrS2xx+Bw4nnEmF6V9NhfheSCmGzTILuTePx4ubvnYw/j8Hmqd6UvM3DBNnlJ3D6po0blirfWvMe/ea+Em4CMXfq8Iq+7r4gRx8azADygKeJ+C89GTBEvS9EvgrXCVfTMVTcFc44YAZhekOqYY1BOZgfxIV4gUiJfpMMd4B9MQv/tmnewrpTsq1reSQQcEW/mXT2cnMeCZbAIJSPg8usZ30QlrH+np+YSzFKWYDP1kThcV0ElEE2Ne8KaUUFIRE5KmhBQc/qtORefCpne5s7V7J5vLjT5rinsDzzENB1XVlmY1Icx42raP5tGAL1gOK5gRHLvtcgFQR3WcDRYaNqELiYxx41j9w9lz5e00Ttla255rZkb760KSLaBFBss6wYGiYCabVgtBNpkExpCFPPEd5eAZa5rNK2QrnojYsdxEnlicF6A+zSChLy/TbzxYwyQywDfoF9F8kBakPZkAhsciQViCii2KlieRq4OgJFZGndmnS82hyPqsoJIm22vWr1iqMvSBHo/9cLj/r+lfmGVOdgM62JHckPZjOLS0QWIb9gQiT+zXZG22+eZElMYbGXVpR1dyMaQtde8ivEVVLas6kMCVKaDTHEFglaCBXjJ3RNJv73HsG1kb0rMmOj8ltbBakjHpv7M59amavuu6SReYt\",\"nonce\":\"6anNjUdNwW6MNfoKzRZcz1R09N1h8G4L\",\"v\":1}",
+    "created_at":1690660515,
+    "id":"d90739741c2f5a8c1a03aab5dc219c0b708ed6b0566044495731cd0307cf19a5",
+    "kind":1059,
+    "pubkey":"a79b7162f8ebb9c9f7aa65a48977ab7f32aa097520bc543e4d625812154ff6af",
+    "sig":"9b012504e779632a2a1f55562fa9a85f8ae6245cbc149b83d25b2971249053abc77f65cc068e5d025b871d743678265fede70de4eaf5af642e675a5b6210077d",
+    "tags":[
+       [
+          "p",
+          "c55f0b0cb4dd180dd4395867b28dd4c208b709144a69fb7c31a46c369a5ad1c6"
+       ]
+    ]
+ }
+        """.trimIndent()
+
+        val privateKey = "de6152a85a0dea3b09a08a6f8139a314d498a7b52f7e5c28858b64270abd4c70"
+        val gossip = unwrapUnsealGossip(json, privateKey)
+
+        assertNotNull(gossip)
+        assertEquals("Hola, que tal?", gossip?.content)
+    }
+
+    @Test
+    fun testCaseFromAmethyst2() {
+        val json = """
+{
+    "content":"{\"ciphertext\":\"Zb0ZNYAcDG5y7BiCWgbxY/i7rN7TxPwr3Oaste6em4VcetuenaMu2SyH6OuCCxxmIa7kFennJD8ZCrev0086azsPNutl9I6OCoOfDQb2GoFaLoJAkE/FuW0uEoEJuN72KsKj05HEjOM6nqL2KiW0pxTCNmlGpweMwpXQdm2ItWkybNpq8+b4NJUDee2czBUd9Kr2ELbPISTYzA17z1IzPXGQw8c73NL+QX9I/QZjM/agqX2x5q11SU52xiRyVd9zHf7TMctZI4QEsqDB6xi54D1bAeZlMhVdcpQRpGDfqRz3KXFlhB3Bwdc8GLgY0aLTn6tJs4qrHP3mQkxFYk0mju0afoc0rloMEUHcBVtM18S9OrTPqfmSqFTQsjaT8g+PkmeiLBo1sXsMCS62w0abSZD9OzQtciMz70ZpcWoLjx5f8panjFClvg4tJ8czMURIHM/IFS1uKAUHBArGN8QpCw8MXQBblpyLDiEkFcSX334Zdps0OIw4z328JSdeejyRh4ks+NHDt9FcjC4iicEqfEh8OTkXuKqEAVkRyfAioNQxWQPnXDzMX0Q+BXvKzBA7NaEBDpbV36H/KnrpBBQwokV9/Byb6Seh3g6GSqRAWD3U6Nk2aBMXkD0xY8vnIqMckBeYHxn8BW7k1FdXFC9lE5xCxWZHkmksJ4f0NVaF37O6d8qOe6RK7bfUeF8/SouJEu+eEX1f4KCMboslwkdk8QA8bThGcRGn8GQBMrPKrpZwHYNyyH8jwt9pywigXJejRLDDnDp3FH/3dbZy5CfuNH6KGydf/O5xx1r316so1UPO1mL5LHJUFZVIaMaMMUsgq12gpI0lLEh5NJPpsi9e3ibkzEZGf7FlAJjJQURbQ8xacN7R+w3GWKbJNHiQbUZ2lXo6fwz33t0DrSqEW970yWPHlqxcpd27EI+qqb5IqfklQZ3RObZZBhzDvImaCPG+U7SmgLhPxnilpGjd5lw/ttiqJhPG9mYFMf1eJXSG+Q9VVkGzN7jxXYtx0q0WGjVq98ZGv5RSnF1d9+QVGCd1fiPS3rsaWdYWly8l0y2quYObJ6Mv3Wh3\",\"nonce\":\"/Q2UTTjVZthm/atcCuDjU1e4reF+ZSgZ\",\"v\":1}",
+    "created_at":1690660515,
+    "id":"087d9627d63135a5050758a69222e566c86702e930c9905f0b93ccd6bebeca3f",
+    "kind":1059,
+    "pubkey":"e59c00796ae2aa9077fc8bcd57fe8d32c0fc363f7c8b93d055c70804ffff3772",
+    "sig":"807cb641c314ca6910aaeefadcf87d859137520be1039eb40e39832ed59d456fdd800c5f88bba09e1b395ee90c66d5330847bdd010b63be9919bf091adbc2c2a",
+    "tags":[
+       [
+          "p",
+          "f85f315c06aaf19c2b30a96ca80d9644720655ee8d3ec43b84657a7c98f36a23"
+       ]
+    ]
+}
+        """.trimIndent()
+
+        val privateKey = "409ff7654141eaa16cd2161fe5bd127aeaef71f270c67587474b78998a8e3533"
+        val gossip = unwrapUnsealGossip(json, privateKey)
+
+        assertNotNull(gossip)
+        assertEquals("Hola, que tal?", gossip?.content)
+    }
+
+    @Test
+    fun testDecryptFromCoracle() {
+        val json = """
+{
+  "content": "{\"ciphertext\":\"fo0/Ywyfu86cXKoOOeFFlMRv+LYM6GJUL+F/J4ARv6EcAufOZP46vimlurPBLPjNgzuGemGjlTFfC3vtq84AqIsqFo3dqKunq8Vp+mmubvxIQUDzOGYvM0WE/XOiW5LEe3U3Vq399Dq07xRpXELcp4EZxGyu4Fowv2Ppb4SKpH8g+9N3z2+bwYcSxBvI6SrL+hgmVMrRlgvsUHN1d53ni9ehRseBqrLj/DqyyEiygsKm6vnEZAPKnl1MrBaVOBZmGsyjAa/G4SBVVmk78sW7xWWvo4cV+C22FluDWUOdj/bYabH4aR4scnBX3GLYqfLuzGnuQlRNsb5unXVX41+39uXzROrmNP6iYVyYxy5tfoyN7PPZ4osoKpLDUGldmXHD6RjMcAFuou4hXt2JlTPmXpj/x8qInXId5mkmU4nTGiasvsCIpJljbCujwCjbjLTcD4QrjuhMdtSsAzjT0CDv5Lmc632eKRYtDu/9B+lkqBBkp7amhzbqp8suNTnybkvbGFQQGEQnsLfNJw/GGopAuthfi8zkTgUZR/LxFR7ZKAX73G+5PQSDSjPuGH/dQEnsFo45zsh1Xro8SfUQBsPphbX2GS31Lwu5vA30O922T4UiWuU+EdNgZR0JankQ5NPgvr1uS56C3v84VwdrNWQUCwC4eYJl4Mb/OdpEy9qwsisisppq6uuzxmxd1qx3JfocnGsvB7h2g2sG+0lyZADDSobOEZEKHaBP3w+dRcJW9D95EmzPym9GO0n+33OfqFQbda7G0rzUWfPDV0gXIuZcKs/HmDqepgIZN8FG7JhRBeAv0bCbKQACre0c8tzVEn5yCYemltScdKop3pC/r6gH50jRhAlFAiIKx8R+XwuMmJRqOcH4WfkpZlfVU85/I0XJOCHWKk6BnJi/NPP9zYiZiJe+5LecqMUVjtO0YAlv138+U/3FIT/anQ4H5bjVWBZmajwf\",\"nonce\":\"Mv70S6jgrs4D1rlqV9b5DddiymGAcVVe\",\"v\":1}",
+  "created_at": 1690528373,
+  "id": "6b108e4236c3c338236ee589388ce0f91f921e1532ae52e75d1d2add6f8e691a",
+  "kind": 1059,
+  "pubkey": "627dc0248335e2bf9adac14be9494139ebbeb12c422d7df5b0e3cd72d04c209c",
+  "sig": "be11da487196db298e4ffb7a03e74176c37441c88b39c95b518fadce6fd02f23c58b2c435ca38c24d512713935ab719dae80bf952267630809e1f84be8e95174",
+  "tags": [
+    [
+      "p",
+      "e7764a227c12ac1ef2db79ae180392c90903b2cec1e37f5c1a4afed38117185e"
+    ]
+  ],
+  "seenOn": [
+    "wss://relay.damus.io/"
+  ]
+}
+        """.trimIndent()
+
+        val privateKey = "09e0051fdf5fdd9dd7a54713583006442cbdbf87bdcdab1a402f26e527d56771"
+        val gossip = unwrapUnsealGossip(json, privateKey)
+
+        assertNotNull(gossip)
+        assertEquals("test", gossip?.content)
+    }
+
+    @Test
+    fun testFromCoracle2() {
+        val json = """
+{
+  "content": "{\"ciphertext\":\"Hn/dHo/I8Qk6QWWAiKyo/SfKJqQfHdV0O5tMmgqMyfHrsFoDY6IhGQP2EgCJ/6HsNQyO/8EMAmLW8w0PbDKlBKYGKGpaMwCA6B1r0rLjvu+149RJZuggRNm9rd7tNVNkNs38iqt1KYD++bohePm52q+VhAQikbX2gTONV82ROwZylAg9vjvMnYkDt45g6N97s9FRB6V7YMiUEtJnneMixa6klucpUuenQ4569tyt5vnUMD2VNhKYCc2jit2hf7k0DIhvZrVC3OdopUvxIuYYWr3r7XpuEB3HJ6Ji3ajHPzgGeFcItBR7uKZ9s6XU34F3keyZbxrv3yWHFM5NrOctAdZexSGpqWRW93M0KZUAp9HgQh3YzMLl8xt0mcrVywCgjU6Kx8IwkI0bjPU+Am8acY3cItted6hZQ4Vy1xFITdKVfPWDl3Ab59iBg9+IkY5C31wqsKPgPVVycwQE6UpaGW74gy3qZshwyoo01owvEIbVvrSJWXH7EUVvndDPvUbo+f+EVa84IEwVjPmY2oR7VsxVfqRBdmPg23OSw/9rzVybmruqaQHd3xrTTEcnG0qBc/ugCXsiuILTeScOovEnqIlKKK3KB36jMtdScdJB+b4YrzJInY1AvqU7IAgqe0vmo1LdbMtj7kjuxkXJhhQsunAbTvPigTrsOfJ08P9l7r/95kpxudgagEaW7XAjYVfLphseJT3Iy1IuQEyG5sshQ+pl/CYvkGide7ykHwm9pjSBVkD9Mdcn5X6lSnLNJEcwY43pz43r6Kq3L09qneILY3DSKyQ16Zcu1MiAMAM5r6JGvpAHqcMmixi9ORuiryjteTmY4L0vI7b3W/0RSUblXxUrb8IpeysBrFmiKJBgCoU0r/D/8tgR+Eewyp1qxKI4SfKG5GFH40zZ2oVvKyoHAR4x1oVDp/MttcnxkzAsCFL6QuJC9A/vImjsumpmYB/EChcZCOAsfqkuzH4VSjZx\",\"nonce\":\"K537d+7m5tUcXZfkr3Qk2J2G86vdBMmY\",\"v\":1}",
+  "created_at": 1690655012,
+  "id": "c4f97c6332b0a63912c44c9e1f8c7b23581dc67a8489ec1522ec205fea7133db",
+  "kind": 1059,
+  "pubkey": "8def03a22b1039256a3883d46c7ccd5562f61743100db401344284547de7ec61",
+  "sig": "25dcf24bdda99c04abc72274d9f7a30538a4a00a70ac4b39db4082b73823979858df93cd649c25edfb759857eac46ed70bb9ad0598f2e011d733a5a382bc4def",
+  "tags": [
+    [
+      "p",
+      "e7764a227c12ac1ef2db79ae180392c90903b2cec1e37f5c1a4afed38117185e"
+    ]
+  ]
+}
+        """.trimIndent()
+
+        val privateKey = "09e0051fdf5fdd9dd7a54713583006442cbdbf87bdcdab1a402f26e527d56771"
+
+        val gossip = unwrapUnsealGossip(json, privateKey)
+
+        assertEquals("asdfasdfasdf", gossip?.content)
+        assertEquals(1690659269L, gossip?.createdAt)
+        assertEquals("827ba09d32ab81d62c60f657b350198c8aaba84372dab9ad3f4f6b8b7274b707", gossip?.id)
+        assertEquals(14, gossip?.kind)
+        assertEquals("subject", gossip?.tags?.firstOrNull()?.get(0))
+        assertEquals("test", gossip?.tags?.firstOrNull()?.get(1))
+    }
+
+    @Test
+    fun testFromCoracle3() {
+        val json = """
+{
+  "content": "{\"ciphertext\":\"PGCodiacmCB/sClw0C6DQRpP/XIfNAKCVZdKLQpOqytgbFryhs9Z+cPldq2FajXzxs3jQsF7/EVQyWpuV8pXetvFT9tvzjg4Xcm7ZcooLUnAeAo2xZNcJontN4cGubuDqKuXy5n59yXP1fIxfnJxRTRRdCZ2edhsKeNR5NSByUi+StjV10rnfHt8AhZCpiXiZ/giTOsC4wdaeONPgMzMeljaJWLvl6n11VjmXhkx1mXIQt43CNB1hIqO3p89Mbd9p+nlLrOsR+Xs0TB4DCh4XTPbvgf7B7Z+PgOfl3GZfJy9x6TciLcF4E3Ba1zrPe4f79czCIEiJ1yrIKrzzYvv+it35DZQ8fgveFXpyHnNL29hml8PNjyOsFbCHVYLMGw88evI5PijOcpe1TtdoioX8kX5kVEQSKJXuoSjTorvbRPCgGzaa1m0J0uTpzri5VD22a/Jh2CcAnubg6w4JDdUWCogdSV3NqiJllo7ZF7WnZ3apPdRD23MEfphVBJrcLBUNlmwajnY5IvVTKTkZOP50r9dBapvMWXIo6M6zhy/5vVWJz57863pelYCRG4upaXZuNK9sMBtbiphxmFR83i8RML8KN8Q391Cd/xBN7TxJNo5p2YU25VeGZUAmHY8DYlMQDm8Br0nStAXp3T+DzTRL8FTECa8DJV+KTAPoCxqhv3B28Ehr0XAP75CsHoLU00G48cR7h3vQ0CnfKh6KXU6nnDA5OWfpMYpirACCpsnpSD0OaCQ3gkQp3zZNMS3HcOpnPK/IY7R0esbzgAkvNhkyxaIfPDdf+eRUSOA9+2Ji28MwjjY8Dw3SLdUqCOzIDjQeR/T5oNmaQJm3lZ8G0FxxC6ejD4VJX/NI/x+STeB9jWHWmHZvqKzV6JHNh6qmZb6TKSIPOHpafWFoeJFOmiiigf46sju9vRXmVEAx59HXWnvnvCBNJg877yCMulB6xyQuSdVDuotQU4tQZwCKedTHJ6GqjesM98UlJrDtdWQURwwW1qc7N8tS6PukmUVEf0jmbIWVIBmUlkcVuiSs1g1h1kjt8c4MnGTz3CSgpOd1MqxLrl9WwrTqM+YnE+yeZYUjFoewyKZIQ==\",\"nonce\":\"OdCZczJiUGR4bOGIElQ4UUH4dQmG5U/3\",\"v\":1}",
+  "kind": 1059,
+  "created_at": 1690772945,
+  "pubkey": "e01475e87896800b7285eb0daf263c59f811c8fc5bc8daa105d2c98b6d7c4952",
+  "tags": [
+    [
+      "p",
+      "b08d8857a92b4d6aa580ff55cc3c18c4edf313c83388c34abc118621f74f1a78"
+    ]
+  ],
+  "id": "d9fc85ece892ce45ffa737b3ddc0f8b752623181d75363b966191f8c03d2debe",
+  "sig": "1b20416b83f4b5b8eead11e29c185f46b5e76d1960e4505210ddd00f7a6973cc11268f52a8989e3799b774d5f3a55db95bed4d66a1b6e88ab54becec5c771c17"
+}
+        """.trimIndent()
+
+        val privateKey = "7dd22cafc512c0bc363a259f6dcda515b13ae3351066d7976fd0bb79cbd0d700"
+
+        val gossip = unwrapUnsealGossip(json, privateKey)
+
+        assertEquals("8d1a56008d4e31dae2fb8bef36b3efea519eff75f57033107e2aa16702466ef2", gossip?.id)
+        assertEquals("Howdy", gossip?.content)
+        assertEquals(1690833960L, gossip?.createdAt)
+        assertEquals(14, gossip?.kind)
+        assertEquals("p", gossip?.tags?.firstOrNull()?.get(0))
+        assertEquals("b08d8857a92b4d6aa580ff55cc3c18c4edf313c83388c34abc118621f74f1a78", gossip?.tags?.firstOrNull()?.get(1))
+        assertEquals("subject", gossip?.tags?.getOrNull(1)?.get(0))
+        assertEquals("Stuff", gossip?.tags?.getOrNull(1)?.get(1))
+    }
+
+    fun unwrapUnsealGossip(json: String, privateKey: HexKey): Gossip? {
+        val pkBytes = privateKey.hexToByteArray()
+
+        val wrap = Event.fromJson(json, Client.lenient) as GiftWrapEvent
+        wrap.checkSignature()
+
+        assertEquals(CryptoUtils.pubkeyCreate(pkBytes).toHexKey(), wrap.recipientPubKey())
+
+        val event = wrap.unwrap(pkBytes)
+        assertNotNull(event)
+
+        return if (event is SealedGossipEvent) {
+            return event.unseal(pkBytes)
+        } else {
+            println(event?.toJson())
+            fail("Event is not a Sealed Gossip")
+            null
+        }
+    }
+}

app/src/androidTest/java/com/vitorpamplona/amethyst/LnInvoiceUtilTest.kt

@@ -0,0 +1,24 @@
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class LnInvoiceUtilTest {
+    @Test
+    fun test100KAmountCalculation() {
+        val bolt11 = "lnbc1m1pjt9u0qsp553q90pj5mafzv20w45eqavned9tgwhl4q99n9s5ppcw24nzw3zeqpp5002kd3ktym67du86kj665fgaev7ka8ys7j5yz5fg686lr5e2gfkshp5dkk27nnuax05az3pk2r6ytxtvwn5j4xzsq9ajprhc7crjkmgvr3qxqyjw5qcqpjrzjqtzxvfsuxe4l92pf97tt4rcgpy2xalkmlwexh899wqxf83l8nwv4xzh0gvqq89qqqqqqqqlgqqqqq0gqvs9qxpqysgqx5mz04wd7kqu5zhhel9enr036hjrp4gga0nz084p2asjl36a0zmrk6mhqa249zsgqref2rlvhffm73u7rxgr47gden6rugup4ksvpzsqvds4pz"
+        // Context of the app under test.
+        Assert.assertEquals(100000, LnInvoiceUtil.getAmountInSats(bolt11).toLong())
+    }
+
+    @Test
+    fun test100GAmountCalculation() {
+        val bolt11 = "lnbc1000000000000000p1pjtxqf0pp5myqxhcufqy56elfsg9dd4dthnqptusnnpwnul7u86l95xzjgqd8shp5gueg34sgm3u3nxqjqyunvvqdu0pr6jz6mwh4ew4886f2lpf4cmrqxqztgsp5w0cdfd45dfnqwex5gn85x7fru3jcrxhlcx3enx835477m3gdfcuq9qyyssqelrcmm7p9qazgjuxtdg7sd8nq5cscl2tratjlclt5rk5mc7uq2lphq3r2a43j5ua4leakc4emq8yp2yxdnzvzszpw6u2afac0kgl7hspfj67ta"
+        // Context of the app under test.
+        Assert.assertEquals(100000000000, LnInvoiceUtil.getAmountInSats(bolt11).toLong())
+    }
+}

app/src/androidTest/java/com/vitorpamplona/amethyst/RichTextParserTest.kt

@@ -4007,7 +4007,7 @@ class RichTextParserTest {
             "Bech(npub17m7f7q08k4x746s2v45eyvwppck32dcahw7uj2mu5txuswldgqkqw9zms7)"
         )
 
-        state.paragraphs.flatten().forEachIndexed { index, seg ->
+        state.paragraphs.map { it.words }.flatten().forEachIndexed { index, seg ->
             Assert.assertEquals(
                 expectedResult[index],
                 "${seg.javaClass.simpleName.replace("Segment", "")}(${seg.segmentText})"
@@ -4027,7 +4027,7 @@ class RichTextParserTest {
         Assert.assertTrue(state.imagesForPager.isEmpty())
         Assert.assertTrue(state.imageList.isEmpty())
         Assert.assertTrue(state.customEmoji.isEmpty())
-        Assert.assertEquals("Hi, how are you doing? ", state.paragraphs.firstOrNull()?.firstOrNull()?.segmentText)
+        Assert.assertEquals("Hi, how are you doing? ", state.paragraphs.firstOrNull()?.words?.firstOrNull()?.segmentText)
     }
 
     @Test
@@ -4039,7 +4039,7 @@ class RichTextParserTest {
         Assert.assertTrue(state.customEmoji.isEmpty())
         Assert.assertEquals(
             "\nHi, \nhow\n\n\n are you doing? \n",
-            state.paragraphs.joinToString("\n") { it.joinToString(" ") { it.segmentText } }
+            state.paragraphs.joinToString("\n") { it.words.joinToString(" ") { it.segmentText } }
         )
     }
 
@@ -4102,7 +4102,7 @@ https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db
             "Image(https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db214e8a.jpg)"
         )
 
-        state.paragraphs.flatten().forEachIndexed { index, seg ->
+        state.paragraphs.map { it.words }.flatten().forEachIndexed { index, seg ->
             Assert.assertEquals(
                 expectedResult[index],
                 "${seg.javaClass.simpleName.replace("Segment", "")}(${seg.segmentText})"
@@ -4112,7 +4112,7 @@ https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db
 
     private fun printStateForDebug(state: RichTextViewerState) {
         state.paragraphs.forEachIndexed { index, paragraph ->
-            paragraph.forEach { seg ->
+            paragraph.words.forEach { seg ->
                 println(
                     "\"${
                     seg.javaClass.simpleName.replace(

app/src/androidTestPlay/java/com/vitorpamplona/amethyst/TranslationsTest.kt

@@ -99,4 +99,13 @@ class TranslationsTest {
             "en"
         )
     }
+
+    @Test
+    fun testEmoji() {
+        assertTranslateContains(
+            "https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg",
+            "\uD83E\uDD23 https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg ",
+            "pt"
+        )
+    }
 }

app/src/main/AndroidManifest.xml

@@ -27,6 +27,19 @@
     <!-- To know receive notifications when the app connects/disconnects from the web -->
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
 
+    <!-- Audio/Video Playback -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+
+    <!-- Keeps screen on while playing videos -->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <!-- This notification permission is needed for some phones -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
+    <!-- Adds Geohash to posts if active -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
     <!-- Old permission to access media -->
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
@@ -51,6 +64,7 @@
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
+            android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize"
             android:configChanges="orientation|screenSize|screenLayout"
             android:theme="@style/Theme.Amethyst">
@@ -91,6 +105,17 @@
             android:screenOrientation="fullSensor"
             tools:replace="screenOrientation" />
 
+        <service
+            android:name=".PlaybackService"
+            android:foregroundServiceType="mediaPlayback"
+            android:stopWithTask="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="androidx.media3.session.MediaSessionService"/>
+                <action android:name="android.media.browse.MediaBrowserService"/>
+            </intent-filter>
+        </service>
+
     </application>
 
 </manifest>

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

@@ -1,11 +1,38 @@
 package com.vitorpamplona.amethyst
 
 import android.app.Application
+import android.os.StrictMode
+import android.os.StrictMode.ThreadPolicy
+import android.os.StrictMode.VmPolicy
 
 class Amethyst : Application() {
+    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
     override fun onCreate() {
         super.onCreate()
         instance = this
+
+        VideoCache.initFileCache(instance)
+
+        if (BuildConfig.DEBUG) {
+            StrictMode.setThreadPolicy(
+                ThreadPolicy.Builder()
+                    .detectAll()
+                    .penaltyLog()
+                    .build()
+            )
+            StrictMode.setVmPolicy(
+                VmPolicy.Builder()
+                    .detectActivityLeaks()
+                    .detectFileUriExposure()
+                    .detectContentUriWithoutPermission()
+                    .detectLeakedClosableObjects()
+                    .detectLeakedRegistrationObjects()
+                    .detectLeakedSqlLiteObjects()
+                    .penaltyLog()
+                    // .penaltyDeath()
+                    .build()
+            )
+        }
     }
 
     companion object {

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

@@ -7,22 +7,24 @@ import androidx.compose.runtime.Immutable
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.model.Settings
 import com.vitorpamplona.amethyst.model.hexToByteArray
+import com.vitorpamplona.amethyst.model.parseConnectivityType
+import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.service.KeyPair
 import com.vitorpamplona.amethyst.service.model.ContactListEvent
 import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.Event.Companion.getRefinedEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.toNpub
 import com.vitorpamplona.amethyst.ui.actions.ServersAvailable
 import com.vitorpamplona.amethyst.ui.note.Nip47URI
 import fr.acinq.secp256k1.Hex
-import nostr.postr.Persona
-import nostr.postr.toHex
-import nostr.postr.toNpub
 import java.io.File
 import java.util.Locale
 
@@ -209,8 +211,8 @@ object LocalPreferences {
     fun saveToEncryptedStorage(account: Account) {
         val prefs = encryptedPreferences(account.userProfile().pubkeyNpub())
         prefs.edit().apply {
-            account.loggedIn.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHex()) }
-            account.loggedIn.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHex()) }
+            account.keyPair.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHexKey()) }
+            account.keyPair.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHexKey()) }
             putStringSet(PrefKeys.FOLLOWING_CHANNELS, account.followingChannels)
             putStringSet(PrefKeys.FOLLOWING_COMMUNITIES, account.followingCommunities)
             putStringSet(PrefKeys.HIDDEN_USERS, account.hiddenUsers)
@@ -245,21 +247,21 @@ object LocalPreferences {
 
         val globalPrefs = encryptedPreferences()
         globalPrefs.edit().apply {
-            if (account.settings.automaticallyShowImages == null) {
+            if (account.settings.automaticallyShowImages.prefCode == null) {
                 remove(PrefKeys.AUTOMATICALLY_SHOW_IMAGES)
             } else {
-                putBoolean(PrefKeys.AUTOMATICALLY_SHOW_IMAGES, account.settings.automaticallyShowImages!!)
+                putBoolean(PrefKeys.AUTOMATICALLY_SHOW_IMAGES, account.settings.automaticallyShowImages.prefCode!!)
             }
 
-            if (account.settings.automaticallyStartPlayback == null) {
+            if (account.settings.automaticallyStartPlayback.prefCode == null) {
                 remove(PrefKeys.AUTOMATICALLY_START_PLAYBACK)
             } else {
-                putBoolean(PrefKeys.AUTOMATICALLY_START_PLAYBACK, account.settings.automaticallyStartPlayback!!)
+                putBoolean(PrefKeys.AUTOMATICALLY_START_PLAYBACK, account.settings.automaticallyStartPlayback.prefCode!!)
             }
-            if (account.settings.automaticallyShowUrlPreview == null) {
+            if (account.settings.automaticallyShowUrlPreview.prefCode == null) {
                 remove(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW)
             } else {
-                putBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, account.settings.automaticallyShowUrlPreview!!)
+                putBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, account.settings.automaticallyShowUrlPreview.prefCode!!)
             }
             putString(PrefKeys.PREFERRED_LANGUAGE, account.settings.preferredLanguage ?: "")
         }.apply()
@@ -390,27 +392,27 @@ object LocalPreferences {
             val settings = Settings()
             encryptedPreferences().apply {
                 settings.automaticallyShowImages = if (contains(PrefKeys.AUTOMATICALLY_SHOW_IMAGES)) {
-                    getBoolean(PrefKeys.AUTOMATICALLY_SHOW_IMAGES, false)
+                    parseConnectivityType(getBoolean(PrefKeys.AUTOMATICALLY_SHOW_IMAGES, false))
                 } else {
-                    null
+                    ConnectivityType.ALWAYS
                 }
 
                 settings.automaticallyStartPlayback = if (contains(PrefKeys.AUTOMATICALLY_START_PLAYBACK)) {
-                    getBoolean(PrefKeys.AUTOMATICALLY_START_PLAYBACK, false)
+                    parseConnectivityType(getBoolean(PrefKeys.AUTOMATICALLY_START_PLAYBACK, false))
                 } else {
-                    null
+                    ConnectivityType.ALWAYS
                 }
                 settings.automaticallyShowUrlPreview = if (contains(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW)) {
-                    getBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, false)
+                    parseConnectivityType(getBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, false))
                 } else {
-                    null
+                    ConnectivityType.ALWAYS
                 }
 
                 settings.preferredLanguage = getString(PrefKeys.PREFERRED_LANGUAGE, "")
             }
 
             val a = Account(
-                loggedIn = Persona(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray()),
+                keyPair = KeyPair(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray()),
                 followingChannels = followingChannels,
                 followingCommunities = followingCommunities,
                 hiddenUsers = hiddenUsers,

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

@@ -0,0 +1,135 @@
+package com.vitorpamplona.amethyst
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.util.LruCache
+import androidx.core.net.toUri
+import androidx.media3.common.C
+import androidx.media3.common.Player
+import androidx.media3.common.Player.STATE_IDLE
+import androidx.media3.common.Player.STATE_READY
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.session.MediaSession
+import com.vitorpamplona.amethyst.ui.MainActivity
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlin.math.abs
+
+class MultiPlayerPlaybackManager(
+    private val dataSourceFactory: androidx.media3.exoplayer.source.MediaSource.Factory? = null,
+    private val cachedPositions: VideoViewedPositionCache
+) {
+    // protects from LruCache killing playing sessions
+    private val playingMap = mutableMapOf<String, MediaSession>()
+
+    private val cache =
+        object : LruCache<String, MediaSession>(10) { // up to 10 videos in the screen at the same time
+            override fun entryRemoved(
+                evicted: Boolean,
+                key: String?,
+                oldValue: MediaSession?,
+                newValue: MediaSession?
+            ) {
+                super.entryRemoved(evicted, key, oldValue, newValue)
+
+                if (!playingMap.contains(key)) {
+                    oldValue?.let {
+                        it.player.release()
+                        it.release()
+                    }
+                }
+            }
+        }
+
+    private fun getCallbackIntent(callbackUri: String, applicationContext: Context): PendingIntent {
+        return PendingIntent.getActivity(
+            applicationContext,
+            0,
+            Intent(Intent.ACTION_VIEW, callbackUri.toUri(), applicationContext, MainActivity::class.java),
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
+    }
+
+    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
+    fun getMediaSession(id: String, uri: String, callbackUri: String?, context: Context, applicationContext: Context): MediaSession {
+        val existingSession = playingMap.get(id) ?: cache.get(id)
+        if (existingSession != null) return existingSession
+
+        val player = ExoPlayer.Builder(context).run {
+            dataSourceFactory?.let { setMediaSourceFactory(it) }
+            build()
+        }
+
+        player.apply {
+            repeatMode = Player.REPEAT_MODE_ALL
+            videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT
+            volume = 0f
+        }
+
+        val mediaSession = MediaSession.Builder(context, player).run {
+            callbackUri?.let {
+                setSessionActivity(getCallbackIntent(it, applicationContext))
+            }
+            setId(id)
+            build()
+        }
+
+        player.addListener(object : Player.Listener {
+            override fun onIsPlayingChanged(isPlaying: Boolean) {
+                if (isPlaying) {
+                    player.setWakeMode(C.WAKE_MODE_NETWORK)
+                    playingMap.put(id, mediaSession)
+                } else {
+                    player.setWakeMode(C.WAKE_MODE_NONE)
+                    cache.put(id, mediaSession)
+                    playingMap.remove(id, mediaSession)
+                }
+            }
+
+            override fun onPlaybackStateChanged(playbackState: Int) {
+                when (playbackState) {
+                    STATE_IDLE -> {
+                        if (player.currentPosition > 5 * 60) { // 5 seconds
+                            cachedPositions.add(uri, player.currentPosition)
+                        }
+                    }
+                    STATE_READY -> {
+                        cachedPositions.get(uri)?.let { lastPosition ->
+                            if (abs(player.currentPosition - lastPosition) > 5 * 60) {
+                                player.seekTo(lastPosition)
+                            }
+                        }
+                    }
+                    else -> {
+                        if (player.currentPosition > 5 * 60) { // 5 seconds
+                            cachedPositions.add(uri, player.currentPosition)
+                        }
+                    }
+                }
+            }
+        })
+
+        cache.put(id, mediaSession)
+
+        return mediaSession
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun releaseAppPlayers() {
+        GlobalScope.launch(Dispatchers.Main) {
+            cache.evictAll()
+            playingMap.forEach {
+                it.value.player.release()
+                it.value.release()
+            }
+            playingMap.clear()
+        }
+    }
+
+    fun playingContent(): Collection<MediaSession> {
+        return playingMap.values
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.vitorpamplona.amethyst
+
+import android.content.ComponentName
+import android.content.Context
+import android.os.Bundle
+import android.util.Log
+import androidx.media3.session.MediaController
+import androidx.media3.session.SessionToken
+import com.google.common.util.concurrent.MoreExecutors
+
+object PlaybackClientController {
+    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
+    fun prepareController(
+        controllerID: String,
+        videoUri: String,
+        callbackUri: String?,
+        context: Context,
+        onReady: (MediaController) -> Unit
+    ) {
+        try {
+            // creating a bundle object
+            // creating a bundle object
+            val bundle = Bundle()
+            bundle.putString("id", controllerID)
+            bundle.putString("uri", videoUri)
+            bundle.putString("callbackUri", callbackUri)
+
+            val sessionTokenLocal = SessionToken(context, ComponentName(context, PlaybackService::class.java))
+            val controllerFuture = MediaController
+                .Builder(context, sessionTokenLocal)
+                .setConnectionHints(bundle)
+                .buildAsync()
+
+            controllerFuture.addListener(
+                {
+                    try {
+                        onReady(controllerFuture.get())
+                    } catch (e: Exception) {
+                        Log.e("Playback Client", "Failed to load Playback Client for $videoUri", e)
+                    }
+                },
+                MoreExecutors.directExecutor()
+            )
+        } catch (e: Exception) {
+            Log.e("Playback Client", "Failed to load Playback Client for $videoUri", e)
+        }
+    }
+}

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

@@ -0,0 +1,123 @@
+package com.vitorpamplona.amethyst
+
+import androidx.annotation.OptIn
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.okhttp.OkHttpDataSource
+import androidx.media3.exoplayer.hls.HlsMediaSource
+import androidx.media3.exoplayer.source.MediaSource
+import androidx.media3.exoplayer.source.ProgressiveMediaSource
+import androidx.media3.session.MediaSession
+import androidx.media3.session.MediaSessionService
+import com.vitorpamplona.amethyst.service.HttpClient
+
+@UnstableApi // Extend MediaSessionService
+class PlaybackService : MediaSessionService() {
+    private var videoViewedPositionCache = VideoViewedPositionCache()
+
+    private var managerHls: MultiPlayerPlaybackManager? = null
+    private var managerProgressive: MultiPlayerPlaybackManager? = null
+    private var managerLocal: MultiPlayerPlaybackManager? = null
+
+    fun newHslDataSource(): MediaSource.Factory {
+        return HlsMediaSource.Factory(OkHttpDataSource.Factory(HttpClient.getHttpClient()))
+    }
+
+    fun newProgressiveDataSource(): MediaSource.Factory {
+        return ProgressiveMediaSource.Factory(VideoCache.get(Amethyst.instance, HttpClient.getHttpClient()))
+    }
+
+    // Create your Player and MediaSession in the onCreate lifecycle event
+    @OptIn(UnstableApi::class)
+    override fun onCreate() {
+        super.onCreate()
+
+        managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
+        managerProgressive = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+        managerLocal = MultiPlayerPlaybackManager(cachedPositions = videoViewedPositionCache)
+
+        // Stop all videos and recreates all managers when the proxy changes.
+        HttpClient.proxyChangeListeners.add(this@PlaybackService::onProxyUpdated)
+    }
+
+    private fun onProxyUpdated() {
+        val toDestroyHls = managerHls
+        val toDestroyProgressive = managerProgressive
+
+        managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
+        managerProgressive = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+
+        toDestroyHls?.releaseAppPlayers()
+        toDestroyProgressive?.releaseAppPlayers()
+    }
+
+    override fun onDestroy() {
+        HttpClient.proxyChangeListeners.remove(this@PlaybackService::onProxyUpdated)
+
+        managerHls?.releaseAppPlayers()
+        managerLocal?.releaseAppPlayers()
+        managerProgressive?.releaseAppPlayers()
+
+        super.onDestroy()
+    }
+
+    fun getAppropriateMediaSessionManager(fileName: String): MultiPlayerPlaybackManager? {
+        return if (fileName.startsWith("file")) {
+            managerLocal
+        } else if (fileName.endsWith("m3u8")) {
+            managerHls
+        } else {
+            managerProgressive
+        }
+    }
+
+    override fun onUpdateNotification(session: MediaSession, startInForegroundRequired: Boolean) {
+        // Updates any new player ready
+        super.onUpdateNotification(session, startInForegroundRequired)
+
+        // Overrides the notification with any player actually playing
+        managerHls?.playingContent()?.forEach {
+            if (it.player.isPlaying) {
+                super.onUpdateNotification(it, startInForegroundRequired)
+            }
+        }
+        managerLocal?.playingContent()?.forEach {
+            if (it.player.isPlaying) {
+                super.onUpdateNotification(session, startInForegroundRequired)
+            }
+        }
+        managerProgressive?.playingContent()?.forEach {
+            if (it.player.isPlaying) {
+                super.onUpdateNotification(session, startInForegroundRequired)
+            }
+        }
+
+        // Overrides again with playing with audio
+        managerHls?.playingContent()?.forEach {
+            if (it.player.isPlaying && it.player.volume > 0) {
+                super.onUpdateNotification(it, startInForegroundRequired)
+            }
+        }
+        managerLocal?.playingContent()?.forEach {
+            if (it.player.isPlaying && it.player.volume > 0) {
+                super.onUpdateNotification(session, startInForegroundRequired)
+            }
+        }
+        managerProgressive?.playingContent()?.forEach {
+            if (it.player.isPlaying && it.player.volume > 0) {
+                super.onUpdateNotification(session, startInForegroundRequired)
+            }
+        }
+    }
+
+    // Return a MediaSession to link with the MediaController that is making
+    // this request.
+    override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaSession? {
+        val id = controllerInfo.connectionHints.getString("id") ?: return null
+        val uri = controllerInfo.connectionHints.getString("uri") ?: return null
+        val callbackUri = controllerInfo.connectionHints.getString("callbackUri")
+
+        val manager = getAppropriateMediaSessionManager(uri)
+
+        return manager?.getMediaSession(id, uri, callbackUri, context = this, applicationContext = applicationContext)
+    }
+}

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

@@ -17,6 +17,7 @@ import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrCommunityDataSource
 import com.vitorpamplona.amethyst.service.NostrDiscoveryDataSource
+import com.vitorpamplona.amethyst.service.NostrGeohashDataSource
 import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
@@ -60,9 +61,6 @@ object ServiceManager {
                 .build()
         }
 
-        // Initializes video cache.
-        VideoCache.init(context.applicationContext)
-
         if (myAccount != null) {
             Client.connect(myAccount.activeRelays() ?: myAccount.convertLocalRelays())
 
@@ -100,6 +98,7 @@ object ServiceManager {
 
         NostrCommunityDataSource.stop()
         NostrHashtagDataSource.stop()
+        NostrGeohashDataSource.stop()
         NostrSearchEventOrUserDataSource.stop()
         NostrSingleChannelDataSource.stop()
         NostrSingleEventDataSource.stop()
@@ -118,7 +117,7 @@ object ServiceManager {
             LocalCache.pruneOldAndHiddenMessages(it)
             LocalCache.pruneHiddenMessages(it)
             LocalCache.pruneContactLists(it)
-            // LocalCache.pruneNonFollows(it)
+            LocalCache.pruneRepliesAndReactions(it)
         }
     }
 }

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

@@ -7,7 +7,7 @@ import androidx.media3.datasource.cache.CacheDataSource
 import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
 import androidx.media3.datasource.cache.SimpleCache
 import androidx.media3.datasource.okhttp.OkHttpDataSource
-import com.vitorpamplona.amethyst.service.HttpClient
+import okhttp3.OkHttpClient
 
 @UnstableApi object VideoCache {
 
@@ -21,33 +21,34 @@ import com.vitorpamplona.amethyst.service.HttpClient
     lateinit var cacheDataSourceFactory: CacheDataSource.Factory
 
     @Synchronized
-    fun init(context: Context) {
-        if (!this::simpleCache.isInitialized) {
-            exoDatabaseProvider = StandaloneDatabaseProvider(context)
+    fun initFileCache(context: Context) {
+        exoDatabaseProvider = StandaloneDatabaseProvider(context)
 
-            simpleCache = SimpleCache(
-                context.cacheDir,
-                leastRecentlyUsedCacheEvictor,
-                exoDatabaseProvider
-            )
-
-            cacheDataSourceFactory = CacheDataSource.Factory()
-                .setCache(simpleCache)
-                .setUpstreamDataSourceFactory(
-                    OkHttpDataSource.Factory(HttpClient.getHttpClient())
-                )
-                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-        } else {
-            cacheDataSourceFactory = CacheDataSource.Factory()
-                .setCache(simpleCache)
-                .setUpstreamDataSourceFactory(
-                    OkHttpDataSource.Factory(HttpClient.getHttpClient())
-                )
-                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-        }
+        simpleCache = SimpleCache(
+            context.cacheDir,
+            leastRecentlyUsedCacheEvictor,
+            exoDatabaseProvider
+        )
     }
 
-    fun get(): CacheDataSource.Factory {
+    // This method should be called when proxy setting changes.
+    fun renewCacheFactory(client: OkHttpClient) {
+        cacheDataSourceFactory = CacheDataSource.Factory()
+            .setCache(simpleCache)
+            .setUpstreamDataSourceFactory(
+                OkHttpDataSource.Factory(client)
+            )
+            .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+    }
+
+    fun get(context: Context, client: OkHttpClient): CacheDataSource.Factory {
+        if (!this::simpleCache.isInitialized) {
+            initFileCache(context)
+        }
+
+        // Renews the factory because OkHttpMight have changed.
+        renewCacheFactory(client)
+
         return cacheDataSourceFactory
     }
 }

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

@@ -0,0 +1,15 @@
+package com.vitorpamplona.amethyst
+
+import android.util.LruCache
+
+class VideoViewedPositionCache {
+    val cachedPosition = LruCache<String, Long>(100)
+
+    fun add(uri: String, position: Long) {
+        cachedPosition.put(uri, position)
+    }
+
+    fun get(uri: String): Long? {
+        return cachedPosition.get(uri)
+    }
+}

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

@@ -7,9 +7,10 @@ import androidx.compose.runtime.Stable
 import androidx.core.os.ConfigurationCompat
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.distinctUntilChanged
-import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.OptOutFromFilters
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import com.vitorpamplona.amethyst.service.FileHeader
+import com.vitorpamplona.amethyst.service.KeyPair
 import com.vitorpamplona.amethyst.service.NostrLnZapPaymentResponseDataSource
 import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.relays.Client
@@ -28,8 +29,6 @@ import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import nostr.postr.Persona
-import nostr.postr.Utils
 import java.math.BigDecimal
 import java.net.Proxy
 import java.util.Locale
@@ -54,7 +53,7 @@ val KIND3_FOLLOWS = " All Follows "
 @OptIn(DelicateCoroutinesApi::class)
 @Stable
 class Account(
-    val loggedIn: Persona,
+    val keyPair: KeyPair,
 
     var followingChannels: Set<String> = DefaultChannels, // deprecated
     var followingCommunities: Set<String> = setOf(), // deprecated
@@ -100,7 +99,7 @@ class Account(
     )
 
     val liveHiddenUsers: LiveData<LiveHiddenUsers> = live.combineWith(getBlockListNote().live().metadata) { localLive, liveMuteListEvent ->
-        val liveBlockedUsers = (liveMuteListEvent?.note?.event as? PeopleListEvent)?.publicAndPrivateUsers(loggedIn.privKey)
+        val liveBlockedUsers = (liveMuteListEvent?.note?.event as? PeopleListEvent)?.publicAndPrivateUsers(keyPair.privKey)
         LiveHiddenUsers(
             hiddenUsers = liveBlockedUsers ?: persistentSetOf(),
             spammers = localLive?.account?.transientHiddenUsers ?: persistentSetOf(),
@@ -111,7 +110,7 @@ class Account(
     var userProfileCache: User? = null
 
     fun updateAutomaticallyStartPlayback(
-        automaticallyStartPlayback: Boolean?
+        automaticallyStartPlayback: ConnectivityType
     ) {
         settings.automaticallyStartPlayback = automaticallyStartPlayback
         live.invalidateData()
@@ -119,7 +118,7 @@ class Account(
     }
 
     fun updateAutomaticallyShowUrlPreview(
-        automaticallyShowUrlPreview: Boolean?
+        automaticallyShowUrlPreview: ConnectivityType
     ) {
         settings.automaticallyShowUrlPreview = automaticallyShowUrlPreview
         live.invalidateData()
@@ -127,7 +126,7 @@ class Account(
     }
 
     fun updateAutomaticallyShowImages(
-        automaticallyShowImages: Boolean?
+        automaticallyShowImages: ConnectivityType
     ) {
         settings.automaticallyShowImages = automaticallyShowImages
         live.invalidateData()
@@ -147,14 +146,14 @@ class Account(
 
     fun userProfile(): User {
         return userProfileCache ?: run {
-            val myUser: User = LocalCache.getOrCreateUser(loggedIn.pubKey.toHexKey())
+            val myUser: User = LocalCache.getOrCreateUser(keyPair.pubKey.toHexKey())
             userProfileCache = myUser
             myUser
         }
     }
 
     fun isWriteable(): Boolean {
-        return loggedIn.privKey != null
+        return keyPair.privKey != null
     }
 
     fun sendNewRelayList(relays: Map<String, ContactListEvent.ReadWrite>) {
@@ -166,7 +165,7 @@ class Account(
             val event = ContactListEvent.updateRelayList(
                 earlierVersion = contactList,
                 relayUse = relays,
-                privateKey = loggedIn.privKey!!
+                privateKey = keyPair.privKey!!
             )
 
             Client.send(event)
@@ -175,10 +174,11 @@ class Account(
             val event = ContactListEvent.createFromScratch(
                 followUsers = listOf(),
                 followTags = listOf(),
+                followGeohashes = listOf(),
                 followCommunities = listOf(),
                 followEvents = DefaultChannels.toList(),
                 relayUse = relays,
-                privateKey = loggedIn.privKey!!
+                privateKey = keyPair.privKey!!
             )
 
             // Keep this local to avoid erasing a good contact list.
@@ -190,8 +190,8 @@ class Account(
     fun sendNewUserMetadata(toString: String, identities: List<IdentityClaim>) {
         if (!isWriteable()) return
 
-        loggedIn.privKey?.let {
-            val event = MetadataEvent.create(toString, identities, loggedIn.privKey!!)
+        keyPair.privKey?.let {
+            val event = MetadataEvent.create(toString, identities, keyPair.privKey!!)
             Client.send(event)
             LocalCache.consume(event)
         }
@@ -225,7 +225,7 @@ class Account(
             val emojiUrl = EmojiUrl.decode(reaction)
             if (emojiUrl != null) {
                 note.event?.let {
-                    val event = ReactionEvent.create(emojiUrl, it, loggedIn.privKey!!)
+                    val event = ReactionEvent.create(emojiUrl, it, keyPair.privKey!!)
                     Client.send(event)
                     LocalCache.consume(event)
                 }
@@ -235,7 +235,7 @@ class Account(
         }
 
         note.event?.let {
-            val event = ReactionEvent.create(reaction, it, loggedIn.privKey!!)
+            val event = ReactionEvent.create(reaction, it, keyPair.privKey!!)
             Client.send(event)
             LocalCache.consume(event)
         }
@@ -249,7 +249,7 @@ class Account(
                 event,
                 userProfile().latestContactList?.relays()?.keys?.ifEmpty { null }
                     ?: localRelays.map { it.url }.toSet(),
-                loggedIn.privKey!!,
+                keyPair.privKey!!,
                 pollOption,
                 message,
                 zapType
@@ -263,18 +263,18 @@ class Account(
     }
 
     fun isNIP47Author(pubkeyHex: String?): Boolean {
-        val privKey = zapPaymentRequest?.secret?.hexToByteArray() ?: loggedIn.privKey
+        val privKey = zapPaymentRequest?.secret?.hexToByteArray() ?: keyPair.privKey
 
         if (privKey == null) return false
 
-        val pubKey = Utils.pubkeyCreate(privKey).toHexKey()
+        val pubKey = CryptoUtils.pubkeyCreate(privKey).toHexKey()
         return (pubKey == pubkeyHex)
     }
 
     fun decryptZapPaymentResponseEvent(zapResponseEvent: LnZapPaymentResponseEvent): Response? {
         val myNip47 = zapPaymentRequest ?: return null
 
-        val privKey = myNip47.secret?.hexToByteArray() ?: loggedIn.privKey
+        val privKey = myNip47.secret?.hexToByteArray() ?: keyPair.privKey
         val pubKey = myNip47.pubKeyHex.hexToByteArray()
 
         if (privKey == null) return null
@@ -287,7 +287,7 @@ class Account(
     }
 
     fun calculateZappedAmount(zappedNote: Note?): BigDecimal {
-        val privKey = zapPaymentRequest?.secret?.hexToByteArray() ?: loggedIn.privKey
+        val privKey = zapPaymentRequest?.secret?.hexToByteArray() ?: keyPair.privKey
         val pubKey = zapPaymentRequest?.pubKeyHex?.hexToByteArray()
         return zappedNote?.zappedAmount(privKey, pubKey) ?: BigDecimal.ZERO
     }
@@ -296,13 +296,13 @@ class Account(
         if (!isWriteable()) return
 
         zapPaymentRequest?.let { nip47 ->
-            val event = LnZapPaymentRequestEvent.create(bolt11, nip47.pubKeyHex, nip47.secret?.hexToByteArray() ?: loggedIn.privKey!!)
+            val event = LnZapPaymentRequestEvent.create(bolt11, nip47.pubKeyHex, nip47.secret?.hexToByteArray() ?: keyPair.privKey!!)
 
             val wcListener = NostrLnZapPaymentResponseDataSource(
                 fromServiceHex = nip47.pubKeyHex,
                 toUserHex = event.pubKey,
                 replyingToHex = event.id,
-                authSigningKey = nip47.secret?.hexToByteArray() ?: loggedIn.privKey!!
+                authSigningKey = nip47.secret?.hexToByteArray() ?: keyPair.privKey!!
             )
             wcListener.start()
 
@@ -330,7 +330,7 @@ class Account(
         return LnZapRequestEvent.create(
             userPubKeyHex,
             userProfile().latestContactList?.relays()?.keys?.ifEmpty { null } ?: localRelays.map { it.url }.toSet(),
-            loggedIn.privKey!!,
+            keyPair.privKey!!,
             message,
             zapType
         )
@@ -345,13 +345,13 @@ class Account(
         }
 
         note.event?.let {
-            val event = ReactionEvent.createWarning(it, loggedIn.privKey!!)
+            val event = ReactionEvent.createWarning(it, keyPair.privKey!!)
             Client.send(event)
             LocalCache.consume(event)
         }
 
         note.event?.let {
-            val event = ReportEvent.create(it, type, loggedIn.privKey!!, content = content)
+            val event = ReportEvent.create(it, type, keyPair.privKey!!, content = content)
             Client.send(event)
             LocalCache.consume(event, null)
         }
@@ -365,7 +365,7 @@ class Account(
             return
         }
 
-        val event = ReportEvent.create(user.pubkeyHex, type, loggedIn.privKey!!)
+        val event = ReportEvent.create(user.pubkeyHex, type, keyPair.privKey!!)
         Client.send(event)
         LocalCache.consume(event, null)
     }
@@ -380,7 +380,7 @@ class Account(
         val myNotes = notes.filter { it.author == userProfile() }.map { it.idHex }
 
         if (myNotes.isNotEmpty()) {
-            val event = DeletionEvent.create(myNotes, loggedIn.privKey!!)
+            val event = DeletionEvent.create(myNotes, keyPair.privKey!!)
             Client.send(event)
             LocalCache.consume(event)
         }
@@ -389,7 +389,7 @@ class Account(
     fun createHTTPAuthorization(url: String, method: String, body: String? = null): HTTPAuthorizationEvent? {
         if (!isWriteable()) return null
 
-        return HTTPAuthorizationEvent.create(url, method, body, loggedIn.privKey!!)
+        return HTTPAuthorizationEvent.create(url, method, body, keyPair.privKey!!)
     }
 
     fun boost(note: Note) {
@@ -402,11 +402,11 @@ class Account(
 
         note.event?.let {
             if (it.kind() == 1) {
-                val event = RepostEvent.create(it, loggedIn.privKey!!)
+                val event = RepostEvent.create(it, keyPair.privKey!!)
                 Client.send(event)
                 LocalCache.consume(event)
             } else {
-                val event = GenericRepostEvent.create(it, loggedIn.privKey!!)
+                val event = GenericRepostEvent.create(it, keyPair.privKey!!)
                 Client.send(event)
                 LocalCache.consume(event)
             }
@@ -427,7 +427,7 @@ class Account(
         if (followingCommunities.isNotEmpty()) {
             followingCommunities.forEach {
                 ATag.parse(it, null)?.let {
-                    returningContactList = ContactListEvent.followAddressableEvent(returningContactList, it, loggedIn.privKey!!)
+                    returningContactList = ContactListEvent.followAddressableEvent(returningContactList, it, keyPair.privKey!!)
                 }
             }
             followingCommunities = emptySet()
@@ -435,7 +435,7 @@ class Account(
 
         if (followingChannels.isNotEmpty()) {
             followingChannels.forEach {
-                returningContactList = ContactListEvent.followEvent(returningContactList, it, loggedIn.privKey!!)
+                returningContactList = ContactListEvent.followEvent(returningContactList, it, keyPair.privKey!!)
             }
             followingChannels = emptySet()
         }
@@ -449,15 +449,16 @@ class Account(
         val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
 
         val event = if (contactList != null) {
-            ContactListEvent.followUser(contactList, user.pubkeyHex, loggedIn.privKey!!)
+            ContactListEvent.followUser(contactList, user.pubkeyHex, keyPair.privKey!!)
         } else {
             ContactListEvent.createFromScratch(
                 followUsers = listOf(Contact(user.pubkeyHex, null)),
                 followTags = emptyList(),
+                followGeohashes = emptyList(),
                 followCommunities = emptyList(),
                 followEvents = DefaultChannels.toList(),
                 relayUse = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) },
-                privateKey = loggedIn.privKey!!
+                privateKey = keyPair.privKey!!
             )
         }
 
@@ -471,15 +472,16 @@ class Account(
         val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
 
         val event = if (contactList != null) {
-            ContactListEvent.followEvent(contactList, channel.idHex, loggedIn.privKey!!)
+            ContactListEvent.followEvent(contactList, channel.idHex, keyPair.privKey!!)
         } else {
             ContactListEvent.createFromScratch(
                 followUsers = emptyList(),
                 followTags = emptyList(),
+                followGeohashes = emptyList(),
                 followCommunities = emptyList(),
                 followEvents = DefaultChannels.toList().plus(channel.idHex),
                 relayUse = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) },
-                privateKey = loggedIn.privKey!!
+                privateKey = keyPair.privKey!!
             )
         }
 
@@ -493,16 +495,17 @@ class Account(
         val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
 
         val event = if (contactList != null) {
-            ContactListEvent.followAddressableEvent(contactList, community.address, loggedIn.privKey!!)
+            ContactListEvent.followAddressableEvent(contactList, community.address, keyPair.privKey!!)
         } else {
             val relays = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) }
             ContactListEvent.createFromScratch(
                 followUsers = emptyList(),
                 followTags = emptyList(),
+                followGeohashes = emptyList(),
                 followCommunities = listOf(community.address),
                 followEvents = DefaultChannels.toList(),
                 relayUse = relays,
-                privateKey = loggedIn.privKey!!
+                privateKey = keyPair.privKey!!
             )
         }
 
@@ -510,7 +513,7 @@ class Account(
         LocalCache.consume(event)
     }
 
-    fun follow(tag: String) {
+    fun followHashtag(tag: String) {
         if (!isWriteable()) return
 
         val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
@@ -519,16 +522,44 @@ class Account(
             ContactListEvent.followHashtag(
                 contactList,
                 tag,
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         } else {
             ContactListEvent.createFromScratch(
                 followUsers = emptyList(),
                 followTags = listOf(tag),
+                followGeohashes = emptyList(),
                 followCommunities = emptyList(),
                 followEvents = DefaultChannels.toList(),
                 relayUse = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) },
-                privateKey = loggedIn.privKey!!
+                privateKey = keyPair.privKey!!
+            )
+        }
+
+        Client.send(event)
+        LocalCache.consume(event)
+    }
+
+    fun followGeohash(geohash: String) {
+        if (!isWriteable()) return
+
+        val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
+
+        val event = if (contactList != null) {
+            ContactListEvent.followGeohash(
+                contactList,
+                geohash,
+                keyPair.privKey!!
+            )
+        } else {
+            ContactListEvent.createFromScratch(
+                followUsers = emptyList(),
+                followTags = emptyList(),
+                followGeohashes = listOf(geohash),
+                followCommunities = emptyList(),
+                followEvents = DefaultChannels.toList(),
+                relayUse = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) },
+                privateKey = keyPair.privKey!!
             )
         }
 
@@ -545,7 +576,7 @@ class Account(
             val event = ContactListEvent.unfollowUser(
                 contactList,
                 user.pubkeyHex,
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
 
             Client.send(event)
@@ -553,7 +584,7 @@ class Account(
         }
     }
 
-    fun unfollow(tag: String) {
+    fun unfollowHashtag(tag: String) {
         if (!isWriteable()) return
 
         val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
@@ -562,7 +593,24 @@ class Account(
             val event = ContactListEvent.unfollowHashtag(
                 contactList,
                 tag,
-                loggedIn.privKey!!
+                keyPair.privKey!!
+            )
+
+            Client.send(event)
+            LocalCache.consume(event)
+        }
+    }
+
+    fun unfollowGeohash(geohash: String) {
+        if (!isWriteable()) return
+
+        val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
+
+        if (contactList != null && contactList.tags.isNotEmpty()) {
+            val event = ContactListEvent.unfollowGeohash(
+                contactList,
+                geohash,
+                keyPair.privKey!!
             )
 
             Client.send(event)
@@ -579,7 +627,7 @@ class Account(
             val event = ContactListEvent.unfollowEvent(
                 contactList,
                 channel.idHex,
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
 
             Client.send(event)
@@ -596,7 +644,7 @@ class Account(
             val event = ContactListEvent.unfollowAddressableEvent(
                 contactList,
                 community.address,
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
 
             Client.send(event)
@@ -610,7 +658,7 @@ class Account(
         val data = FileStorageEvent.create(
             mimeType = headerInfo.mimeType ?: "",
             data = byteArray,
-            privateKey = loggedIn.privKey!!
+            privateKey = keyPair.privKey!!
         )
 
         val signedEvent = FileStorageHeaderEvent.create(
@@ -622,25 +670,25 @@ class Account(
             blurhash = headerInfo.blurHash,
             description = headerInfo.description,
             sensitiveContent = headerInfo.sensitiveContent,
-            privateKey = loggedIn.privKey!!
+            privateKey = keyPair.privKey!!
         )
 
         return Pair(data, signedEvent)
     }
 
-    fun sendNip95(data: FileStorageEvent, signedEvent: FileStorageHeaderEvent): Note? {
+    fun sendNip95(data: FileStorageEvent, signedEvent: FileStorageHeaderEvent, relayList: List<Relay>? = null): Note? {
         if (!isWriteable()) return null
 
-        Client.send(data)
+        Client.send(data, relayList = relayList)
         LocalCache.consume(data, null)
 
-        Client.send(signedEvent)
+        Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent, null)
 
         return LocalCache.notes[signedEvent.id]
     }
 
-    fun sendHeader(headerInfo: FileHeader): Note? {
+    fun sendHeader(headerInfo: FileHeader, relayList: List<Relay>? = null): Note? {
         if (!isWriteable()) return null
 
         val signedEvent = FileHeaderEvent.create(
@@ -652,10 +700,10 @@ class Account(
             blurhash = headerInfo.blurHash,
             description = headerInfo.description,
             sensitiveContent = headerInfo.sensitiveContent,
-            privateKey = loggedIn.privKey!!
+            privateKey = keyPair.privKey!!
         )
 
-        Client.send(signedEvent)
+        Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent, null)
 
         return LocalCache.notes[signedEvent.id]
@@ -671,7 +719,9 @@ class Account(
         zapRaiserAmount: Long? = null,
         replyingTo: String?,
         root: String?,
-        directMentions: Set<HexKey>
+        directMentions: Set<HexKey>,
+        relayList: List<Relay>? = null,
+        geohash: String? = null
     ) {
         if (!isWriteable()) return
 
@@ -691,10 +741,11 @@ class Account(
             replyingTo = replyingTo,
             root = root,
             directMentions = directMentions,
-            privateKey = loggedIn.privKey!!
+            geohash = geohash,
+            privateKey = keyPair.privKey!!
         )
 
-        Client.send(signedEvent)
+        Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent)
     }
 
@@ -709,7 +760,9 @@ class Account(
         closedAt: Int?,
         zapReceiver: String? = null,
         wantsToMarkAsSensitive: Boolean,
-        zapRaiserAmount: Long? = null
+        zapRaiserAmount: Long? = null,
+        relayList: List<Relay>? = null,
+        geohash: String? = null
     ) {
         if (!isWriteable()) return
 
@@ -722,7 +775,7 @@ class Account(
             replyTos = repliesToHex,
             mentions = mentionsHex,
             addresses = addresses,
-            privateKey = loggedIn.privKey!!,
+            privateKey = keyPair.privKey!!,
             pollOptions = pollOptions,
             valueMaximum = valueMaximum,
             valueMinimum = valueMinimum,
@@ -730,14 +783,15 @@ class Account(
             closedAt = closedAt,
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
-            zapRaiserAmount = zapRaiserAmount
+            zapRaiserAmount = zapRaiserAmount,
+            geohash = geohash
         )
         // println("Sending new PollNoteEvent: %s".format(signedEvent.toJson()))
-        Client.send(signedEvent)
+        Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent)
     }
 
-    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null) {
+    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
         if (!isWriteable()) return
 
         // val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -752,13 +806,14 @@ class Account(
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
             zapRaiserAmount = zapRaiserAmount,
-            privateKey = loggedIn.privKey!!
+            geohash = geohash,
+            privateKey = keyPair.privKey!!
         )
         Client.send(signedEvent)
         LocalCache.consume(signedEvent, null)
     }
 
-    fun sendLiveMessage(message: String, toChannel: ATag, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null) {
+    fun sendLiveMessage(message: String, toChannel: ATag, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
         if (!isWriteable()) return
 
         // val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -773,13 +828,14 @@ class Account(
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
             zapRaiserAmount = zapRaiserAmount,
-            privateKey = loggedIn.privKey!!
+            geohash = geohash,
+            privateKey = keyPair.privKey!!
         )
         Client.send(signedEvent)
         LocalCache.consume(signedEvent, null)
     }
 
-    fun sendPrivateMessage(message: String, toUser: User, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null) {
+    fun sendPrivateMessage(message: String, toUser: User, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
         if (!isWriteable()) return
 
         val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -794,7 +850,8 @@ class Account(
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
             zapRaiserAmount = zapRaiserAmount,
-            privateKey = loggedIn.privKey!!,
+            geohash = geohash,
+            privateKey = keyPair.privKey!!,
             advertiseNip18 = false
         )
         Client.send(signedEvent)
@@ -812,7 +869,7 @@ class Account(
 
         val event = ChannelCreateEvent.create(
             channelInfo = metadata,
-            privateKey = loggedIn.privKey!!
+            privateKey = keyPair.privKey!!
         )
 
         Client.send(event)
@@ -833,7 +890,7 @@ class Account(
 
         val event = EmojiPackSelectionEvent.create(
             noteEvent.taggedAddresses().filter { it != emojiListEvent.address() },
-            loggedIn.privKey!!
+            keyPair.privKey!!
         )
 
         Client.send(event)
@@ -848,7 +905,7 @@ class Account(
         val event = if (usersEmojiList.event == null) {
             EmojiPackSelectionEvent.create(
                 listOf(emojiListEvent.address()),
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         } else {
             val noteEvent = usersEmojiList.event
@@ -860,7 +917,7 @@ class Account(
 
             EmojiPackSelectionEvent.create(
                 noteEvent.taggedAddresses().plus(emojiListEvent.address()),
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         }
 
@@ -880,11 +937,11 @@ class Account(
                 bookmarks?.taggedUsers() ?: emptyList(),
                 bookmarks?.taggedAddresses() ?: emptyList(),
 
-                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!)?.plus(note.address) ?: listOf(note.address),
+                bookmarks?.privateTaggedEvents(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = keyPair.privKey!!)?.plus(note.address) ?: listOf(note.address),
 
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         } else {
             BookmarkListEvent.create(
@@ -893,11 +950,11 @@ class Account(
                 bookmarks?.taggedUsers() ?: emptyList(),
                 bookmarks?.taggedAddresses() ?: emptyList(),
 
-                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!)?.plus(note.idHex) ?: listOf(note.idHex),
-                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedEvents(privKey = keyPair.privKey!!)?.plus(note.idHex) ?: listOf(note.idHex),
+                bookmarks?.privateTaggedUsers(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = keyPair.privKey!!) ?: emptyList(),
 
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         }
 
@@ -917,11 +974,11 @@ class Account(
                 bookmarks?.taggedUsers() ?: emptyList(),
                 bookmarks?.taggedAddresses()?.plus(note.address) ?: listOf(note.address),
 
-                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedEvents(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = keyPair.privKey!!) ?: emptyList(),
 
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         } else {
             BookmarkListEvent.create(
@@ -930,11 +987,11 @@ class Account(
                 bookmarks?.taggedUsers() ?: emptyList(),
                 bookmarks?.taggedAddresses() ?: emptyList(),
 
-                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedEvents(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = keyPair.privKey!!) ?: emptyList(),
 
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         }
 
@@ -954,11 +1011,11 @@ class Account(
                 bookmarks?.taggedUsers() ?: emptyList(),
                 bookmarks?.taggedAddresses() ?: emptyList(),
 
-                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!)?.minus(note.address) ?: listOf(),
+                bookmarks?.privateTaggedEvents(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = keyPair.privKey!!)?.minus(note.address) ?: listOf(),
 
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         } else {
             BookmarkListEvent.create(
@@ -967,11 +1024,11 @@ class Account(
                 bookmarks?.taggedUsers() ?: emptyList(),
                 bookmarks?.taggedAddresses() ?: emptyList(),
 
-                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!)?.minus(note.idHex) ?: listOf(),
-                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedEvents(privKey = keyPair.privKey!!)?.minus(note.idHex) ?: listOf(),
+                bookmarks?.privateTaggedUsers(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = keyPair.privKey!!) ?: emptyList(),
 
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         }
 
@@ -982,7 +1039,7 @@ class Account(
     fun createAuthEvent(relay: Relay, challenge: String): RelayAuthEvent? {
         if (!isWriteable()) return null
 
-        return RelayAuthEvent.create(relay.url, challenge, loggedIn.privKey!!)
+        return RelayAuthEvent.create(relay.url, challenge, keyPair.privKey!!)
     }
 
     fun removePublicBookmark(note: Note) {
@@ -997,11 +1054,11 @@ class Account(
                 bookmarks?.taggedUsers() ?: emptyList(),
                 bookmarks?.taggedAddresses()?.minus(note.address),
 
-                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedEvents(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = keyPair.privKey!!) ?: emptyList(),
 
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         } else {
             BookmarkListEvent.create(
@@ -1010,11 +1067,11 @@ class Account(
                 bookmarks?.taggedUsers() ?: emptyList(),
                 bookmarks?.taggedAddresses() ?: emptyList(),
 
-                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
-                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedEvents(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = keyPair.privKey!!) ?: emptyList(),
 
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         }
 
@@ -1026,10 +1083,10 @@ class Account(
         if (!isWriteable()) return false
 
         if (note is AddressableNote) {
-            return userProfile().latestBookmarkList?.privateTaggedAddresses(loggedIn.privKey!!)
+            return userProfile().latestBookmarkList?.privateTaggedAddresses(keyPair.privKey!!)
                 ?.contains(note.address) == true
         } else {
-            return userProfile().latestBookmarkList?.privateTaggedEvents(loggedIn.privKey!!)
+            return userProfile().latestBookmarkList?.privateTaggedEvents(keyPair.privKey!!)
                 ?.contains(note.idHex) == true
         }
     }
@@ -1059,7 +1116,7 @@ class Account(
         var returningList: PeopleListEvent = latestList
 
         if (hiddenUsers.isNotEmpty()) {
-            returningList = PeopleListEvent.addUsers(returningList, hiddenUsers.toList(), true, loggedIn.privKey!!)
+            returningList = PeopleListEvent.addUsers(returningList, hiddenUsers.toList(), true, keyPair.privKey!!)
             hiddenUsers = emptySet()
         }
 
@@ -1074,14 +1131,14 @@ class Account(
                 earlierVersion = blockList,
                 pubKeyHex = pubkeyHex,
                 isPrivate = true,
-                privateKey = loggedIn.privKey!!
+                privateKey = keyPair.privKey!!
             )
         } else {
             PeopleListEvent.createListWithUser(
                 name = PeopleListEvent.blockList,
                 pubKeyHex = pubkeyHex,
                 isPrivate = true,
-                privateKey = loggedIn.privKey!!
+                privateKey = keyPair.privKey!!
             )
         }
 
@@ -1100,7 +1157,7 @@ class Account(
                 earlierVersion = blockList,
                 pubKeyHex = pubkeyHex,
                 isPrivate = true,
-                privateKey = loggedIn.privKey!!
+                privateKey = keyPair.privKey!!
             )
 
             Client.send(event)
@@ -1170,7 +1227,7 @@ class Account(
         if (listName == GLOBAL_FOLLOWS) return null
         if (listName == KIND3_FOLLOWS) return userProfile().cachedFollowingKeySet()
 
-        val privKey = loggedIn.privKey
+        val privKey = keyPair.privKey
 
         return if (listName != null) {
             val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, listName, null).toTag()
@@ -1194,7 +1251,7 @@ class Account(
         if (listName == GLOBAL_FOLLOWS) return null
         if (listName == KIND3_FOLLOWS) return userProfile().cachedFollowingTagSet()
 
-        val privKey = loggedIn.privKey
+        val privKey = keyPair.privKey
 
         return if (listName != null) {
             val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, listName, null).toTag()
@@ -1214,11 +1271,35 @@ class Account(
         }
     }
 
+    fun selectedGeohashesFollowList(listName: String?): Set<String>? {
+        if (listName == GLOBAL_FOLLOWS) return null
+        if (listName == KIND3_FOLLOWS) return userProfile().cachedFollowingGeohashSet()
+
+        val privKey = keyPair.privKey
+
+        return if (listName != null) {
+            val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, listName, null).toTag()
+            val list = LocalCache.addressables[aTag]
+            if (list != null) {
+                val publicAddresses = list.event?.geohashes() ?: emptySet()
+                val privateAddresses = privKey?.let {
+                    (list.event as? GeneralListEvent)?.privateGeohashes(it)
+                } ?: emptySet()
+
+                (publicAddresses + privateAddresses).toSet()
+            } else {
+                emptySet()
+            }
+        } else {
+            emptySet()
+        }
+    }
+
     fun selectedCommunitiesFollowList(listName: String?): Set<String>? {
         if (listName == GLOBAL_FOLLOWS) return null
         if (listName == KIND3_FOLLOWS) return userProfile().cachedFollowingCommunitiesSet()
 
-        val privKey = loggedIn.privKey
+        val privKey = keyPair.privKey
 
         return if (listName != null) {
             val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, listName, null).toTag()
@@ -1255,7 +1336,7 @@ class Account(
         val event = ChannelMetadataEvent.create(
             newChannelInfo = metadata,
             originalChannelIdHex = channel.idHex,
-            privateKey = loggedIn.privKey!!
+            privateKey = keyPair.privKey!!
         )
 
         Client.send(event)
@@ -1266,9 +1347,9 @@ class Account(
 
     fun decryptContent(note: Note): String? {
         val event = note.event
-        return if (event is PrivateDmEvent && loggedIn.privKey != null) {
-            event.plainContent(loggedIn.privKey!!, event.talkingWith(userProfile().pubkeyHex).hexToByteArray())
-        } else if (event is LnZapRequestEvent && loggedIn.privKey != null) {
+        return if (event is PrivateDmEvent && keyPair.privKey != null) {
+            event.plainContent(keyPair.privKey!!, event.talkingWith(userProfile().pubkeyHex).hexToByteArray())
+        } else if (event is LnZapRequestEvent && keyPair.privKey != null) {
             decryptZapContentAuthor(note)?.content()
         } else {
             event?.content()
@@ -1277,7 +1358,7 @@ class Account(
 
     fun decryptZapContentAuthor(note: Note): Event? {
         val event = note.event
-        val loggedInPrivateKey = loggedIn.privKey
+        val loggedInPrivateKey = keyPair.privKey
 
         return if (event is LnZapRequestEvent && loggedInPrivateKey != null && event.isPrivateZap()) {
             val recipientPK = event.zappedAuthor().firstOrNull()
@@ -1310,7 +1391,7 @@ class Account(
 
                 try {
                     if (altPrivateKeyToUse != null && altPubkeyToUse != null) {
-                        val altPubKeyFromPrivate = Utils.pubkeyCreate(altPrivateKeyToUse).toHexKey()
+                        val altPubKeyFromPrivate = CryptoUtils.pubkeyCreate(altPrivateKeyToUse).toHexKey()
 
                         if (altPubKeyFromPrivate == event.pubKey) {
                             val result = event.getPrivateZapEvent(altPrivateKeyToUse, altPubkeyToUse)
@@ -1412,7 +1493,7 @@ class Account(
     fun isHidden(userHex: String): Boolean {
         val blockList = getBlockList()
 
-        return (blockList?.publicAndPrivateUsers(loggedIn.privKey)?.contains(userHex) ?: false) || userHex in transientHiddenUsers
+        return (blockList?.publicAndPrivateUsers(keyPair.privKey)?.contains(userHex) ?: false) || userHex in transientHiddenUsers
     }
 
     fun followingKeySet(): Set<HexKey> {
@@ -1547,7 +1628,9 @@ class Account(
             println("Loading saved contacts ${it.toJson()}")
 
             if (userProfile().latestContactList == null) {
-                LocalCache.consume(it)
+                GlobalScope.launch(Dispatchers.IO) {
+                    LocalCache.consume(it)
+                }
             }
         }
     }

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

@@ -7,6 +7,7 @@ import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.ATag
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
+import com.vitorpamplona.amethyst.service.toNote
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
@@ -95,6 +96,10 @@ abstract class Channel(val idHex: String) {
         return null
     }
 
+    open fun creatorName(): String? {
+        return creator?.toBestDisplayName()
+    }
+
     open fun profilePicture(): String? {
         return creator?.profilePicture()
     }

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

@@ -1,119 +0,0 @@
-package com.vitorpamplona.amethyst.model
-
-import com.vitorpamplona.amethyst.service.nip19.Nip19
-import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import fr.acinq.secp256k1.Hex
-import nostr.postr.Bech32
-import nostr.postr.Persona
-import nostr.postr.bechToBytes
-import nostr.postr.toHex
-import nostr.postr.toNpub
-
-/** Makes the distinction between String and Hex **/
-typealias HexKey = String
-
-typealias NPubKey = String
-typealias NoteId = String
-
-fun NPubKey.toDisplayKey(): String {
-    return this.toShortenHex()
-}
-
-fun NoteId.toDisplayId(): String {
-    return this.toShortenHex()
-}
-
-fun ByteArray.toNote() = Bech32.encodeBytes(hrp = "note", this, Bech32.Encoding.Bech32)
-
-fun ByteArray.toHexKey(): HexKey {
-    return toHex()
-}
-
-fun HexKey.hexToByteArray(): ByteArray {
-    return Hex.decode(this)
-}
-
-fun HexKey.toDisplayHexKey(): String {
-    return this.toShortenHex()
-}
-
-fun decodePublicKey(key: String): ByteArray {
-    val parsed = Nip19.uriToRoute(key)
-    val pubKeyParsed = parsed?.hex?.hexToByteArray()
-
-    return if (key.startsWith("nsec")) {
-        Persona(privKey = key.bechToBytes()).pubKey
-    } else if (pubKeyParsed != null) {
-        pubKeyParsed
-    } else {
-        Hex.decode(key)
-    }
-}
-
-fun decodePublicKeyAsHexOrNull(key: String): HexKey? {
-    return try {
-        val parsed = Nip19.uriToRoute(key)
-        val pubKeyParsed = parsed?.hex
-
-        if (key.startsWith("nsec")) {
-            Persona(privKey = key.bechToBytes()).pubKey.toHexKey()
-        } else if (pubKeyParsed != null) {
-            pubKeyParsed
-        } else {
-            Hex.decode(key).toHexKey()
-        }
-    } catch (e: Exception) {
-        null
-    }
-}
-
-data class DirtyKeyInfo(val key: Nip19.Return, val restOfWord: String)
-
-fun parseDirtyWordForKey(mightBeAKey: String): DirtyKeyInfo? {
-    var key = mightBeAKey
-    if (key.startsWith("nostr:", true)) {
-        key = key.substring("nostr:".length)
-    }
-
-    key = key.removePrefix("@")
-
-    if (key.length < 63) {
-        return null
-    }
-
-    try {
-        val keyB32 = key.substring(0, 63)
-        val restOfWord = key.substring(63)
-
-        if (key.startsWith("nsec1", true)) {
-            // Converts to npub
-            val pubkey = Nip19.uriToRoute(Persona(privKey = keyB32.bechToBytes()).pubKey.toNpub()) ?: return null
-
-            return DirtyKeyInfo(pubkey, restOfWord)
-        } else if (key.startsWith("npub1", true)) {
-            val pubkey = Nip19.uriToRoute(keyB32) ?: return null
-
-            return DirtyKeyInfo(pubkey, restOfWord)
-        } else if (key.startsWith("note1", true)) {
-            val noteId = Nip19.uriToRoute(keyB32) ?: return null
-
-            return DirtyKeyInfo(noteId, restOfWord)
-        } else if (key.startsWith("nprofile", true)) {
-            val pubkeyRelay = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
-
-            return DirtyKeyInfo(pubkeyRelay, pubkeyRelay.additionalChars)
-        } else if (key.startsWith("nevent1", true)) {
-            val noteRelayId = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
-
-            return DirtyKeyInfo(noteRelayId, noteRelayId.additionalChars)
-        } else if (key.startsWith("naddr1", true)) {
-            val address = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
-
-            return DirtyKeyInfo(address, address.additionalChars) // no way to know when they address ends and dirt begins
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-
-    return null
-}

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

@@ -0,0 +1,52 @@
+package com.vitorpamplona.amethyst.model
+
+import com.vitorpamplona.amethyst.service.KeyPair
+import com.vitorpamplona.amethyst.service.bechToBytes
+import com.vitorpamplona.amethyst.service.nip19.Nip19
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
+import fr.acinq.secp256k1.Hex
+
+/** Makes the distinction between String and Hex **/
+typealias HexKey = String
+
+fun ByteArray.toHexKey(): HexKey {
+    return Hex.encode(this)
+}
+
+fun HexKey.hexToByteArray(): ByteArray {
+    return Hex.decode(this)
+}
+
+fun HexKey.toDisplayHexKey(): String {
+    return this.toShortenHex()
+}
+
+fun decodePublicKey(key: String): ByteArray {
+    val parsed = Nip19.uriToRoute(key)
+    val pubKeyParsed = parsed?.hex?.hexToByteArray()
+
+    return if (key.startsWith("nsec")) {
+        KeyPair(privKey = key.bechToBytes()).pubKey
+    } else if (pubKeyParsed != null) {
+        pubKeyParsed
+    } else {
+        Hex.decode(key)
+    }
+}
+
+fun decodePublicKeyAsHexOrNull(key: String): HexKey? {
+    return try {
+        val parsed = Nip19.uriToRoute(key)
+        val pubKeyParsed = parsed?.hex
+
+        if (key.startsWith("nsec")) {
+            KeyPair(privKey = key.bechToBytes()).pubKey.toHexKey()
+        } else if (pubKeyParsed != null) {
+            pubKeyParsed
+        } else {
+            Hex.decode(key).toHexKey()
+        }
+    } catch (e: Exception) {
+        null
+    }
+}

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

@@ -1110,6 +1110,57 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    private fun consume(event: ChatMessageEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
+    private fun consume(event: SealedGossipEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
+    private fun consume(event: GiftWrapEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
     fun consume(event: LnZapPaymentRequestEvent) {
         // Does nothing without a response callback.
     }
@@ -1185,13 +1236,12 @@ object LocalCache {
         }
 
         return notes.values.filter {
-            (it.event is TextNoteEvent && it.event?.content()?.contains(text, true) ?: false) ||
-                (it.event is PollNoteEvent && it.event?.content()?.contains(text, true) ?: false) ||
-                (it.event is ChannelMessageEvent && it.event?.content()?.contains(text, true) ?: false) ||
+            it.event?.content()?.contains(text, true) ?: false ||
+                it.event?.matchTag1With(text) ?: false ||
                 it.idHex.startsWith(text, true) ||
                 it.idNote().startsWith(text, true)
         } + addressables.values.filter {
-            (it.event as? LongTextNoteEvent)?.content?.contains(text, true) ?: false ||
+            it.event?.content()?.contains(text, true) ?: false ||
                 it.event?.matchTag1With(text) ?: false ||
                 it.idHex.startsWith(text, true)
         }
@@ -1222,6 +1272,10 @@ object LocalCache {
             it.value.clearLive()
         }
 
+        addressables.forEach {
+            it.value.clearLive()
+        }
+
         users.forEach {
             it.value.clearLive()
         }
@@ -1233,6 +1287,8 @@ object LocalCache {
         channels.forEach { it ->
             val toBeRemoved = it.value.pruneOldAndHiddenMessages(account)
 
+            val childrenToBeRemoved = mutableListOf<Note>()
+
             toBeRemoved.forEach {
                 notes.remove(it.idHex)
                 // Doesn't need to clean up the replies and mentions.. Too small to matter.
@@ -1241,17 +1297,84 @@ object LocalCache {
                 it.replyTo?.forEach { _ ->
                     it.removeReply(it)
                 }
+
+                childrenToBeRemoved.addAll(it.removeAllChildNotes())
             }
 
+            removeChildrenOf(childrenToBeRemoved)
+
             if (toBeRemoved.size > 100 || it.value.notes.size > 100) {
                 println("PRUNE: ${toBeRemoved.size} messages removed from ${it.value.toBestDisplayName()}. ${it.value.notes.size} kept")
             }
         }
+
+        users.forEach { userPair ->
+            userPair.value.privateChatrooms.values.map {
+                val toBeRemoved = it.pruneMessagesToTheLatestOnly()
+
+                val childrenToBeRemoved = mutableListOf<Note>()
+
+                toBeRemoved.forEach {
+                    notes.remove(it.idHex)
+
+                    // Counts the replies
+                    it.replyTo?.forEach { _ ->
+                        it.removeReply(it)
+                    }
+
+                    childrenToBeRemoved.addAll(it.removeAllChildNotes())
+                }
+
+                removeChildrenOf(childrenToBeRemoved)
+
+                if (toBeRemoved.size > 1) {
+                    println("PRUNE: ${toBeRemoved.size} private messages with ${userPair.value.toBestDisplayName()} removed. ${it.roomMessages.size} kept")
+                }
+            }
+        }
+    }
+
+    fun pruneRepliesAndReactions(account: Account) {
+        checkNotInMainThread()
+        val user = account.userProfile()
+
+        val toBeRemoved = notes.filter {
+            (
+                (it.value.event is TextNoteEvent && !it.value.isNewThread()) ||
+                    it.value.event is ReactionEvent || it.value.event is LnZapEvent || it.value.event is LnZapRequestEvent ||
+                    it.value.event is ReportEvent || it.value.event is GenericRepostEvent
+                ) &&
+                it.value.liveSet?.isInUse() != true && // don't delete if observing.
+                it.value.author != user && // don't delete if it is the logged in account
+                it.value.event?.isTaggedUser(user.pubkeyHex) != true // don't delete if it's a notification to the logged in user
+        }.values
+
+        val childrenToBeRemoved = mutableListOf<Note>()
+
+        toBeRemoved.forEach {
+            notes.remove(it.idHex)
+
+            it.replyTo?.forEach { masterNote ->
+                masterNote.removeReply(it)
+                masterNote.removeBoost(it)
+                masterNote.removeReaction(it)
+                masterNote.removeZap(it)
+                masterNote.clearEOSE() // allows reloading of these events
+            }
+
+            childrenToBeRemoved.addAll(it.removeAllChildNotes())
+        }
+
+        if (toBeRemoved.size > 1) {
+            println("PRUNE: ${toBeRemoved.size} thread replies removed.")
+        }
     }
 
     fun pruneHiddenMessages(account: Account) {
         checkNotInMainThread()
 
+        val childrenToBeRemoved = mutableListOf<Note>()
+
         val toBeRemoved = account.hiddenUsers.map { userHex ->
             (
                 notes.values.filter {
@@ -1273,11 +1396,30 @@ object LocalCache {
             }
 
             notes.remove(it.idHex)
+
+            childrenToBeRemoved.addAll(it.removeAllChildNotes())
         }
 
+        removeChildrenOf(childrenToBeRemoved)
+
         println("PRUNE: ${toBeRemoved.size} messages removed because they were Hidden")
     }
 
+    fun removeChildrenOf(nextToBeRemoved: List<Note>) {
+        nextToBeRemoved.forEach { note ->
+            if (note.event is LnZapEvent) {
+                (note.event as LnZapEvent).zappedAuthor().mapNotNull { getUserIfExists(it)?.removeZap(note) }
+            }
+            if (note.event is LnZapRequestEvent) {
+                (note.event as LnZapRequestEvent).zappedAuthor().mapNotNull { getUserIfExists(it)?.removeZap(note) }
+            }
+            if (note.event is ReportEvent) {
+                (note.event as ReportEvent).reportedAuthor().mapNotNull { getUserIfExists(it.key)?.removeZap(note) }
+            }
+            notes.remove(note.idHex)
+        }
+    }
+
     fun pruneContactLists(userAccount: Account) {
         checkNotInMainThread()
 
@@ -1325,6 +1467,7 @@ object LocalCache {
                 is ChannelMessageEvent -> consume(event, relay)
                 is ChannelMetadataEvent -> consume(event)
                 is ChannelMuteUserEvent -> consume(event)
+                is ChatMessageEvent -> consume(event, relay)
                 is ClassifiedsEvent -> consume(event)
                 is CommunityDefinitionEvent -> consume(event, relay)
                 is CommunityPostApprovalEvent -> {
@@ -1337,10 +1480,12 @@ object LocalCache {
                 is DeletionEvent -> consume(event)
                 is EmojiPackEvent -> consume(event)
                 is EmojiPackSelectionEvent -> consume(event)
+                is SealedGossipEvent -> consume(event, relay)
 
                 is FileHeaderEvent -> consume(event, relay)
                 is FileStorageEvent -> consume(event, relay)
                 is FileStorageHeaderEvent -> consume(event, relay)
+                is GiftWrapEvent -> consume(event, relay)
                 is HighlightEvent -> consume(event, relay)
                 is LiveActivitiesEvent -> consume(event, relay)
                 is LiveActivitiesChatMessageEvent -> consume(event, relay)

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

@@ -11,6 +11,7 @@ import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.service.toNote
 import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.actions.updated
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
@@ -75,6 +76,10 @@ open class Note(val idHex: String) {
         return Nip19.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull())
     }
 
+    fun toNostrUri(): String {
+        return "nostr:${toNEvent()}"
+    }
+
     open fun idDisplayNote() = idNote().toShortenHex()
 
     fun channelHex(): HexKey? {
@@ -153,6 +158,35 @@ open class Note(val idHex: String) {
         boosts = boosts - note
         liveSet?.boosts?.invalidateData()
     }
+
+    fun removeAllChildNotes(): Set<Note> {
+        val toBeRemoved = replies +
+            reactions.values.flatten() +
+            boosts +
+            reports.values.flatten() +
+            zaps.keys +
+            zaps.values.filterNotNull() +
+            zapPayments.keys +
+            zapPayments.values.filterNotNull()
+
+        replies = setOf<Note>()
+        reactions = mapOf<String, Set<Note>>()
+        boosts = setOf<Note>()
+        reports = mapOf<User, Set<Note>>()
+        zaps = mapOf<Note, Note?>()
+        zapPayments = mapOf<Note, Note?>()
+        relays = setOf<String>()
+        lastReactionsDownloadTime = emptyMap()
+
+        liveSet?.replies?.invalidateData()
+        liveSet?.reactions?.invalidateData()
+        liveSet?.boosts?.invalidateData()
+        liveSet?.reports?.invalidateData()
+        liveSet?.zaps?.invalidateData()
+
+        return toBeRemoved
+    }
+
     fun removeReaction(note: Note) {
         val tags = note.event?.tags() ?: emptyList()
         val reaction = note.event?.content()?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
@@ -549,6 +583,10 @@ open class Note(val idHex: String) {
         zaps = emptyMap()
     }
 
+    fun clearEOSE() {
+        lastReactionsDownloadTime = emptyMap()
+    }
+
     var liveSet: NoteLiveSet? = null
 
     fun live(): NoteLiveSet {
@@ -567,8 +605,15 @@ open class Note(val idHex: String) {
     fun isHiddenFor(accountChoices: Account.LiveHiddenUsers): Boolean {
         if (event == null) return false
 
+        val isBoostedNoteHidden = if (event is GenericRepostEvent || event is RepostEvent || event is CommunityPostApprovalEvent) {
+            replyTo?.lastOrNull()?.isHiddenFor(accountChoices) ?: false
+        } else {
+            false
+        }
+
         val isSensitive = event?.isSensitive() ?: false
-        return accountChoices.hiddenUsers.contains(author?.pubkeyHex) ||
+        return isBoostedNoteHidden ||
+            accountChoices.hiddenUsers.contains(author?.pubkeyHex) ||
             accountChoices.spammers.contains(author?.pubkeyHex) ||
             (isSensitive && accountChoices.showSensitiveContent == false)
     }

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

@@ -1,11 +1,40 @@
 package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.R
 
 @Stable
 class Settings(
-    var automaticallyShowImages: Boolean? = null,
-    var automaticallyStartPlayback: Boolean? = null,
     var preferredLanguage: String? = null,
-    var automaticallyShowUrlPreview: Boolean? = null
+    var automaticallyShowImages: ConnectivityType = ConnectivityType.ALWAYS,
+    var automaticallyStartPlayback: ConnectivityType = ConnectivityType.ALWAYS,
+    var automaticallyShowUrlPreview: ConnectivityType = ConnectivityType.ALWAYS
 )
+
+enum class ConnectivityType(val prefCode: Boolean?, val screenCode: Int, val reourceId: Int) {
+    ALWAYS(null, 0, R.string.connectivity_type_always),
+    WIFI_ONLY(true, 1, R.string.connectivity_type_wifi_only),
+    NEVER(false, 2, R.string.connectivity_type_never)
+}
+
+fun parseConnectivityType(code: Boolean?): ConnectivityType {
+    return when (code) {
+        ConnectivityType.ALWAYS.prefCode -> ConnectivityType.ALWAYS
+        ConnectivityType.WIFI_ONLY.prefCode -> ConnectivityType.WIFI_ONLY
+        ConnectivityType.NEVER.prefCode -> ConnectivityType.NEVER
+        else -> {
+            ConnectivityType.ALWAYS
+        }
+    }
+}
+
+fun parseConnectivityType(screenCode: Int): ConnectivityType {
+    return when (screenCode) {
+        ConnectivityType.ALWAYS.screenCode -> ConnectivityType.ALWAYS
+        ConnectivityType.WIFI_ONLY.screenCode -> ConnectivityType.WIFI_ONLY
+        ConnectivityType.NEVER.screenCode -> ConnectivityType.NEVER
+        else -> {
+            ConnectivityType.ALWAYS
+        }
+    }
+}

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

@@ -1,13 +1,17 @@
 package com.vitorpamplona.amethyst.model
 
 object TimeUtils {
-    const val fiveMinutes = 60 * 5
-    const val oneHour = 60 * 60
-    const val oneDay = 24 * 60 * 60
+    const val oneMinute = 60
+    const val fiveMinutes = 5 * oneMinute
+    const val oneHour = 60 * oneMinute
+    const val eightHours = 8 * oneHour
+    const val oneDay = 24 * oneHour
+    const val oneWeek = 7 * oneDay
 
     fun now() = System.currentTimeMillis() / 1000
     fun fiveMinutesAgo() = now() - fiveMinutes
     fun oneHourAgo() = now() - oneHour
     fun oneDayAgo() = now() - oneDay
-    fun eightHoursAgo() = now() - (oneHour * 8)
+    fun eightHoursAgo() = now() - eightHours
+    fun oneWeekAgo() = now() - oneWeek
 }

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.model
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.Bech32
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
@@ -12,14 +13,13 @@ import com.vitorpamplona.amethyst.service.model.MetadataEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.service.toNpub
 import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
 import kotlinx.coroutines.Dispatchers
-import nostr.postr.Bech32
-import nostr.postr.toNpub
 import java.math.BigDecimal
 import java.util.regex.Pattern
 
@@ -51,6 +51,8 @@ class User(val pubkeyHex: String) {
 
     fun pubkeyDisplayHex() = pubkeyNpub().toShortenHex()
 
+    fun toNostrUri() = "nostr:${pubkeyNpub()}"
+
     override fun toString(): String = pubkeyHex
 
     fun toBestDisplayName(): String {
@@ -135,6 +137,16 @@ class User(val pubkeyHex: String) {
         }
     }
 
+    fun removeZap(zapRequestOrZapEvent: Note) {
+        if (zapRequestOrZapEvent in zaps.keys) {
+            zaps = zaps.minus(zapRequestOrZapEvent)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapRequestOrZapEvent in zaps.values) {
+            zaps = zaps.filter { it.value != zapRequestOrZapEvent }
+            liveSet?.zaps?.invalidateData()
+        }
+    }
+
     fun zappedAmount(): BigDecimal {
         return zaps.mapNotNull { it.value?.event }
             .filterIsInstance<LnZapEvent>()
@@ -247,6 +259,12 @@ class User(val pubkeyHex: String) {
         } ?: false
     }
 
+    fun isFollowingGeohashCached(geoTag: String): Boolean {
+        return latestContactList?.verifiedFollowGeohashSet?.let {
+            return geoTag.lowercase() in it
+        } ?: false
+    }
+
     fun isFollowingCached(user: User): Boolean {
         return latestContactList?.verifiedFollowKeySet?.let {
             return user.pubkeyHex in it
@@ -275,6 +293,10 @@ class User(val pubkeyHex: String) {
         return latestContactList?.verifiedFollowTagSet ?: emptySet()
     }
 
+    fun cachedFollowingGeohashSet(): Set<HexKey> {
+        return latestContactList?.verifiedFollowGeohashSet ?: emptySet()
+    }
+
     fun cachedFollowingCommunitiesSet(): Set<HexKey> {
         return latestContactList?.verifiedFollowCommunitySet ?: emptySet()
     }
@@ -371,6 +393,22 @@ class Chatroom() {
             roomMessages = roomMessages + msg
         }
     }
+
+    fun pruneMessagesToTheLatestOnly(): Set<Note> {
+        val sorted = roomMessages.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
+
+        val toKeep = if ((sorted.firstOrNull()?.createdAt() ?: 0) > TimeUtils.oneWeekAgo()) {
+            // Recent messages, keep last 100
+            sorted.take(100).toSet()
+        } else {
+            // Old messages, keep the last one.
+            sorted.take(1).toSet()
+        } + sorted.filter { it.liveSet?.isInUse() ?: false }
+
+        val toRemove = roomMessages.minus(toKeep)
+        roomMessages = toKeep
+        return toRemove
+    }
 }
 
 @Stable

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

@@ -0,0 +1,217 @@
+package com.vitorpamplona.amethyst.service
+
+/*
+ * Copyright 2020 ACINQ SAS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import kotlin.jvm.JvmStatic
+
+/**
+ * Bech32 works with 5 bits values, we use this type to make it explicit: whenever you see Int5 it means 5 bits values,
+ * and whenever you see Byte it means 8 bits values.
+ */
+private typealias Int5 = Byte
+
+/**
+ * Bech32 and Bech32m address formats.
+ * See https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki and https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki.
+ */
+object Bech32 {
+    const val alphabet: String = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"
+
+    enum class Encoding(public val constant: Int) {
+        Bech32(1),
+        Bech32m(0x2bc830a3),
+        Beck32WithoutChecksum(0)
+    }
+
+    // char -> 5 bits value
+    private val map = Array<Int5>(255) { -1 }
+
+    init {
+        for (i in 0..alphabet.lastIndex) {
+            map[alphabet[i].code] = i.toByte()
+        }
+    }
+
+    private fun expand(hrp: String): Array<Int5> {
+        val result = Array<Int5>(hrp.length + 1 + hrp.length) { 0 }
+        for (i in hrp.indices) {
+            result[i] = hrp[i].code.shr(5).toByte()
+            result[hrp.length + 1 + i] = (hrp[i].code and 31).toByte()
+        }
+        result[hrp.length] = 0
+        return result
+    }
+
+    private fun polymod(values: Array<Int5>, values1: Array<Int5>): Int {
+        val GEN = arrayOf(0x3b6a57b2, 0x26508e6d, 0x1ea119fa, 0x3d4233dd, 0x2a1462b3)
+        var chk = 1
+        values.forEach { v ->
+            val b = chk shr 25
+            chk = ((chk and 0x1ffffff) shl 5) xor v.toInt()
+            for (i in 0..5) {
+                if (((b shr i) and 1) != 0) chk = chk xor GEN[i]
+            }
+        }
+        values1.forEach { v ->
+            val b = chk shr 25
+            chk = ((chk and 0x1ffffff) shl 5) xor v.toInt()
+            for (i in 0..5) {
+                if (((b shr i) and 1) != 0) chk = chk xor GEN[i]
+            }
+        }
+        return chk
+    }
+
+    /**
+     * @param hrp human readable prefix
+     * @param int5s 5-bit data
+     * @param encoding encoding to use (bech32 or bech32m)
+     * @return hrp + data encoded as a Bech32 string
+     */
+    @JvmStatic
+    public fun encode(hrp: String, int5s: Array<Int5>, encoding: Encoding): String {
+        require(hrp.lowercase() == hrp || hrp.uppercase() == hrp) { "mixed case strings are not valid bech32 prefixes" }
+        val data = int5s.toByteArray().toTypedArray()
+        val checksum = when (encoding) {
+            Encoding.Beck32WithoutChecksum -> arrayOf()
+            else -> checksum(hrp, data, encoding)
+        }
+        return hrp + "1" + (data + checksum).map { i -> alphabet[i.toInt()] }.toCharArray().concatToString()
+    }
+
+    /**
+     * @param hrp human readable prefix
+     * @param data data to encode
+     * @param encoding encoding to use (bech32 or bech32m)
+     * @return hrp + data encoded as a Bech32 string
+     */
+    @JvmStatic
+    public fun encodeBytes(hrp: String, data: ByteArray, encoding: Encoding): String = encode(hrp, eight2five(data), encoding)
+
+    /**
+     * decodes a bech32 string
+     * @param bech32 bech32 string
+     * @param noChecksum if true, the bech32 string doesn't have a checksum
+     * @return a (hrp, data, encoding) tuple
+     */
+    @JvmStatic
+    public fun decode(bech32: String, noChecksum: Boolean = false): Triple<String, Array<Int5>, Encoding> {
+        require(bech32.lowercase() == bech32 || bech32.uppercase() == bech32) { "mixed case strings are not valid bech32" }
+        bech32.forEach { require(it.code in 33..126) { "invalid character " } }
+        val input = bech32.lowercase()
+        val pos = input.lastIndexOf('1')
+        val hrp = input.take(pos)
+        require(hrp.length in 1..83) { "hrp must contain 1 to 83 characters" }
+        val data = Array<Int5>(input.length - pos - 1) { 0 }
+        for (i in 0..data.lastIndex) data[i] = map[input[pos + 1 + i].code]
+        return if (noChecksum) {
+            Triple(hrp, data, Encoding.Beck32WithoutChecksum)
+        } else {
+            val encoding = when (polymod(expand(hrp), data)) {
+                Encoding.Bech32.constant -> Encoding.Bech32
+                Encoding.Bech32m.constant -> Encoding.Bech32m
+                else -> throw IllegalArgumentException("invalid checksum for $bech32")
+            }
+            Triple(hrp, data.dropLast(6).toTypedArray(), encoding)
+        }
+    }
+
+    /**
+     * decodes a bech32 string
+     * @param bech32 bech32 string
+     * @param noChecksum if true, the bech32 string doesn't have a checksum
+     * @return a (hrp, data, encoding) tuple
+     */
+    @JvmStatic
+    public fun decodeBytes(bech32: String, noChecksum: Boolean = false): Triple<String, ByteArray, Encoding> {
+        val (hrp, int5s, encoding) = decode(bech32, noChecksum)
+        return Triple(hrp, five2eight(int5s, 0), encoding)
+    }
+
+    /**
+     * @param hrp Human Readable Part
+     * @param data data (a sequence of 5 bits integers)
+     * @param encoding encoding to use (bech32 or bech32m)
+     * @return a checksum computed over hrp and data
+     */
+    private fun checksum(hrp: String, data: Array<Int5>, encoding: Encoding): Array<Int5> {
+        val values = expand(hrp) + data
+        val poly = polymod(values, arrayOf(0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte())) xor encoding.constant
+        return Array(6) { i -> (poly.shr(5 * (5 - i)) and 31).toByte() }
+    }
+
+    /**
+     * @param input a sequence of 8 bits integers
+     * @return a sequence of 5 bits integers
+     */
+    @JvmStatic
+    public fun eight2five(input: ByteArray): Array<Int5> {
+        var buffer = 0L
+        val output = ArrayList<Int5>()
+        var count = 0
+        input.forEach { b ->
+            buffer = (buffer shl 8) or (b.toLong() and 0xff)
+            count += 8
+            while (count >= 5) {
+                output.add(((buffer shr (count - 5)) and 31).toByte())
+                count -= 5
+            }
+        }
+        if (count > 0) output.add(((buffer shl (5 - count)) and 31).toByte())
+        return output.toTypedArray()
+    }
+
+    /**
+     * @param input a sequence of 5 bits integers
+     * @return a sequence of 8 bits integers
+     */
+    @JvmStatic
+    public fun five2eight(input: Array<Int5>, offset: Int): ByteArray {
+        var buffer = 0L
+        val output = ArrayList<Byte>()
+        var count = 0
+        for (i in offset..input.lastIndex) {
+            val b = input[i]
+            buffer = (buffer shl 5) or (b.toLong() and 31)
+            count += 5
+            while (count >= 8) {
+                output.add(((buffer shr (count - 8)) and 0xff).toByte())
+                count -= 8
+            }
+        }
+        require(count <= 4) { "Zero-padding of more than 4 bits" }
+        require((buffer and ((1L shl count) - 1L)) == 0L) { "Non-zero padding in 8-to-5 conversion" }
+        return output.toByteArray()
+    }
+}
+
+fun ByteArray.toNsec() = Bech32.encodeBytes(hrp = "nsec", this, Bech32.Encoding.Bech32)
+fun ByteArray.toNpub() = Bech32.encodeBytes(hrp = "npub", this, Bech32.Encoding.Bech32)
+fun ByteArray.toNote() = Bech32.encodeBytes(hrp = "note", this, Bech32.Encoding.Bech32)
+fun ByteArray.toNEvent() = Bech32.encodeBytes(hrp = "nevent", this, Bech32.Encoding.Bech32)
+fun ByteArray.toNAddress() = Bech32.encodeBytes(hrp = "naddr", this, Bech32.Encoding.Bech32)
+fun ByteArray.toLnUrl() = Bech32.encodeBytes(hrp = "lnurl", this, Bech32.Encoding.Bech32)
+
+fun String.bechToBytes(hrp: String? = null): ByteArray {
+    val decodedForm = Bech32.decodeBytes(this)
+    hrp?.also {
+        if (it != decodedForm.first) {
+            throw IllegalArgumentException("Expected $it but obtained ${decodedForm.first}")
+        }
+    }
+    return decodedForm.second
+}

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

@@ -80,16 +80,17 @@ class CashuProcessor {
                 .post(requestBody)
                 .build()
 
-            val response = client.newCall(request).execute()
-            val body = response.body.string()
-            val tree = jacksonObjectMapper().readTree(body)
+            client.newCall(request).execute().use {
+                val body = it.body.string()
+                val tree = jacksonObjectMapper().readTree(body)
 
-            val successful = tree?.get("paid")?.asText() == "true"
+                val successful = tree?.get("paid")?.asText() == "true"
 
-            if (successful) {
-                onSuccess("Redeemed ${token.totalAmount} Sats" + " (Fees: ${token.fees} Sats)")
-            } else {
-                onError(tree?.get("detail")?.asText()?.split('.')?.getOrNull(0) ?: "Cashu: Tokens already spent.")
+                if (successful) {
+                    onSuccess("Redeemed ${token.totalAmount} Sats" + " (Fees: ${token.fees} Sats)")
+                } else {
+                    onError(tree?.get("detail")?.asText()?.split('.')?.getOrNull(0) ?: "Cashu: Tokens already spent.")
+                }
             }
         } catch (e: Exception) {
             onError("Token melt failure: " + e.message)

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

@@ -0,0 +1,132 @@
+package com.vitorpamplona.amethyst.service
+
+import com.goterl.lazysodium.SodiumAndroid
+import com.goterl.lazysodium.utils.Key
+import fr.acinq.secp256k1.Hex
+import fr.acinq.secp256k1.Secp256k1
+import java.security.MessageDigest
+import java.security.SecureRandom
+import java.util.Base64
+import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+object CryptoUtils {
+    private val secp256k1 = Secp256k1.get()
+    private val random = SecureRandom()
+
+    /**
+     * Provides a 32B "private key" aka random number
+     */
+    fun privkeyCreate(): ByteArray {
+        val bytes = ByteArray(32)
+        random.nextBytes(bytes)
+        return bytes
+    }
+
+    fun pubkeyCreate(privKey: ByteArray) =
+        secp256k1.pubKeyCompress(secp256k1.pubkeyCreate(privKey)).copyOfRange(1, 33)
+
+    fun sign(data: ByteArray, privKey: ByteArray): ByteArray =
+        secp256k1.signSchnorr(data, privKey, null)
+
+    fun verifySignature(
+        signature: ByteArray,
+        hash: ByteArray,
+        pubKey: ByteArray
+    ): Boolean {
+        return secp256k1.verifySchnorr(signature, hash, pubKey)
+    }
+
+    fun sha256(data: ByteArray): ByteArray {
+        // Creates a new buffer every time
+        return MessageDigest.getInstance("SHA-256").digest(data)
+    }
+
+    /**
+     * @return 32B shared secret
+     */
+    fun getSharedSecretNIP04(privateKey: ByteArray, pubKey: ByteArray): ByteArray =
+        secp256k1.pubKeyTweakMul(Hex.decode("02") + pubKey, privateKey).copyOfRange(1, 33)
+
+    fun encryptNIP04(msg: String, privateKey: ByteArray, pubKey: ByteArray): String {
+        val sharedSecret = getSharedSecretNIP04(privateKey, pubKey)
+        return encryptNIP04(msg, sharedSecret)
+    }
+
+    fun encryptNIP04(msg: String, sharedSecret: ByteArray): String {
+        val iv = ByteArray(16)
+        random.nextBytes(iv)
+        val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
+        cipher.init(Cipher.ENCRYPT_MODE, SecretKeySpec(sharedSecret, "AES"), IvParameterSpec(iv))
+        val ivBase64 = Base64.getEncoder().encodeToString(iv)
+        val encryptedMsg = cipher.doFinal(msg.toByteArray())
+        val encryptedMsgBase64 = Base64.getEncoder().encodeToString(encryptedMsg)
+        return "$encryptedMsgBase64?iv=$ivBase64"
+    }
+
+    fun decryptNIP04(msg: String, privateKey: ByteArray, pubKey: ByteArray): String {
+        val sharedSecret = getSharedSecretNIP04(privateKey, pubKey)
+        return decryptNIP04(msg, sharedSecret)
+    }
+
+    fun decryptNIP04(msg: String, sharedSecret: ByteArray): String {
+        val parts = msg.split("?iv=")
+        val iv = parts[1].run { Base64.getDecoder().decode(this) }
+        val encryptedMsg = parts.first().run { Base64.getDecoder().decode(this) }
+        val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
+        cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(sharedSecret, "AES"), IvParameterSpec(iv))
+        return String(cipher.doFinal(encryptedMsg))
+    }
+
+    fun encryptNIP24(msg: String, privateKey: ByteArray, pubKey: ByteArray): EncryptedInfo {
+        val sharedSecret = getSharedSecretNIP24(privateKey, pubKey)
+        return encryptNIP24(msg, sharedSecret)
+    }
+
+    fun encryptNIP24(msg: String, sharedSecret: ByteArray): EncryptedInfo {
+        val nonce = ByteArray(24)
+        random.nextBytes(nonce)
+
+        val cipher = SodiumAndroid().cryptoStreamXChaCha20Xor(
+            messageBytes = msg.toByteArray(),
+            nonce = nonce,
+            key = Key.fromBytes(sharedSecret)
+        )
+
+        val cipherBase64 = Base64.getEncoder().encodeToString(cipher)
+        val nonceBase64 = Base64.getEncoder().encodeToString(nonce)
+
+        return EncryptedInfo(
+            ciphertext = cipherBase64,
+            nonce = nonceBase64,
+            v = Nip44Version.XChaCha20.versionCode
+        )
+    }
+
+    fun decryptNIP24(encryptedInfo: EncryptedInfo, privateKey: ByteArray, pubKey: ByteArray): String? {
+        val sharedSecret = getSharedSecretNIP24(privateKey, pubKey)
+        return decryptNIP24(encryptedInfo, sharedSecret)
+    }
+
+    fun decryptNIP24(encryptedInfo: EncryptedInfo, sharedSecret: ByteArray): String? {
+        return SodiumAndroid().cryptoStreamXChaCha20Xor(
+            messageBytes = Base64.getDecoder().decode(encryptedInfo.ciphertext),
+            nonce = Base64.getDecoder().decode(encryptedInfo.nonce),
+            key = Key.fromBytes(sharedSecret)
+        )?.decodeToString()
+    }
+
+    /**
+     * @return 32B shared secret
+     */
+    fun getSharedSecretNIP24(privateKey: ByteArray, pubKey: ByteArray): ByteArray =
+        sha256(secp256k1.pubKeyTweakMul(Hex.decode("02") + pubKey, privateKey).copyOfRange(1, 33))
+}
+
+data class EncryptedInfo(val ciphertext: String, val nonce: String, val v: Int)
+
+enum class Nip44Version(val versionCode: Int) {
+    Reserved(0),
+    XChaCha20(1)
+}

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

@@ -6,7 +6,6 @@ import android.util.Log
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.ui.actions.ImageDownloader
 import io.trbl.blurhash.BlurHash
-import java.security.MessageDigest
 import kotlin.math.roundToInt
 
 class FileHeader(
@@ -45,9 +44,7 @@ class FileHeader(
             onError: () -> Unit
         ) {
             try {
-                val sha256 = MessageDigest.getInstance("SHA-256")
-
-                val hash = sha256.digest(data).toHexKey()
+                val hash = CryptoUtils.sha256(data).toHexKey()
                 val size = data.size
 
                 val (blurHash, dim) = if (mimeType?.startsWith("image/") == true) {

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

@@ -5,19 +5,29 @@ import okhttp3.OkHttpClient
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.time.Duration
+import kotlin.properties.Delegates
 
 object HttpClient {
-    private var proxy: Proxy? = null
+    var proxyChangeListeners = ArrayList<() -> Unit>()
+
+    // fires off every time value of the property changes
+    private var internalProxy: Proxy? by Delegates.observable(null) { _, oldValue, newValue ->
+        if (oldValue != newValue) {
+            proxyChangeListeners.forEach {
+                it()
+            }
+        }
+    }
 
     fun start(account: Account?) {
-        this.proxy = account?.proxy
+        this.internalProxy = account?.proxy
     }
 
     fun getHttpClient(): OkHttpClient {
-        val seconds = if (proxy != null) 20L else 10L
+        val seconds = if (internalProxy != null) 20L else 10L
         val duration = Duration.ofSeconds(seconds)
         return OkHttpClient.Builder()
-            .proxy(proxy)
+            .proxy(internalProxy)
             .readTimeout(duration)
             .connectTimeout(duration)
             .writeTimeout(duration)
@@ -25,7 +35,7 @@ object HttpClient {
     }
 
     fun getProxy(): Proxy? {
-        return proxy
+        return internalProxy
     }
 
     fun initProxy(useProxy: Boolean, hostname: String, port: Int): Proxy? {

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

@@ -0,0 +1,34 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.toHexKey
+
+class KeyPair(
+    privKey: ByteArray? = null,
+    pubKey: ByteArray? = null
+) {
+    val privKey: ByteArray?
+    val pubKey: ByteArray
+
+    init {
+        if (privKey == null) {
+            if (pubKey == null) {
+                // create new, random keys
+                this.privKey = CryptoUtils.privkeyCreate()
+                this.pubKey = CryptoUtils.pubkeyCreate(this.privKey)
+            } else {
+                // this is a read-only account
+                check(pubKey.size == 32)
+                this.privKey = null
+                this.pubKey = pubKey
+            }
+        } else {
+            // as private key is provided, ignore the public key and set keys according to private key
+            this.privKey = privKey
+            this.pubKey = CryptoUtils.pubkeyCreate(privKey)
+        }
+    }
+
+    override fun toString(): String {
+        return "KeyPair(privateKey=${privKey?.toHexKey()}, publicKey=${pubKey.toHexKey()}"
+    }
+}

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

@@ -0,0 +1,79 @@
+package com.vitorpamplona.amethyst.service
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.location.Geocoder
+import android.location.Location
+import android.location.LocationListener
+import android.location.LocationManager
+import android.os.HandlerThread
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class LocationUtil(context: Context) {
+    companion object {
+        const val MIN_TIME: Long = 1000L
+        const val MIN_DISTANCE: Float = 0.0f
+    }
+
+    private val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+    private var locationListener: LocationListener? = null
+
+    val locationStateFlow = MutableStateFlow<Location>(Location(LocationManager.NETWORK_PROVIDER))
+    val providerState = mutableStateOf(false)
+    val isStart: MutableState<Boolean> = mutableStateOf(false)
+
+    private val locHandlerThread = HandlerThread("LocationUtil Thread")
+
+    init {
+        locHandlerThread.start()
+    }
+
+    @SuppressLint("MissingPermission")
+    fun start(minTimeMs: Long = MIN_TIME, minDistanceM: Float = MIN_DISTANCE) {
+        locationListener().let {
+            locationListener = it
+            locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, minTimeMs, minDistanceM, it, locHandlerThread.looper)
+        }
+        providerState.value = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
+        isStart.value = true
+    }
+
+    fun stop() {
+        locationListener?.let {
+            locationManager.removeUpdates(it)
+        }
+        isStart.value = false
+    }
+
+    private fun locationListener() = object : LocationListener {
+        override fun onLocationChanged(location: Location) {
+            locationStateFlow.value = location
+        }
+
+        override fun onProviderEnabled(provider: String) {
+            providerState.value = true
+        }
+
+        override fun onProviderDisabled(provider: String) {
+            providerState.value = false
+        }
+    }
+}
+
+class ReverseGeoLocationUtil {
+    fun execute(
+        location: Location,
+        context: Context
+    ): String? {
+        return try {
+            Geocoder(context).getFromLocation(location.latitude, location.longitude, 1)?.firstOrNull()?.let { address ->
+                listOfNotNull(address.locality ?: address.subAdminArea, address.countryCode).joinToString(", ")
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return null
+        }
+    }
+}

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.GiftWrapEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
@@ -24,7 +25,7 @@ object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
             TypedFilter(
                 types = setOf(FeedType.PRIVATE_DMS),
                 filter = JsonFilter(
-                    kinds = listOf(PrivateDmEvent.kind),
+                    kinds = listOf(PrivateDmEvent.kind, GiftWrapEvent.kind),
                     authors = listOf(myPeer.pubkeyHex),
                     tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
                 )

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

@@ -4,6 +4,7 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.GiftWrapEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
@@ -20,7 +21,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
     fun createMessagesToMeFilter() = TypedFilter(
         types = setOf(FeedType.PRIVATE_DMS),
         filter = JsonFilter(
-            kinds = listOf(PrivateDmEvent.kind),
+            kinds = listOf(PrivateDmEvent.kind, GiftWrapEvent.kind),
             tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
             since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )

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

@@ -92,6 +92,26 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
         )
     }
 
+    fun createLiveStreamGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                kinds = listOf(LiveActivitiesChatMessageEvent.kind, LiveActivitiesEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
     fun createPublicChatsTagsFilter(): TypedFilter? {
         val hashToLoad = account.selectedTagsFollowList(account.defaultDiscoveryFollowList)
 
@@ -112,6 +132,26 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
         )
     }
 
+    fun createPublicChatsGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.PUBLIC_CHATS),
+            filter = JsonFilter(
+                kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind, ChannelMessageEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
     fun createCommunitiesTagsFilter(): TypedFilter? {
         val hashToLoad = account.selectedTagsFollowList(account.defaultDiscoveryFollowList)
 
@@ -132,6 +172,26 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
         )
     }
 
+    fun createCommunitiesGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                kinds = listOf(CommunityDefinitionEvent.kind, CommunityPostApprovalEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
     val discoveryFeedChannel = requestNewChannel() { time, relayUrl ->
         latestEOSEs.addOrUpdate(account.userProfile(), account.defaultDiscoveryFollowList, relayUrl, time)
     }
@@ -143,7 +203,10 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
             createCommunitiesFilter(),
             createLiveStreamTagsFilter(),
             createPublicChatsTagsFilter(),
-            createCommunitiesTagsFilter()
+            createCommunitiesTagsFilter(),
+            createCommunitiesGeohashesFilter(),
+            createPublicChatsGeohashesFilter(),
+            createLiveStreamGeohashesFilter()
         ).ifEmpty { null }
     }
 }

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

@@ -0,0 +1,46 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ClassifiedsEvent
+import com.vitorpamplona.amethyst.service.model.HighlightEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.PollNoteEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+
+object NostrGeohashDataSource : NostrDataSource("SingleGeoHashFeed") {
+    private var geohashToWatch: String? = null
+
+    fun createLoadHashtagFilter(): TypedFilter? {
+        val hashToLoad = geohashToWatch ?: return null
+
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                tags = mapOf(
+                    "g" to listOf(
+                        hashToLoad
+                    )
+                ),
+                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, LiveActivitiesChatMessageEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind),
+                limit = 200
+            )
+        )
+    }
+
+    val loadGeohashChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        loadGeohashChannel.typedFilters = listOfNotNull(createLoadHashtagFilter()).ifEmpty { null }
+    }
+
+    fun loadHashtag(tag: String?) {
+        geohashToWatch = tag
+
+        invalidateFilters()
+    }
+}

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

@@ -1,7 +1,11 @@
 package com.vitorpamplona.amethyst.service
 
 import androidx.compose.ui.text.capitalize
+import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ClassifiedsEvent
+import com.vitorpamplona.amethyst.service.model.HighlightEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.PollNoteEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
@@ -26,7 +30,7 @@ object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
                         hashToLoad.capitalize()
                     )
                 ),
-                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, LiveActivitiesChatMessageEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind),
                 limit = 200
             )
         )

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

@@ -104,6 +104,26 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         )
     }
 
+    fun createFollowGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultHomeFollowList) ?: emptySet()
+
+        if (hashToLoad.isEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter = JsonFilter(
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 100,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultHomeFollowList)?.relayList
+            )
+        )
+    }
+
     fun createFollowCommunitiesFilter(): TypedFilter? {
         val communitiesToLoad = account.selectedCommunitiesFollowList(account.defaultHomeFollowList) ?: emptySet()
 
@@ -135,6 +155,11 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
     }
 
     override fun updateChannelFilters() {
-        followAccountChannel.typedFilters = listOfNotNull(createFollowAccountsFilter(), createFollowCommunitiesFilter(), createFollowTagsFilter()).ifEmpty { null }
+        followAccountChannel.typedFilters = listOfNotNull(
+            createFollowAccountsFilter(),
+            createFollowCommunitiesFilter(),
+            createFollowTagsFilter(),
+            createFollowGeohashesFilter()
+        ).ifEmpty { null }
     }
 }

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

@@ -9,7 +9,7 @@ import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import fr.acinq.secp256k1.Hex
 
-object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
+object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
     private var searchString: String? = null
 
     private fun createAnythingWithIDFilter(): List<TypedFilter>? {
@@ -54,6 +54,28 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
             TypedFilter(
                 types = setOf(FeedType.SEARCH),
                 filter = JsonFilter(
+                    kinds = listOf(
+                        TextNoteEvent.kind, LongTextNoteEvent.kind, BadgeDefinitionEvent.kind,
+                        PeopleListEvent.kind, BookmarkListEvent.kind, AudioTrackEvent.kind, PinListEvent.kind,
+                        PollNoteEvent.kind, ChannelCreateEvent.kind
+                    ),
+                    search = mySearchString,
+                    limit = 100
+                )
+            ),
+            TypedFilter(
+                types = setOf(FeedType.SEARCH),
+                filter = JsonFilter(
+                    kinds = listOf(
+                        ChannelMetadataEvent.kind,
+                        ClassifiedsEvent.kind,
+                        CommunityDefinitionEvent.kind,
+                        EmojiPackEvent.kind,
+                        HighlightEvent.kind,
+                        LiveActivitiesEvent.kind,
+                        PollNoteEvent.kind,
+                        NNSEvent.kind
+                    ),
                     search = mySearchString,
                     limit = 100
                 )

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

@@ -12,7 +12,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
     private var eventsToWatch = setOf<Note>()
     private var addressesToWatch = setOf<Note>()
 
-    private fun createTagToAddressFilter(): List<TypedFilter>? {
+    private fun createReactionsToWatchInAddressFilter(): List<TypedFilter>? {
         val addressesToWatch = eventsToWatch.filter { it.address() != null } + addressesToWatch
 
         if (addressesToWatch.isEmpty()) {
@@ -25,12 +25,15 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                     types = COMMON_FEED_TYPES,
                     filter = JsonFilter(
                         kinds = listOf(
-                            TextNoteEvent.kind, LongTextNoteEvent.kind,
-                            ReactionEvent.kind, RepostEvent.kind, GenericRepostEvent.kind, ReportEvent.kind,
-                            LnZapEvent.kind, LnZapRequestEvent.kind,
-                            BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind,
-                            PollNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind,
-                            PeopleListEvent.kind, BookmarkListEvent.kind
+                            TextNoteEvent.kind,
+                            ReactionEvent.kind,
+                            RepostEvent.kind,
+                            GenericRepostEvent.kind,
+                            ReportEvent.kind,
+                            LnZapEvent.kind,
+                            PollNoteEvent.kind,
+                            CommunityPostApprovalEvent.kind,
+                            LiveActivitiesChatMessageEvent.kind
                         ),
                         tags = mapOf("a" to listOf(aTag.toTag())),
                         since = it.lastReactionsDownloadTime,
@@ -55,7 +58,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         types = COMMON_FEED_TYPES,
                         filter = JsonFilter(
                             kinds = listOf(aTag.kind),
-                            authors = listOf(aTag.pubKeyHex)
+                            authors = listOf(aTag.pubKeyHex),
+                            limit = 1000 // Max amount of "replies" to download on a specific event.
                         )
                     )
                 } else {
@@ -64,7 +68,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         filter = JsonFilter(
                             kinds = listOf(aTag.kind),
                             tags = mapOf("d" to listOf(aTag.dTag)),
-                            authors = listOf(aTag.pubKeyHex)
+                            authors = listOf(aTag.pubKeyHex),
+                            limit = 1000 // Max amount of "replies" to download on a specific event.
                         )
                     )
                 }
@@ -85,17 +90,12 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                 filter = JsonFilter(
                     kinds = listOf(
                         TextNoteEvent.kind,
-                        LongTextNoteEvent.kind,
                         ReactionEvent.kind,
                         RepostEvent.kind,
                         GenericRepostEvent.kind,
                         ReportEvent.kind,
                         LnZapEvent.kind,
-                        LnZapRequestEvent.kind,
-                        PollNoteEvent.kind,
-                        HighlightEvent.kind,
-                        AudioTrackEvent.kind,
-                        PinListEvent.kind
+                        PollNoteEvent.kind
                     ),
                     tags = mapOf("e" to listOf(it.idHex)),
                     since = it.lastReactionsDownloadTime,
@@ -154,7 +154,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         val reactions = createRepliesAndReactionsFilter()
         val missing = createLoadEventsIfNotLoadedFilter()
         val addresses = createAddressFilter()
-        val addressReactions = createTagToAddressFilter()
+        val addressReactions = createReactionsToWatchInAddressFilter()
 
         singleEventChannel.typedFilters = listOfNotNull(missing, addresses, reactions, addressReactions).flatten().ifEmpty { null }
     }

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

@@ -51,11 +51,35 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
         )
     }
 
+    fun createFollowGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultStoriesFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                kinds = listOf(FileHeaderEvent.kind, FileStorageHeaderEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 100,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultStoriesFollowList)?.relayList
+            )
+        )
+    }
+
     val videoFeedChannel = requestNewChannel() { time, relayUrl ->
         latestEOSEs.addOrUpdate(account.userProfile(), account.defaultStoriesFollowList, relayUrl, time)
     }
 
     override fun updateChannelFilters() {
-        videoFeedChannel.typedFilters = listOfNotNull(createContextualFilter(), createFollowTagsFilter()).ifEmpty { null }
+        videoFeedChannel.typedFilters = listOfNotNull(
+            createContextualFilter(),
+            createFollowTagsFilter(),
+            createFollowGeohashesFilter()
+        ).ifEmpty { null }
     }
 }

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

@@ -28,7 +28,9 @@ object OnlineChecker {
                 .get()
                 .build()
 
-            val result = HttpClient.getHttpClient().newCall(request).execute().code == 200
+            val result = HttpClient.getHttpClient().newCall(request).execute().use {
+                it.isSuccessful
+            }
             checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), result))
             result
         } catch (e: Exception) {

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

@@ -0,0 +1,75 @@
+package com.vitorpamplona.amethyst.service
+
+import com.goterl.lazysodium.Sodium
+import com.goterl.lazysodium.SodiumAndroid
+import com.goterl.lazysodium.utils.Key
+
+fun Sodium.crypto_stream_xchacha20_xor_ic(
+    cipher: ByteArray,
+    message: ByteArray,
+    messageLen: Long,
+    nonce: ByteArray,
+    ic: Long,
+    key: ByteArray
+): Int {
+    /**
+     * C++ Code:
+     *
+     * unsigned char k2[crypto_core_hchacha20_OUTPUTBYTES];
+     * crypto_core_hchacha20(k2, n, k, NULL);
+     * return crypto_stream_chacha20_xor_ic(
+     * c, m, mlen, n + crypto_core_hchacha20_INPUTBYTES, ic, k2);
+     */
+    val k2 = ByteArray(32)
+
+    val nonceChaCha = nonce.drop(16).toByteArray()
+    assert(nonceChaCha.size == 8)
+
+    crypto_core_hchacha20(k2, nonce, key, null)
+    return crypto_stream_chacha20_xor_ic(
+        cipher,
+        message,
+        messageLen,
+        nonceChaCha,
+        ic,
+        k2
+    )
+}
+
+fun Sodium.crypto_stream_xchacha20_xor(
+    cipher: ByteArray,
+    message: ByteArray,
+    messageLen: Long,
+    nonce: ByteArray,
+    key: ByteArray
+): Int {
+    return crypto_stream_xchacha20_xor_ic(cipher, message, messageLen, nonce, 0, key)
+}
+
+fun SodiumAndroid.cryptoStreamXChaCha20Xor(
+    cipher: ByteArray,
+    message: ByteArray,
+    messageLen: Long,
+    nonce: ByteArray,
+    key: ByteArray
+): Boolean {
+    require(!(messageLen < 0 || messageLen > message.size)) { "messageLen out of bounds: $messageLen" }
+    return crypto_stream_xchacha20_xor(
+        cipher,
+        message,
+        messageLen,
+        nonce,
+        key
+    ) == 0
+}
+
+fun SodiumAndroid.cryptoStreamXChaCha20Xor(
+    messageBytes: ByteArray,
+    nonce: ByteArray,
+    key: Key
+): ByteArray? {
+    val mLen = messageBytes.size
+    val cipher = ByteArray(mLen)
+    val sucessful = cryptoStreamXChaCha20Xor(cipher, messageBytes, mLen.toLong(), nonce, key.asBytes)
+    return if (sucessful) cipher else null
+}

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

@@ -3,7 +3,6 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 
 fun String.isUTF16Char(pos: Int): Boolean {
-    println("Test $pos ${Character.charCount(this.codePointAt(pos))}")
     return Character.charCount(this.codePointAt(pos)) == 2
 }
 

app/src/main/java/com/vitorpamplona/amethyst/service/connectivitystatus/ConnectivityStatus.kt

@@ -7,16 +7,9 @@ object ConnectivityStatus {
     private val onMobileData = mutableStateOf(false)
     val isOnMobileData: MutableState<Boolean> = onMobileData
 
-    private val onWifi = mutableStateOf(false)
-    val isOnWifi: MutableState<Boolean> = onWifi
-
     fun updateConnectivityStatus(isOnMobileData: Boolean, isOnWifi: Boolean) {
         if (onMobileData.value != isOnMobileData) {
             onMobileData.value = isOnMobileData
         }
-
-        if (onWifi.value != isOnWifi) {
-            onWifi.value = isOnWifi
-        }
     }
 }

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

@@ -2,14 +2,15 @@ package com.vitorpamplona.amethyst.service.lnurl
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.amethyst.service.Bech32
 import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.service.toLnUrl
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import nostr.postr.Bech32
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Request
@@ -131,7 +132,7 @@ class LightningAddressResolver() {
         fetchLightningAddressJson(
             lnaddress,
             onSuccess = {
-                onSuccess(Bech32.encodeBytes("lnurl", it.toByteArray(), Bech32.Encoding.Bech32))
+                onSuccess(it.toByteArray().toLnUrl())
             },
             onError = onError
         )

app/src/main/java/com/vitorpamplona/amethyst/service/model/ATag.kt

@@ -4,11 +4,11 @@ import android.util.Log
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.bechToBytes
 import com.vitorpamplona.amethyst.service.nip19.Tlv
+import com.vitorpamplona.amethyst.service.nip19.toByteArray
+import com.vitorpamplona.amethyst.service.toNAddress
 import fr.acinq.secp256k1.Hex
-import nostr.postr.Bech32
-import nostr.postr.bechToBytes
-import nostr.postr.toByteArray
 
 @Immutable
 data class ATag(val kind: Int, val pubKeyHex: String, val dTag: String, val relay: String?) {
@@ -30,7 +30,7 @@ data class ATag(val kind: Int, val pubKeyHex: String, val dTag: String, val rela
             byteArrayOf(Tlv.Type.AUTHOR.id, author.size.toByte()) + author +
             byteArrayOf(Tlv.Type.KIND.id, kind.size.toByte()) + kind
 
-        return Bech32.encodeBytes(hrp = "naddr", fullArray, Bech32.Encoding.Bech32)
+        return fullArray.toNAddress()
     }
 
     companion object {

app/src/main/java/com/vitorpamplona/amethyst/service/model/AudioTrackEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class AudioTrackEvent(
@@ -52,9 +52,9 @@ class AudioTrackEvent(
                 subject?.let { listOf(SUBJECT, it) }
             )
 
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, "")
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return AudioTrackEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/BookmarkListEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class BookmarkListEvent(
@@ -32,7 +32,7 @@ class BookmarkListEvent(
             privateKey: ByteArray,
             createdAt: Long = TimeUtils.now()
         ): BookmarkListEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey)
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey)
             val content = createPrivateTags(privEvents, privUsers, privAddresses, privateKey, pubKey)
 
             val tags = mutableListOf<List<String>>()
@@ -49,7 +49,7 @@ class BookmarkListEvent(
             }
 
             val id = generateId(pubKey.toHexKey(), createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return BookmarkListEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelCreateEvent.kt

@@ -5,7 +5,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class ChannelCreateEvent(
@@ -38,10 +38,10 @@ class ChannelCreateEvent(
                 ""
             }
 
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = emptyList<List<String>>()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return ChannelCreateEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelHideMessageEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class ChannelHideMessageEvent(
@@ -27,14 +27,14 @@ class ChannelHideMessageEvent(
         const val kind = 43
 
         fun create(reason: String, messagesToHide: List<String>?, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ChannelHideMessageEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags =
                 messagesToHide?.map {
                     listOf("e", it)
                 } ?: emptyList()
 
             val id = generateId(pubKey, createdAt, kind, tags, reason)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return ChannelHideMessageEvent(id.toHexKey(), pubKey, createdAt, tags, reason, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelMessageEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class ChannelMessageEvent(
@@ -36,10 +36,11 @@ class ChannelMessageEvent(
             privateKey: ByteArray,
             createdAt: Long = TimeUtils.now(),
             markAsSensitive: Boolean,
-            zapRaiserAmount: Long?
+            zapRaiserAmount: Long?,
+            geohash: String? = null
         ): ChannelMessageEvent {
             val content = message
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf(
                 listOf("e", channel, "", "root")
             )
@@ -58,9 +59,12 @@ class ChannelMessageEvent(
             zapRaiserAmount?.let {
                 tags.add(listOf("zapraiser", "$it"))
             }
+            geohash?.let {
+                tags.add(listOf("g", it))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return ChannelMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelMetadataEvent.kt

@@ -5,7 +5,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class ChannelMetadataEvent(
@@ -37,10 +37,10 @@ class ChannelMetadataEvent(
                     ""
                 }
 
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = listOf(listOf("e", originalChannelIdHex, "", "root"))
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return ChannelMetadataEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelMuteUserEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class ChannelMuteUserEvent(
@@ -28,14 +28,14 @@ class ChannelMuteUserEvent(
 
         fun create(reason: String, usersToMute: List<String>?, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ChannelMuteUserEvent {
             val content = reason
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags =
                 usersToMute?.map {
                     listOf("p", it)
                 } ?: emptyList()
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return ChannelMuteUserEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChatMessageEvent.kt

@@ -0,0 +1,72 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
+
+@Immutable
+class ChatMessageEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    /**
+     * Recepients intended to receive this conversation
+     */
+    private fun recipientsPubKey() = tags.mapNotNull {
+        if (it.size > 1 && it[0] == "p") it[1] else null
+    }
+
+    fun replyTo() = tags.firstOrNull { it.size > 1 && it[0] == "e" }?.get(1)
+
+    companion object {
+        const val kind = 14
+
+        fun create(
+            msg: String,
+            to: List<String>? = null,
+            replyTos: List<String>? = null,
+            mentions: List<String>? = null,
+            zapReceiver: String? = null,
+            markAsSensitive: Boolean = false,
+            zapRaiserAmount: Long? = null,
+            geohash: String? = null,
+            privateKey: ByteArray,
+            createdAt: Long = TimeUtils.now()
+        ): ChatMessageEvent {
+            val content = msg
+            val tags = mutableListOf<List<String>>()
+            to?.forEach {
+                tags.add(listOf("p", it))
+            }
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it, "", "mention"))
+            }
+            zapReceiver?.let {
+                tags.add(listOf("zap", it))
+            }
+            if (markAsSensitive) {
+                tags.add(listOf("content-warning", ""))
+            }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
+            geohash?.let {
+                tags.add(listOf("g", it))
+            }
+
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).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())
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ClassifiedsEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class ClassifiedsEvent(
@@ -66,9 +66,9 @@ class ClassifiedsEvent(
             publishedAt?.let { tags.add(listOf("publishedAt", it.toString())) }
             title?.let { tags.add(listOf("title", it)) }
 
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, "")
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return ClassifiedsEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/CommunityDefinitionEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class CommunityDefinitionEvent(
@@ -33,9 +33,9 @@ class CommunityDefinitionEvent(
             createdAt: Long = TimeUtils.now()
         ): CommunityDefinitionEvent {
             val tags = mutableListOf<List<String>>()
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, "")
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return CommunityDefinitionEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/CommunityPostApprovalEvent.kt

@@ -5,8 +5,8 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import com.vitorpamplona.amethyst.service.relays.Client
-import nostr.postr.Utils
 
 @Immutable
 class CommunityPostApprovalEvent(
@@ -53,10 +53,10 @@ class CommunityPostApprovalEvent(
             val replyToAuthor = listOf("p", approvedPost.pubKey())
             val kind = listOf("k", "${approvedPost.kind()}")
 
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags: List<List<String>> = listOf(communities, replyToPost, replyToAuthor, kind)
             val id = generateId(pubKey, createdAt, GenericRepostEvent.kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return GenericRepostEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/ContactListEvent.kt

@@ -8,7 +8,7 @@ import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.decodePublicKey
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 data class Contact(val pubKeyHex: String, val relayUri: String?)
@@ -39,6 +39,10 @@ class ContactListEvent(
         unverifiedFollowTagSet().map { it.lowercase() }.toSet()
     }
 
+    val verifiedFollowGeohashSet: Set<String> by lazy {
+        unverifiedFollowGeohashSet().map { it.lowercase() }.toSet()
+    }
+
     val verifiedFollowCommunitySet: Set<String> by lazy {
         unverifiedFollowAddressSet().toSet()
     }
@@ -49,6 +53,7 @@ class ContactListEvent(
 
     fun unverifiedFollowKeySet() = tags.filter { it[0] == "p" }.mapNotNull { it.getOrNull(1) }
     fun unverifiedFollowTagSet() = tags.filter { it[0] == "t" }.mapNotNull { it.getOrNull(1) }
+    fun unverifiedFollowGeohashSet() = tags.filter { it[0] == "g" }.mapNotNull { it.getOrNull(1) }
 
     fun unverifiedFollowAddressSet() = tags.filter { it[0] == "a" }.mapNotNull { it.getOrNull(1) }
 
@@ -82,6 +87,7 @@ class ContactListEvent(
         fun createFromScratch(
             followUsers: List<Contact>,
             followTags: List<String>,
+            followGeohashes: List<String>,
             followCommunities: List<ATag>,
             followEvents: List<String>,
             relayUse: Map<String, ReadWrite>?,
@@ -110,6 +116,8 @@ class ContactListEvent(
                 } else {
                     listOf("a", it.toTag())
                 }
+            } + followGeohashes.map {
+                listOf("g", it)
             }
 
             return create(
@@ -164,6 +172,28 @@ class ContactListEvent(
             )
         }
 
+        fun followGeohash(earlierVersion: ContactListEvent, hashtag: String, privateKey: ByteArray, 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,
+                createdAt = createdAt
+            )
+        }
+
+        fun unfollowGeohash(earlierVersion: ContactListEvent, hashtag: String, privateKey: ByteArray, 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,
+                createdAt = createdAt
+            )
+        }
+
         fun followEvent(earlierVersion: ContactListEvent, idHex: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
             if (earlierVersion.isTaggedEvent(idHex)) return earlierVersion
 
@@ -224,9 +254,9 @@ class ContactListEvent(
         }
 
         fun create(content: String, tags: List<List<String>>, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return ContactListEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/DeletionEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class DeletionEvent(
@@ -22,10 +22,10 @@ class DeletionEvent(
 
         fun create(deleteEvents: List<String>, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): DeletionEvent {
             val content = ""
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = deleteEvents.map { listOf("e", it) }
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return DeletionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/EmojiPackEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class EmojiPackEvent(
@@ -25,13 +25,13 @@ class EmojiPackEvent(
             createdAt: Long = TimeUtils.now()
         ): EmojiPackEvent {
             val content = ""
-            val pubKey = Utils.pubkeyCreate(privateKey)
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey)
 
             val tags = mutableListOf<List<String>>()
             tags.add(listOf("d", name))
 
             val id = generateId(pubKey.toHexKey(), createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return EmojiPackEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/EmojiPackSelectionEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class EmojiPackSelectionEvent(
@@ -28,7 +28,7 @@ class EmojiPackSelectionEvent(
             createdAt: Long = TimeUtils.now()
         ): EmojiPackSelectionEvent {
             val msg = ""
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
 
             listOfEmojiPacks?.forEach {
@@ -36,7 +36,7 @@ class EmojiPackSelectionEvent(
             }
 
             val id = generateId(pubKey, createdAt, kind, tags, msg)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return EmojiPackSelectionEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/Event.kt

@@ -7,13 +7,11 @@ import com.google.gson.annotations.SerializedName
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
+import com.vitorpamplona.amethyst.service.nip19.Nip19
 import fr.acinq.secp256k1.Hex
-import fr.acinq.secp256k1.Secp256k1
-import nostr.postr.Utils
-import nostr.postr.toHex
 import java.lang.reflect.Type
 import java.math.BigDecimal
-import java.security.MessageDigest
 import java.util.*
 
 @Immutable
@@ -71,6 +69,7 @@ open class Event(
     }
 
     override fun hashtags() = tags.filter { it.size > 1 && it[0] == "t" }.map { it[1] }
+    override fun geohashes() = tags.filter { it.size > 1 && it[0] == "g" }.map { it[1] }
 
     override fun matchTag1With(text: String) = tags.any { it.size > 1 && it[1].contains(text, true) }
 
@@ -83,7 +82,10 @@ open class Event(
     override fun isTaggedAddressableNotes(idHexes: Set<String>) = tags.any { it.size > 1 && it[0] == "a" && it[1] in idHexes }
 
     override fun isTaggedHash(hashtag: String) = tags.any { it.size > 1 && it[0] == "t" && it[1].equals(hashtag, true) }
+
+    override fun isTaggedGeoHash(hashtag: String) = tags.any { it.size > 1 && it[0] == "g" && it[1].startsWith(hashtag, true) }
     override fun isTaggedHashes(hashtags: Set<String>) = tags.any { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }
+    override fun isTaggedGeoHashes(hashtags: Set<String>) = tags.any { it.size > 1 && it[0] == "g" && it[1].lowercase() in hashtags }
     override fun firstIsTaggedHashes(hashtags: Set<String>) = tags.firstOrNull { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }?.getOrNull(1)
 
     override fun firstIsTaggedAddressableNote(addressableNotes: Set<String>) = tags.firstOrNull { it.size > 1 && it[0] == "a" && it[1] in addressableNotes }?.getOrNull(1)
@@ -124,6 +126,10 @@ open class Event(
         return rank
     }
 
+    override fun getGeoHash(): String? {
+        return tags.firstOrNull { it.size > 1 && it[0] == "g" }?.get(1)?.ifBlank { null }
+    }
+
     override fun getReward(): BigDecimal? {
         return try {
             tags.firstOrNull { it.size > 1 && it[0] == "reward" }?.get(1)?.let { BigDecimal(it) }
@@ -132,6 +138,18 @@ open class Event(
         }
     }
 
+    open fun toNIP19(): String {
+        return if (this is AddressableEvent) {
+            ATag(kind, pubKey, dTag(), null).toNAddr()
+        } else {
+            Nip19.createNEvent(id, pubKey, kind, null)
+        }
+    }
+
+    fun toNostrUri(): String {
+        return "nostr:${toNIP19()}"
+    }
+
     /**
      * Checks if the ID is correct and then if the pubKey's secret key signed the event.
      */
@@ -145,14 +163,14 @@ open class Event(
                 """.trimIndent()
             )
         }
-        if (!secp256k1.verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))) {
+        if (!CryptoUtils.verifySignature(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))) {
             throw Exception("""Bad signature!""")
         }
     }
 
     override fun hasValidSignature(): Boolean {
         return try {
-            id.contentEquals(generateId()) && secp256k1.verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))
+            id.contentEquals(generateId()) && CryptoUtils.verifySignature(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))
         } catch (e: Exception) {
             Log.e("Event", "Fail checking if event $id has a valid signature", e)
             false
@@ -170,7 +188,7 @@ open class Event(
             .replace("\\u2028", "\u2028")
             .replace("\\u2029", "\u2029")
 
-        return MessageDigest.getInstance("SHA-256").digest(rawEventJson.toByteArray()).toHexKey()
+        return CryptoUtils.sha256(rawEventJson.toByteArray()).toHexKey()
     }
 
     private class EventDeserializer : JsonDeserializer<Event> {
@@ -238,12 +256,10 @@ open class Event(
             src: ByteArray,
             typeOfSrc: Type?,
             context: JsonSerializationContext?
-        ) = JsonPrimitive(src.toHex())
+        ) = JsonPrimitive(src.toHexKey())
     }
 
     companion object {
-        private val secp256k1 = Secp256k1.get()
-
         val gson: Gson = GsonBuilder()
             .disableHtmlEscaping()
             .registerTypeAdapter(Event::class.java, EventSerializer())
@@ -258,52 +274,8 @@ open class Event(
 
         fun fromJson(json: JsonElement, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
 
-        fun Event.getRefinedEvent(lenient: Boolean = false): Event = when (kind) {
-            AppDefinitionEvent.kind -> AppDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
-            AppRecommendationEvent.kind -> AppRecommendationEvent(id, pubKey, createdAt, tags, content, sig)
-            AudioTrackEvent.kind -> AudioTrackEvent(id, pubKey, createdAt, tags, content, sig)
-            BadgeAwardEvent.kind -> BadgeAwardEvent(id, pubKey, createdAt, tags, content, sig)
-            BadgeDefinitionEvent.kind -> BadgeDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
-            BadgeProfilesEvent.kind -> BadgeProfilesEvent(id, pubKey, createdAt, tags, content, sig)
-            BookmarkListEvent.kind -> BookmarkListEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelCreateEvent.kind -> ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelHideMessageEvent.kind -> ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelMessageEvent.kind -> ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelMetadataEvent.kind -> ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelMuteUserEvent.kind -> ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
-            ClassifiedsEvent.kind -> ClassifiedsEvent(id, pubKey, createdAt, tags, content, sig)
-            CommunityDefinitionEvent.kind -> CommunityDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
-            CommunityPostApprovalEvent.kind -> CommunityPostApprovalEvent(id, pubKey, createdAt, tags, content, sig)
-            ContactListEvent.kind -> ContactListEvent(id, pubKey, createdAt, tags, content, sig)
-            DeletionEvent.kind -> DeletionEvent(id, pubKey, createdAt, tags, content, sig)
-            EmojiPackEvent.kind -> EmojiPackEvent(id, pubKey, createdAt, tags, content, sig)
-            EmojiPackSelectionEvent.kind -> EmojiPackSelectionEvent(id, pubKey, createdAt, tags, content, sig)
-
-            FileHeaderEvent.kind -> FileHeaderEvent(id, pubKey, createdAt, tags, content, sig)
-            FileStorageEvent.kind -> FileStorageEvent(id, pubKey, createdAt, tags, content, sig)
-            FileStorageHeaderEvent.kind -> FileStorageHeaderEvent(id, pubKey, createdAt, tags, content, sig)
-            GenericRepostEvent.kind -> GenericRepostEvent(id, pubKey, createdAt, tags, content, sig)
-            HighlightEvent.kind -> HighlightEvent(id, pubKey, createdAt, tags, content, sig)
-            LiveActivitiesEvent.kind -> LiveActivitiesEvent(id, pubKey, createdAt, tags, content, sig)
-            LiveActivitiesChatMessageEvent.kind -> LiveActivitiesChatMessageEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapEvent.kind -> LnZapEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapPaymentRequestEvent.kind -> LnZapPaymentRequestEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapPaymentResponseEvent.kind -> LnZapPaymentResponseEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapRequestEvent.kind -> LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
-            LongTextNoteEvent.kind -> LongTextNoteEvent(id, pubKey, createdAt, tags, content, sig)
-            MetadataEvent.kind -> MetadataEvent(id, pubKey, createdAt, tags, content, sig)
-            NNSEvent.kind -> NNSEvent(id, pubKey, createdAt, tags, content, sig)
-            PeopleListEvent.kind -> PeopleListEvent(id, pubKey, createdAt, tags, content, sig)
-            PinListEvent.kind -> PinListEvent(id, pubKey, createdAt, tags, content, sig)
-            PollNoteEvent.kind -> PollNoteEvent(id, pubKey, createdAt, tags, content, sig)
-            PrivateDmEvent.kind -> PrivateDmEvent(id, pubKey, createdAt, tags, content, sig)
-            ReactionEvent.kind -> ReactionEvent(id, pubKey, createdAt, tags, content, sig)
-            RecommendRelayEvent.kind -> RecommendRelayEvent(id, pubKey, createdAt, tags, content, sig, lenient)
-            RelaySetEvent.kind -> RelaySetEvent(id, pubKey, createdAt, tags, content, sig)
-            ReportEvent.kind -> ReportEvent(id, pubKey, createdAt, tags, content, sig)
-            RepostEvent.kind -> RepostEvent(id, pubKey, createdAt, tags, content, sig)
-            TextNoteEvent.kind -> TextNoteEvent(id, pubKey, createdAt, tags, content, sig)
-            else -> this
+        fun Event.getRefinedEvent(lenient: Boolean = false): Event {
+            return EventFactory.create(id, pubKey, createdAt, kind, tags, content, sig, lenient)
         }
 
         fun generateId(pubKey: HexKey, createdAt: Long, kind: Int, tags: List<List<String>>, content: String): ByteArray {
@@ -324,13 +296,13 @@ open class Event(
                 .replace("\\u2028", "\u2028")
                 .replace("\\u2029", "\u2029")
 
-            return MessageDigest.getInstance("SHA-256").digest(rawEventJson.toByteArray())
+            return CryptoUtils.sha256(rawEventJson.toByteArray())
         }
 
         fun create(privateKey: ByteArray, kind: Int, tags: List<List<String>> = emptyList(), content: String = "", createdAt: Long = TimeUtils.now()): Event {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = Companion.generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey).toHexKey()
+            val sig = CryptoUtils.sign(id, privateKey).toHexKey()
             return Event(id.toHexKey(), pubKey, createdAt, kind, tags, content, sig)
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/EventFactory.kt

@@ -0,0 +1,106 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.toHexKey
+
+class EventFactory {
+    companion object {
+        fun create(
+            id: String,
+            pubKey: String,
+            createdAt: Long,
+            kind: Int,
+            tags: List<List<String>>,
+            content: String,
+            sig: String,
+            lenient: Boolean
+        ): Event {
+            val internedTags = tags.map {
+                it.map {
+                    it.intern()
+                }
+            }
+
+            return internedCreate(
+                id = id.intern(),
+                pubKey = pubKey.intern(),
+                createdAt = createdAt,
+                kind = kind,
+                tags = internedTags,
+                content = content,
+                sig = sig,
+                lenient = lenient
+            )
+        }
+
+        fun internedCreate(
+            id: String,
+            pubKey: String,
+            createdAt: Long,
+            kind: Int,
+            tags: List<List<String>>,
+            content: String,
+            sig: String,
+            lenient: Boolean
+        ) = when (kind) {
+            AppDefinitionEvent.kind -> AppDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
+            AppRecommendationEvent.kind -> AppRecommendationEvent(id, pubKey, createdAt, tags, content, sig)
+            AudioTrackEvent.kind -> AudioTrackEvent(id, pubKey, createdAt, tags, content, sig)
+            BadgeAwardEvent.kind -> BadgeAwardEvent(id, pubKey, createdAt, tags, content, sig)
+            BadgeDefinitionEvent.kind -> BadgeDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
+            BadgeProfilesEvent.kind -> BadgeProfilesEvent(id, pubKey, createdAt, tags, content, sig)
+            BookmarkListEvent.kind -> BookmarkListEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelCreateEvent.kind -> ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelHideMessageEvent.kind -> ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelMessageEvent.kind -> ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelMetadataEvent.kind -> ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelMuteUserEvent.kind -> ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
+            ChatMessageEvent.kind -> {
+                if (id.isBlank()) {
+                    val id = Event.generateId(pubKey, createdAt, kind, tags, content).toHexKey()
+                    ChatMessageEvent(id, pubKey, createdAt, tags, content, sig)
+                } else {
+                    ChatMessageEvent(id, pubKey, createdAt, tags, content, sig)
+                }
+            }
+            ClassifiedsEvent.kind -> ClassifiedsEvent(id, pubKey, createdAt, tags, content, sig)
+            CommunityDefinitionEvent.kind -> CommunityDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
+            CommunityPostApprovalEvent.kind -> CommunityPostApprovalEvent(id, pubKey, createdAt, tags, content, sig)
+            ContactListEvent.kind -> ContactListEvent(id, pubKey, createdAt, tags, content, sig)
+            DeletionEvent.kind -> DeletionEvent(id, pubKey, createdAt, tags, content, sig)
+
+            // Will never happen.
+            // DirectMessageEvent.kind -> DirectMessageEvent(createdAt, tags, content)
+
+            EmojiPackEvent.kind -> EmojiPackEvent(id, pubKey, createdAt, tags, content, sig)
+            EmojiPackSelectionEvent.kind -> EmojiPackSelectionEvent(id, pubKey, createdAt, tags, content, sig)
+            SealedGossipEvent.kind -> SealedGossipEvent(id, pubKey, createdAt, tags, content, sig)
+
+            FileHeaderEvent.kind -> FileHeaderEvent(id, pubKey, createdAt, tags, content, sig)
+            FileStorageEvent.kind -> FileStorageEvent(id, pubKey, createdAt, tags, content, sig)
+            FileStorageHeaderEvent.kind -> FileStorageHeaderEvent(id, pubKey, createdAt, tags, content, sig)
+            GenericRepostEvent.kind -> GenericRepostEvent(id, pubKey, createdAt, tags, content, sig)
+            GiftWrapEvent.kind -> GiftWrapEvent(id, pubKey, createdAt, tags, content, sig)
+            HighlightEvent.kind -> HighlightEvent(id, pubKey, createdAt, tags, content, sig)
+            LiveActivitiesEvent.kind -> LiveActivitiesEvent(id, pubKey, createdAt, tags, content, sig)
+            LiveActivitiesChatMessageEvent.kind -> LiveActivitiesChatMessageEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapEvent.kind -> LnZapEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapPaymentRequestEvent.kind -> LnZapPaymentRequestEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapPaymentResponseEvent.kind -> LnZapPaymentResponseEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapRequestEvent.kind -> LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
+            LongTextNoteEvent.kind -> LongTextNoteEvent(id, pubKey, createdAt, tags, content, sig)
+            MetadataEvent.kind -> MetadataEvent(id, pubKey, createdAt, tags, content, sig)
+            NNSEvent.kind -> NNSEvent(id, pubKey, createdAt, tags, content, sig)
+            PeopleListEvent.kind -> PeopleListEvent(id, pubKey, createdAt, tags, content, sig)
+            PinListEvent.kind -> PinListEvent(id, pubKey, createdAt, tags, content, sig)
+            PollNoteEvent.kind -> PollNoteEvent(id, pubKey, createdAt, tags, content, sig)
+            PrivateDmEvent.kind -> PrivateDmEvent(id, pubKey, createdAt, tags, content, sig)
+            ReactionEvent.kind -> ReactionEvent(id, pubKey, createdAt, tags, content, sig)
+            RecommendRelayEvent.kind -> RecommendRelayEvent(id, pubKey, createdAt, tags, content, sig, lenient)
+            RelaySetEvent.kind -> RelaySetEvent(id, pubKey, createdAt, tags, content, sig)
+            ReportEvent.kind -> ReportEvent(id, pubKey, createdAt, tags, content, sig)
+            RepostEvent.kind -> RepostEvent(id, pubKey, createdAt, tags, content, sig)
+            TextNoteEvent.kind -> TextNoteEvent(id, pubKey, createdAt, tags, content, sig)
+            else -> Event(id, pubKey, createdAt, kind, tags, content, sig)
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/EventInterface.kt

@@ -34,7 +34,11 @@ interface EventInterface {
     fun isTaggedAddressableNotes(idHexes: Set<String>): Boolean
 
     fun isTaggedHash(hashtag: String): Boolean
+    fun isTaggedGeoHash(hashtag: String): Boolean
+
     fun isTaggedHashes(hashtags: Set<String>): Boolean
+    fun isTaggedGeoHashes(hashtags: Set<String>): Boolean
+
     fun firstIsTaggedHashes(hashtags: Set<String>): String?
     fun firstIsTaggedAddressableNote(addressableNotes: Set<String>): String?
 
@@ -42,9 +46,11 @@ interface EventInterface {
     fun getTagOfAddressableKind(kind: Int): ATag?
 
     fun hashtags(): List<String>
+    fun geohashes(): List<String>
 
     fun getReward(): BigDecimal?
     fun getPoWRank(): Int
+    fun getGeoHash(): String?
 
     fun zapAddress(): String?
     fun isSensitive(): Boolean

app/src/main/java/com/vitorpamplona/amethyst/service/model/FileHeaderEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class FileHeaderEvent(
@@ -74,9 +74,9 @@ class FileHeaderEvent(
             )
 
             val content = description ?: ""
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return FileHeaderEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/FileStorageEvent.kt

@@ -5,7 +5,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import java.util.Base64
 
 @Immutable
@@ -51,9 +51,9 @@ class FileStorageEvent(
             )
 
             val content = encode(data)
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return FileStorageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/FileStorageHeaderEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class FileStorageHeaderEvent(
@@ -74,9 +74,9 @@ class FileStorageHeaderEvent(
             )
 
             val content = description ?: ""
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return FileStorageHeaderEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/GeneralListEvent.kt

@@ -5,7 +5,7 @@ import androidx.compose.runtime.Immutable
 import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.hexToByteArray
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 abstract class GeneralListEvent(
@@ -28,9 +28,9 @@ abstract class GeneralListEvent(
         if (content.isBlank()) return null
 
         return try {
-            val sharedSecret = Utils.getSharedSecret(privKey, pubKey.hexToByteArray())
+            val sharedSecret = CryptoUtils.getSharedSecretNIP04(privKey, pubKey.hexToByteArray())
 
-            return Utils.decrypt(content, sharedSecret)
+            return CryptoUtils.decryptNIP04(content, sharedSecret)
         } catch (e: Exception) {
             Log.w("GeneralList", "Error decrypting the message ${e.message} for ${dTag()}")
             null
@@ -61,6 +61,7 @@ abstract class GeneralListEvent(
     fun privateTaggedUsers(privKey: ByteArray) = privateTags(privKey)?.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 privateGeohashes(privKey: ByteArray) = privateTags(privKey)?.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 privateTaggedAddresses(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "a" }?.mapNotNull {
         val aTagValue = it.getOrNull(1)
@@ -90,7 +91,7 @@ abstract class GeneralListEvent(
             }
             val msg = gson.toJson(privTags)
 
-            return Utils.encrypt(
+            return CryptoUtils.encryptNIP04(
                 msg,
                 privateKey,
                 pubKey
@@ -101,10 +102,10 @@ abstract class GeneralListEvent(
             privateTags: List<List<String>>? = null,
             privateKey: ByteArray
         ): String {
-            return Utils.encrypt(
+            return CryptoUtils.encryptNIP04(
                 msg = gson.toJson(privateTags),
                 privateKey = privateKey,
-                pubKey = Utils.pubkeyCreate(privateKey)
+                pubKey = CryptoUtils.pubkeyCreate(privateKey)
             )
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/GenericRepostEvent.kt

@@ -4,8 +4,8 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import com.vitorpamplona.amethyst.service.relays.Client
-import nostr.postr.Utils
 
 @Immutable
 class GenericRepostEvent(
@@ -35,7 +35,7 @@ class GenericRepostEvent(
             val replyToPost = listOf("e", boostedPost.id())
             val replyToAuthor = listOf("p", boostedPost.pubKey())
 
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             var tags: List<List<String>> = listOf(replyToPost, replyToAuthor)
 
             if (boostedPost is AddressableEvent) {
@@ -45,7 +45,7 @@ class GenericRepostEvent(
             tags = tags + listOf(listOf("k", "${boostedPost.kind()}"))
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return GenericRepostEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/GiftWrapEvent.kt

@@ -0,0 +1,84 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
+import com.vitorpamplona.amethyst.model.hexToByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
+import com.vitorpamplona.amethyst.service.EncryptedInfo
+import com.vitorpamplona.amethyst.service.relays.Client
+
+@Immutable
+class GiftWrapEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    private var cachedInnerEvent: Map<HexKey, Event?> = mapOf()
+
+    fun cachedGossip(privKey: ByteArray): Event? {
+        val hex = privKey.toHexKey()
+        if (cachedInnerEvent.contains(hex)) return cachedInnerEvent[hex]
+
+        val myInnerEvent = unwrap(privKey = privKey)
+        cachedInnerEvent = cachedInnerEvent + Pair(hex, myInnerEvent)
+        return myInnerEvent
+    }
+
+    fun unwrap(privKey: ByteArray) = try {
+        plainContent(privKey)?.let { fromJson(it, Client.lenient) }
+    } catch (e: Exception) {
+        // Log.e("UnwrapError", "Couldn't Decrypt the content", e)
+        null
+    }
+
+    private fun plainContent(privKey: ByteArray): String? {
+        if (content.isBlank()) return null
+
+        return try {
+            val sharedSecret = CryptoUtils.getSharedSecretNIP24(privKey, pubKey.hexToByteArray())
+
+            val toDecrypt = gson.fromJson<EncryptedInfo>(
+                content,
+                EncryptedInfo::class.java
+            )
+
+            return CryptoUtils.decryptNIP24(toDecrypt, sharedSecret)
+        } catch (e: Exception) {
+            Log.w("GeneralList", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    fun recipientPubKey() = tags.firstOrNull { it.size > 1 && it[0] == "p" }?.get(1)
+
+    companion object {
+        const val kind = 1059
+
+        fun create(
+            event: Event,
+            recipientPubKey: HexKey,
+            createdAt: Long = TimeUtils.now()
+        ): GiftWrapEvent {
+            val privateKey = CryptoUtils.privkeyCreate() // GiftWrap is always a random key
+            val sharedSecret = CryptoUtils.getSharedSecretNIP24(privateKey, recipientPubKey.hexToByteArray())
+
+            val content = gson.toJson(
+                CryptoUtils.encryptNIP24(
+                    gson.toJson(event),
+                    sharedSecret
+                )
+            )
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val tags = listOf(listOf("p", recipientPubKey))
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = CryptoUtils.sign(id, privateKey)
+            return GiftWrapEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/HTTPAuthorizationEvent.kt

@@ -4,8 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
-import java.security.MessageDigest
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class HTTPAuthorizationEvent(
@@ -27,11 +26,9 @@ class HTTPAuthorizationEvent(
             privateKey: ByteArray,
             createdAt: Long = TimeUtils.now()
         ): HTTPAuthorizationEvent {
-            val sha256 = MessageDigest.getInstance("SHA-256")
-
             var hash = ""
             body?.let {
-                hash = sha256.digest(it.toByteArray()).toHexKey()
+                hash = CryptoUtils.sha256(it.toByteArray()).toHexKey()
             }
 
             val tags = listOfNotNull(
@@ -40,9 +37,9 @@ class HTTPAuthorizationEvent(
                 listOf("payload", hash)
             )
 
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, "")
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return HTTPAuthorizationEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/HighlightEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class HighlightEvent(
@@ -30,10 +30,10 @@ class HighlightEvent(
             privateKey: ByteArray,
             createdAt: Long = TimeUtils.now()
         ): PollNoteEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
             val id = generateId(pubKey, createdAt, kind, tags, msg)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return PollNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/LiveActivitiesChatMessageEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class LiveActivitiesChatMessageEvent(
@@ -51,10 +51,11 @@ class LiveActivitiesChatMessageEvent(
             privateKey: ByteArray,
             createdAt: Long = TimeUtils.now(),
             markAsSensitive: Boolean,
-            zapRaiserAmount: Long?
+            zapRaiserAmount: Long?,
+            geohash: String? = null
         ): LiveActivitiesChatMessageEvent {
             val content = message
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf(
                 listOf("a", activity.toTag(), "", "root")
             )
@@ -73,9 +74,12 @@ class LiveActivitiesChatMessageEvent(
             zapRaiserAmount?.let {
                 tags.add(listOf("zapraiser", "$it"))
             }
+            geohash?.let {
+                tags.add(listOf("g", it))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return LiveActivitiesChatMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/LiveActivitiesEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class LiveActivitiesEvent(
@@ -51,9 +51,9 @@ class LiveActivitiesEvent(
             createdAt: Long = TimeUtils.now()
         ): LiveActivitiesEvent {
             val tags = mutableListOf<List<String>>()
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, "")
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return LiveActivitiesEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapPaymentRequestEvent.kt

@@ -10,7 +10,7 @@ import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import java.lang.reflect.Type
 
 @Immutable
@@ -35,9 +35,9 @@ class LnZapPaymentRequestEvent(
         }
 
         return try {
-            val sharedSecret = Utils.getSharedSecret(privKey, pubkey)
+            val sharedSecret = CryptoUtils.getSharedSecretNIP04(privKey, pubkey)
 
-            val jsonText = Utils.decrypt(content, sharedSecret)
+            val jsonText = CryptoUtils.decryptNIP04(content, sharedSecret)
 
             val payInvoiceMethod = gson.fromJson(jsonText, Request::class.java)
 
@@ -59,10 +59,10 @@ class LnZapPaymentRequestEvent(
             privateKey: ByteArray,
             createdAt: Long = TimeUtils.now()
         ): LnZapPaymentRequestEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey)
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey)
             val serializedRequest = gson.toJson(PayInvoiceMethod.create(lnInvoice))
 
-            val content = Utils.encrypt(
+            val content = CryptoUtils.encryptNIP04(
                 serializedRequest,
                 privateKey,
                 walletServicePubkey.hexToByteArray()
@@ -72,7 +72,7 @@ class LnZapPaymentRequestEvent(
             tags.add(listOf("p", walletServicePubkey))
 
             val id = generateId(pubKey.toHexKey(), createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return LnZapPaymentRequestEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapPaymentResponseEvent.kt

@@ -8,7 +8,7 @@ import com.google.gson.JsonElement
 import com.google.gson.JsonParseException
 import com.google.gson.annotations.SerializedName
 import com.vitorpamplona.amethyst.model.HexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import java.lang.reflect.Type
 
 @Immutable
@@ -30,9 +30,9 @@ class LnZapPaymentResponseEvent(
 
     private fun decrypt(privKey: ByteArray, pubKey: ByteArray): String? {
         return try {
-            val sharedSecret = Utils.getSharedSecret(privKey, pubKey)
+            val sharedSecret = CryptoUtils.getSharedSecretNIP04(privKey, pubKey)
 
-            val retVal = Utils.decrypt(content, sharedSecret)
+            val retVal = CryptoUtils.decryptNIP04(content, sharedSecret)
 
             if (retVal.startsWith(PrivateDmEvent.nip18Advertisement)) {
                 retVal.substring(16)

app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt

@@ -2,12 +2,10 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.*
-import nostr.postr.Bech32
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.Bech32
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import java.nio.charset.Charset
-import java.security.MessageDigest
 import java.security.SecureRandom
-import java.util.*
 import javax.crypto.BadPaddingException
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
@@ -68,7 +66,7 @@ class LnZapRequestEvent(
         ): LnZapRequestEvent {
             var content = message
             var privkey = privateKey
-            var pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             var tags = listOf(
                 listOf("e", originalNote.id()),
                 listOf("p", originalNote.pubKey()),
@@ -82,8 +80,8 @@ class LnZapRequestEvent(
             }
             if (zapType == LnZapEvent.ZapType.ANONYMOUS) {
                 tags = tags + listOf(listOf("anon", ""))
-                privkey = Utils.privkeyCreate()
-                pubKey = Utils.pubkeyCreate(privkey).toHexKey()
+                privkey = CryptoUtils.privkeyCreate()
+                pubKey = CryptoUtils.pubkeyCreate(privkey).toHexKey()
             } else if (zapType == LnZapEvent.ZapType.PRIVATE) {
                 var encryptionPrivateKey = createEncryptionPrivateKey(privateKey.toHexKey(), originalNote.id(), createdAt)
                 var noteJson = (create(privkey, 9733, listOf(tags[0], tags[1]), message)).toJson()
@@ -91,10 +89,10 @@ class LnZapRequestEvent(
                 tags = tags + listOf(listOf("anon", encryptedContent))
                 content = "" // make sure public content is empty, as the content is encrypted
                 privkey = encryptionPrivateKey // sign event with generated privkey
-                pubKey = Utils.pubkeyCreate(encryptionPrivateKey).toHexKey() // updated event with according pubkey
+                pubKey = CryptoUtils.pubkeyCreate(encryptionPrivateKey).toHexKey() // updated event with according pubkey
             }
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privkey)
+            val sig = CryptoUtils.sign(id, privkey)
             return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
 
@@ -108,14 +106,14 @@ class LnZapRequestEvent(
         ): LnZapRequestEvent {
             var content = message
             var privkey = privateKey
-            var pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             var tags = listOf(
                 listOf("p", userHex),
                 listOf("relays") + relays
             )
             if (zapType == LnZapEvent.ZapType.ANONYMOUS) {
-                privkey = Utils.privkeyCreate()
-                pubKey = Utils.pubkeyCreate(privkey).toHexKey()
+                privkey = CryptoUtils.privkeyCreate()
+                pubKey = CryptoUtils.pubkeyCreate(privkey).toHexKey()
                 tags = tags + listOf(listOf("anon", ""))
             } else if (zapType == LnZapEvent.ZapType.PRIVATE) {
                 var encryptionPrivateKey = createEncryptionPrivateKey(privateKey.toHexKey(), userHex, createdAt)
@@ -124,21 +122,21 @@ class LnZapRequestEvent(
                 tags = tags + listOf(listOf("anon", encryptedContent))
                 content = ""
                 privkey = encryptionPrivateKey
-                pubKey = Utils.pubkeyCreate(encryptionPrivateKey).toHexKey()
+                pubKey = CryptoUtils.pubkeyCreate(encryptionPrivateKey).toHexKey()
             }
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privkey)
+            val sig = CryptoUtils.sign(id, privkey)
             return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
 
         fun createEncryptionPrivateKey(privkey: String, id: String, createdAt: Long): ByteArray {
             var str = privkey + id + createdAt.toString()
             var strbyte = str.toByteArray(Charset.forName("utf-8"))
-            return MessageDigest.getInstance("SHA-256").digest(strbyte)
+            return CryptoUtils.sha256(strbyte)
         }
 
         private fun encryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
-            var sharedSecret = Utils.getSharedSecret(privkey, pubkey)
+            var sharedSecret = CryptoUtils.getSharedSecretNIP04(privkey, pubkey)
             val iv = ByteArray(16)
             SecureRandom().nextBytes(iv)
 
@@ -157,7 +155,7 @@ class LnZapRequestEvent(
         }
 
         private fun decryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
-            var sharedSecret = Utils.getSharedSecret(privkey, pubkey)
+            var sharedSecret = CryptoUtils.getSharedSecretNIP04(privkey, pubkey)
             if (sharedSecret.size != 16 && sharedSecret.size != 32) {
                 throw IllegalArgumentException("Invalid shared secret size")
             }

app/src/main/java/com/vitorpamplona/amethyst/service/model/LongTextNoteEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class LongTextNoteEvent(
@@ -33,7 +33,7 @@ class LongTextNoteEvent(
         const val kind = 30023
 
         fun create(msg: String, replyTos: List<String>?, mentions: List<String>?, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): LongTextNoteEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
             replyTos?.forEach {
                 tags.add(listOf("e", it))
@@ -42,7 +42,7 @@ class LongTextNoteEvent(
                 tags.add(listOf("p", it))
             }
             val id = generateId(pubKey, createdAt, kind, tags, msg)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return LongTextNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/MetadataEvent.kt

@@ -10,7 +10,7 @@ import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.UserMetadata
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import java.io.ByteArrayInputStream
 
 @Stable
@@ -172,7 +172,7 @@ class MetadataEvent(
         }
 
         fun create(contactMetaData: String, identities: List<IdentityClaim>, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): MetadataEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
 
             identities.forEach {
@@ -180,7 +180,7 @@ class MetadataEvent(
             }
 
             val id = generateId(pubKey, createdAt, kind, tags, contactMetaData)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return MetadataEvent(id.toHexKey(), pubKey, createdAt, tags, contactMetaData, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/MuteListEvent.kt

@@ -7,7 +7,7 @@ import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class MuteListEvent(
@@ -23,9 +23,9 @@ class MuteListEvent(
 
     fun plainContent(privKey: ByteArray): String? {
         return try {
-            val sharedSecret = Utils.getSharedSecret(privKey, pubKey.hexToByteArray())
+            val sharedSecret = CryptoUtils.getSharedSecretNIP04(privKey, pubKey.hexToByteArray())
 
-            return Utils.decrypt(content, sharedSecret)
+            return CryptoUtils.decryptNIP04(content, sharedSecret)
         } catch (e: Exception) {
             Log.w("BookmarkList", "Error decrypting the message ${e.message}")
             null
@@ -73,7 +73,7 @@ class MuteListEvent(
             privateKey: ByteArray,
             createdAt: Long = TimeUtils.now()
         ): MuteListEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey)
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey)
 
             val privTags = mutableListOf<List<String>>()
             privEvents?.forEach {
@@ -87,7 +87,7 @@ class MuteListEvent(
             }
             val msg = gson.toJson(privTags)
 
-            val content = Utils.encrypt(
+            val content = CryptoUtils.encryptNIP04(
                 msg,
                 privateKey,
                 pubKey
@@ -105,7 +105,7 @@ class MuteListEvent(
             }
 
             val id = generateId(pubKey.toHexKey(), createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return MuteListEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/NIP24Factory.kt

@@ -0,0 +1,32 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
+
+class NIP24Factory {
+    fun createMsgNIP24(
+        msg: String,
+        to: List<HexKey>,
+        from: ByteArray
+    ): List<GiftWrapEvent> {
+        val senderPublicKey = CryptoUtils.pubkeyCreate(from).toHexKey()
+
+        val senderMessage = ChatMessageEvent.create(
+            msg = msg,
+            to = to,
+            privateKey = from
+        )
+
+        return to.plus(senderPublicKey).map {
+            GiftWrapEvent.create(
+                event = SealedGossipEvent.create(
+                    event = senderMessage,
+                    encryptTo = it,
+                    privateKey = from
+                ),
+                recipientPubKey = it
+            )
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/NNSEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class NNSEvent(
@@ -31,9 +31,9 @@ class NNSEvent(
             createdAt: Long = TimeUtils.now()
         ): NNSEvent {
             val tags = mutableListOf<List<String>>()
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, "")
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return NNSEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/PeopleListEvent.kt

@@ -4,10 +4,10 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableSet
-import nostr.postr.Utils
 
 @Immutable
 class PeopleListEvent(
@@ -141,9 +141,9 @@ class PeopleListEvent(
         }
 
         fun create(content: String, tags: List<List<String>>, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): PeopleListEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return PeopleListEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/PinListEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class PinListEvent(
@@ -34,9 +34,9 @@ class PinListEvent(
                 tags.add(listOf("pin", it))
             }
 
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, "")
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return PinListEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/PollNoteEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 const val POLL_OPTION = "poll_option"
 const val VALUE_MAXIMUM = "value_maximum"
@@ -53,9 +53,10 @@ class PollNoteEvent(
             closedAt: Int?,
             zapReceiver: String?,
             markAsSensitive: Boolean,
-            zapRaiserAmount: Long?
+            zapRaiserAmount: Long?,
+            geohash: String? = null
         ): PollNoteEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
             replyTos?.forEach {
                 tags.add(listOf("e", it))
@@ -83,9 +84,12 @@ class PollNoteEvent(
             zapRaiserAmount?.let {
                 tags.add(listOf("zapraiser", "$it"))
             }
+            geohash?.let {
+                tags.add(listOf("g", it))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, msg)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return PollNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/PrivateDmEvent.kt

@@ -5,10 +5,9 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import com.vitorpamplona.amethyst.service.HexValidator
 import fr.acinq.secp256k1.Hex
-import nostr.postr.Utils
-import nostr.postr.toHex
 
 @Immutable
 class PrivateDmEvent(
@@ -56,9 +55,9 @@ class PrivateDmEvent(
 
     fun plainContent(privKey: ByteArray, pubKey: ByteArray): String? {
         return try {
-            val sharedSecret = Utils.getSharedSecret(privKey, pubKey)
+            val sharedSecret = CryptoUtils.getSharedSecretNIP04(privKey, pubKey)
 
-            val retVal = Utils.decrypt(content, sharedSecret)
+            val retVal = CryptoUtils.decryptNIP04(content, sharedSecret)
 
             if (retVal.startsWith(nip18Advertisement)) {
                 retVal.substring(16)
@@ -87,17 +86,18 @@ class PrivateDmEvent(
             publishedRecipientPubKey: ByteArray? = null,
             advertiseNip18: Boolean = true,
             markAsSensitive: Boolean,
-            zapRaiserAmount: Long?
+            zapRaiserAmount: Long?,
+            geohash: String? = null
         ): PrivateDmEvent {
-            val content = Utils.encrypt(
+            val content = CryptoUtils.encryptNIP04(
                 if (advertiseNip18) { nip18Advertisement } else { "" } + msg,
                 privateKey,
                 recipientPubKey
             )
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
             publishedRecipientPubKey?.let {
-                tags.add(listOf("p", publishedRecipientPubKey.toHex()))
+                tags.add(listOf("p", publishedRecipientPubKey.toHexKey()))
             }
             replyTos?.forEach {
                 tags.add(listOf("e", it))
@@ -114,8 +114,12 @@ class PrivateDmEvent(
             zapRaiserAmount?.let {
                 tags.add(listOf("zapraiser", "$it"))
             }
+            geohash?.let {
+                tags.add(listOf("g", it))
+            }
+
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return PrivateDmEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/ReactionEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class ReactionEvent(
@@ -31,7 +31,7 @@ class ReactionEvent(
         }
 
         fun create(content: String, originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ReactionEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
 
             var tags = listOf(listOf("e", originalNote.id()), listOf("p", originalNote.pubKey()))
             if (originalNote is AddressableEvent) {
@@ -39,13 +39,13 @@ class ReactionEvent(
             }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return ReactionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
 
         fun create(emojiUrl: EmojiUrl, originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ReactionEvent {
             val content = ":${emojiUrl.code}:"
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
 
             var tags = listOf(
                 listOf("e", originalNote.id()),
@@ -58,7 +58,7 @@ class ReactionEvent(
             }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return ReactionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/RecommendRelayEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import java.net.URI
 
 @Immutable
@@ -29,10 +29,10 @@ class RecommendRelayEvent(
 
         fun create(relay: URI, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): RecommendRelayEvent {
             val content = relay.toString()
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = listOf<List<String>>()
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return RecommendRelayEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/RelayAuthEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class RelayAuthEvent(
@@ -23,13 +23,13 @@ class RelayAuthEvent(
 
         fun create(relay: String, challenge: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): RelayAuthEvent {
             val content = ""
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            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 = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return RelayAuthEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/RelaySetEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 class RelaySetEvent(
@@ -35,9 +35,9 @@ class RelaySetEvent(
                 tags.add(listOf("r", it))
             }
 
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, "")
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return RelaySetEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/ReportEvent.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
+import com.vitorpamplona.amethyst.service.CryptoUtils
 
 @Immutable
 data class ReportedKey(val key: String, val reportType: ReportEvent.ReportType)
@@ -63,7 +63,7 @@ class ReportEvent(
             val reportPostTag = listOf("e", reportedPost.id(), type.name.lowercase())
             val reportAuthorTag = listOf("p", reportedPost.pubKey(), type.name.lowercase())
 
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             var tags: List<List<String>> = listOf(reportPostTag, reportAuthorTag)
 
             if (reportedPost is AddressableEvent) {
@@ -71,7 +71,7 @@ class ReportEvent(
             }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return ReportEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
 
@@ -80,10 +80,10 @@ class ReportEvent(
 
             val reportAuthorTag = listOf("p", reportedUser, type.name.lowercase())
 
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags: List<List<String>> = listOf(reportAuthorTag)
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return ReportEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/RepostEvent.kt

@@ -4,8 +4,8 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import com.vitorpamplona.amethyst.service.relays.Client
-import nostr.postr.Utils
 
 @Immutable
 class RepostEvent(
@@ -35,7 +35,7 @@ class RepostEvent(
             val replyToPost = listOf("e", boostedPost.id())
             val replyToAuthor = listOf("p", boostedPost.pubKey())
 
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             var tags: List<List<String>> = listOf(replyToPost, replyToAuthor)
 
             if (boostedPost is AddressableEvent) {
@@ -43,7 +43,7 @@ class RepostEvent(
             }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return RepostEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/SealedGossipEvent.kt

@@ -0,0 +1,122 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import androidx.compose.runtime.Immutable
+import com.google.gson.annotations.SerializedName
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
+import com.vitorpamplona.amethyst.model.hexToByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
+import com.vitorpamplona.amethyst.service.EncryptedInfo
+import com.vitorpamplona.amethyst.service.relays.Client
+
+@Immutable
+class SealedGossipEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    private var cachedInnerEvent: Map<HexKey, Event?> = mapOf()
+
+    fun cachedGossip(privKey: ByteArray): Event? {
+        val hex = privKey.toHexKey()
+        if (cachedInnerEvent.contains(hex)) return cachedInnerEvent[hex]
+
+        val gossip = unseal(privKey = privKey)
+        val event = gossip?.mergeWith(this)
+        cachedInnerEvent = cachedInnerEvent + Pair(hex, event)
+        return event
+    }
+
+    fun unseal(privKey: ByteArray): Gossip? = try {
+        plainContent(privKey)?.let { gson.fromJson(it, Gossip::class.java) }
+    } catch (e: Exception) {
+        null
+    }
+
+    private fun plainContent(privKey: ByteArray): String? {
+        if (content.isBlank()) return null
+
+        return try {
+            val sharedSecret = CryptoUtils.getSharedSecretNIP24(privKey, pubKey.hexToByteArray())
+
+            val toDecrypt = gson.fromJson<EncryptedInfo>(
+                content,
+                EncryptedInfo::class.java
+            )
+
+            return CryptoUtils.decryptNIP24(toDecrypt, sharedSecret)
+        } catch (e: Exception) {
+            Log.w("GeneralList", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    companion object {
+        const val kind = 13
+
+        fun create(
+            event: Event,
+            encryptTo: HexKey,
+            privateKey: ByteArray,
+            createdAt: Long = TimeUtils.now()
+        ): SealedGossipEvent {
+            val gossip = Gossip.create(event)
+            return create(gossip, encryptTo, privateKey, createdAt)
+        }
+
+        fun create(
+            gossip: Gossip,
+            encryptTo: HexKey,
+            privateKey: ByteArray,
+            createdAt: Long = TimeUtils.now()
+        ): SealedGossipEvent {
+            val sharedSecret = CryptoUtils.getSharedSecretNIP24(privateKey, encryptTo.hexToByteArray())
+
+            val content = gson.toJson(
+                CryptoUtils.encryptNIP24(
+                    gson.toJson(gossip),
+                    sharedSecret
+                )
+            )
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val tags = listOf<List<String>>()
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = CryptoUtils.sign(id, privateKey)
+            return SealedGossipEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}
+
+class Gossip(
+    val id: HexKey?,
+    @SerializedName("pubkey")
+    val pubKey: HexKey?,
+    @SerializedName("created_at")
+    val createdAt: Long?,
+    val kind: Int?,
+    val tags: List<List<String>>?,
+    val content: String?
+) {
+    fun mergeWith(event: SealedGossipEvent): Event {
+        val newPubKey = pubKey?.ifBlank { null } ?: event.pubKey
+        val newCreatedAt = if (createdAt != null && createdAt > 1000) createdAt else event.createdAt
+        val newKind = kind ?: 0
+        val newTags = (tags ?: emptyList()).plus(event.tags)
+        val newContent = content ?: ""
+        val newID = id?.ifBlank { null } ?: Event.generateId(newPubKey, newCreatedAt, newKind, newTags, newContent).toHexKey()
+        val sig = ""
+
+        return EventFactory.create(newID, newPubKey, newCreatedAt, newKind, newTags, newContent, sig, Client.lenient)
+    }
+
+    companion object {
+        fun create(event: Event): Gossip {
+            return Gossip(event.id, event.pubKey, event.createdAt, event.kind, event.tags, event.content)
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/TextNoteEvent.kt

@@ -6,8 +6,8 @@ import com.linkedin.urls.detection.UrlDetectorOptions
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.findHashtags
-import nostr.postr.Utils
 
 @Immutable
 class TextNoteEvent(
@@ -38,11 +38,12 @@ class TextNoteEvent(
             replyingTo: String?,
             root: String?,
             directMentions: Set<HexKey>,
+            geohash: String? = null,
 
             privateKey: ByteArray,
             createdAt: Long = TimeUtils.now()
         ): TextNoteEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
             replyTos?.forEach {
                 if (it == replyingTo) {
@@ -93,9 +94,12 @@ class TextNoteEvent(
             zapRaiserAmount?.let {
                 tags.add(listOf("zapraiser", "$it"))
             }
+            geohash?.let {
+                tags.add(listOf("g", it))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, msg)
-            val sig = Utils.sign(id, privateKey)
+            val sig = CryptoUtils.sign(id, privateKey)
             return TextNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/nip19/Nip19.kt

@@ -4,9 +4,8 @@ import android.util.Log
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Bech32
-import nostr.postr.bechToBytes
-import nostr.postr.toByteArray
+import com.vitorpamplona.amethyst.service.bechToBytes
+import com.vitorpamplona.amethyst.service.toNEvent
 import java.util.regex.Pattern
 
 object Nip19 {
@@ -167,6 +166,14 @@ object Nip19 {
             fullArray = fullArray + byteArrayOf(Tlv.Type.KIND.id, kind.size.toByte()) + kind
         }
 
-        return Bech32.encodeBytes(hrp = "nevent", fullArray, Bech32.Encoding.Bech32)
+        return fullArray.toNEvent()
     }
 }
+
+fun Int.toByteArray(): ByteArray {
+    val bytes = ByteArray(4)
+    (0..3).forEach {
+        bytes[3 - it] = ((this ushr (8 * it)) and 0xFFFF).toByte()
+    }
+    return bytes
+}

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

@@ -26,9 +26,12 @@ class EventNotificationConsumer(private val applicationContext: Context) {
                 // adds to database
                 LocalCache.verifyAndConsume(event, null)
 
-                when (event) {
-                    is PrivateDmEvent -> notify(event)
-                    is LnZapEvent -> notify(event)
+                val manager = notificationManager()
+                if (manager.areNotificationsEnabled()) {
+                    when (event) {
+                        is PrivateDmEvent -> notify(event)
+                        is LnZapEvent -> notify(event)
+                    }
                 }
             }
         }

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

@@ -18,6 +18,8 @@ import com.vitorpamplona.amethyst.ui.MainActivity
 object NotificationUtils {
     private var dmChannel: NotificationChannel? = null
     private var zapChannel: NotificationChannel? = null
+    private const val DM_GROUP_KEY = "com.vitorpamplona.amethyst.DM_NOTIFICATION"
+    private const val ZAP_GROUP_KEY = "com.vitorpamplona.amethyst.ZAP_NOTIFICATION"
 
     private fun getOrCreateDMChannel(applicationContext: Context): NotificationChannel {
         if (dmChannel != null) return dmChannel!!
@@ -70,7 +72,7 @@ object NotificationUtils {
         val zapChannel = getOrCreateZapChannel(applicationContext)
         val channelId = applicationContext.getString(R.string.app_notification_zaps_channel_id)
 
-        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, applicationContext)
+        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, ZAP_GROUP_KEY, applicationContext)
     }
 
     fun NotificationManager.sendDMNotification(
@@ -84,7 +86,7 @@ object NotificationUtils {
         val dmChannel = getOrCreateDMChannel(applicationContext)
         val channelId = applicationContext.getString(R.string.app_notification_dms_channel_id)
 
-        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, applicationContext)
+        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, DM_GROUP_KEY, applicationContext)
     }
 
     fun NotificationManager.sendNotification(
@@ -94,6 +96,7 @@ object NotificationUtils {
         pictureUrl: String?,
         uri: String,
         channelId: String,
+        notificationGroupKey: String,
         applicationContext: Context
     ) {
         if (pictureUrl != null) {
@@ -110,6 +113,7 @@ object NotificationUtils {
                 picture = imageResult.drawable as? BitmapDrawable,
                 uri = uri,
                 channelId,
+                notificationGroupKey,
                 applicationContext = applicationContext
             )
         } else {
@@ -120,6 +124,7 @@ object NotificationUtils {
                 picture = null,
                 uri = uri,
                 channelId,
+                notificationGroupKey,
                 applicationContext = applicationContext
             )
         }
@@ -132,6 +137,7 @@ object NotificationUtils {
         picture: BitmapDrawable?,
         uri: String,
         channelId: String,
+        notificationGroupKey: String,
         applicationContext: Context
     ) {
         val notId = id.hashCode()
@@ -164,7 +170,8 @@ object NotificationUtils {
             .setContentTitle(messageTitle)
             .setContentText(applicationContext.getString(R.string.app_notification_private_message))
             .setLargeIcon(picture?.bitmap)
-            .setGroup(messageTitle)
+            // .setGroup(messageTitle)
+            // .setGroup(notificationGroupKey) //-> Might need a Group summary as well before we activate this
             .setContentIntent(contentPendingIntent)
             .setPriority(NotificationCompat.PRIORITY_HIGH)
             .setAutoCancel(true)
@@ -178,7 +185,8 @@ object NotificationUtils {
             .setContentTitle(messageTitle)
             .setContentText(messageBody)
             .setLargeIcon(picture?.bitmap)
-            .setGroup(messageTitle)
+            // .setGroup(messageTitle)
+            // .setGroup(notificationGroupKey)  //-> Might need a Group summary as well before we activate this
             .setContentIntent(contentPendingIntent)
             .setPublicVersion(builderPublic.build())
             .setPriority(NotificationCompat.PRIORITY_HIGH)

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

@@ -56,7 +56,9 @@ class RegisterAccounts(
 
             val client = HttpClient.getHttpClient()
 
-            client.newCall(request).execute()
+            val isSucess = client.newCall(request).execute().use {
+                it.isSuccessful
+            }
         } catch (e: java.lang.Exception) {
             Log.e("FirebaseMsgService", "Unable to register with push server", e)
         }

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.service.previews
 import com.vitorpamplona.amethyst.service.HttpClient
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import okhttp3.Request
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 
@@ -61,10 +62,12 @@ private const val CONTENT = "content"
 
 suspend fun getDocument(url: String, timeOut: Int = 30000): Document =
     withContext(Dispatchers.IO) {
-        return@withContext Jsoup.connect(url)
-            .proxy(HttpClient.getProxy())
-            .timeout(timeOut)
-            .get()
+        val request: Request = Request.Builder().url(url).get().build()
+        val html = HttpClient.getHttpClient().newCall(request).execute().use {
+            it.body.string()
+        }
+
+        Jsoup.parse(html)
     }
 
 suspend fun parseHtml(url: String, document: Document): UrlInfoItem =