v0.70.7

add a button to return to default relay list

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 261
-        versionName "0.70.4"
+        versionCode 264
+        versionName "0.70.7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -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'
 
@@ -186,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

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/main/java/com/vitorpamplona/amethyst/Amethyst.kt

@@ -1,11 +1,35 @@
 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() {
     override fun onCreate() {
         super.onCreate()
         instance = this
+
+        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

@@ -12,6 +12,7 @@ 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
@@ -116,6 +117,7 @@ class MultiPlayerPlaybackManager(
         return mediaSession
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     fun releaseAppPlayers() {
         GlobalScope.launch(Dispatchers.Main) {
             cache.evictAll()

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

@@ -3,6 +3,7 @@ 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
@@ -16,25 +17,29 @@ object PlaybackClientController {
         context: Context,
         onReady: (MediaController) -> Unit
     ) {
-        // creating a bundle object
-        // creating a bundle object
-        val bundle = Bundle()
-        bundle.putString("id", controllerID)
-        bundle.putString("uri", videoUri)
-        bundle.putString("callbackUri", callbackUri)
+        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()
+            val sessionTokenLocal = SessionToken(context, ComponentName(context, PlaybackService::class.java))
+            val controllerFuture = MediaController
+                .Builder(context, sessionTokenLocal)
+                .setConnectionHints(bundle)
+                .buildAsync()
 
-        controllerFuture.addListener(
-            {
-                val controller = controllerFuture.get()
-                onReady(controller)
-            },
-            MoreExecutors.directExecutor()
-        )
+            controllerFuture.addListener(
+                {
+                    val controller = controllerFuture.get()
+                    onReady(controller)
+                },
+                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

@@ -10,6 +10,10 @@ import androidx.media3.session.DefaultMediaNotificationProvider
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSessionService
 import com.vitorpamplona.amethyst.service.HttpClient
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 
 @UnstableApi // Extend MediaSessionService
 class PlaybackService : MediaSessionService() {
@@ -28,29 +32,32 @@ class PlaybackService : MediaSessionService() {
     }
 
     // Create your Player and MediaSession in the onCreate lifecycle event
+    @kotlin.OptIn(DelicateCoroutinesApi::class)
     @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 {
-            val toDestroyHls = managerHls
-            val toDestroyProgressive = managerProgressive
-
+        GlobalScope.launch(Dispatchers.IO) {
             managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
             managerProgressive = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+            managerLocal = MultiPlayerPlaybackManager(cachedPositions = videoViewedPositionCache)
 
-            toDestroyHls?.releaseAppPlayers()
-            toDestroyProgressive?.releaseAppPlayers()
+            // Stop all videos and recreates all managers when the proxy changes.
+            HttpClient.proxyChangeListeners.add {
+                val toDestroyHls = managerHls
+                val toDestroyProgressive = managerProgressive
+
+                managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
+                managerProgressive = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+
+                toDestroyHls?.releaseAppPlayers()
+                toDestroyProgressive?.releaseAppPlayers()
+            }
+
+            setMediaNotificationProvider(
+                DefaultMediaNotificationProvider.Builder(applicationContext).build()
+            )
         }
-
-        setMediaNotificationProvider(
-            DefaultMediaNotificationProvider.Builder(applicationContext).build()
-        )
     }
 
     override fun onDestroy() {

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)
@@ -178,7 +177,7 @@ class Account(
                 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 +189,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 +224,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 +234,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 +248,7 @@ class Account(
                 event,
                 userProfile().latestContactList?.relays()?.keys?.ifEmpty { null }
                     ?: localRelays.map { it.url }.toSet(),
-                loggedIn.privKey!!,
+                keyPair.privKey!!,
                 pollOption,
                 message,
                 zapType
@@ -263,18 +262,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 +286,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 +295,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 +329,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 +344,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 +364,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 +379,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 +388,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 +401,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 +426,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 +434,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,7 +448,7 @@ 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)),
@@ -457,7 +456,7 @@ class Account(
                 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,7 +470,7 @@ 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(),
@@ -479,7 +478,7 @@ class Account(
                 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,7 +492,7 @@ 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(
@@ -502,7 +501,7 @@ class Account(
                 followCommunities = listOf(community.address),
                 followEvents = DefaultChannels.toList(),
                 relayUse = relays,
-                privateKey = loggedIn.privKey!!
+                privateKey = keyPair.privKey!!
             )
         }
 
@@ -519,7 +518,7 @@ class Account(
             ContactListEvent.followHashtag(
                 contactList,
                 tag,
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         } else {
             ContactListEvent.createFromScratch(
@@ -528,7 +527,7 @@ class Account(
                 followCommunities = emptyList(),
                 followEvents = DefaultChannels.toList(),
                 relayUse = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) },
-                privateKey = loggedIn.privKey!!
+                privateKey = keyPair.privKey!!
             )
         }
 
@@ -545,7 +544,7 @@ class Account(
             val event = ContactListEvent.unfollowUser(
                 contactList,
                 user.pubkeyHex,
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
 
             Client.send(event)
@@ -562,7 +561,7 @@ class Account(
             val event = ContactListEvent.unfollowHashtag(
                 contactList,
                 tag,
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
 
             Client.send(event)
@@ -579,7 +578,7 @@ class Account(
             val event = ContactListEvent.unfollowEvent(
                 contactList,
                 channel.idHex,
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
 
             Client.send(event)
@@ -596,7 +595,7 @@ class Account(
             val event = ContactListEvent.unfollowAddressableEvent(
                 contactList,
                 community.address,
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
 
             Client.send(event)
@@ -610,7 +609,7 @@ class Account(
         val data = FileStorageEvent.create(
             mimeType = headerInfo.mimeType ?: "",
             data = byteArray,
-            privateKey = loggedIn.privKey!!
+            privateKey = keyPair.privKey!!
         )
 
         val signedEvent = FileStorageHeaderEvent.create(
@@ -622,7 +621,7 @@ class Account(
             blurhash = headerInfo.blurHash,
             description = headerInfo.description,
             sensitiveContent = headerInfo.sensitiveContent,
-            privateKey = loggedIn.privKey!!
+            privateKey = keyPair.privKey!!
         )
 
         return Pair(data, signedEvent)
@@ -652,7 +651,7 @@ class Account(
             blurhash = headerInfo.blurHash,
             description = headerInfo.description,
             sensitiveContent = headerInfo.sensitiveContent,
-            privateKey = loggedIn.privKey!!
+            privateKey = keyPair.privKey!!
         )
 
         Client.send(signedEvent, relayList = relayList)
@@ -692,7 +691,7 @@ class Account(
             replyingTo = replyingTo,
             root = root,
             directMentions = directMentions,
-            privateKey = loggedIn.privKey!!
+            privateKey = keyPair.privKey!!
         )
 
         Client.send(signedEvent, relayList = relayList)
@@ -724,7 +723,7 @@ class Account(
             replyTos = repliesToHex,
             mentions = mentionsHex,
             addresses = addresses,
-            privateKey = loggedIn.privKey!!,
+            privateKey = keyPair.privKey!!,
             pollOptions = pollOptions,
             valueMaximum = valueMaximum,
             valueMinimum = valueMinimum,
@@ -754,7 +753,7 @@ class Account(
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
             zapRaiserAmount = zapRaiserAmount,
-            privateKey = loggedIn.privKey!!
+            privateKey = keyPair.privKey!!
         )
         Client.send(signedEvent)
         LocalCache.consume(signedEvent, null)
@@ -775,7 +774,7 @@ class Account(
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
             zapRaiserAmount = zapRaiserAmount,
-            privateKey = loggedIn.privKey!!
+            privateKey = keyPair.privKey!!
         )
         Client.send(signedEvent)
         LocalCache.consume(signedEvent, null)
@@ -796,7 +795,7 @@ class Account(
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
             zapRaiserAmount = zapRaiserAmount,
-            privateKey = loggedIn.privKey!!,
+            privateKey = keyPair.privKey!!,
             advertiseNip18 = false
         )
         Client.send(signedEvent)
@@ -814,7 +813,7 @@ class Account(
 
         val event = ChannelCreateEvent.create(
             channelInfo = metadata,
-            privateKey = loggedIn.privKey!!
+            privateKey = keyPair.privKey!!
         )
 
         Client.send(event)
@@ -835,7 +834,7 @@ class Account(
 
         val event = EmojiPackSelectionEvent.create(
             noteEvent.taggedAddresses().filter { it != emojiListEvent.address() },
-            loggedIn.privKey!!
+            keyPair.privKey!!
         )
 
         Client.send(event)
@@ -850,7 +849,7 @@ class Account(
         val event = if (usersEmojiList.event == null) {
             EmojiPackSelectionEvent.create(
                 listOf(emojiListEvent.address()),
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         } else {
             val noteEvent = usersEmojiList.event
@@ -862,7 +861,7 @@ class Account(
 
             EmojiPackSelectionEvent.create(
                 noteEvent.taggedAddresses().plus(emojiListEvent.address()),
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         }
 
@@ -882,11 +881,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(
@@ -895,11 +894,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!!
             )
         }
 
@@ -919,11 +918,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(
@@ -932,11 +931,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!!
             )
         }
 
@@ -956,11 +955,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(
@@ -969,11 +968,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!!
             )
         }
 
@@ -984,7 +983,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) {
@@ -999,11 +998,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(
@@ -1012,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!!) ?: emptyList(),
+                bookmarks?.privateTaggedEvents(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = keyPair.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = keyPair.privKey!!) ?: emptyList(),
 
-                loggedIn.privKey!!
+                keyPair.privKey!!
             )
         }
 
@@ -1028,10 +1027,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
         }
     }
@@ -1061,7 +1060,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()
         }
 
@@ -1076,14 +1075,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!!
             )
         }
 
@@ -1102,7 +1101,7 @@ class Account(
                 earlierVersion = blockList,
                 pubKeyHex = pubkeyHex,
                 isPrivate = true,
-                privateKey = loggedIn.privKey!!
+                privateKey = keyPair.privKey!!
             )
 
             Client.send(event)
@@ -1172,7 +1171,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()
@@ -1196,7 +1195,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()
@@ -1220,7 +1219,7 @@ class Account(
         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()
@@ -1257,7 +1256,7 @@ class Account(
         val event = ChannelMetadataEvent.create(
             newChannelInfo = metadata,
             originalChannelIdHex = channel.idHex,
-            privateKey = loggedIn.privKey!!
+            privateKey = keyPair.privKey!!
         )
 
         Client.send(event)
@@ -1268,9 +1267,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()
@@ -1279,7 +1278,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()
@@ -1312,7 +1311,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)
@@ -1414,7 +1413,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> {

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

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/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

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/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
 

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/CryptoUtils.kt

@@ -0,0 +1,87 @@
+package com.vitorpamplona.amethyst.service
+
+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 encrypt(msg: String, privateKey: ByteArray, pubKey: ByteArray): String {
+        val sharedSecret = getSharedSecret(privateKey, pubKey)
+        return encrypt(msg, sharedSecret)
+    }
+
+    fun encrypt(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 decrypt(msg: String, privateKey: ByteArray, pubKey: ByteArray): String {
+        val sharedSecret = getSharedSecret(privateKey, pubKey)
+        return decrypt(msg, sharedSecret)
+    }
+
+    fun decrypt(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 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 getSharedSecret(privateKey: ByteArray, pubKey: ByteArray): ByteArray =
+        secp256k1.pubKeyTweakMul(Hex.decode("02") + pubKey, privateKey).copyOfRange(1, 33)
+}
+
+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/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/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/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.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(
@@ -39,7 +39,7 @@ class ChannelMessageEvent(
             zapRaiserAmount: Long?
         ): ChannelMessageEvent {
             val content = message
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf(
                 listOf("e", channel, "", "root")
             )
@@ -60,7 +60,7 @@ class ChannelMessageEvent(
             }
 
             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/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?)
@@ -224,9 +224,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,14 +7,12 @@ 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
@@ -158,14 +156,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
@@ -183,7 +181,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> {
@@ -251,7 +249,7 @@ open class Event(
             src: ByteArray,
             typeOfSrc: Type?,
             context: JsonSerializationContext?
-        ) = JsonPrimitive(src.toHex())
+        ) = JsonPrimitive(src.toHexKey())
     }
 
     companion object {
@@ -337,13 +335,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/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.getSharedSecret(privKey, pubKey.hexToByteArray())
 
-            return Utils.decrypt(content, sharedSecret)
+            return CryptoUtils.decrypt(content, sharedSecret)
         } catch (e: Exception) {
             Log.w("GeneralList", "Error decrypting the message ${e.message} for ${dTag()}")
             null
@@ -90,7 +90,7 @@ abstract class GeneralListEvent(
             }
             val msg = gson.toJson(privTags)
 
-            return Utils.encrypt(
+            return CryptoUtils.encrypt(
                 msg,
                 privateKey,
                 pubKey
@@ -101,10 +101,10 @@ abstract class GeneralListEvent(
             privateTags: List<List<String>>? = null,
             privateKey: ByteArray
         ): String {
-            return Utils.encrypt(
+            return CryptoUtils.encrypt(
                 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/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(
@@ -54,7 +54,7 @@ class LiveActivitiesChatMessageEvent(
             zapRaiserAmount: Long?
         ): LiveActivitiesChatMessageEvent {
             val content = message
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf(
                 listOf("a", activity.toTag(), "", "root")
             )
@@ -75,7 +75,7 @@ class LiveActivitiesChatMessageEvent(
             }
 
             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.getSharedSecret(privKey, pubkey)
 
-            val jsonText = Utils.decrypt(content, sharedSecret)
+            val jsonText = CryptoUtils.decrypt(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.encrypt(
                 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.getSharedSecret(privKey, pubKey)
 
-            val retVal = Utils.decrypt(content, sharedSecret)
+            val retVal = CryptoUtils.decrypt(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.getSharedSecret(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.getSharedSecret(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.getSharedSecret(privKey, pubKey.hexToByteArray())
 
-            return Utils.decrypt(content, sharedSecret)
+            return CryptoUtils.decrypt(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.encrypt(
                 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/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"
@@ -55,7 +55,7 @@ class PollNoteEvent(
             markAsSensitive: Boolean,
             zapRaiserAmount: Long?
         ): 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))
@@ -85,7 +85,7 @@ class PollNoteEvent(
             }
 
             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.getSharedSecret(privKey, pubKey)
 
-            val retVal = Utils.decrypt(content, sharedSecret)
+            val retVal = CryptoUtils.decrypt(content, sharedSecret)
 
             if (retVal.startsWith(nip18Advertisement)) {
                 retVal.substring(16)
@@ -89,15 +88,15 @@ class PrivateDmEvent(
             markAsSensitive: Boolean,
             zapRaiserAmount: Long?
         ): PrivateDmEvent {
-            val content = Utils.encrypt(
+            val content = CryptoUtils.encrypt(
                 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))
@@ -115,7 +114,7 @@ class PrivateDmEvent(
                 tags.add(listOf("zapraiser", "$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/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(
@@ -42,7 +42,7 @@ class TextNoteEvent(
             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) {
@@ -95,7 +95,7 @@ class TextNoteEvent(
             }
 
             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,9 @@ 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.toByteArray
+import com.vitorpamplona.amethyst.service.toNEvent
 import java.util.regex.Pattern
 
 object Nip19 {
@@ -167,6 +167,6 @@ 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()
     }
 }

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,10 @@ 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().body.string()
+
+        Jsoup.parse(html)
     }
 
 suspend fun parseHtml(url: String, document: Document): UrlInfoItem =

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Client.kt

@@ -178,6 +178,7 @@ object Client : RelayPool.Listener {
         }
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onAuth(relay: Relay, challenge: String) {
         // Releases the Web thread for the new payload.
         // May need to add a processing queue if processing new events become too costly.

app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt

@@ -24,7 +24,7 @@ object RelayPool : Relay.Listener {
     }
 
     fun connectedRelays(): Int {
-        return relays.filter { it.isConnected() }.size
+        return relays.count { it.isConnected() }
     }
 
     fun getRelay(url: String): Relay? {

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

@@ -14,14 +14,10 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.core.os.LocaleListCompat
@@ -65,9 +61,6 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val uri = intent?.data?.toString()
-        val startingPage = uriToRoute(uri)
-
         LocalPreferences.migrateSingleUserPrefs()
         val language = LocalPreferences.getPreferredLanguage()
         if (language.isNotBlank()) {
@@ -90,14 +83,6 @@ class MainActivity : AppCompatActivity() {
                     AccountScreen(accountStateViewModel, themeViewModel, navController)
                 }
             }
-
-            var actionableNextPage by remember { mutableStateOf(startingPage) }
-            actionableNextPage?.let {
-                LaunchedEffect(it) {
-                    navController.navigate(it)
-                }
-                actionableNextPage = null
-            }
         }
 
         val networkRequest = NetworkRequest.Builder()
@@ -110,6 +95,15 @@ class MainActivity : AppCompatActivity() {
         connectivityManager.requestNetwork(networkRequest, networkCallback)
 
         Client.lenient = true
+
+        val uri = intent?.data?.toString()
+        val startingPage = uriToRoute(uri)
+        if (startingPage != null) {
+            navController.navigate(startingPage) {
+                popUpTo(Route.Home.route)
+                launchSingleTop = true
+            }
+        }
     }
 
     @OptIn(DelicateCoroutinesApi::class)
@@ -128,24 +122,26 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onPause() {
-        ServiceManager.pause()
-
         if (BuildConfig.DEBUG) {
             debugState(this)
         }
 
+        ServiceManager.pause()
         super.onPause()
     }
 
     override fun onDestroy() {
         super.onDestroy()
         keepPlayingMutex?.stop()
+        keepPlayingMutex?.release()
+        keepPlayingMutex = null
     }
 
     /**
      * Release memory when the UI becomes hidden or when system resources become low.
      * @param level the memory-related event that was raised.
      */
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onTrimMemory(level: Int) {
         super.onTrimMemory(level)
         println("Trim Memory $level")
@@ -157,15 +153,17 @@ class MainActivity : AppCompatActivity() {
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
 
-        val uri = intent?.data?.toString()
-        val startingPage = uriToRoute(uri)
+        if (this::navController.isInitialized) {
+            val uri = intent?.data?.toString()
+            val startingPage = uriToRoute(uri)
 
-        startingPage?.let { route ->
-            val currentRoute = getRouteWithArguments(navController)
-            if (!isSameRoute(currentRoute, route)) {
-                navController.navigate(route) {
-                    popUpTo(Route.Home.route)
-                    launchSingleTop = true
+            startingPage?.let { route ->
+                val currentRoute = getRouteWithArguments(navController)
+                if (!isSameRoute(currentRoute, route)) {
+                    navController.navigate(route) {
+                        popUpTo(Route.Home.route)
+                        launchSingleTop = true
+                    }
                 }
             }
         }
@@ -187,6 +185,7 @@ class MainActivity : AppCompatActivity() {
         return false
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     private val networkCallback = object : ConnectivityManager.NetworkCallback() {
         // network is available for use
         override fun onAvailable(network: Network) {
@@ -207,14 +206,13 @@ class MainActivity : AppCompatActivity() {
             super.onCapabilitiesChanged(network, networkCapabilities)
 
             GlobalScope.launch(Dispatchers.IO) {
-                val hasMobileData =
-                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
+                val hasMobileData = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
                 val hasWifi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
                 Log.d("NETWORKCALLBACK", "onCapabilitiesChanged: hasMobileData $hasMobileData")
                 Log.d("NETWORKCALLBACK", "onCapabilitiesChanged: hasWifi $hasWifi")
                 ConnectivityStatus.updateConnectivityStatus(
-                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR),
-                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+                    hasMobileData,
+                    hasWifi
                 )
             }
         }

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

@@ -224,7 +224,7 @@ class NostrCheckMeServer : FileServer() {
         var id = tree?.get("id")?.asText()
         var isCompleted = false
 
-        val client = OkHttpClient()
+        val client = HttpClient.getHttpClient()
         var requrl = "https://nostrcheck.me/api/v1/media?id=" + id // + "&apikey=26d075787d261660682fb9d20dbffa538c708b1eda921d0efa2be95fbef4910a"
 
         val request = Request.Builder()

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

@@ -4,10 +4,17 @@ import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.model.parseDirtyWordForKey
+import com.vitorpamplona.amethyst.service.KeyPair
+import com.vitorpamplona.amethyst.service.bechToBytes
 import com.vitorpamplona.amethyst.service.nip19.Nip19
+import com.vitorpamplona.amethyst.service.toNpub
 
-class NewMessageTagger(var channelHex: String?, var mentions: List<User>?, var replyTos: List<Note>?, var message: String) {
+class NewMessageTagger(
+    var message: String,
+    var mentions: List<User>? = null,
+    var replyTos: List<Note>? = null,
+    var channelHex: String? = null
+) {
 
     val directMentions = mutableSetOf<HexKey>()
 
@@ -83,4 +90,55 @@ class NewMessageTagger(var channelHex: String?, var mentions: List<User>?, var r
             }.joinToString(" ")
         }.joinToString("\n")
     }
+
+    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(KeyPair(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/ui/actions/NewPostViewModel.kt

@@ -130,7 +130,7 @@ open class NewPostViewModel() : ViewModel() {
     }
 
     fun sendPost(relayList: List<Relay>? = null) {
-        val tagger = NewMessageTagger(originalNote?.channelHex(), mentions, replyTos, message.text)
+        val tagger = NewMessageTagger(message.text, mentions, replyTos, originalNote?.channelHex())
         tagger.run()
 
         val zapReceiver = if (wantsForwardZapTo) {

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

@@ -58,6 +58,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.RelayInformation
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
+import com.vitorpamplona.amethyst.service.relays.Constants.defaultRelays
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
@@ -105,6 +106,22 @@ fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, re
                         onClose()
                     })
 
+                    Button(
+                        onClick = {
+                            postViewModel.deleteAll()
+                            defaultRelays.forEach {
+                                postViewModel.addRelay(it)
+                            }
+                            postViewModel.relays.value.forEach { item ->
+                                loadRelayInfo(item.url, context, scope) {
+                                    postViewModel.togglePaidRelay(item, it.limitation?.payment_required ?: false)
+                                }
+                            }
+                        }
+                    ) {
+                        Text(stringResource(R.string.default_relays))
+                    }
+
                     PostButton(
                         onPost = {
                             postViewModel.create()

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

@@ -90,6 +90,12 @@ class NewRelayListViewModel : ViewModel() {
         }
     }
 
+    fun deleteAll() {
+        _relays.update { relays ->
+            relays.dropWhile { relays.isNotEmpty() }
+        }
+    }
+
     fun toggleDownload(relay: RelaySetupInfo) {
         _relays.update {
             it.updated(relay, relay.copy(read = !relay.read))

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

@@ -24,9 +24,11 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.RelayInformation
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
@@ -37,7 +39,6 @@ data class RelayList(
     val isSelected: Boolean
 )
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun RelaySelectionDialog(
     list: List<Relay>,
@@ -79,6 +80,10 @@ fun RelaySelectionDialog(
         )
     }
 
+    var selected by remember {
+        mutableStateOf(true)
+    }
+
     Dialog(
         onDismissRequest = { onClose() },
         properties = DialogProperties(
@@ -126,6 +131,17 @@ fun RelaySelectionDialog(
                     )
                 }
 
+                RelaySwitch(
+                    text = stringResource(R.string.select_deselect_all),
+                    checked = selected,
+                    onClick = {
+                        selected = !selected
+                        relays = relays.mapIndexed { _, item ->
+                            item.copy(isSelected = selected)
+                        }
+                    }
+                )
+
                 LazyColumn(
                     contentPadding = PaddingValues(
                         top = 10.dp,
@@ -136,48 +152,55 @@ fun RelaySelectionDialog(
                         relays,
                         key = { _, item -> item.relay.url }
                     ) { index, item ->
-                        Row(
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .combinedClickable(
-                                    onClick = {
-                                        relays = relays.mapIndexed { j, item ->
-                                            if (index == j) {
-                                                item.copy(isSelected = !item.isSelected)
-                                            } else {
-                                                item
-                                            }
-                                        }
-                                    },
-                                    onLongClick = {
-                                        loadRelayInfo(item.relay.url, context, scope) {
-                                            relayInfo = it
-                                        }
-                                    }
-                                )
-                        ) {
-                            Text(
-                                item.relay.url
-                                    .removePrefix("ws://")
-                                    .removePrefix("wss://")
-                                    .removeSuffix("/")
-                            )
-                            Switch(
-                                checked = item.isSelected,
-                                onCheckedChange = {
-                                    relays = relays.mapIndexed { j, item ->
-                                        if (index == j) {
-                                            item.copy(isSelected = !item.isSelected)
-                                        } else { item }
+                        RelaySwitch(
+                            text = item.relay.url
+                                .removePrefix("ws://")
+                                .removePrefix("wss://")
+                                .removeSuffix("/"),
+                            checked = item.isSelected,
+                            onClick = {
+                                relays = relays.mapIndexed { j, item ->
+                                    if (index == j) {
+                                        item.copy(isSelected = !item.isSelected)
+                                    } else {
+                                        item
                                     }
                                 }
-                            )
-                        }
+                            },
+                            onLongPress = {
+                                loadRelayInfo(item.relay.url, context, scope) {
+                                    relayInfo = it
+                                }
+                            }
+                        )
                     }
                 }
             }
         }
     }
 }
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun RelaySwitch(text: String, checked: Boolean, onClick: () -> Unit, onLongPress: () -> Unit = { }) {
+    Row(
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .combinedClickable(
+                onClick = onClick,
+                onLongClick = onLongPress
+            )
+    ) {
+        Text(
+            modifier = Modifier.weight(1f),
+            text = text
+        )
+        Switch(
+            checked = checked,
+            onCheckedChange = {
+                onClick()
+            }
+        )
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/components/Robohash.kt

@@ -13,9 +13,9 @@ import coil.fetch.Fetcher
 import coil.fetch.SourceResult
 import coil.request.ImageRequest
 import coil.request.Options
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import okio.Buffer
-import java.security.MessageDigest
 
 private fun toHex(color: Color): String {
     val argb = color.toArgb()
@@ -35,7 +35,7 @@ private fun bytesToRGB(b1: Byte, b2: Byte, b3: Byte): Color {
 private fun svgString(msg: String): String {
     checkNotInMainThread()
 
-    val hash = MessageDigest.getInstance("SHA-256").digest(msg.toByteArray())
+    val hash = CryptoUtils.sha256(msg.toByteArray())
     val hashHex = hash.joinToString(separator = "") { b -> "%02x".format(b) }
     val bgColor = bytesToRGB(hash[0], hash[1], hash[2])
     val fgColor = bytesToRGB(hash[3], hash[4], hash[5])

app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreview.kt

@@ -8,6 +8,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
 import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
@@ -16,13 +17,12 @@ import kotlinx.coroutines.launch
 
 @Composable
 fun UrlPreview(url: String, urlText: String, accountViewModel: AccountViewModel) {
-    val settings = accountViewModel.account.settings
-    val isMobile = ConnectivityStatus.isOnMobileData.value
-
-    val automaticallyShowUrlPreview = when (settings.automaticallyShowUrlPreview) {
-        true -> !isMobile
-        false -> false
-        else -> true
+    val automaticallyShowUrlPreview = remember {
+        when (accountViewModel.account.settings.automaticallyShowUrlPreview) {
+            ConnectivityType.WIFI_ONLY -> !ConnectivityStatus.isOnMobileData.value
+            ConnectivityType.NEVER -> false
+            ConnectivityType.ALWAYS -> true
+        }
     }
 
     if (!automaticallyShowUrlPreview) {

app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewCard.kt

@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
@@ -17,6 +18,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
 import com.vitorpamplona.amethyst.service.previews.UrlInfoItem
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
@@ -28,13 +30,12 @@ fun UrlPreviewCard(
     previewInfo: UrlInfoItem,
     accountViewModel: AccountViewModel
 ) {
-    val settings = accountViewModel.account.settings
-    val isMobile = ConnectivityStatus.isOnMobileData.value
-
-    val automaticallyShowUrlPreview = when (settings.automaticallyShowUrlPreview) {
-        true -> !isMobile
-        false -> false
-        else -> true
+    val automaticallyShowUrlPreview = remember {
+        when (accountViewModel.account.settings.automaticallyShowUrlPreview) {
+            ConnectivityType.WIFI_ONLY -> !ConnectivityStatus.isOnMobileData.value
+            ConnectivityType.NEVER -> false
+            ConnectivityType.ALWAYS -> true
+        }
     }
 
     if (!automaticallyShowUrlPreview) {

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

@@ -55,6 +55,7 @@ import androidx.media3.ui.PlayerView
 import coil.imageLoader
 import coil.request.ImageRequest
 import com.vitorpamplona.amethyst.PlaybackClientController
+import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
 import com.vitorpamplona.amethyst.ui.note.LyricsIcon
 import com.vitorpamplona.amethyst.ui.note.LyricsOffIcon
@@ -173,16 +174,13 @@ fun VideoViewInner(
     accountViewModel: AccountViewModel,
     onDialog: ((Boolean) -> Unit)? = null
 ) {
-    val settings = accountViewModel.account.settings
-    val isMobile = ConnectivityStatus.isOnMobileData.value
-
     val automaticallyStartPlayback = remember {
         mutableStateOf(
             if (alwaysShowVideo) { true } else {
-                when (settings.automaticallyStartPlayback) {
-                    true -> !isMobile
-                    false -> false
-                    else -> true
+                when (accountViewModel.account.settings.automaticallyStartPlayback) {
+                    ConnectivityType.WIFI_ONLY -> !ConnectivityStatus.isOnMobileData.value
+                    ConnectivityType.NEVER -> false
+                    ConnectivityType.ALWAYS -> true
                 }
             }
         )
@@ -229,7 +227,7 @@ fun VideoViewInner(
 }
 
 @Composable
-@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
+@OptIn(UnstableApi::class)
 fun GetVideoController(
     mediaItem: MediaItem,
     videoUri: String,
@@ -531,6 +529,7 @@ private fun RenderVideoPlayer(
             // if the user unmutes a video and it's not the current playing, switches to that one.
             if (!mute && keepPlayingMutex != null && keepPlayingMutex != controller) {
                 keepPlayingMutex?.stop()
+                keepPlayingMutex?.release()
                 keepPlayingMutex = null
             }
 
@@ -542,6 +541,7 @@ private fun RenderVideoPlayer(
             if (newKeepPlaying) {
                 if (keepPlayingMutex != null && keepPlayingMutex != controller) {
                     keepPlayingMutex?.stop()
+                    keepPlayingMutex?.release()
                 }
                 keepPlayingMutex = controller
             } else {

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

@@ -66,8 +66,10 @@ import coil.compose.AsyncImage
 import coil.compose.AsyncImagePainter
 import coil.imageLoader
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.BlurHashRequester
+import com.vitorpamplona.amethyst.service.CryptoUtils
 import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.actions.LoadingAnimation
@@ -90,7 +92,6 @@ import kotlinx.coroutines.launch
 import net.engawapg.lib.zoomable.rememberZoomState
 import net.engawapg.lib.zoomable.zoomable
 import java.io.File
-import java.security.MessageDigest
 
 @Immutable
 abstract class ZoomableContent(
@@ -248,15 +249,13 @@ private fun LocalImageView(
 ) {
     if (content.localFile != null && content.localFile.exists()) {
         BoxWithConstraints(contentAlignment = Alignment.Center) {
-            val settings = accountViewModel?.account?.settings
-            val isMobile = ConnectivityStatus.isOnMobileData.value
-
             val showImage = remember {
                 mutableStateOf(
                     if (alwayShowImage) { true } else {
-                        when (settings?.automaticallyShowImages) {
-                            true -> !isMobile
-                            false -> false
+                        when (accountViewModel?.account?.settings?.automaticallyShowImages) {
+                            ConnectivityType.WIFI_ONLY -> !ConnectivityStatus.isOnMobileData.value
+                            ConnectivityType.NEVER -> false
+                            ConnectivityType.ALWAYS -> true
                             else -> true
                         }
                     }
@@ -318,15 +317,13 @@ private fun UrlImageView(
     alwayShowImage: Boolean = false
 ) {
     BoxWithConstraints(contentAlignment = Alignment.Center) {
-        val settings = accountViewModel?.account?.settings
-        val isMobile = ConnectivityStatus.isOnMobileData.value
-
         val showImage = remember {
             mutableStateOf(
                 if (alwayShowImage) { true } else {
-                    when (settings?.automaticallyShowImages) {
-                        true -> !isMobile
-                        false -> false
+                    when (accountViewModel?.account?.settings?.automaticallyShowImages) {
+                        ConnectivityType.WIFI_ONLY -> !ConnectivityStatus.isOnMobileData.value
+                        ConnectivityType.NEVER -> false
+                        ConnectivityType.ALWAYS -> true
                         else -> true
                     }
                 }
@@ -700,11 +697,7 @@ private fun verifyHash(content: ZoomableUrlContent, context: Context): Boolean?
     if (content.hash == null) return null
 
     context.imageLoader.diskCache?.get(content.url)?.use { snapshot ->
-        val imageFile = snapshot.data.toFile()
-        val bytes = imageFile.readBytes()
-        val sha256 = MessageDigest.getInstance("SHA-256")
-
-        val hash = sha256.digest(bytes).toHexKey()
+        val hash = CryptoUtils.sha256(snapshot.data.toFile().readBytes()).toHexKey()
 
         Log.d("Image Hash Verification", "$hash == ${content.hash}")
 

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

@@ -12,7 +12,7 @@ object BookmarkPrivateFeedFilter : FeedFilter<Note>() {
     }
 
     override fun feed(): List<Note> {
-        val privKey = account.loggedIn.privKey ?: return emptyList()
+        val privKey = account.keyPair.privKey ?: return emptyList()
 
         val bookmarks = account.userProfile().latestBookmarkList
 

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

@@ -15,7 +15,7 @@ class HiddenAccountsFeedFilter(val account: Account) : FeedFilter<User>() {
 
     override fun feed(): List<User> {
         return account.getBlockList()
-            ?.publicAndPrivateUsers(account.loggedIn.privKey)
+            ?.publicAndPrivateUsers(account.keyPair.privKey)
             ?.map { LocalCache.getOrCreateUser(it) }
             ?: emptyList()
     }

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

@@ -34,7 +34,6 @@ import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -53,6 +52,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.lifecycle.distinctUntilChanged
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.BuildConfig
@@ -296,8 +296,10 @@ fun ListContent(
     modifier: Modifier,
     accountViewModel: AccountViewModel
 ) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = remember(accountState) { accountState?.account } ?: return
+    val route = remember(accountViewModel) {
+        "User/${accountViewModel.userProfile().pubkeyHex}"
+    }
+
     val coroutineScope = rememberCoroutineScope()
     val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
     var wantsToEditRelays by remember {
@@ -322,7 +324,7 @@ fun ListContent(
             tint = MaterialTheme.colors.primary,
             nav = nav,
             scaffoldState = scaffoldState,
-            route = "User/${account.userProfile().pubkeyHex}"
+            route = route
         )
 
         NavigationRow(
@@ -481,20 +483,8 @@ private fun enableTor(
 private fun RelayStatus(
     relayViewModel: RelayPoolViewModel
 ) {
-    val connectedRelaysLiveData = relayViewModel.connectedRelaysLiveData.observeAsState()
-    val availableRelaysLiveData = relayViewModel.availableRelaysLiveData.observeAsState()
-
-    val connectedRelaysText by remember(connectedRelaysLiveData, availableRelaysLiveData) {
-        derivedStateOf {
-            "${connectedRelaysLiveData.value ?: "--"}/${availableRelaysLiveData.value ?: "--"}"
-        }
-    }
-
-    val isConnected by remember(connectedRelaysLiveData) {
-        derivedStateOf {
-            (connectedRelaysLiveData.value ?: 0) > 0
-        }
-    }
+    val connectedRelaysText by relayViewModel.connectionStatus.observeAsState("--/--")
+    val isConnected by relayViewModel.isConnected.distinctUntilChanged().observeAsState(false)
 
     RenderRelayStatus(connectedRelaysText, isConnected)
 }

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

@@ -0,0 +1 @@
+package com.vitorpamplona.amethyst.ui.note

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

@@ -200,7 +200,7 @@ fun DisplayNip05ProfileStatus(user: User) {
                 if (user != "_") {
                     Text(
                         text = remember { AnnotatedString(user + "@") },
-                        color = MaterialTheme.colors.nip05,
+                        color = MaterialTheme.colors.primary,
                         modifier = Modifier.padding(top = 1.dp, bottom = 1.dp, start = 5.dp),
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis
@@ -211,7 +211,7 @@ fun DisplayNip05ProfileStatus(user: User) {
                 ClickableText(
                     text = AnnotatedString(domain),
                     onClick = { nip05.let { runCatching { uri.openUri("https://${it.split("@")[1]}") } } },
-                    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.nip05),
+                    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
                     modifier = Modifier.padding(top = 1.dp, bottom = 1.dp, start = domainPadStart),
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis

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

@@ -77,6 +77,7 @@ import coil.request.SuccessResult
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
@@ -117,12 +118,14 @@ import com.vitorpamplona.amethyst.service.model.RelaySetEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.toNpub
 import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.actions.NewRelayListView
 import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.ClickableUrl
 import com.vitorpamplona.amethyst.ui.components.CreateClickableTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
+import com.vitorpamplona.amethyst.ui.components.LoadNote
 import com.vitorpamplona.amethyst.ui.components.LoadThumbAndThenVideoView
 import com.vitorpamplona.amethyst.ui.components.MeasureSpaceWidth
 import com.vitorpamplona.amethyst.ui.components.ObserveDisplayNip05Status
@@ -189,7 +192,6 @@ import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import nostr.postr.toNpub
 import java.io.File
 import java.math.BigDecimal
 import java.net.URL
@@ -3128,130 +3130,99 @@ fun FileHeaderDisplay(note: Note, accountViewModel: AccountViewModel) {
     val event = (note.event as? FileHeaderEvent) ?: return
     val fullUrl = event.url() ?: return
 
-    var content by remember { mutableStateOf<ZoomableContent?>(null) }
+    val content by remember(note) {
+        val blurHash = event.blurhash()
+        val hash = event.hash()
+        val dimensions = event.dimensions()
+        val description = event.content
+        val isImage = imageExtensions.any { fullUrl.split("?")[0].lowercase().endsWith(it) }
+        val uri = note.toNostrUri()
 
-    if (content == null) {
-        LaunchedEffect(key1 = event.id) {
-            launch(Dispatchers.IO) {
-                val blurHash = event.blurhash()
-                val hash = event.hash()
-                val dimensions = event.dimensions()
-                val description = event.content
-                val removedParamsFromUrl = fullUrl.split("?")[0].lowercase()
-                val isImage = imageExtensions.any { removedParamsFromUrl.endsWith(it) }
-                val uri = note.toNostrUri()
-                val newContent = if (isImage) {
-                    ZoomableUrlImage(
-                        url = fullUrl,
-                        description = description,
-                        hash = hash,
-                        blurhash = blurHash,
-                        dim = dimensions,
-                        uri = uri
-                    )
-                } else {
-                    ZoomableUrlVideo(
-                        url = fullUrl,
-                        description = description,
-                        hash = hash,
-                        dim = dimensions,
-                        uri = uri,
-                        authorName = note.author?.toBestDisplayName()
-                    )
-                }
-
-                launch(Dispatchers.Main) {
-                    content = newContent
-                }
+        mutableStateOf<ZoomableContent>(
+            if (isImage) {
+                ZoomableUrlImage(
+                    url = fullUrl,
+                    description = description,
+                    hash = hash,
+                    blurhash = blurHash,
+                    dim = dimensions,
+                    uri = uri
+                )
+            } else {
+                ZoomableUrlVideo(
+                    url = fullUrl,
+                    description = description,
+                    hash = hash,
+                    dim = dimensions,
+                    uri = uri,
+                    authorName = note.author?.toBestDisplayName()
+                )
             }
-        }
+        )
     }
 
-    Crossfade(targetState = content) {
-        if (it != null) {
-            SensitivityWarning(note = note, accountViewModel = accountViewModel) {
-                ZoomableContentView(content = it, accountViewModel = accountViewModel)
-            }
-        }
+    SensitivityWarning(note = note, accountViewModel = accountViewModel) {
+        ZoomableContentView(content = content, accountViewModel = accountViewModel)
     }
 }
 
 @Composable
 fun FileStorageHeaderDisplay(baseNote: Note, accountViewModel: AccountViewModel) {
     val eventHeader = (baseNote.event as? FileStorageHeaderEvent) ?: return
+    val dataEventId = eventHeader.dataEventId() ?: return
 
-    var fileNote by remember { mutableStateOf<Note?>(null) }
-
-    if (fileNote == null) {
-        LaunchedEffect(key1 = eventHeader.id) {
-            launch(Dispatchers.IO) {
-                val newFileNote = eventHeader.dataEventId()?.let { LocalCache.checkGetOrCreateNote(it) }
-                launch(Dispatchers.Main) {
-                    fileNote = newFileNote
-                }
-            }
-        }
-    }
-
-    Crossfade(targetState = fileNote) {
-        if (it != null) {
-            RenderNIP95(it, eventHeader, baseNote, accountViewModel)
+    LoadNote(baseNoteHex = dataEventId) { contentNote ->
+        if (contentNote != null) {
+            ObserverAndRenderNIP95(baseNote, contentNote, accountViewModel)
         }
     }
 }
 
 @Composable
-private fun RenderNIP95(
-    content: Note,
-    eventHeader: FileStorageHeaderEvent,
+private fun ObserverAndRenderNIP95(
     header: Note,
+    content: Note,
     accountViewModel: AccountViewModel
 ) {
+    val eventHeader = (header.event as? FileStorageHeaderEvent) ?: return
+
     val appContext = LocalContext.current.applicationContext
 
     val noteState by content.live().metadata.observeAsState()
-    val note = remember(noteState) { noteState?.note }
 
-    var content by remember { mutableStateOf<ZoomableContent?>(null) }
+    val content by remember(noteState) {
+        // Creates a new object when the event arrives to force an update of the image.
+        val note = noteState?.note
+        val uri = header.toNostrUri()
+        val localDir = note?.idHex?.let { File(File(appContext.externalCacheDir, "NIP95"), it) }
+        val blurHash = eventHeader.blurhash()
+        val dimensions = eventHeader.dimensions()
+        val description = eventHeader.content
+        val mimeType = eventHeader.mimeType()
 
-    if (content == null) {
-        LaunchedEffect(key1 = eventHeader.id, key2 = noteState, key3 = note?.event) {
-            launch(Dispatchers.IO) {
-                val uri = header.toNostrUri()
-                val localDir =
-                    note?.idHex?.let { File(File(appContext.externalCacheDir, "NIP95"), it) }
-                val blurHash = eventHeader.blurhash()
-                val dimensions = eventHeader.dimensions()
-                val description = eventHeader.content
-                val mimeType = eventHeader.mimeType()
-
-                val newContent = if (mimeType?.startsWith("image") == true) {
-                    ZoomableLocalImage(
-                        localFile = localDir,
-                        mimeType = mimeType,
-                        description = description,
-                        blurhash = blurHash,
-                        dim = dimensions,
-                        isVerified = true,
-                        uri = uri
-                    )
-                } else {
-                    ZoomableLocalVideo(
-                        localFile = localDir,
-                        mimeType = mimeType,
-                        description = description,
-                        dim = dimensions,
-                        isVerified = true,
-                        uri = uri,
-                        authorName = header.author?.toBestDisplayName()
-                    )
-                }
-
-                launch(Dispatchers.Main) {
-                    content = newContent
-                }
-            }
+        val newContent = if (mimeType?.startsWith("image") == true) {
+            ZoomableLocalImage(
+                localFile = localDir,
+                mimeType = mimeType,
+                description = description,
+                blurhash = blurHash,
+                dim = dimensions,
+                isVerified = true,
+                uri = uri
+            )
+        } else {
+            ZoomableLocalVideo(
+                localFile = localDir,
+                mimeType = mimeType,
+                description = description,
+                dim = dimensions,
+                isVerified = true,
+                uri = uri,
+                authorName = header.author?.toBestDisplayName()
+            )
         }
+
+        mutableStateOf<ZoomableContent?>(newContent)
     }
 
     Crossfade(targetState = content) {
@@ -3439,9 +3410,9 @@ fun RenderLiveActivityEventInner(baseNote: Note, accountViewModel: AccountViewMo
                 }
         ) {
             ClickableUserPicture(it.second, 25.dp, accountViewModel)
-            Spacer(Modifier.width(5.dp))
+            Spacer(StdHorzSpacer)
             UsernameDisplay(it.second, Modifier.weight(1f))
-            Spacer(Modifier.width(5.dp))
+            Spacer(StdHorzSpacer)
             it.first.role?.let {
                 Text(
                     text = it.capitalize(Locale.ROOT),
@@ -3456,8 +3427,7 @@ fun RenderLiveActivityEventInner(baseNote: Note, accountViewModel: AccountViewMo
         if (status == STATUS_LIVE) {
             if (isOnline) {
                 Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.padding(10.dp)
+                    verticalAlignment = Alignment.CenterVertically
                 ) {
                     VideoView(
                         videoUri = media,
@@ -3515,14 +3485,14 @@ private fun LongFormHeader(noteEvent: LongTextNoteEvent, note: Note, accountView
             )
     ) {
         Column {
-            val settings = accountViewModel.account.settings
-            val isMobile = ConnectivityStatus.isOnMobileData.value
-
-            val automaticallyShowUrlPreview = when (settings.automaticallyShowUrlPreview) {
-                true -> !isMobile
-                false -> false
-                else -> true
+            val automaticallyShowUrlPreview = remember {
+                when (accountViewModel.account.settings.automaticallyShowUrlPreview) {
+                    ConnectivityType.WIFI_ONLY -> !ConnectivityStatus.isOnMobileData.value
+                    ConnectivityType.NEVER -> false
+                    ConnectivityType.ALWAYS -> true
+                }
             }
+
             if (automaticallyShowUrlPreview) {
                 image?.let {
                     AsyncImage(

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

@@ -1,9 +1,9 @@
 package com.vitorpamplona.amethyst.ui.note
 
-import nostr.postr.toHex
+import com.vitorpamplona.amethyst.model.toHexKey
 
 fun ByteArray.toShortenHex(): String {
-    return toHex().toShortenHex()
+    return toHexKey().toShortenHex()
 }
 
 fun String.toShortenHex(): String {

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

@@ -9,6 +9,8 @@ import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.service.KeyPair
+import com.vitorpamplona.amethyst.service.bechToBytes
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import fr.acinq.secp256k1.Hex
 import kotlinx.coroutines.CoroutineScope
@@ -20,8 +22,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import nostr.postr.Persona
-import nostr.postr.bechToBytes
 import java.util.regex.Pattern
 
 @Stable
@@ -53,14 +53,14 @@ class AccountStateViewModel(val context: Context) : ViewModel() {
 
         val account =
             if (key.startsWith("nsec")) {
-                Account(Persona(privKey = key.bechToBytes()), proxy = proxy, proxyPort = proxyPort)
+                Account(KeyPair(privKey = key.bechToBytes()), proxy = proxy, proxyPort = proxyPort)
             } else if (pubKeyParsed != null) {
-                Account(Persona(pubKey = pubKeyParsed), proxy = proxy, proxyPort = proxyPort)
+                Account(KeyPair(pubKey = pubKeyParsed), proxy = proxy, proxyPort = proxyPort)
             } else if (pattern.matcher(key).matches()) {
                 // Evaluate NIP-5
-                Account(Persona(), proxy = proxy, proxyPort = proxyPort)
+                Account(KeyPair(), proxy = proxy, proxyPort = proxyPort)
             } else {
-                Account(Persona(Hex.decode(key)), proxy = proxy, proxyPort = proxyPort)
+                Account(KeyPair(Hex.decode(key)), proxy = proxy, proxyPort = proxyPort)
             }
 
         LocalPreferences.updatePrefsForLogin(account)
@@ -75,7 +75,7 @@ class AccountStateViewModel(val context: Context) : ViewModel() {
 
     fun newKey(useProxy: Boolean, proxyPort: Int) {
         val proxy = HttpClient.initProxy(useProxy, "127.0.0.1", proxyPort)
-        val account = Account(Persona(), proxy = proxy, proxyPort = proxyPort)
+        val account = Account(KeyPair(), proxy = proxy, proxyPort = proxyPort)
         // saves to local preferences
         LocalPreferences.updatePrefsForLogin(account)
         startUI(account)
@@ -83,7 +83,7 @@ class AccountStateViewModel(val context: Context) : ViewModel() {
 
     @OptIn(DelicateCoroutinesApi::class)
     fun startUI(account: Account) {
-        if (account.loggedIn.privKey != null) {
+        if (account.keyPair.privKey != null) {
             _accountContent.update { AccountState.LoggedIn(account) }
         } else {
             _accountContent.update { AccountState.LoggedInViewOnly(account) }

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

@@ -1,15 +1,18 @@
 package com.vitorpamplona.amethyst.ui.screen
 
-import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.distinctUntilChanged
 import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.service.relays.RelayPool
 
 class RelayPoolViewModel : ViewModel() {
-    val connectedRelaysLiveData: LiveData<Int> = RelayPool.live.map {
-        it.relays.connectedRelays()
-    }
-    val availableRelaysLiveData: LiveData<Int> = RelayPool.live.map {
-        it.relays.availableRelays()
+    val connectionStatus = RelayPool.live.map {
+        val connectedRelays = it.relays.connectedRelays()
+        val availableRelays = it.relays.availableRelays()
+        "$connectedRelays/$availableRelays"
+    }.distinctUntilChanged()
+
+    val isConnected = RelayPool.live.map {
+        it.relays.connectedRelays() > 0
     }
 }

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

@@ -44,12 +44,12 @@ import com.halilibo.richtext.ui.material.MaterialRichText
 import com.halilibo.richtext.ui.resolveDefaults
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.service.toNsec
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.note.authenticate
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import nostr.postr.toNsec
 
 @Composable
 fun AccountBackupDialog(account: Account, onClose: () -> Unit) {
@@ -157,7 +157,7 @@ private fun copyNSec(
     account: Account,
     clipboardManager: ClipboardManager
 ) {
-    account.loggedIn.privKey?.let {
+    account.keyPair.privKey?.let {
         clipboardManager.setText(AnnotatedString(it.toNsec()))
         scope.launch {
             Toast.makeText(

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

@@ -13,6 +13,7 @@ import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.AccountState
+import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
@@ -41,19 +42,19 @@ class AccountViewModel(val account: Account) : ViewModel() {
     val userRelays: LiveData<UserState> = account.userProfile().live().relays.map { it }
 
     fun updateAutomaticallyStartPlayback(
-        automaticallyStartPlayback: Boolean?
+        automaticallyStartPlayback: ConnectivityType
     ) {
         account.updateAutomaticallyStartPlayback(automaticallyStartPlayback)
     }
 
     fun updateAutomaticallyShowUrlPreview(
-        automaticallyShowUrlPreview: Boolean?
+        automaticallyShowUrlPreview: ConnectivityType
     ) {
         account.updateAutomaticallyShowUrlPreview(automaticallyShowUrlPreview)
     }
 
     fun updateAutomaticallyShowImages(
-        automaticallyShowImages: Boolean?
+        automaticallyShowImages: ConnectivityType
     ) {
         account.updateAutomaticallyShowImages(automaticallyShowImages)
     }

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

@@ -272,10 +272,10 @@ fun ChannelScreen(
         EditFieldRow(newPostModel, isPrivate = false, accountViewModel = accountViewModel) {
             scope.launch(Dispatchers.IO) {
                 val tagger = NewMessageTagger(
-                    channelHex = channel.idHex,
+                    message = newPostModel.message.text,
                     mentions = listOfNotNull(replyTo.value?.author),
                     replyTos = listOfNotNull(replyTo.value),
-                    message = newPostModel.message.text
+                    channelHex = channel.idHex
                 )
                 tagger.run()
                 if (channel is PublicChatChannel) {

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

@@ -97,6 +97,7 @@ import com.vitorpamplona.amethyst.ui.screen.RefreshingFeedUserFeedView
 import com.vitorpamplona.amethyst.ui.screen.RelayFeedView
 import com.vitorpamplona.amethyst.ui.screen.RelayFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.UserFeedViewModel
+import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.Size16Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size35dp
@@ -984,7 +985,7 @@ fun DisplayLNAddress(
 
     if (!lud16.isNullOrEmpty()) {
         Row(verticalAlignment = Alignment.CenterVertically) {
-            LightningAddressIcon(modifier = Size16Modifier)
+            LightningAddressIcon(modifier = Size16Modifier, tint = BitcoinOrange)
 
             ClickableText(
                 text = AnnotatedString(lud16),

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

@@ -35,6 +35,8 @@ import androidx.compose.ui.unit.sp
 import androidx.core.os.LocaleListCompat
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.ConnectivityType
+import com.vitorpamplona.amethyst.model.parseConnectivityType
 import com.vitorpamplona.amethyst.ui.screen.ThemeViewModel
 import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.StdPadding
@@ -102,22 +104,14 @@ fun SettingsScreen(
 ) {
     val scope = rememberCoroutineScope()
     val selectedItens = persistentListOf(
-        stringResource(R.string.always),
-        stringResource(R.string.wifi_only),
-        stringResource(R.string.never).replaceFirstChar {
-            it.uppercase()
-        }
+        stringResource(ConnectivityType.ALWAYS.reourceId),
+        stringResource(ConnectivityType.WIFI_ONLY.reourceId),
+        stringResource(ConnectivityType.NEVER.reourceId)
     )
     val settings = accountViewModel.account.settings
-    val index = if (settings.automaticallyShowImages == null) { 0 } else {
-        if (settings.automaticallyShowImages == true) 1 else 2
-    }
-    val videoIndex = if (settings.automaticallyStartPlayback == null) { 0 } else {
-        if (settings.automaticallyShowImages == true) 1 else 2
-    }
-    val linkIndex = if (settings.automaticallyShowUrlPreview == null) { 0 } else {
-        if (settings.automaticallyShowUrlPreview == true) 1 else 2
-    }
+    val index = settings.automaticallyShowImages.screenCode
+    val videoIndex = settings.automaticallyStartPlayback.screenCode
+    val linkIndex = settings.automaticallyShowUrlPreview.screenCode
 
     val themeItens = persistentListOf(
         stringResource(R.string.system),
@@ -194,11 +188,7 @@ fun SettingsScreen(
                 placeholder = selectedItens[index],
                 options = selectedItens,
                 onSelect = {
-                    val automaticallyShowImages = when (it) {
-                        1 -> true
-                        2 -> false
-                        else -> null
-                    }
+                    val automaticallyShowImages = parseConnectivityType(it)
 
                     scope.launch(Dispatchers.IO) {
                         accountViewModel.updateAutomaticallyShowImages(automaticallyShowImages)
@@ -220,11 +210,7 @@ fun SettingsScreen(
                 placeholder = selectedItens[videoIndex],
                 options = selectedItens,
                 onSelect = {
-                    val automaticallyStartPlayback = when (it) {
-                        1 -> true
-                        2 -> false
-                        else -> null
-                    }
+                    val automaticallyStartPlayback = parseConnectivityType(it)
 
                     scope.launch(Dispatchers.IO) {
                         accountViewModel.updateAutomaticallyStartPlayback(automaticallyStartPlayback)
@@ -246,11 +232,7 @@ fun SettingsScreen(
                 placeholder = selectedItens[linkIndex],
                 options = selectedItens,
                 onSelect = {
-                    val automaticallyShowUrlPreview = when (it) {
-                        1 -> true
-                        2 -> false
-                        else -> null
-                    }
+                    val automaticallyShowUrlPreview = parseConnectivityType(it)
 
                     scope.launch(Dispatchers.IO) {
                         accountViewModel.updateAutomaticallyShowUrlPreview(automaticallyShowUrlPreview)

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

@@ -461,8 +461,8 @@
     <string name="add_sensitive_content_label">Citlivý obsah</string>
     <string name="add_sensitive_content_description">Před zobrazením tohoto obsahu přidá upozornění na citlivý obsah.</string>
     <string name="settings">Nastavení</string>
-    <string name="always">Vždy</string>
-    <string name="wifi_only">Pouze Wi-Fi</string>
+    <string name="connectivity_type_always">Vždy</string>
+    <string name="connectivity_type_wifi_only">Pouze Wi-Fi</string>
     <string name="system">Systém</string>
     <string name="light">Světlý</string>
     <string name="dark">Tmavý</string>

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

@@ -470,8 +470,8 @@ anz der Bedingungen ist erforderlich</string>
     <string name="add_sensitive_content_label">Sensibler Inhalt</string>
     <string name="add_sensitive_content_description">Fügt eine Warnung für sensiblen Inhalt hinzu, bevor dieser Inhalt angezeigt wird.</string>
     <string name="settings">Einstellungen</string>
-    <string name="always">Immer</string>
-    <string name="wifi_only">Nur WLAN</string>
+    <string name="connectivity_type_always">Immer</string>
+    <string name="connectivity_type_wifi_only">Nur WLAN</string>
     <string name="system">System</string>
     <string name="light">Hell</string>
     <string name="dark">Dunkel</string>

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

@@ -440,4 +440,41 @@
     <string name="live_stream_is_offline">Az élő közvetítés offline</string>
     <string name="live_stream_has_ended">Az élő közvetítésnek vége</string>
     <string name="are_you_sure_you_want_to_log_out">A Kijelentkezés minden helyben tárolt információt töröl. Bizonyosodj meg róla, hogy a privát kulcsod le van mentve, ezzel elkerülve a fiókod elvesztését. Folytatni akarod?</string>
+    <string name="followed_tags">Követettek cimkéi</string>
+
+    <string name="relay_setup">Csomópontok</string>
+
+    <string name="discover_live">Élő</string>
+    <string name="discover_community">Közösség</string>
+    <string name="discover_chat">Társalgók</string>
+    <string name="community_approved_posts">Elfogadott Bejegyzések</string>
+
+    <string name="groups_no_descriptor">Ennek a csoportnak nincsen leírása vagy szabályzata. A módosítás miatt, a tulajdonossal egyeztess.</string>
+    <string name="community_no_descriptor">Ennek a csoportnak nincsen leírása. A módosítás miatt, a tulajdonossal egyeztess.</string>
+
+    <string name="add_sensitive_content_label">Érzékeny tartalom</string>
+    <string name="add_sensitive_content_description">Megjelenítés előtt egy érzékeny tartalom figyelmeztetés jelenik meg.</string>
+    <string name="settings">Beállítások</string>
+    <string name="connectivity_type_always">Mindig</string>
+    <string name="connectivity_type_wifi_only">Csak WIFI</string>
+    <string name="system">Rendszer</string>
+    <string name="light">Világos</string>
+    <string name="dark">Sötét</string>
+    <string name="application_preferences">Alkalmazás beállítások</string>
+    <string name="language">Nyelv</string>
+    <string name="theme">Téma</string>
+    <string name="automatically_load_images_gifs">Képek/GIF-ek automatikus betöltése</string>
+    <string name="automatically_play_videos">Videók automatikus betöltése</string>
+    <string name="automatically_show_url_preview">Az URL előnézetének automatikus megjelenítése</string>
+    <string name="load_image">Kép Betöltése</string>
+
+    <string name="spamming_users">Spammerek</string>
+
+    <string name="muted_button">Lenémítva. Kattínts a feloldásért</string>
+    <string name="mute_button">Hang bekapcsolva. Kattints a némításért</string>
+    <string name="search_button">Helyi és távoli adatok keresése</string>
+
+    <string name="nip05_verified">A Nostr cím ellenőrzésre került</string>
+    <string name="nip05_failed">A Nostr cím ellenőrzése sikeretelen</string>
+    <string name="nip05_checking">A Nostr cím ellenőrzése</string>
 </resources>

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

@@ -460,8 +460,8 @@
     <string name="add_sensitive_content_label">センシティブなコンテンツ</string>
     <string name="add_sensitive_content_description">コンテンツを表示する前に、センシティブなコンテンツであることを示す警告を表示します</string>
     <string name="settings">設定</string>
-    <string name="always">常に</string>
-    <string name="wifi_only">Wifiのみ</string>
+    <string name="connectivity_type_always">常に</string>
+    <string name="connectivity_type_wifi_only">Wifiのみ</string>
     <string name="system">システム</string>
     <string name="light">ライト</string>
     <string name="dark">ダーク</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -415,8 +415,8 @@
     <string name="add_sensitive_content_label">Conteúdo sensível</string>
     <string name="add_sensitive_content_description">Adiciona aviso de conteúdo sensível antes de mostrar este conteúdo</string>
     <string name="settings">Configurações</string>
-    <string name="always">Sempre</string>
-    <string name="wifi_only">Somente wifi</string>
+    <string name="connectivity_type_always">Sempre</string>
+    <string name="connectivity_type_wifi_only">Somente wifi</string>
     <string name="system">Sistema</string>
     <string name="light">Claro</string>
     <string name="dark">Escuro</string>

app/src/main/res/values-sv-rSE/strings.xml

@@ -458,8 +458,8 @@
     <string name="add_sensitive_content_label">Känsligt innehåll</string>
     <string name="add_sensitive_content_description">Lägger till varning för känsligt innehåll innan detta innehåll visas.</string>
     <string name="settings">Inställningar</string>
-    <string name="always">Alltid</string>
-    <string name="wifi_only">Endast Wi-Fi</string>
+    <string name="connectivity_type_always">Alltid</string>
+    <string name="connectivity_type_wifi_only">Endast Wi-Fi</string>
     <string name="system">System</string>
     <string name="light">Ljus</string>
     <string name="dark">Mörk</string>

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

@@ -482,8 +482,10 @@
     <string name="add_sensitive_content_label">Sensitive Content</string>
     <string name="add_sensitive_content_description">Adds sensitive content warning before showing this content</string>
     <string name="settings">Settings</string>
-    <string name="always">Always</string>
-    <string name="wifi_only">Wifi-only</string>
+    <string name="connectivity_type_always">Always</string>
+    <string name="connectivity_type_wifi_only">Wifi-only</string>
+    <string name="connectivity_type_never">Never</string>
+
     <string name="system">System</string>
     <string name="light">Light</string>
     <string name="dark">Dark</string>
@@ -504,4 +506,6 @@
     <string name="nip05_verified">Nostr address was verified</string>
     <string name="nip05_failed">Nostr address failed verification</string>
     <string name="nip05_checking">Checking Nostr address</string>
+    <string name="select_deselect_all">Select/Deselect all</string>
+    <string name="default_relays">Default</string>
 </resources>