v1.03.0

Fix Quartz build issues.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -25,8 +25,9 @@ If applicable, add a video and/or screenshots to help explain your problem.
 
 **Device (please complete the following information):**
  - Phone Brand/Model [e.g. Pixel 7 Pro]:
- - Android Version [e.g. 33]:
- - App Version [e.g. v0.20.3]:
+ - Android Version [e.g. 34]:
+ - App Version [e.g. v0.94.3]:
+ - App Flavour [e.g. Google Play or FDroid]: 
  - Amber Version (if using it to sign):
 
 **Bounty (in Bitcoin sats) offered for a solution**

.github/workflows/build.yml

@@ -15,11 +15,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Cache gradle
         uses: actions/cache@v4
@@ -40,7 +40,7 @@ jobs:
         if: ${{ always() }} # IMPORTANT: run Android Test Report regardless
 
       - name: Build APK (gradle)
-        run: ./gradlew assembleDebug --no-daemon
+        run: ./gradlew assembleDebug
 
       - name: Upload Play APK
         uses: actions/upload-artifact@v4
@@ -54,6 +54,21 @@ jobs:
           name: FDroid Debug APK
           path: amethyst/build/outputs/apk/fdroid/debug/amethyst-fdroid-universal-debug.apk
 
+      - name: Build APK (gradle)
+        run: ./gradlew assembleBenchmark
+
+      - name: Upload Play APK Benchmark
+        uses: actions/upload-artifact@v4
+        with:
+          name: Play Benchmark APK
+          path: amethyst/build/outputs/apk/play/debug/amethyst-play-universal-benchmark.apk
+
+      - name: Upload FDroid APK Benchmark
+        uses: actions/upload-artifact@v4
+        with:
+          name: FDroid Benchmark APK
+          path: amethyst/build/outputs/apk/fdroid/debug/amethyst-fdroid-universal-benchmark.apk
+
       - name: Upload Compose Reports
         uses: actions/upload-artifact@v4
         with:

.github/workflows/create-release.yml

@@ -12,11 +12,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Cache gradle
         uses: actions/cache@v4
@@ -39,7 +39,7 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
           # override default build-tools version (29.0.3) -- optional
-          BUILD_TOOLS_VERSION: "34.0.0"
+          BUILD_TOOLS_VERSION: "36.0.0"
 
       - name: Sign AAB (F-Droid)
         uses: r0adkll/sign-android-release@v1
@@ -51,7 +51,7 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
           # override default build-tools version (29.0.3) -- optional
-          BUILD_TOOLS_VERSION: "34.0.0"
+          BUILD_TOOLS_VERSION: "36.0.0"
 
       - name: Build APK
         run: ./gradlew assembleRelease --stacktrace
@@ -66,7 +66,7 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
           # override default build-tools version (29.0.3) -- optional
-          BUILD_TOOLS_VERSION: "34.0.0"
+          BUILD_TOOLS_VERSION: "36.0.0"
 
       - name: Sign APK (F-Droid)
         uses: r0adkll/sign-android-release@v1
@@ -78,7 +78,7 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
           # override default build-tools version (29.0.3) -- optional
-          BUILD_TOOLS_VERSION: "34.0.0"
+          BUILD_TOOLS_VERSION: "36.0.0"
 
       - name: Create Release
         id: create_release

.github/workflows/crowdin.yml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: crowdin action
-        uses: crowdin/github-action@v1
+        uses: crowdin/github-action@v2
         with:
           upload_sources: true
           upload_translations: true

.gitignore

@@ -14,6 +14,9 @@
 /.idea/studiobot.xml
 /.idea/other.xml
 /.idea/runConfigurations.xml
+/.idea/ChatHistory_schema_v2.xml
+/.idea/artifacts/*
+/.idea/kotlinNotebook.xml
 .DS_Store
 /build
 /captures

.idea/AndroidProjectSystem.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>

.idea/deviceManager.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceTable">
+    <option name="columnSorters">
+      <list>
+        <ColumnSorterState>
+          <option name="column" value="Name" />
+          <option name="order" value="ASCENDING" />
+        </ColumnSorterState>
+      </list>
+    </option>
+  </component>
+</project>

.idea/icon.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 170.16 186.2"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:url(#linear-gradient-2);}</style><linearGradient id="linear-gradient" x1="80.19" y1="57.17" x2="91.66" y2="57.17" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#652d80"/><stop offset="1" stop-color="#2598cf"/></linearGradient><linearGradient id="linear-gradient-2" x1="335.87" y1="297.64" x2="506.02" y2="297.64" xlink:href="#linear-gradient"/></defs><title>Amethyst_svg_monogram</title><ellipse class="cls-1" cx="85.93" cy="57.17" rx="5.74" ry="5.64"/><path class="cls-2" d="M506,347.08c-.2-.61-46.85-111.69-59.68-142.5-15.62,0-48.61,0-71.88,0-6.83,16.89-24.46,59.94-38.6,94.62,7.75,18.49,14.71,35.1,20.08,47.91l29.27,0a2,2,0,0,0,1.87-2.35c-.25-5.91-16.34-27.39-11.54-50.63,1.28-5,2.26-10.08,3.66-15.06a175.77,175.77,0,0,1,13.44-34.8c.89-1.69,1.3-2.45,3.35-1.17,4.37,2.72,9.25,2.56,14.11,2.21,4.19-.91,6.23-2.92,13.91-.88,1.52,0,3,0,4.55.14,3.69.29,7.15,1.17,9.37,4.51,2.42,3.65,2.81,7.78,2.42,12-.59,6.31-.17,12.19,5.17,16.64a57.52,57.52,0,0,0,6,4c2.65,1.7,5.85,2.44,8.12,4.8,1.34,1.39,2.13,2.87,1.55,4.85s-2.13,2.91-4.17,3.13c-5.16.56-10.2-.49-15.27-1.1-.66-.08-1.31-.13-2-.17a11.47,11.47,0,0,1-3.81.13l-1.19,0a26.7,26.7,0,0,0-5.9,1.41c-4.78,1.74-9.13,3.66-14.77,3.56a4.32,4.32,0,0,0-2.05.89c-4.42,3.93-7.08,8.89-4.87,16.14,6.06,16.93,21.61,57.77,28.29,75.4-.19-11.94-.24-33.32-.28-43.7C461.83,347.1,502.74,347.08,506,347.08Z" transform="translate(-335.87 -204.54)"/></svg>

.idea/inspectionProfiles/Project_Default.xml

@@ -65,6 +65,10 @@
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewParameterProviderOnFirstParameter" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />

.idea/kotlinNotebook.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinNotebookOptionsProvider">
+    <option name="shouldAddProjectLibrariesToClasspath" value="true" />
+  </component>
+</project>

.idea/kotlinc.xml

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="moduleKind" value="plain" />
+  </component>
+  <component name="Kotlin2JvmCompilerArguments">
+    <option name="jvmTarget" value="1.8" />
+  </component>
   <component name="KotlinJpsPluginSettings">
     <option name="version" value="2.1.0" />
   </component>

PRIVACY.md

@@ -4,33 +4,39 @@
 
 Effective as of Jun 12, 2023
 
-The Amethyst app for Android does not collect or process any personal information from its users. The app is used to connect to third-party Nostr servers (also called Relays) that may or may not collect personal information and are not covered by this privacy policy. Each third-party relay server comes equipped with its own privacy policy and terms of use that can be viewed through the app or through that server's website. The developers of this open-source project or maintainers of the distribution channels (app stores) do not have access to the data located in the user's phone. Accounts are fully maintained by the user. We do not have control over them. 
+The Amethyst app for Android does not collect or process any personal information from its users. 
 
-The app may collect a per-device token, your public key, and a preferred Relay to connect to and provide push notification services through Google's Firebase Cloud Messaging. Other than that, the data from connected accounts are only stored locally on the device when it's required for the functionality and performance of Amethyst. This data is strictly confidential and cannot be accessed by other apps (on non-rooted devices). Phone data can be deleted by clearing Amethyst's local storage or uninstalling the app.
+The app is used to browse third-party Nostr servers (called Relays) that may or may not collect personal information and are not covered by this privacy policy. Each third-party relay server comes equipped with its own privacy policy and terms of use that can be viewed through the app or through that server's website. The developers of this open-source project or maintainers of the distribution channels (app stores) do not have access to the data located in the user's phone. Accounts are fully maintained by the user. We do not have control over them. 
 
-Amethyst offers a few options to upload pictures and videos in order to post them online. You can choose the server at your discretion. Similar to relays, such services are independent of the app and have their own privacy policy and terms of use. 
+The app may collect a per-device token, your public key, and a preferred Relay to connect to and provide push notification services through Google's Firebase Cloud Messaging. Other than that, the data from connected accounts is only stored locally on the device when it's required for the functionality and performance of Amethyst. This data is strictly confidential and cannot be accessed by other apps (on non-rooted devices). Phone data can be deleted by clearing Amethyst's local storage or uninstalling the app.
 
-### Privacy with Relays services
+Amethyst offers several options for uploading pictures and videos to post online. You can choose the server at your discretion. Similar to relays, such services are independent of the app and have their own privacy policy and terms of use. 
 
-Your internet protocol (IP) address is exposed to the relays you connect to. If you want to improve your privacy, consider utilizing a service that masks your IP address (e.g. a VPN) from trackers online.
+### Privacy with Relay services
+
+Your Internet Protocol (IP) address is exposed to the relays you connect to. If you want to improve your privacy, consider utilizing a service that masks your IP address (e.g., a VPN) from trackers online.
 
 The relay can also see which public keys you are using and what information you are requesting from the network. Your public key is tied to your IP address and your relay filters.
 
 Relays have all your data in raw text. They know your IP, your name, your location (guessed from IP), your pub key, all your contacts, and other relays, and can read every action you do (post, like, boost, quote, report, etc) with the exception of the content inside Private Zaps and Private DMs.
 
-While the content of direct messages (DMs) is only visible to you, and your DM Nostr counterparty, everyone can see when you and your counterparty are DM-ing each other. Image uploads in the DM screen use one of the chosen image servers and simply paste the image link on the DM text. Your uploaded pictures are available to anyone with that direct link. 
+While the content of direct messages (DMs) is only visible to you and your DM Nostr counterparty, everyone can see when you and your counterparty are DM-ing each other. Image uploads in the DM screen use one of the chosen image servers and simply paste the image link into the DM text. Your uploaded pictures are available to anyone with that direct link. 
 
 ### Visibility & Permanence of Your Content on Nostr Relays
 
 #### Information Visibility
 
 Content that you share can be shared with other relays by any user of the network. 
-Information that you share is publicly visible to anyone reading from relays that have your information. Your information may also be visible to Nostr users who do not share relays with you.
+The information you share is publicly visible to anyone reading from relays that have access to your information. Your information may also be visible to Nostr users who do not share relays with you.
 
 #### Information Permanence
 
 Information shared on Nostr should be assumed permanent for privacy purposes. There is no way to guarantee deleting or editing any content once posted.
 
+## Child safety standards
+
+Amethyst does not knowingly collect information from children. The app has no age verification because it collects no personal information from anyone. The application is 17+. We rely on Google Play's age verification to make sure the user downloading the app is an adult. Since we do not control which relays the user connects to, there is no content moderation beyond the standard block post, block account, and report post and/or account that will hide the content from the user.
+
 ## Terms of Use
 
 ### For versions downloaded from Google's Play Store

README.md

@@ -1,4 +1,4 @@
-<div align="center">
+ <div align="center">
 
 <a href="https://amethyst.social">
     <img src="./docs/design/3rd%20Logo%20-%20Zitron/amethyst.svg" alt="Amethyst Logo" title="Amethyst logo" width="80"/>
@@ -17,6 +17,7 @@ Join the social network you control.
 [![JitPack version](https://jitpack.io/v/vitorpamplona/amethyst.svg)](https://jitpack.io/#vitorpamplona/amethyst)
 [![CI](https://img.shields.io/github/actions/workflow/status/vitorpamplona/amethyst/build.yml?labelColor=27303D)](https://github.com/vitorpamplona/amethyst/actions/workflows/build.yml)
 [![License: Apache-2.0](https://img.shields.io/github/license/vitorpamplona/amethyst?labelColor=27303D&color=0877d2)](/LICENSE)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/vitorpamplona/amethyst)
 
 ## Download and Install
 
@@ -28,9 +29,6 @@ alt="Get it on Obtaininum"
 height="70">](https://github.com/ImranR98/Obtainium)
 [<img src="https://github.com/machiav3lli/oandbackupx/raw/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png" alt="Get it on GitHub"
 height="70">](https://github.com/vitorpamplona/amethyst/releases)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-     alt="Get it on F-Droid"
-     height="70">](https://f-droid.org/packages/com.vitorpamplona.amethyst/)
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
      alt="Get it on Google Play"
      height="70">](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
@@ -64,7 +62,7 @@ height="70">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] Bech Encoding support (NIP-19)
 - [x] Command Results (NIP-20)
 - [x] URI Support (NIP-21)
-- [x] Long-form Content (NIP-23)
+- [x] Long-form Content (NIP-23) (view only)
 - [x] User Profile Fields / Relay list (NIP-24)
 - [x] Reactions (NIP-25)
 - [ ] Delegated Event Signing (NIP-26, Will not implement)
@@ -137,7 +135,8 @@ height="70">](https://github.com/vitorpamplona/amethyst/releases)
 - [ ] Signed Filters (NIP-xx/Draft)
 - [ ] Key Migration (NIP-xx/Draft)
 - [ ] Time-based Sync (NIP-xx/Draft)
-- [ ] Image/Video Capture in the app
+- [x] Image Capture in the app
+- [ ] Video Capture in the app
 - [ ] Local Database
 - [ ] Workspaces
 - [ ] Infinity Scroll
@@ -176,7 +175,7 @@ Lastly, the user's account information (private key/pub key) is stored in the An
 ## Setup
 
 Make sure to have the following pre-requisites installed:
-1. Java 17+
+1. Java 21+
 2. Android Studio
 3. Android 8.0+ Phone or Emulation setup
 
@@ -252,10 +251,84 @@ dependencyResolutionManagement {
 }
 ```
 
-Add the dependency
+Add the dependency by using one of the versions [here](https://jitpack.io/#vitorpamplona/amethyst/)
 
 ```gradle
-implementation('com.github.vitorpamplona.amethyst:quartz:v0.85.1')
+implementation('com.github.vitorpamplona.amethyst:quartz:<tag, commit, -SNAPSHOT>')
+```
+
+Manage logged in users with the `KeyPair` class
+
+```kt
+val keys = KeyPair() // creates a random key
+val keys = KeyPair("hex...".hexToByteArray())
+val keys = KeyPair("nsec1...".bechToBytes())
+val keys = KeyPair(Nip06().privateKeyFromMnemonic("<mnemonic>"))
+val readOnly = KeyPair(pubKey = "hex...".hexToByteArray())
+val readOnly = KeyPair(pubKey = "npub1...".bechToBytes())
+```
+
+Create signers that can be internal, when you have the private key or when it is a read-only user
+or external, when it is controlled by Amber in NIP-55
+
+the `NostrSignerInternal` and `NostrSignerExternal` classes.
+
+```kt
+val signer = NostrSignerInternal(keyPair)
+val amberSigner = NostrSignerExternal(
+    pubKey = keyPair.pubKey.toHexKey(),
+    packageName = signerPackageName,
+    contentResolver = appContext.contentResolver,
+)
+```
+
+Create a single NostrClient for the entire application and control which relays it will access by
+registering subscriptions and sending events. The pool will automatically changed based on filters +
+outbox events.
+
+You will need a coroutine scope to process events and if you are using OKHttp, we offer a basic
+wrapper to create the socket connections themselves.
+
+```kt
+val appScope = CoroutineScope(Dispatchers.Default + SupervisorJob())
+val rootClient = OkHttpClient.Builder().build()
+val socketBuilder = BasicOkHttpWebSocket.Builder { url -> rootClient }
+
+val client = NostrClient(socketBuilder, appScope)
+```
+
+If you want to auth, given a logged-in `signer`:
+
+```kt
+val authCoordinator = RelayAuthenticator(client, applicationIOScope) { challenge, relay ->
+    val authedEvent = RelayAuthEvent.create(relayUrl, challenge, signer)
+    client.sendIfExists(authedEvent, relay.url)
+}
+```
+
+To manage subscriptions, the suggested approach is to use subscriptions in the Application class.
+
+```kt
+val metadataSub = RelayClientSubscription(
+    client = client,
+    filter = {
+        val filters = listOf(
+            Filter(
+                kinds = listOf(MetadataEvent.KIND),
+                authors = listOf(signer.pubkey)
+            )
+        )
+
+        val signerOutboxRelays = listOfNotNull(
+            RelayUrlNormalizer.normalizeOrNull("wss://relay1.com"),
+            RelayUrlNormalizer.normalizeOrNull("wss://relay2.com")
+        )
+
+        signerOutboxRelays.associateWith { filters }
+    }
+) { event ->
+    /* consume event */
+}
 ```
 
 ## Contributing

amethyst/build.gradle

@@ -8,65 +8,102 @@ plugins {
     alias(libs.plugins.serialization)
 }
 
+def getCurrentBranch() {
+    try {
+        def branch = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim()
+        return branch
+    } catch (Exception e) {
+        println "Could not determine git branch: ${e.message}"
+        return "unknown"
+    }
+}
+
+def generateVersionName(String baseVersion) {
+    def currentBranch = getCurrentBranch()
+
+    if (currentBranch == "main" || currentBranch == "master" || currentBranch == "unknown" || currentBranch == "HEAD") {
+        return baseVersion
+    } else {
+        // Clean branch name for version (replace special characters)
+        def cleanBranch = currentBranch.replaceAll(/[^a-zA-Z0-9\-_]/, "-")
+
+        // Limit branch name to maximum 20 characters
+        if (cleanBranch.length() > 20) {
+            cleanBranch = cleanBranch.substring(0, 20)
+        }
+
+        return "${baseVersion}-${cleanBranch}"
+    }
+}
+
 android {
-    namespace 'com.vitorpamplona.amethyst'
-    compileSdk libs.versions.android.compileSdk.get().toInteger()
+    namespace = 'com.vitorpamplona.amethyst'
+    compileSdk = libs.versions.android.compileSdk.get().toInteger()
 
     defaultConfig {
-        applicationId "com.vitorpamplona.amethyst"
-        minSdk libs.versions.android.minSdk.get().toInteger()
-        targetSdk libs.versions.android.targetSdk.get().toInteger()
-        versionCode 417
-        versionName "0.94.2"
-        buildConfigField "String", "RELEASE_NOTES_ID", "\"fd42b23b9ef792059b1c1a89555443abbb11578f4b3c8430b452559eec7325f3\""
+        applicationId = "com.vitorpamplona.amethyst"
+        minSdk = libs.versions.android.minSdk.get().toInteger()
+        targetSdk = libs.versions.android.targetSdk.get().toInteger()
+        versionCode = 428
+        versionName = generateVersionName("1.03.0")
+        buildConfigField "String", "RELEASE_NOTES_ID", "\"08abe267baf5d7ce14db7975866f929e2794cc23484171aef0816c60a2416597\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
-            useSupportLibrary true
+            useSupportLibrary = true
         }
         resourceConfigurations += [
             'ar',
+            'ar-rSA',
             'bn-rBD',
             'cs',
+            'cs-rCZ',
             'cy-rGB',
             'da-rDK',
             'de',
+            'de-rDE',
             'el-rGR',
             'en-rGB',
             'eo',
+            'eo-rUY',
             'es',
             'es-rES',
             'es-rMX',
             'es-rUS',
             'et-rEE',
             'fa',
+            'fa-rIR',
             'fi-rFI',
             'fo-rFO',
             'fr',
             'fr-rCA',
+            'fr-rFR',
             'gu-rIN',
             'hi-rIN',
             'hr-rHR',
             'hu',
+            'hu-rHU',
             'in',
             'in-rID',
             'it-rIT',
             'iw-rIL',
             'ja',
+            'ja-rJP',
             'kk-rKZ',
             'ko-rKR',
             'ks-rIN',
             'ku-rTR',
             'lt-rLT',
             'ne-rNP',
-            'night',
             'nl',
             'nl-rBE',
+            'nl-rNL',
             'pcm-rNG',
             'pl-rPL',
             'pt-rBR',
             'pt-rPT',
             'ru',
+            'ru-rRU',
             'ru-rUA',
             'sa-rIN',
             'sl-rSI',
@@ -77,9 +114,13 @@ android {
             'sw-rKE',
             'sw-rTZ',
             'ta',
+            'ta-rIN',
             'th',
+            'th-rTH',
             'tr',
+            'tr-rTR',
             'uk',
+            'uk-rUA',
             'ur-rIN',
             'uz-rUZ',
             'vi-rVN',
@@ -94,8 +135,7 @@ android {
     buildTypes {
         release {
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), 'proguard-rules.pro'
-            minifyEnabled true
-            resValue "string", "app_name", "@string/app_name_release"
+            minifyEnabled = true
         }
         debug {
             applicationIdSuffix '.debug'
@@ -104,8 +144,11 @@ android {
         }
         create("benchmark") {
             initWith(getByName("release"))
-            profileable true
-            signingConfig signingConfigs.debug
+            applicationIdSuffix '.benchmark'
+            versionNameSuffix '-BENCHMARK'
+            resValue "string", "app_name", "@string/app_name_benchmark"
+            profileable = true
+            signingConfig = signingConfigs.debug
         }
     }
 
@@ -124,21 +167,21 @@ android {
 
     splits {
         abi {
-            enable true
+            enable = true
             reset()
             include "x86", "x86_64", "arm64-v8a", "armeabi-v7a"
-            universalApk true
+            universalApk = true
         }
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 
     buildFeatures {
-        compose true
-        buildConfig true
+        compose = true
+        buildConfig = true
     }
 
     packagingOptions {
@@ -156,9 +199,20 @@ android {
     }
 }
 
+// TODO: until google merges and unifiedpush updates https://github.com/tink-crypto/tink-java-apps/pull/5
+configurations.all {
+    def tink = "com.google.crypto.tink:tink-android:1.17.0"
+    resolutionStrategy {
+        force(tink)
+        dependencySubstitution {
+            substitute module('com.google.crypto.tink:tink') using module(tink)
+        }
+    }
+}
+
 kotlin {
     compilerOptions {
-        jvmTarget = JvmTarget.JVM_17
+        jvmTarget = JvmTarget.JVM_21
     }
 }
 
@@ -186,9 +240,6 @@ dependencies {
     // Navigation
     implementation libs.androidx.navigation.compose
 
-    // Observe Live data as State
-    implementation libs.androidx.runtime.livedata
-
     // Material 3 Design
     implementation libs.androidx.material3
     implementation libs.androidx.material.icons
@@ -201,7 +252,6 @@ dependencies {
     implementation libs.androidx.lifecycle.runtime.ktx
     implementation libs.androidx.lifecycle.runtime.compose
     implementation libs.androidx.lifecycle.viewmodel.compose
-    implementation libs.androidx.lifecycle.livedata.ktx
 
     // Zoomable images
     implementation libs.zoomable
@@ -211,9 +261,11 @@ dependencies {
 
     // Websockets API
     implementation libs.okhttp
+    implementation libs.okhttpCoroutines
 
     // Encrypted Key Storage
     implementation libs.androidx.security.crypto.ktx
+    implementation libs.androidx.datastore.preferences
 
     // view videos
     implementation libs.androidx.media3.exoplayer
@@ -308,5 +360,4 @@ dependencies {
     implementation libs.androidx.camera.lifecycle
     implementation libs.androidx.camera.view
     implementation libs.androidx.camera.extensions
-}
-
+}

amethyst/google-services.json

@@ -2,7 +2,7 @@
   "project_info": {
     "project_number": "768341258853",
     "project_id": "amethyst-3057a",
-    "storage_bucket": "amethyst-3057a.appspot.com"
+    "storage_bucket": "amethyst-3057a.firebasestorage.app"
   },
   "client": [
     {
@@ -12,12 +12,7 @@
           "package_name": "com.vitorpamplona.amethyst"
         }
       },
-      "oauth_client": [
-        {
-          "client_id": "768341258853-6um8ig59qstvio60gfo60fe5e45lnqqe.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
+      "oauth_client": [],
       "api_key": [
         {
           "current_key": "AIzaSyB7ZxgdpgrN6R223HCFdfv4ulP8Egp7trE"
@@ -25,12 +20,26 @@
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "768341258853-6um8ig59qstvio60gfo60fe5e45lnqqe.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:768341258853:android:3270514bee61de546b8c8c",
+        "android_client_info": {
+          "package_name": "com.vitorpamplona.amethyst.benchmark"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyB7ZxgdpgrN6R223HCFdfv4ulP8Egp7trE"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
         }
       }
     },
@@ -41,12 +50,7 @@
           "package_name": "com.vitorpamplona.amethyst.debug"
         }
       },
-      "oauth_client": [
-        {
-          "client_id": "768341258853-6um8ig59qstvio60gfo60fe5e45lnqqe.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
+      "oauth_client": [],
       "api_key": [
         {
           "current_key": "AIzaSyB7ZxgdpgrN6R223HCFdfv4ulP8Egp7trE"
@@ -54,12 +58,7 @@
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "768341258853-6um8ig59qstvio60gfo60fe5e45lnqqe.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
+          "other_platform_oauth_client": []
         }
       }
     }

amethyst/proguard-rules.pro

@@ -38,6 +38,8 @@
 -keep class com.lambdaworks.crypto.** { *; }
 -keep class com.lambdaworks.jni.** { *; }
 
+-keep class info.guardianproject.** { *; }
+
 # JNA also requires AWT, which Android does not have. So the classes are broken down to filter AWT out
 -keep class com.sun.jna.ToNativeConverter { *; }
 -keep class com.sun.jna.NativeMapped { *; }
@@ -58,10 +60,6 @@
 }
 
 # JSON parsing
--keep class com.vitorpamplona.quartz.crypto.** { *; }
--keep class com.vitorpamplona.quartz.encoders.** { *; }
--keep class com.vitorpamplona.quartz.events.** { *; }
--keep class com.vitorpamplona.amethyst.model.** { *; }
--keep class com.vitorpamplona.amethyst.service.** { *; }
--keep class com.vitorpamplona.ammolite.service.** { *; }
--keep class com.vitorpamplona.ammolite.relays.** { *; }
+-keep class com.vitorpamplona.quartz.** { *; }
+-keep class com.vitorpamplona.amethyst.** { *; }
+-keep class com.vitorpamplona.ammolite.** { *; }

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/CashuBTest.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -21,8 +21,8 @@
 package com.vitorpamplona.amethyst
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.vitorpamplona.amethyst.service.CashuProcessor
-import com.vitorpamplona.amethyst.service.CashuToken
+import com.vitorpamplona.amethyst.service.cashu.CashuParser
+import com.vitorpamplona.amethyst.service.cashu.CashuToken
 import com.vitorpamplona.amethyst.ui.components.GenericLoadable
 import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.runBlocking
@@ -38,7 +38,7 @@ class CashuBTest {
     @Test()
     fun parseCashuA() {
         runBlocking {
-            val parsed = (CashuProcessor().parse(cashuTokenA) as GenericLoadable.Loaded<List<CashuToken>>).loaded[0]
+            val parsed = (CashuParser().parse(cashuTokenA) as GenericLoadable.Loaded<List<CashuToken>>).loaded[0]
 
             assertEquals(cashuTokenA, parsed.token)
             assertEquals("https://8333.space:3338", parsed.mint)
@@ -59,7 +59,7 @@ class CashuBTest {
     @Test()
     fun parseCashuB() =
         runBlocking {
-            val parsed = (CashuProcessor().parse(cashuTokenB1) as GenericLoadable.Loaded<List<CashuToken>>).loaded
+            val parsed = (CashuParser().parse(cashuTokenB1) as GenericLoadable.Loaded<List<CashuToken>>).loaded
 
             assertEquals(cashuTokenB1, parsed[0].token)
             assertEquals("http://localhost:3338", parsed[0].mint)
@@ -84,7 +84,7 @@ class CashuBTest {
     @Test()
     fun parseCashuB2() =
         runBlocking {
-            val parsed = (CashuProcessor().parse(cashuTokenB2) as GenericLoadable.Loaded<List<CashuToken>>).loaded
+            val parsed = (CashuParser().parse(cashuTokenB2) as GenericLoadable.Loaded<List<CashuToken>>).loaded
 
             assertEquals(cashuTokenB2, parsed[0].token)
             assertEquals("http://lbutlh5lfggq5r7xpiwhrajdl7sxpupgagazxl65w4c5cg72wtofasad.onion:3338", parsed[0].mint)

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/DMFileDecryptionTest.kt

@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.amethyst.service.okhttp.EncryptedBlobInterceptor
+import com.vitorpamplona.amethyst.service.okhttp.EncryptionKeyCache
+import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray
+import com.vitorpamplona.quartz.nip17Dm.files.encryption.AESGCM
+import junit.framework.TestCase.assertEquals
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class DMFileDecryptionTest {
+    // Key cache to download and decrypt encrypted files before caching them.
+    val keyCache = EncryptionKeyCache()
+
+    val url = "https://cdn.satellite.earth/812fd4cf9d4d4b59c141ecd6a6c08c7571b5872237ad6477916cb2d119b5cacd"
+    val cipher =
+        AESGCM(
+            "7b184b3849e161027bab1aac9f2d96eb22bfe02c8dc34cad5d2cc436a64f191d".hexToByteArray(),
+            "3936923383652e3f0d72bfd40568b435".hexToByteArray(),
+        )
+    val decryptedSize = 1277122
+    val expectedMimeType = "video/mp4"
+
+    @Test
+    fun runDownloadAndDecryptVideo() {
+        val client =
+            OkHttpClient
+                .Builder()
+                .addNetworkInterceptor(EncryptedBlobInterceptor(keyCache))
+                .build()
+
+        keyCache.add(url, cipher, "video/mp4")
+
+        val request =
+            Request
+                .Builder()
+                .url(url)
+                .get()
+                .build()
+
+        client.newCall(request).execute().use {
+            assertEquals(decryptedSize, it.body.bytes().size)
+            assertEquals(expectedMimeType, it.body.contentType().toString())
+        }
+    }
+}

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ImageUploadTesting.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -24,8 +24,10 @@ import android.graphics.Bitmap
 import android.graphics.Color
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.nipB7Blossom.BlossomServerListState
+import com.vitorpamplona.amethyst.service.okhttp.DefaultContentTypeInterceptor
 import com.vitorpamplona.amethyst.service.uploads.FileHeader
 import com.vitorpamplona.amethyst.service.uploads.ImageDownloader
 import com.vitorpamplona.amethyst.service.uploads.blossom.BlossomUploader
@@ -34,15 +36,18 @@ import com.vitorpamplona.amethyst.service.uploads.nip96.ServerInfoRetriever
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.DEFAULT_MEDIA_SERVERS
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerType
-import com.vitorpamplona.quartz.crypto.CryptoUtils
-import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.nip01Core.core.toHexKey
+import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.nip98HttpAuth.HTTPAuthorizationEvent
+import com.vitorpamplona.quartz.utils.sha256.sha256
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.fail
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.runBlocking
+import okhttp3.OkHttpClient
 import org.junit.Assert
 import org.junit.Ignore
 import org.junit.Test
@@ -52,11 +57,28 @@ import kotlin.random.Random
 
 @RunWith(AndroidJUnit4::class)
 class ImageUploadTesting {
-    val account =
-        Account(
-            AccountSettings(KeyPair()),
-            scope = CoroutineScope(Dispatchers.IO + SupervisorJob()),
-        )
+    companion object {
+        val accountSettings = AccountSettings(KeyPair())
+        val signer = NostrSignerInternal(accountSettings.keyPair)
+        val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+        val cache = LocalCache
+
+        val blossomServerListState =
+            BlossomServerListState(
+                signer = signer,
+                cache = cache,
+                scope = scope,
+                settings = accountSettings,
+            )
+    }
+
+    val client =
+        OkHttpClient
+            .Builder()
+            .followRedirects(true)
+            .followSslRedirects(true)
+            .addInterceptor(DefaultContentTypeInterceptor("Amethyst/${BuildConfig.VERSION_NAME}"))
+            .build()
 
     private suspend fun getBitmap(): ByteArray {
         val bitmap = Bitmap.createBitmap(200, 300, Bitmap.Config.ARGB_8888)
@@ -81,11 +103,11 @@ class ImageUploadTesting {
 
     private suspend fun testBlossom(server: ServerName) {
         val paylod = getBitmap()
-        val initialHash = CryptoUtils.sha256(paylod).toHexKey()
+        val initialHash = sha256(paylod).toHexKey()
         val inputStream = paylod.inputStream()
         val result =
             BlossomUploader()
-                .uploadImage(
+                .upload(
                     inputStream = inputStream,
                     hash = initialHash,
                     length = paylod.size,
@@ -94,8 +116,8 @@ class ImageUploadTesting {
                     alt = null,
                     sensitiveContent = null,
                     serverBaseUrl = server.baseUrl,
-                    forceProxy = { false },
-                    httpAuth = account::createBlossomUploadAuth,
+                    okHttpClient = { client },
+                    httpAuth = blossomServerListState::createBlossomUploadAuth,
                     context = InstrumentationRegistry.getInstrumentation().targetContext,
                 )
 
@@ -105,13 +127,13 @@ class ImageUploadTesting {
         assertEquals("${server.baseUrl}/$initialHash", result.url?.removeSuffix(".png"))
 
         val imageData: ByteArray =
-            ImageDownloader().waitAndGetImage(result.url!!, false)
+            ImageDownloader().waitAndGetImage(result.url!!, { client })?.bytes
                 ?: run {
                     fail("${server.name}: Should not be null")
                     return
                 }
 
-        val downloadedHash = CryptoUtils.sha256(imageData).toHexKey()
+        val downloadedHash = sha256(imageData).toHexKey()
         assertEquals(initialHash, downloadedHash)
     }
 
@@ -120,35 +142,37 @@ class ImageUploadTesting {
             ServerInfoRetriever()
                 .loadInfo(
                     server.baseUrl,
-                    false,
+                    { client },
                 )
 
-        val paylod = getBitmap()
-        val inputStream = paylod.inputStream()
+        val payload = getBitmap()
+        val inputStream = payload.inputStream()
         val result =
             Nip96Uploader()
-                .uploadImage(
+                .upload(
                     inputStream = inputStream,
-                    length = paylod.size.toLong(),
+                    length = payload.size.toLong(),
                     contentType = "image/png",
                     alt = null,
                     sensitiveContent = null,
                     server = serverInfo,
-                    forceProxy = { false },
+                    okHttpClient = { client },
                     onProgress = {},
-                    httpAuth = account::createHTTPAuthorization,
+                    httpAuth = { url, method, body ->
+                        signer.sign(HTTPAuthorizationEvent.build(url, method, body))
+                    },
                     context = InstrumentationRegistry.getInstrumentation().targetContext,
                 )
 
         val url = result.url!!
-        val size = result.size
+        val size = result.size?.toInt()
         val dim = result.dimension
         val hash = result.sha256
 
         Assert.assertTrue("${server.name}: Invalid result url", url.startsWith("http"))
 
         val imageData: ByteArray =
-            ImageDownloader().waitAndGetImage(url, false)
+            ImageDownloader().waitAndGetImage(url, { client })?.bytes
                 ?: run {
                     fail("${server.name}: Should not be null")
                     return
@@ -167,7 +191,7 @@ class ImageUploadTesting {
                     assertEquals("${server.name}: Invalid dimensions", it.dim.toString(), dim.toString())
                 }
                 if (size != null) {
-                    assertEquals("${server.name}: Invalid size", it.size.toString(), size)
+                    assertEquals("${server.name}: Invalid size", it.size, size)
                 }
             },
             onFailure = { fail("${server.name}: It should not fail") },
@@ -209,6 +233,7 @@ class ImageUploadTesting {
             testBase(ServerName("sove", "https://sove.rent", ServerType.NIP96))
         }
 
+    @Ignore("Not Working anymore")
     @Test()
     fun testNostrBuild() =
         runBlocking {
@@ -223,6 +248,7 @@ class ImageUploadTesting {
         }
 
     @Test()
+    @Ignore("Not Working anymore")
     fun testVoidCat() =
         runBlocking {
             testBase(ServerName("void.cat", "https://void.cat", ServerType.NIP96))
@@ -255,6 +281,7 @@ class ImageUploadTesting {
         }
 
     @Test()
+    @Ignore("Not Working anymore/ Timeout")
     fun testNostrCheckBlossom() =
         runBlocking {
             testBase(ServerName("nostrcheck", "https://cdn.nostrcheck.me", ServerType.Blossom))

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/OkHttpOtsTest.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -21,20 +21,19 @@
 package com.vitorpamplona.amethyst
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.vitorpamplona.amethyst.service.ots.OkHttpBlockstreamExplorer
-import com.vitorpamplona.amethyst.service.ots.OkHttpCalendarBuilder
-import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.OtsEvent
-import com.vitorpamplona.quartz.ots.OpenTimestamps
-import com.vitorpamplona.quartz.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
+import com.vitorpamplona.quartz.nip01Core.jackson.JsonMapper
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.nip03Timestamp.OtsEvent
+import com.vitorpamplona.quartz.nip03Timestamp.OtsResolver
+import com.vitorpamplona.quartz.nip03Timestamp.ots.okhttp.OkHttpBitcoinExplorer
+import com.vitorpamplona.quartz.nip03Timestamp.ots.okhttp.OkHttpCalendarBuilder
+import com.vitorpamplona.quartz.nip03Timestamp.ots.okhttp.OtsBlockHeightCache
 import junit.framework.TestCase.assertEquals
-import org.junit.Assert
-import org.junit.Before
+import kotlinx.coroutines.runBlocking
+import okhttp3.OkHttpClient
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
 
 @RunWith(AndroidJUnit4::class)
 class OkHttpOtsTest {
@@ -43,53 +42,54 @@ class OkHttpOtsTest {
     val otsPendingEvent = "{\"id\":\"12fa15ad4b4cf9dc5940389325b69b93c5c1f59c049c701ee669b275299fdaf1\",\"pubkey\":\"dcaa6c8a2f47b6fef4a34b20e8843c59dbe7c5f07a402338c09fd147dd01d22b\",\"created_at\":1708877521,\"kind\":1040,\"tags\":[[\"e\",\"a8634f5368e17789e8fb3836cad0e4b9fe4f2288afafc28723c04bebc68a18d6\"],[\"alt\",\"Opentimestamps Attestation\"]],\"content\":\"AE9wZW5UaW1lc3RhbXBzAABQcm9vZgC/ieLohOiSlAEIqGNPU2jhd4no+zg2ytDkuf5PIoivr8KHI8BL68aKGNbwELidvzr0usf55CkpKf6OABQI//AQK3sWd2tq+7KO8YNJIARJugjxBGXbZtPwCL0H4/7GL5+SAIPf4w0u+QyOLCtodHRwczovL2JvYi5idGMuY2FsZW5kYXIub3BlbnRpbWVzdGFtcHMub3Jn//AQPDZsJgN1TnJXoUzlsgo93wjwIIfBc7LUqkCbC1BLZRZ+6LXztK50UdH5xe7fn40bupkrCPEEZdtm0/AI0CADXN5ZIncAg9/jDS75DI4uLWh0dHBzOi8vYWxpY2UuYnRjLmNhbGVuZGFyLm9wZW50aW1lc3RhbXBzLm9yZ/AQcELcSrE04cuGKlZQf2LeVwjwILUDSf9vK2GaefKTpn/LV2oUsQaA5WbqaP3C+1ZxQfRNCPEEZdtm0/AIbCtb+yRXFqUAg9/jDS75DI4pKGh0dHBzOi8vZmlubmV5LmNhbGVuZGFyLmV0ZXJuaXR5d2FsbC5jb20=\",\"sig\":\"f6854c0228c15c08aeb70bbabe9ed87bbb7289fab31b13cabac15138bb71179553e06080b83f4a813fbdaf614f63293beea3fc73fe865da6551193fa4d38de04\"}"
 
     val otsEvent2Digest = "a8634f5368e17789e8fb3836cad0e4b9fe4f2288afafc28723c04bebc68a18d6"
+    val otsCache = OtsBlockHeightCache()
 
-    @Before
-    fun setup() {
-        OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer(forceProxy = { false }), OkHttpCalendarBuilder(forceProxy = { false }))
-    }
+    val resolver =
+        OtsResolver(
+            OkHttpBitcoinExplorer(
+                baseAPI = OkHttpBitcoinExplorer.MEMPOOL_API_URL,
+                client = OkHttpClient.Builder().build(),
+                cache = otsCache,
+            ),
+            OkHttpCalendarBuilder { OkHttpClient.Builder().build() },
+        )
 
     @Test
     fun verifyNostrEvent() {
-        val ots = Event.fromJson(otsEvent) as OtsEvent
-        println(ots.info())
-        assertEquals(1707688818L, ots.verify())
+        val ots = JsonMapper.fromJson(otsEvent) as OtsEvent
+        println(resolver.info(ots.otsByteArray()))
+        assertEquals(1707688818L, ots.verify(resolver))
     }
 
     @Test
     fun verifyNostrEvent2() {
-        val ots = Event.fromJson(otsEvent2) as OtsEvent
-        println(ots.info())
-        assertEquals(1706322179L, ots.verify())
+        val ots = JsonMapper.fromJson(otsEvent2) as OtsEvent
+        println(resolver.info(ots.otsByteArray()))
+        assertEquals(1706322179L, ots.verify(resolver))
     }
 
     @Test
     fun verifyNostrPendingEvent() {
-        val ots = Event.fromJson(otsPendingEvent) as OtsEvent
-        println(ots.info())
-        assertEquals(null, ots.verify())
+        val ots = JsonMapper.fromJson(otsPendingEvent) as OtsEvent
+        println(resolver.info(ots.otsByteArray()))
+        assertEquals(null, ots.verify(resolver))
     }
 
     @Test
     fun createOTSEventAndVerify() {
         val signer = NostrSignerInternal(KeyPair())
-        var ots: OtsEvent? = null
 
-        val countDownLatch = CountDownLatch(1)
+        val otsFile = OtsEvent.stamp(otsEvent2Digest, resolver)
 
-        val otsFile = OtsEvent.stamp(otsEvent2Digest)
+        val ots =
+            runBlocking {
+                signer.sign(OtsEvent.build(otsEvent2Digest, otsFile))
+            }
 
-        OtsEvent.create(otsEvent2Digest, otsFile, signer) {
-            ots = it
-            countDownLatch.countDown()
-        }
-
-        Assert.assertTrue(countDownLatch.await(1, TimeUnit.SECONDS))
-
-        println(ots!!.toJson())
-        println(ots!!.info())
+        println(ots.toJson())
+        println(resolver.info(ots.otsByteArray()))
 
         // Should not be valid because we need to wait for confirmations
-        assertEquals(null, ots!!.verify())
+        assertEquals(null, ots.verify(resolver))
     }
 }

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/URIParserTest.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/UrlUserTagTransformationTest.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -27,9 +27,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.ui.actions.buildAnnotatedStringWithUrlHighlighting
-import com.vitorpamplona.quartz.encoders.decodePublicKey
-import com.vitorpamplona.quartz.encoders.toHexKey
-import com.vitorpamplona.quartz.events.UserMetadata
+import com.vitorpamplona.quartz.nip01Core.core.toHexKey
+import com.vitorpamplona.quartz.nip01Core.metadata.UserMetadata
+import com.vitorpamplona.quartz.nip19Bech32.decodePublicKey
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith

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

@@ -1,4 +1,5 @@
 <resources>
-    <string name="app_name_release">Amethyst</string>
-    <string name="app_name_debug">Amethyst Debug</string>
+    <string name="app_name">Amethyst</string>
+    <string name="app_name_debug">Amy Debug</string>
+    <string name="app_name_benchmark">Amy Benchmark</string>
 </resources>

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -89,14 +89,14 @@ object PushDistributorHandler : PushDistributorActions {
 
     override fun saveDistributor(distributor: String) {
         unifiedPush.saveDistributor(appContext(), distributor)
-        unifiedPush.registerApp(appContext())
+        unifiedPush.register(appContext())
     }
 
     override fun removeSavedDistributor() {
-        unifiedPush.safeRemoveDistributor(appContext())
+        unifiedPush.removeDistributor(appContext())
     }
 
     fun forceRemoveDistributor(context: Context) {
-        unifiedPush.forceRemoveDistributor(context)
+        UnifiedPush.removeDistributor(context)
     }
 }

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -29,12 +29,15 @@ import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.getOrCreateDMChannel
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.getOrCreateZapChannel
-import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.GiftWrapEvent
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.unifiedpush.android.connector.FailedReason
 import org.unifiedpush.android.connector.MessagingReceiver
+import org.unifiedpush.android.connector.data.PushEndpoint
+import org.unifiedpush.android.connector.data.PushMessage
 
 class PushMessageReceiver : MessagingReceiver() {
     companion object {
@@ -48,10 +51,10 @@ class PushMessageReceiver : MessagingReceiver() {
 
     override fun onMessage(
         context: Context,
-        message: ByteArray,
+        message: PushMessage,
         instance: String,
     ) {
-        val messageStr = message.decodeToString()
+        val messageStr = message.content.decodeToString()
         Log.d(TAG, "New message $messageStr for Instance: $instance")
         scope.launch {
             try {
@@ -81,15 +84,17 @@ class PushMessageReceiver : MessagingReceiver() {
 
     override fun onNewEndpoint(
         context: Context,
-        endpoint: String,
+        endpoint: PushEndpoint,
         instance: String,
     ) {
-        val sanitizedEndpoint = if (endpoint.endsWith("?up=1")) endpoint.dropLast(5) else endpoint
+        val sanitizedEndpoint = if (endpoint.url.endsWith("?up=1")) endpoint.url.dropLast(5) else endpoint.url
         if (sanitizedEndpoint != pushHandler.getSavedEndpoint()) {
             Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance ${pushHandler.getSavedEndpoint()} $sanitizedEndpoint")
             pushHandler.setEndpoint(sanitizedEndpoint)
             scope.launch(Dispatchers.IO) {
-                RegisterAccounts(LocalPreferences.allSavedAccounts()).go(sanitizedEndpoint)
+                PushNotificationUtils.checkAndInit(sanitizedEndpoint, LocalPreferences.allSavedAccounts()) {
+                    Amethyst.instance.okHttpClients.getHttpClient(Amethyst.instance.torManager.isSocksReady())
+                }
                 notificationManager().getOrCreateZapChannel(appContext)
                 notificationManager().getOrCreateDMChannel(appContext)
             }
@@ -100,6 +105,7 @@ class PushMessageReceiver : MessagingReceiver() {
 
     override fun onRegistrationFailed(
         context: Context,
+        reason: FailedReason,
         instance: String,
     ) {
         Log.d(TAG, "Registration failed for Instance: $instance")

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -20,28 +20,53 @@
  */
 package com.vitorpamplona.amethyst.service.notifications
 
-import android.util.Log
 import com.vitorpamplona.amethyst.AccountInfo
-import kotlinx.coroutines.CancellationException
+import com.vitorpamplona.amethyst.service.retryIfException
+import kotlinx.coroutines.Dispatchers
+import okhttp3.OkHttpClient
 
 object PushNotificationUtils {
-    var hasInit: Boolean = false
+    var lastToken: String? = null
+    var hasInit: List<AccountInfo>? = null
+
     private val pushHandler = PushDistributorHandler
 
-    suspend fun init(accounts: List<AccountInfo>) {
-        if (hasInit) {
-            return
-        }
-        try {
-            if (pushHandler.savedDistributorExists()) {
-                val currentDistributor = PushDistributorHandler.getSavedDistributor()
-                PushDistributorHandler.saveDistributor(currentDistributor)
+    suspend fun checkAndInit(
+        accounts: List<AccountInfo>,
+        okHttpClient: (String) -> OkHttpClient,
+    ) = with(Dispatchers.IO) {
+        if (!pushHandler.savedDistributorExists()) return
 
-                RegisterAccounts(accounts).go(pushHandler.getSavedEndpoint())
-            }
-        } catch (e: Exception) {
-            if (e is CancellationException) throw e
-            Log.d("Amethyst-OSSPushUtils", "Failed to get endpoint.")
+        val currentDistributor = PushDistributorHandler.getSavedDistributor()
+        PushDistributorHandler.saveDistributor(currentDistributor)
+        val token = pushHandler.getSavedEndpoint()
+
+        if (hasInit?.equals(accounts) == true && lastToken == token) {
+            return@with
         }
+
+        registerToken(token, accounts, okHttpClient)
+    }
+
+    suspend fun checkAndInit(
+        token: String,
+        accounts: List<AccountInfo>,
+        okHttpClient: (String) -> OkHttpClient,
+    ) = with(Dispatchers.IO) {
+        // initializes if the accounts are different or if the token has changed
+        if (hasInit?.equals(accounts) == true && lastToken == token) {
+            return@with
+        }
+        registerToken(token, accounts, okHttpClient)
+    }
+
+    private suspend fun registerToken(
+        token: String,
+        accounts: List<AccountInfo>,
+        okHttpClient: (String) -> OkHttpClient,
+    ) = retryIfException("RegisterAccounts") {
+        RegisterAccounts(accounts, okHttpClient).go(token)
+        lastToken = token
+        hasInit = accounts.toList()
     }
 }

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/SelectNotificationProvider.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -54,9 +54,9 @@ import com.halilibo.richtext.ui.material3.RichText
 import com.halilibo.richtext.ui.resolveDefaults
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.notifications.PushDistributorHandler
+import com.vitorpamplona.amethyst.ui.components.SpinnerSelectionDialog
+import com.vitorpamplona.amethyst.ui.components.TitleExplainer
 import com.vitorpamplona.amethyst.ui.screen.SharedPreferencesViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.SpinnerSelectionDialog
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.TitleExplainer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.checkifItNeedsToRequestNotificationPermission
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.SettingsRow
 import com.vitorpamplona.amethyst.ui.stringRes

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -22,11 +22,13 @@ package com.vitorpamplona.amethyst.ui.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.vitorpamplona.amethyst.ui.navigation.INav
+import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
+import com.vitorpamplona.quartz.nip02FollowList.ImmutableListOfLists
 
 @Composable
 fun TranslatableRichTextViewer(
@@ -52,3 +54,11 @@ fun TranslatableRichTextViewer(
     accountViewModel,
     nav,
 )
+
+@Composable
+fun TranslatableRichTextViewer(
+    content: String,
+    id: String,
+    accountViewModel: AccountViewModel,
+    displayText: @Composable (String) -> Unit,
+) = displayText(content)

amethyst/src/main/AndroidManifest.xml

@@ -8,23 +8,28 @@
             <category android:name="android.intent.category.BROWSABLE" />
             <data android:scheme="nostrsigner" />
         </intent>
+        <intent>
+            <action android:name="android.intent.action.TTS_SERVICE" />
+        </intent>
     </queries>
 
+
     <!-- Doesn't require a camera -->
     <uses-feature android:name="android.hardware.camera" android:required="false" />
 
     <!-- To connect with relays -->
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <!-- To take pictures -->
-    <uses-permission android:name="android.permission.CAMERA" />
-
     <!-- To Upload media (old devices) -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
 
     <!-- To read QRs that contain nostr:<NIP19> -->
+    <!-- To take pictures -->
     <uses-permission android:name="android.permission.CAMERA" />
 
+    <!-- To record audio messages -->
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
     <!-- To read NFCs that contain nostr:<NIP19> -->
     <uses-permission android:name="android.permission.NFC" />
 
@@ -68,9 +73,10 @@
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
-            android:launchMode="singleTop"
+            android:launchMode="singleInstance"
             android:windowSoftInputMode="adjustResize"
             android:configChanges="orientation|screenSize|screenLayout"
+            android:taskAffinity=".service.playback.pip.PipVideoActivity"
             android:theme="@style/Theme.Amethyst">
 
             <intent-filter android:label="Amethyst">
@@ -116,18 +122,62 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="image/*" />
             </intent-filter>
+
+            <intent-filter android:label="njump.me">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" />
+                <data android:host="njump.me" />
+            </intent-filter>
+
+            <intent-filter android:label="Primal">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" />
+                <data android:host="primal.net" />
+                <data android:pathPrefix="/e/" />
+                <data android:pathPrefix="/p/" />
+                <data android:pathPrefix="/a/" />
+            </intent-filter>
+
+            <intent-filter android:label="Yakihonne">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" />
+                <data android:host="yakihonne.com" />
+                <data android:pathPrefix="/notes/" />
+                <data android:pathPrefix="/users/" />
+                <data android:pathPrefix="/videos/" />
+                <data android:pathPrefix="/article/" />
+            </intent-filter>
         </activity>
 
         <activity
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
             android:screenOrientation="fullSensor"
-            tools:replace="screenOrientation" />
+            tools:replace="screenOrientation"
+            tools:ignore="DiscouragedApi" />
+
+        <activity
+            android:name=".service.playback.pip.PipVideoActivity"
+            android:autoRemoveFromRecents="true"
+            android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize|keyboardHidden|keyboard|uiMode"
+            android:supportsPictureInPicture="true"
+            android:launchMode="singleInstance"
+            android:exported="false"
+            android:resizeableActivity="true"
+            android:theme="@style/noAnimTheme"
+        />
 
         <service
-            android:name=".service.playback.PlaybackService"
+            android:name=".service.playback.service.PlaybackService"
             android:foregroundServiceType="mediaPlayback"
             android:stopWithTask="true"
-            android:exported="true">
+            android:exported="true"
+            tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="androidx.media3.session.MediaSessionService"/>
                 <action android:name="android.media.browse.MediaBrowserService"/>
@@ -147,6 +197,7 @@
         <receiver
             android:name=".service.notifications.PokeyReceiver"
             android:exported="true"
+            tools:ignore="ExportedReceiver"
             >
             <intent-filter>
                 <action android:name="com.shared.NOSTR" />
@@ -155,4 +206,4 @@
     </application>
 
 
-</manifest>
+</manifest>

amethyst/src/main/java/androidx/compose/material3/adaptive/Posture.kt

@@ -1,182 +0,0 @@
-/**
- * Copyright (c) 2024 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package androidx.compose.material3.adaptive
-
-import androidx.compose.runtime.Immutable
-import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.graphics.toComposeRect
-import androidx.window.layout.FoldingFeature
-
-/**
- * Calculates the [Posture] for a given list of [FoldingFeature]s. This methods converts framework
- * folding info into the Material-opinionated posture info.
- */
-fun calculatePosture(foldingFeatures: List<FoldingFeature>): Posture {
-    var isTableTop = false
-    val hingeList = mutableListOf<HingeInfo>()
-    @Suppress("ListIterator")
-    foldingFeatures.forEach {
-        if (it.orientation == FoldingFeature.Orientation.HORIZONTAL &&
-            it.state == FoldingFeature.State.HALF_OPENED
-        ) {
-            isTableTop = true
-        }
-        hingeList.add(
-            HingeInfo(
-                bounds = it.bounds.toComposeRect(),
-                isFlat = it.state == FoldingFeature.State.FLAT,
-                isVertical = it.orientation == FoldingFeature.Orientation.VERTICAL,
-                isSeparating = it.isSeparating,
-                isOccluding = it.occlusionType == FoldingFeature.OcclusionType.FULL,
-            ),
-        )
-    }
-    return Posture(isTableTop, hingeList)
-}
-
-/**
- * Posture info that can help make layout adaptation decisions. For example when
- * [Posture.separatingVerticalHingeBounds] is not empty, the layout may want to avoid putting any
- * content over those hinge area. We suggest to use [calculatePosture] to retrieve instances of this
- * class in applications, unless you have a strong need of customization that cannot be fulfilled by
- * the default implementation.
- *
- * Note that the hinge bounds will be represent as [Rect] with window coordinates, instead of layout
- * coordinate.
- *
- * @constructor create an instance of [Posture]
- * @property isTabletop `true` if the current window is considered as in the table top mode, i.e.
- *           there is one half-opened horizontal hinge in the middle of the current window. When
- *           this is `true` it usually means it's hard for users to interact with the window area
- *           around the hinge and developers may consider separating the layout along the hinge and
- *           show software keyboard or other controls in the bottom half of the window.
- * @property hingeList a list of all hinges that are relevant to the posture.
- */
-@Immutable
-class Posture(
-    val isTabletop: Boolean = false,
-    val hingeList: List<HingeInfo> = emptyList(),
-) {
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is Posture) return false
-        if (isTabletop != other.isTabletop) return false
-        if (hingeList != other.hingeList) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = isTabletop.hashCode()
-        result = 31 * result + hingeList.hashCode()
-        return result
-    }
-
-    override fun toString(): String {
-        @Suppress("ListIterator")
-        return "Posture(isTabletop=$isTabletop, " +
-            "hinges=[${hingeList.joinToString(", ")}])"
-    }
-}
-
-/**
- * Returns the list of vertical hinge bounds that are separating.
- */
-val Posture.separatingVerticalHingeBounds get() = hingeList.getBounds { isVertical && isSeparating }
-
-/**
- *  Returns the list of vertical hinge bounds that are occluding.
- */
-val Posture.occludingVerticalHingeBounds get() = hingeList.getBounds { isVertical && isOccluding }
-
-/**
- *  Returns the list of all vertical hinge bounds.
- */
-val Posture.allVerticalHingeBounds get() = hingeList.getBounds { isVertical }
-
-/**
- * Returns the list of horizontal hinge bounds that are separating.
- */
-val Posture.separatingHorizontalHingeBounds
-    get() = hingeList.getBounds { !isVertical && isSeparating }
-
-/**
- * Returns the list of horizontal hinge bounds that are occluding.
- */
-val Posture.occludingHorizontalHingeBounds
-    get() = hingeList.getBounds { !isVertical && isOccluding }
-
-/**
- *  Returns the list of all horizontal hinge bounds.
- */
-val Posture.allHorizontalHingeBounds
-    get() = hingeList.getBounds { !isVertical }
-
-/**
- * A class that contains the info of a hinge relevant to a [Posture].
- *
- * @param bounds the bounds of the hinge in the relevant viewport.
- * @param isFlat `true` if the hinge is fully open and the relevant window space presented to the
- *        user is flat.
- * @param isVertical `true` if the hinge is a vertical one, i.e., it separates the viewport into
- *        left and right; `false` if the hinge is horizontal, i.e., it separates the viewport
- *        into top and bottom.
- * @param isSeparating `true` if the hinge creates two logical display areas.
- * @param isOccluding `true` if the hinge conceals part of the display.
- */
-@Immutable
-class HingeInfo(
-    val bounds: Rect,
-    val isFlat: Boolean,
-    val isVertical: Boolean,
-    val isSeparating: Boolean,
-    val isOccluding: Boolean,
-) {
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is HingeInfo) return false
-        if (bounds != other.bounds) return false
-        if (isFlat != other.isFlat) return false
-        if (isVertical != other.isVertical) return false
-        if (isSeparating != other.isSeparating) return false
-        if (isOccluding != other.isOccluding) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = bounds.hashCode()
-        result = 31 * result + isFlat.hashCode()
-        result = 31 * result + isVertical.hashCode()
-        result = 31 * result + isSeparating.hashCode()
-        result = 31 * result + isOccluding.hashCode()
-        return result
-    }
-
-    override fun toString(): String =
-        "HingeInfo(bounds=$bounds, " +
-            "isFlat=$isFlat, " +
-            "isVertical=$isVertical, " +
-            "isSeparating=$isSeparating, " +
-            "isOccluding=$isOccluding)"
-}
-
-private inline fun List<HingeInfo>.getBounds(predicate: HingeInfo.() -> Boolean): List<Rect> =
-    @Suppress("ListIterator")
-    mapNotNull { if (it.predicate()) it.bounds else null }

amethyst/src/main/java/androidx/compose/material3/adaptive/WindowAdaptiveInfo.kt

@@ -1,122 +0,0 @@
-/**
- * Copyright (c) 2024 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package androidx.compose.material3.adaptive
-
-import android.app.Activity
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.unit.toSize
-import androidx.window.core.layout.WindowSizeClass
-import androidx.window.layout.FoldingFeature
-import androidx.window.layout.WindowInfoTracker
-import androidx.window.layout.WindowMetricsCalculator
-import kotlinx.coroutines.flow.map
-
-@Composable
-fun currentWindowAdaptiveInfo(): WindowAdaptiveInfo {
-    val windowSize =
-        with(LocalDensity.current) {
-            currentWindowSize().toSize().toDpSize()
-        }
-    return WindowAdaptiveInfo(
-        WindowSizeClass.compute(windowSize.width.value, windowSize.height.value),
-        calculatePosture(collectFoldingFeaturesAsState().value),
-    )
-}
-
-/**
- * Returns and automatically update the current window size from [WindowMetricsCalculator].
- *
- * @return an [IntSize] that represents the current window size.
- */
-@Composable
-fun currentWindowSize(): IntSize {
-    // Observe view configuration changes and recalculate the size class on each change. We can't
-    // use Activity#onConfigurationChanged as this will sometimes fail to be called on different
-    // API levels, hence why this function needs to be @Composable so we can observe the
-    // ComposeView's configuration changes.
-    LocalConfiguration.current
-    val windowBounds =
-        WindowMetricsCalculator
-            .getOrCreate()
-            .computeCurrentWindowMetrics(LocalContext.current)
-            .bounds
-    return IntSize(windowBounds.width(), windowBounds.height())
-}
-
-/**
- * Collects the current window folding features from [WindowInfoTracker] in to a [State].
- *
- * @return a [State] of a [FoldingFeature] list.
- */
-@Composable
-fun collectFoldingFeaturesAsState(): State<List<FoldingFeature>> {
-    val context = LocalContext.current
-    return remember(context) {
-        if (context is Activity) {
-            // TODO(b/284347941) remove the instance check after the test bug is fixed.
-            WindowInfoTracker
-                .getOrCreate(context)
-                .windowLayoutInfo(context)
-        } else {
-            WindowInfoTracker
-                .getOrCreate(context)
-                .windowLayoutInfo(context)
-        }.map { it.displayFeatures.filterIsInstance<FoldingFeature>() }
-    }.collectAsState(emptyList())
-}
-
-/**
- * This class collects window info that affects adaptation decisions. An adaptive layout is supposed
- * to use the info from this class to decide how the layout is supposed to be adapted.
- *
- * @constructor create an instance of [WindowAdaptiveInfo]
- * @param windowSizeClass [WindowSizeClass] of the current window.
- * @param windowPosture [Posture] of the current window.
- */
-@Immutable
-class WindowAdaptiveInfo(
-    val windowSizeClass: WindowSizeClass,
-    val windowPosture: Posture,
-) {
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is WindowAdaptiveInfo) return false
-        if (windowSizeClass != other.windowSizeClass) return false
-        if (windowPosture != other.windowPosture) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = windowSizeClass.hashCode()
-        result = 31 * result + windowPosture.hashCode()
-        return result
-    }
-
-    override fun toString(): String = "WindowAdaptiveInfo(windowSizeClass=$windowSizeClass, windowPosture=$windowPosture)"
-}

amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefresh.kt

@@ -1,122 +0,0 @@
-/**
- * Copyright (c) 2024 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package androidx.compose.material3.pullrefresh
-
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource.Companion.Drag
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.debugInspectorInfo
-import androidx.compose.ui.platform.inspectable
-import androidx.compose.ui.unit.Velocity
-
-/**
- * A nested scroll modifier that provides scroll events to [state].
- *
- * Note that this modifier must be added above a scrolling container, such as a lazy column, in
- * order to receive scroll events. For example:
- *
- * @param state The [PullRefreshState] associated with this pull-to-refresh component. The state
- *   will be updated by this modifier.
- * @param enabled If not enabled, all scroll delta and fling velocity will be ignored.
- * @sample androidx.compose.material.samples.PullRefreshSample
- */
-fun Modifier.pullRefresh(
-    state: PullRefreshState,
-    enabled: Boolean = true,
-) = inspectable(
-    inspectorInfo =
-        debugInspectorInfo {
-            name = "pullRefresh"
-            properties["state"] = state
-            properties["enabled"] = enabled
-        },
-) {
-    Modifier.pullRefresh(state::onPull, state::onRelease, enabled)
-}
-
-/**
- * A nested scroll modifier that provides [onPull] and [onRelease] callbacks to aid building custom
- * pull refresh components.
- *
- * Note that this modifier must be added above a scrolling container, such as a lazy column, in
- * order to receive scroll events. For example:
- *
- * @param onPull Callback for dispatching vertical scroll delta, takes float pullDelta as argument.
- *   Positive delta (pulling down) is dispatched only if the child does not consume it (i.e. pulling
- *   down despite being at the top of a scrollable component), whereas negative delta (swiping up)
- *   is dispatched first (in case it is needed to push the indicator back up), and then the
- *   unconsumed delta is passed on to the child. The callback returns how much delta was consumed.
- * @param onRelease Callback for when drag is released, takes float flingVelocity as argument. The
- *   callback returns how much velocity was consumed - in most cases this should only consume
- *   velocity if pull refresh has been dragged already and the velocity is positive (the fling is
- *   downwards), as an upwards fling should typically still scroll a scrollable component beneath
- *   the pullRefresh. This is invoked before any remaining velocity is passed to the child.
- * @param enabled If not enabled, all scroll delta and fling velocity will be ignored and neither
- *   [onPull] nor [onRelease] will be invoked.
- * @sample androidx.compose.material.samples.CustomPullRefreshSample
- */
-fun Modifier.pullRefresh(
-    onPull: (pullDelta: Float) -> Float,
-    onRelease: suspend (flingVelocity: Float) -> Float,
-    enabled: Boolean = true,
-) = inspectable(
-    inspectorInfo =
-        debugInspectorInfo {
-            name = "pullRefresh"
-            properties["onPull"] = onPull
-            properties["onRelease"] = onRelease
-            properties["enabled"] = enabled
-        },
-) {
-    Modifier.nestedScroll(PullRefreshNestedScrollConnection(onPull, onRelease, enabled))
-}
-
-private class PullRefreshNestedScrollConnection(
-    private val onPull: (pullDelta: Float) -> Float,
-    private val onRelease: suspend (flingVelocity: Float) -> Float,
-    private val enabled: Boolean,
-) : NestedScrollConnection {
-    override fun onPreScroll(
-        available: Offset,
-        source: NestedScrollSource,
-    ): Offset =
-        when {
-            !enabled -> Offset.Zero
-            source == Drag && available.y < 0 -> Offset(0f, onPull(available.y)) // Swiping up
-            else -> Offset.Zero
-        }
-
-    override fun onPostScroll(
-        consumed: Offset,
-        available: Offset,
-        source: NestedScrollSource,
-    ): Offset =
-        when {
-            !enabled -> Offset.Zero
-            source == Drag && available.y > 0 -> Offset(0f, onPull(available.y)) // Pulling down
-            else -> Offset.Zero
-        }
-
-    override suspend fun onPreFling(available: Velocity): Velocity = Velocity(0f, onRelease(available.y))
-}

amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicator.kt

@@ -1,231 +0,0 @@
-/**
- * Copyright (c) 2024 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package androidx.compose.material3.pullrefresh
-
-import androidx.compose.animation.Crossfade
-import androidx.compose.animation.core.LinearEasing
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.contentColorFor
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.geometry.center
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Path
-import androidx.compose.ui.graphics.PathFillType
-import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.graphics.drawscope.DrawScope
-import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.graphics.drawscope.rotate
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.unit.dp
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.pow
-
-/**
- * The default indicator for Compose pull-to-refresh, based on Android's SwipeRefreshLayout.
- *
- * @param refreshing A boolean representing whether a refresh is occurring.
- * @param state The [PullRefreshState] which controls where and how the indicator will be drawn.
- * @param modifier Modifiers for the indicator.
- * @param backgroundColor The color of the indicator's background.
- * @param contentColor The color of the indicator's arc and arrow.
- * @param scale A boolean controlling whether the indicator's size scales with pull progress or not.
- * @sample androidx.compose.material.samples.PullRefreshSample
- */
-@Composable
-fun PullRefreshIndicator(
-    refreshing: Boolean,
-    state: PullRefreshState,
-    modifier: Modifier = Modifier,
-    backgroundColor: Color = MaterialTheme.colorScheme.surface,
-    contentColor: Color = contentColorFor(backgroundColor),
-    scale: Boolean = false,
-) {
-    val showElevation by
-        remember(refreshing, state) { derivedStateOf { refreshing || state.position > 0.5f } }
-
-    Surface(
-        modifier = modifier.size(IndicatorSize).pullRefreshIndicatorTransform(state, scale),
-        shape = SpinnerShape,
-        color = backgroundColor,
-        shadowElevation = if (showElevation) Elevation else 0.dp,
-    ) {
-        Crossfade(
-            targetState = refreshing,
-            animationSpec = tween(durationMillis = CROSSFADE_DURATION_MS),
-        ) { refreshing ->
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.Center,
-            ) {
-                val spinnerSize = (ArcRadius + StrokeWidth).times(2)
-
-                if (refreshing) {
-                    CircularProgressIndicator(
-                        color = contentColor,
-                        strokeWidth = StrokeWidth,
-                        modifier = Modifier.size(spinnerSize),
-                    )
-                } else {
-                    CircularArrowIndicator(state, contentColor, Modifier.size(spinnerSize))
-                }
-            }
-        }
-    }
-}
-
-/** Modifier.size MUST be specified. */
-@Composable
-private fun CircularArrowIndicator(
-    state: PullRefreshState,
-    color: Color,
-    modifier: Modifier,
-) {
-    val path = remember { Path().apply { fillType = PathFillType.EvenOdd } }
-
-    val targetAlpha by
-        remember(state) { derivedStateOf { if (state.progress >= 1f) MAX_ALPHA else MIN_ALPHA } }
-
-    val alphaState = animateFloatAsState(targetValue = targetAlpha, animationSpec = AlphaTween)
-
-    // Empty semantics for tests
-    Canvas(modifier.semantics {}) {
-        val values = ArrowValues(state.progress)
-        val alpha = alphaState.value
-
-        rotate(degrees = values.rotation) {
-            val arcRadius = ArcRadius.toPx() + StrokeWidth.toPx() / 2f
-            val arcBounds =
-                Rect(
-                    size.center.x - arcRadius,
-                    size.center.y - arcRadius,
-                    size.center.x + arcRadius,
-                    size.center.y + arcRadius,
-                )
-            drawArc(
-                color = color,
-                alpha = alpha,
-                startAngle = values.startAngle,
-                sweepAngle = values.endAngle - values.startAngle,
-                useCenter = false,
-                topLeft = arcBounds.topLeft,
-                size = arcBounds.size,
-                style =
-                    Stroke(
-                        width = StrokeWidth.toPx(),
-                        cap = StrokeCap.Square,
-                    ),
-            )
-            drawArrow(path, arcBounds, color, alpha, values)
-        }
-    }
-}
-
-@Immutable
-private class ArrowValues(
-    val rotation: Float,
-    val startAngle: Float,
-    val endAngle: Float,
-    val scale: Float,
-)
-
-private fun ArrowValues(progress: Float): ArrowValues {
-    // Discard first 40% of progress. Scale remaining progress to full range between 0 and 100%.
-    val adjustedPercent = max(min(1f, progress) - 0.4f, 0f) * 5 / 3
-    // How far beyond the threshold pull has gone, as a percentage of the threshold.
-    val overshootPercent = abs(progress) - 1.0f
-    // Limit the overshoot to 200%. Linear between 0 and 200.
-    val linearTension = overshootPercent.coerceIn(0f, 2f)
-    // Non-linear tension. Increases with linearTension, but at a decreasing rate.
-    val tensionPercent = linearTension - linearTension.pow(2) / 4
-
-    // Calculations based on SwipeRefreshLayout specification.
-    val endTrim = adjustedPercent * MAX_PROGRESS_ARC
-    val rotation = (-0.25f + 0.4f * adjustedPercent + tensionPercent) * 0.5f
-    val startAngle = rotation * 360
-    val endAngle = (rotation + endTrim) * 360
-    val scale = min(1f, adjustedPercent)
-
-    return ArrowValues(rotation, startAngle, endAngle, scale)
-}
-
-private fun DrawScope.drawArrow(
-    arrow: Path,
-    bounds: Rect,
-    color: Color,
-    alpha: Float,
-    values: ArrowValues,
-) {
-    arrow.reset()
-    arrow.moveTo(0f, 0f) // Move to left corner
-    arrow.lineTo(x = ArrowWidth.toPx() * values.scale, y = 0f) // Line to right corner
-
-    // Line to tip of arrow
-    arrow.lineTo(
-        x = ArrowWidth.toPx() * values.scale / 2,
-        y = ArrowHeight.toPx() * values.scale,
-    )
-
-    val radius = min(bounds.width, bounds.height) / 2f
-    val inset = ArrowWidth.toPx() * values.scale / 2f
-    arrow.translate(
-        Offset(
-            x = radius + bounds.center.x - inset,
-            y = bounds.center.y + StrokeWidth.toPx() / 2f,
-        ),
-    )
-    arrow.close()
-    rotate(degrees = values.endAngle) { drawPath(path = arrow, color = color, alpha = alpha) }
-}
-
-private const val CROSSFADE_DURATION_MS = 100
-private const val MAX_PROGRESS_ARC = 0.8f
-
-private val IndicatorSize = 40.dp
-private val SpinnerShape = CircleShape
-private val ArcRadius = 7.5.dp
-private val StrokeWidth = 2.5.dp
-private val ArrowWidth = 10.dp
-private val ArrowHeight = 5.dp
-private val Elevation = 6.dp
-
-// Values taken from SwipeRefreshLayout
-private const val MIN_ALPHA = 0.3f
-private const val MAX_ALPHA = 1f
-private val AlphaTween = tween<Float>(300, easing = LinearEasing)

amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicatorTransform.kt

@@ -1,76 +0,0 @@
-/**
- * Copyright (c) 2024 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package androidx.compose.material3.pullrefresh
-
-import androidx.compose.animation.core.LinearOutSlowInEasing
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.graphics.drawscope.clipRect
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.platform.debugInspectorInfo
-import androidx.compose.ui.platform.inspectable
-
-/**
- * A modifier for translating the position and scaling the size of a pull-to-refresh indicator based
- * on the given [PullRefreshState].
- *
- * @param state The [PullRefreshState] which determines the position of the indicator.
- * @param scale A boolean controlling whether the indicator's size scales with pull progress or not.
- * @sample androidx.compose.material.samples.PullRefreshIndicatorTransformSample
- */
-fun Modifier.pullRefreshIndicatorTransform(
-    state: PullRefreshState,
-    scale: Boolean = false,
-) = inspectable(
-    inspectorInfo =
-        debugInspectorInfo {
-            name = "pullRefreshIndicatorTransform"
-            properties["state"] = state
-            properties["scale"] = scale
-        },
-) {
-    Modifier
-        // Essentially we only want to clip the at the top, so the indicator will not appear when
-        // the position is 0. It is preferable to clip the indicator as opposed to the layout that
-        // contains the indicator, as this would also end up clipping shadows drawn by items in a
-        // list for example - so we leave the clipping to the scrolling container. We use MAX_VALUE
-        // for the other dimensions to allow for more room for elevation / arbitrary indicators - we
-        // only ever really want to clip at the top edge.
-        .drawWithContent {
-            clipRect(
-                top = 0f,
-                left = -Float.MAX_VALUE,
-                right = Float.MAX_VALUE,
-                bottom = Float.MAX_VALUE,
-            ) {
-                this@drawWithContent.drawContent()
-            }
-        }.graphicsLayer {
-            translationY = state.position - size.height
-
-            if (scale && !state.refreshing) {
-                val scaleFraction =
-                    LinearOutSlowInEasing.transform(state.position / state.threshold).coerceIn(0f, 1f)
-                scaleX = scaleFraction
-                scaleY = scaleFraction
-            }
-        }
-}

amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshState.kt

@@ -1,234 +0,0 @@
-/**
- * Copyright (c) 2024 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package androidx.compose.material3.pullrefresh
-
-import androidx.compose.animation.core.animate
-import androidx.compose.foundation.MutatorMutex
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.State
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import kotlin.math.abs
-import kotlin.math.pow
-
-/**
- * Creates a [PullRefreshState] that is remembered across compositions.
- *
- * Changes to [refreshing] will result in [PullRefreshState] being updated.
- *
- * @param refreshing A boolean representing whether a refresh is currently occurring.
- * @param onRefresh The function to be called to trigger a refresh.
- * @param refreshThreshold The threshold below which, if a release occurs, [onRefresh] will be
- *   called.
- * @param refreshingOffset The offset at which the indicator will be drawn while refreshing. This
- *   offset corresponds to the position of the bottom of the indicator.
- * @sample androidx.compose.material.samples.PullRefreshSample
- */
-@Composable
-fun rememberPullRefreshState(
-    refreshing: Boolean,
-    onRefresh: () -> Unit,
-    refreshThreshold: Dp = PullRefreshDefaults.RefreshThreshold,
-    refreshingOffset: Dp = PullRefreshDefaults.RefreshingOffset,
-): PullRefreshState {
-    require(refreshThreshold > 0.dp) { "The refresh trigger must be greater than zero!" }
-
-    val scope = rememberCoroutineScope()
-    val onRefreshState = rememberUpdatedState(onRefresh)
-    val thresholdPx: Float
-    val refreshingOffsetPx: Float
-
-    with(LocalDensity.current) {
-        thresholdPx = refreshThreshold.toPx()
-        refreshingOffsetPx = refreshingOffset.toPx()
-    }
-
-    val state =
-        remember(scope) { PullRefreshState(scope, onRefreshState, refreshingOffsetPx, thresholdPx) }
-
-    SideEffect {
-        state.setRefreshing(refreshing)
-        state.setThreshold(thresholdPx)
-        state.setRefreshingOffset(refreshingOffsetPx)
-    }
-
-    return state
-}
-
-/**
- * A state object that can be used in conjunction with [pullRefresh] to add pull-to-refresh
- * behaviour to a scroll component. Based on Android's SwipeRefreshLayout.
- *
- * Provides [progress], a float representing how far the user has pulled as a percentage of the
- * refreshThreshold. Values of one or less indicate that the user has not yet pulled past the
- * threshold. Values greater than one indicate how far past the threshold the user has pulled.
- *
- * Can be used in conjunction with [pullRefreshIndicatorTransform] to implement Android-like
- * pull-to-refresh behaviour with a custom indicator.
- *
- * Should be created using [rememberPullRefreshState].
- */
-class PullRefreshState
-    internal constructor(
-        private val animationScope: CoroutineScope,
-        private val onRefreshState: State<() -> Unit>,
-        refreshingOffset: Float,
-        threshold: Float,
-    ) {
-        /**
-         * A float representing how far the user has pulled as a percentage of the refreshThreshold.
-         *
-         * If the component has not been pulled at all, progress is zero. If the pull has reached halfway
-         * to the threshold, progress is 0.5f. A value greater than 1 indicates that pull has gone beyond
-         * the refreshThreshold - e.g. a value of 2f indicates that the user has pulled to two times the
-         * refreshThreshold.
-         */
-        val progress
-            get() = adjustedDistancePulled / threshold
-
-        val refreshing
-            get() = _refreshing
-
-        val position
-            get() = _position
-
-        val threshold
-            get() = _threshold
-
-        private val adjustedDistancePulled by derivedStateOf { distancePulled * DRAG_MULTIPLIER }
-
-        private var _refreshing by mutableStateOf(false)
-        private var _position by mutableStateOf(0f)
-        private var distancePulled by mutableStateOf(0f)
-        private var _threshold by mutableStateOf(threshold)
-        private var refreshingOffsetState by mutableStateOf(refreshingOffset)
-
-        internal fun onPull(pullDelta: Float): Float {
-            if (_refreshing) return 0f // Already refreshing, do nothing.
-
-            val newOffset = (distancePulled + pullDelta).coerceAtLeast(0f)
-            val dragConsumed = newOffset - distancePulled
-            distancePulled = newOffset
-            _position = calculateIndicatorPosition()
-            return dragConsumed
-        }
-
-        internal fun onRelease(velocity: Float): Float {
-            if (refreshing) return 0f // Already refreshing, do nothing
-
-            if (adjustedDistancePulled > threshold) {
-                onRefreshState.value()
-            }
-            animateIndicatorTo(0f)
-            val consumed =
-                when {
-                    // We are flinging without having dragged the pull refresh (for example a fling inside
-                    // a list) - don't consume
-                    distancePulled == 0f -> 0f
-                    // If the velocity is negative, the fling is upwards, and we don't want to prevent the
-                    // the list from scrolling
-                    velocity < 0f -> 0f
-                    // We are showing the indicator, and the fling is downwards - consume everything
-                    else -> velocity
-                }
-            distancePulled = 0f
-            return consumed
-        }
-
-        internal fun setRefreshing(refreshing: Boolean) {
-            if (_refreshing != refreshing) {
-                _refreshing = refreshing
-                distancePulled = 0f
-                animateIndicatorTo(if (refreshing) refreshingOffsetState else 0f)
-            }
-        }
-
-        internal fun setThreshold(threshold: Float) {
-            _threshold = threshold
-        }
-
-        internal fun setRefreshingOffset(refreshingOffset: Float) {
-            if (refreshingOffsetState != refreshingOffset) {
-                refreshingOffsetState = refreshingOffset
-                if (refreshing) animateIndicatorTo(refreshingOffset)
-            }
-        }
-
-        // Make sure to cancel any existing animations when we launch a new one. We use this instead of
-        // Animatable as calling snapTo() on every drag delta has a one frame delay, and some extra
-        // overhead of running through the animation pipeline instead of directly mutating the state.
-        private val mutatorMutex = MutatorMutex()
-
-        private fun animateIndicatorTo(offset: Float) =
-            animationScope.launch {
-                mutatorMutex.mutate {
-                    animate(initialValue = _position, targetValue = offset) { value, _ -> _position = value }
-                }
-            }
-
-        private fun calculateIndicatorPosition(): Float =
-            when {
-                // If drag hasn't gone past the threshold, the position is the adjustedDistancePulled.
-                adjustedDistancePulled <= threshold -> adjustedDistancePulled
-                else -> {
-                    // How far beyond the threshold pull has gone, as a percentage of the threshold.
-                    val overshootPercent = abs(progress) - 1.0f
-                    // Limit the overshoot to 200%. Linear between 0 and 200.
-                    val linearTension = overshootPercent.coerceIn(0f, 2f)
-                    // Non-linear tension. Increases with linearTension, but at a decreasing rate.
-                    val tensionPercent = linearTension - linearTension.pow(2) / 4
-                    // The additional offset beyond the threshold.
-                    val extraOffset = threshold * tensionPercent
-                    threshold + extraOffset
-                }
-            }
-    }
-
-/** Default parameter values for [rememberPullRefreshState]. */
-object PullRefreshDefaults {
-    /**
-     * If the indicator is below this threshold offset when it is released, a refresh will be
-     * triggered.
-     */
-    val RefreshThreshold = 80.dp
-
-    /** The offset at which the indicator should be rendered whilst a refresh is occurring. */
-    val RefreshingOffset = 56.dp
-}
-
-/**
- * The distance pulled is multiplied by this value to give us the adjusted distance pulled, which is
- * used in calculating the indicator position (when the adjusted distance pulled is less than the
- * refresh threshold, it is the indicator position, otherwise the indicator position is derived from
- * the progress).
- */
-private const val DRAG_MULTIPLIER = 0.5f

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -22,139 +22,195 @@ package com.vitorpamplona.amethyst
 
 import android.app.Application
 import android.content.ContentResolver
-import android.content.Context
-import android.content.IntentFilter
-import android.os.Build
-import android.os.Looper
-import android.os.StrictMode
-import android.os.StrictMode.ThreadPolicy
-import android.os.StrictMode.VmPolicy
 import android.util.Log
 import androidx.security.crypto.EncryptedSharedPreferences
-import coil3.ImageLoader
 import coil3.disk.DiskCache
 import coil3.memory.MemoryCache
-import com.vitorpamplona.amethyst.service.LocationState
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.connectivity.ConnectivityManager
+import com.vitorpamplona.amethyst.service.crashreports.CrashReportCache
+import com.vitorpamplona.amethyst.service.crashreports.UnexpectedCrashSaver
+import com.vitorpamplona.amethyst.service.eventCache.MemoryTrimmingService
+import com.vitorpamplona.amethyst.service.images.ImageCacheFactory
+import com.vitorpamplona.amethyst.service.images.ImageLoaderSetup
+import com.vitorpamplona.amethyst.service.location.LocationState
+import com.vitorpamplona.amethyst.service.logging.Logging
 import com.vitorpamplona.amethyst.service.notifications.PokeyReceiver
-import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
+import com.vitorpamplona.amethyst.service.okhttp.DualHttpClientManager
+import com.vitorpamplona.amethyst.service.okhttp.EncryptionKeyCache
 import com.vitorpamplona.amethyst.service.okhttp.OkHttpWebSocket
-import com.vitorpamplona.amethyst.service.playback.VideoCache
-import com.vitorpamplona.ammolite.relays.NostrClient
+import com.vitorpamplona.amethyst.service.okhttp.ProxySettingsAnchor
+import com.vitorpamplona.amethyst.service.playback.diskCache.VideoCache
+import com.vitorpamplona.amethyst.service.playback.diskCache.VideoCacheFactory
+import com.vitorpamplona.amethyst.service.relayClient.CacheClientConnector
+import com.vitorpamplona.amethyst.service.relayClient.RelayProxyClientConnector
+import com.vitorpamplona.amethyst.service.relayClient.authCommand.model.AuthCoordinator
+import com.vitorpamplona.amethyst.service.relayClient.notifyCommand.model.NotifyCoordinator
+import com.vitorpamplona.amethyst.service.relayClient.reqCommand.RelaySubscriptionsCoordinator
+import com.vitorpamplona.amethyst.service.relayClient.speedLogger.RelaySpeedLogger
+import com.vitorpamplona.amethyst.service.uploads.nip95.Nip95CacheFactory
+import com.vitorpamplona.amethyst.ui.tor.TorManager
+import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip03Timestamp.VerificationStateCache
+import com.vitorpamplona.quartz.nip03Timestamp.ots.okhttp.OtsBlockHeightCache
+import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import okio.Path.Companion.toOkioPath
 import java.io.File
-import kotlin.time.measureTimedValue
 
 class Amethyst : Application() {
-    val applicationIOScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    val appAgent = "Amethyst/${BuildConfig.VERSION_NAME}"
 
-    val client: NostrClient = NostrClient(OkHttpWebSocket.Builder())
+    // Exists to avoid exceptions stopping the coroutine
+    val exceptionHandler =
+        CoroutineExceptionHandler { _, throwable ->
+            Log.e("AmethystCoroutine", "Caught exception: ${throwable.message}", throwable)
+        }
 
-    // Service Manager is only active when the activity is active.
-    val serviceManager = ServiceManager(client, applicationIOScope)
+    val applicationIOScope = CoroutineScope(Dispatchers.IO + SupervisorJob() + exceptionHandler)
+
+    // Key cache service to download and decrypt encrypted files before caching them.
+    val keyCache = EncryptionKeyCache()
+
+    // App services that should be run as soon as there are subscribers to their flows
     val locationManager = LocationState(this, applicationIOScope)
+    val connManager = ConnectivityManager(this, applicationIOScope)
 
+    val torManager = TorManager(this, applicationIOScope)
+
+    // Service that will run at all times to receive events from Pokey
     val pokeyReceiver = PokeyReceiver()
 
+    // manages all the other connections separately from relays.
+    val okHttpClients =
+        DualHttpClientManager(
+            userAgent = appAgent,
+            proxyPortProvider = torManager.activePortOrNull,
+            isMobileDataProvider = connManager.isMobileOrNull,
+            keyCache = keyCache,
+            scope = applicationIOScope,
+        )
+
+    // manages all relay connections
+    val okHttpClientForRelays =
+        DualHttpClientManager(
+            userAgent = appAgent,
+            proxyPortProvider = torManager.activePortOrNull,
+            isMobileDataProvider = connManager.isMobileOrNull,
+            keyCache = keyCache,
+            scope = applicationIOScope,
+        )
+
+    // manages all relay connections
+    val okHttpClientForRelaysForDms =
+        DualHttpClientManager(
+            userAgent = appAgent,
+            proxyPortProvider = torManager.activePortOrNull,
+            isMobileDataProvider = connManager.isMobileOrNull,
+            keyCache = keyCache,
+            scope = applicationIOScope,
+        )
+
+    val torProxySettingsAnchor = ProxySettingsAnchor()
+
+    // Connects the NostrClient class with okHttp
+    val websocketBuilder =
+        OkHttpWebSocket.Builder { url ->
+            val useTor = torProxySettingsAnchor.useProxy(url)
+            if (torProxySettingsAnchor.isDM(url)) {
+                okHttpClientForRelaysForDms.getHttpClient(useTor)
+            } else {
+                okHttpClientForRelays.getHttpClient(useTor)
+            }
+        }
+
+    // Caches all events in Memory
+    val cache: LocalCache = LocalCache
+
+    // Organizes cache clearing
+    val trimmingService = MemoryTrimmingService(cache)
+
+    // Provides a relay pool
+    val client: NostrClient = NostrClient(websocketBuilder, applicationIOScope)
+
+    // Watches for changes on Tor and Relay List Settings
+    val relayProxyClientConnector = RelayProxyClientConnector(torProxySettingsAnchor, okHttpClients, connManager, client, torManager, applicationIOScope)
+
+    // Verifies and inserts in the cache from all relays, all subscriptions
+    val cacheClientConnector = CacheClientConnector(client, cache)
+
+    // Show messages from the Relay and controls their dismissal
+    val notifyCoordinator = NotifyCoordinator(client)
+
+    // Authenticates with relays.
+    val authCoordinator = AuthCoordinator(client, applicationIOScope)
+
+    val logger = if (isDebug) RelaySpeedLogger(client) else null
+
+    // Coordinates all subscriptions for the Nostr Client
+    val sources: RelaySubscriptionsCoordinator = RelaySubscriptionsCoordinator(LocalCache, client, applicationIOScope)
+
+    // saves the .content of NIP-95 blobs in disk to save memory
+    val nip95cache: File by lazy { Nip95CacheFactory.new(this) }
+
+    // local video cache with disk + memory
+    val videoCache: VideoCache by lazy { VideoCacheFactory.new(this) }
+
+    // image cache in disk for coil
+    val diskCache: DiskCache by lazy { ImageCacheFactory.newDisk(this) }
+
+    // image cache in memory for coil
+    val memoryCache: MemoryCache by lazy { ImageCacheFactory.newMemory(this) }
+
+    val crashReportCache: CrashReportCache by lazy { CrashReportCache(this) }
+
+    // Application-wide ots verification cache
+    val otsVerifCache by lazy { VerificationStateCache() }
+
+    // Application-wide block height request cache
+    val otsBlockHeightCache by lazy { OtsBlockHeightCache() }
+
+    override fun onCreate() {
+        super.onCreate()
+        Log.d("AmethystApp", "onCreate $this")
+
+        Thread.setDefaultUncaughtExceptionHandler(UnexpectedCrashSaver(crashReportCache, applicationIOScope))
+
+        instance = this
+
+        if (isDebug) {
+            Logging.setup()
+        }
+
+        // initializes diskcache on an IO thread.
+        applicationIOScope.launch {
+            diskCache
+            videoCache
+        }
+
+        // registers to receive events
+        pokeyReceiver.register(this)
+    }
+
     override fun onTerminate() {
         super.onTerminate()
-        unregisterReceiver(pokeyReceiver)
-        applicationIOScope.cancel()
-    }
+        Log.d("AmethystApp", "onTerminate $this")
 
-    fun nip95cache() = safeCacheDir.resolve("NIP95")
-
-    val videoCache: VideoCache by lazy {
-        val newCache = VideoCache()
-        runBlocking {
-            newCache.initFileCache(
-                this@Amethyst,
-                safeCacheDir.resolve("exoplayer"),
-            )
-        }
-        newCache
-    }
-
-    val coilCache: DiskCache by lazy {
-        DiskCache
-            .Builder()
-            .directory(safeCacheDir.resolve("image_cache").toOkioPath())
-            .maxSizePercent(0.2)
-            .maximumMaxSizeBytes(1024 * 1024 * 1024) // 1GB
-            .build()
-    }
-
-    val memoryCache: MemoryCache by lazy {
-        MemoryCache
-            .Builder()
-            .maxSizePercent(this)
-            .build()
+        pokeyReceiver.unregister(this)
+        applicationIOScope.cancel("Application onTerminate $this")
     }
 
     fun contentResolverFn(): ContentResolver = contentResolver
 
-    override fun onCreate() {
-        super.onCreate()
-
-        instance = this
-
-        HttpClientManager.setDefaultUserAgent("Amethyst/${BuildConfig.VERSION_NAME}")
-
-        if (BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "benchmark") {
-            StrictMode.setThreadPolicy(
-                ThreadPolicy
-                    .Builder()
-                    .detectAll()
-                    .penaltyLog()
-                    .build(),
-            )
-            StrictMode.setVmPolicy(
-                VmPolicy
-                    .Builder()
-                    .detectAll()
-                    .penaltyLog()
-                    .build(),
-            )
-            Looper.getMainLooper().setMessageLogging(LogMonitor())
-            ChoreographerHelper.start()
-        }
-
-        GlobalScope.launch(Dispatchers.IO) {
-            val (value, elapsed) =
-                measureTimedValue {
-                    // initializes the video cache in a thread
-                    videoCache
-                }
-            Log.d("Rendering Metrics", "VideoCache initialized in $elapsed")
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            registerReceiver(
-                pokeyReceiver,
-                IntentFilter(PokeyReceiver.POKEY_ACTION),
-                RECEIVER_EXPORTED,
-            )
-        } else {
-            registerReceiver(
-                pokeyReceiver,
-                IntentFilter(PokeyReceiver.POKEY_ACTION),
-            )
+    fun setImageLoader(shouldUseTor: (String) -> Boolean?) {
+        ImageLoaderSetup.setup(this, diskCache, memoryCache) { url ->
+            shouldUseTor(url)?.let { okHttpClients.getHttpClient(it) } ?: okHttpClients.getHttpClient(false)
         }
     }
 
-    fun imageLoaderBuilder(): ImageLoader.Builder =
-        ImageLoader
-            .Builder(this)
-            .diskCache { coilCache }
-            .memoryCache { memoryCache }
-
     fun encryptedStorage(npub: String? = null): EncryptedSharedPreferences = EncryptedStorage.preferences(instance, npub)
 
     /**
@@ -162,13 +218,11 @@ class Amethyst : Application() {
      *
      * @param level the memory-related event that was raised.
      */
-    @OptIn(DelicateCoroutinesApi::class)
     override fun onTrimMemory(level: Int) {
         super.onTrimMemory(level)
-        println("Trim Memory $level")
-        GlobalScope.launch(Dispatchers.Default) {
-            println("Trim Memory Inside $level")
-            serviceManager.trimMemory()
+        Log.d("AmethystApp", "onTrimMemory $level")
+        applicationIOScope.launch(Dispatchers.Default) {
+            trimmingService.run(null, LocalPreferences.allSavedAccounts())
         }
     }
 
@@ -177,9 +231,3 @@ class Amethyst : Application() {
             private set
     }
 }
-
-internal val Context.safeCacheDir: File
-    get() {
-        val cacheDir = checkNotNull(cacheDir) { "cacheDir == null" }
-        return cacheDir.apply { mkdirs() }
-    }

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -27,44 +27,16 @@ import android.os.Debug
 import android.util.Log
 import androidx.core.content.getSystemService
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.service.NostrAccountDataSource
-import com.vitorpamplona.amethyst.service.NostrChannelDataSource
-import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
-import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
-import com.vitorpamplona.amethyst.service.NostrCommunityDataSource
-import com.vitorpamplona.amethyst.service.NostrDiscoveryDataSource
-import com.vitorpamplona.amethyst.service.NostrGeohashDataSource
-import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
-import com.vitorpamplona.amethyst.service.NostrHomeDataSource
-import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
-import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
-import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
-import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
-import com.vitorpamplona.amethyst.service.NostrThreadDataSource
-import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
-import com.vitorpamplona.amethyst.service.NostrVideoDataSource
+import kotlin.time.DurationUnit
+import kotlin.time.measureTimedValue
+
+@Suppress("SENSELESS_COMPARISON")
+val isDebug = BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "benchmark"
 
 fun debugState(context: Context) {
-    Amethyst.instance.client
-        .allSubscriptions()
-        .forEach { Log.d("STATE DUMP", "${it.key} ${it.value.joinToString { it.filter.toDebugJson() }}") }
-
-    NostrAccountDataSource.printCounter()
-    NostrChannelDataSource.printCounter()
-    NostrChatroomDataSource.printCounter()
-    NostrChatroomListDataSource.printCounter()
-    NostrCommunityDataSource.printCounter()
-    NostrDiscoveryDataSource.printCounter()
-    NostrHashtagDataSource.printCounter()
-    NostrGeohashDataSource.printCounter()
-    NostrHomeDataSource.printCounter()
-    NostrSearchEventOrUserDataSource.printCounter()
-    NostrSingleChannelDataSource.printCounter()
-    NostrSingleEventDataSource.printCounter()
-    NostrSingleUserDataSource.printCounter()
-    NostrThreadDataSource.printCounter()
-    NostrUserProfileDataSource.printCounter()
-    NostrVideoDataSource.printCounter()
+    // Amethyst.instance.client
+    //    .allSubscriptions()
+    //    .forEach { Log.d("STATE DUMP", "${it.key} ${it.value.filters.joinToString { it.filter.toJson() }}") }
 
     val totalMemoryMb = Runtime.getRuntime().totalMemory() / (1024 * 1024)
     val freeMemoryMb = Runtime.getRuntime().freeMemory() / (1024 * 1024)
@@ -72,37 +44,44 @@ fun debugState(context: Context) {
 
     val jvmHeapAllocatedMb = totalMemoryMb - freeMemoryMb
 
-    Log.d("STATE DUMP", "Total Heap Allocated: " + jvmHeapAllocatedMb + "/" + maxMemoryMb + " MB")
+    Log.d("STATE DUMP", "Total Heap Allocated: $jvmHeapAllocatedMb/$maxMemoryMb MB")
 
     val nativeHeap = Debug.getNativeHeapAllocatedSize() / (1024 * 1024)
     val maxNative = Debug.getNativeHeapSize() / (1024 * 1024)
 
-    Log.d("STATE DUMP", "Total Native Heap Allocated: " + nativeHeap + "/" + maxNative + " MB")
+    Log.d("STATE DUMP", "Total Native Heap Allocated: $nativeHeap/$maxNative MB")
 
     val activityManager: ActivityManager? = context.getSystemService()
     if (activityManager != null) {
         val isLargeHeap = (context.applicationInfo.flags and ApplicationInfo.FLAG_LARGE_HEAP) != 0
         val memClass = if (isLargeHeap) activityManager.largeMemoryClass else activityManager.memoryClass
 
-        Log.d("STATE DUMP", "Memory Class " + memClass + " MB (largeHeap $isLargeHeap)")
+        Log.d("STATE DUMP", "Memory Class $memClass MB (largeHeap $isLargeHeap)")
     }
 
-    Log.d("STATE DUMP", "Connected Relays: " + Amethyst.instance.client.connectedRelays())
-
     Log.d(
         "STATE DUMP",
-        "Image Disk Cache ${(Amethyst.instance.coilCache.size) / (1024 * 1024)}/${(Amethyst.instance.coilCache.maxSize) / (1024 * 1024)} MB",
+        "Connected Relays: " +
+            Amethyst.instance.client
+                .relayStatusFlow()
+                .value.connected.size + "/" +
+            Amethyst.instance.client
+                .relayStatusFlow()
+                .value.available.size,
+    )
+
+    Log.d(
+        "STATE DUMP",
+        "Image Disk Cache ${(Amethyst.instance.diskCache.size) / (1024 * 1024)}/${(Amethyst.instance.diskCache.maxSize) / (1024 * 1024)} MB",
     )
     Log.d(
         "STATE DUMP",
-        "Image Memory Cache ${(Amethyst.instance.memoryCache.size) / (1024 * 1024)}/${(Amethyst.instance.memoryCache.size) / (1024 * 1024)} MB",
+        "Image Memory Cache ${(Amethyst.instance.memoryCache.size) / (1024 * 1024)}/${(Amethyst.instance.memoryCache.maxSize) / (1024 * 1024)} MB",
     )
 
     Log.d(
         "STATE DUMP",
         "Notes: " +
-            LocalCache.notes.filter { _, it -> it.liveSet != null }.size +
-            " / " +
             LocalCache.notes.filter { _, it -> it.flowSet != null }.size +
             " / " +
             LocalCache.notes.filter { _, it -> it.event != null }.size +
@@ -112,8 +91,6 @@ fun debugState(context: Context) {
     Log.d(
         "STATE DUMP",
         "Addressables: " +
-            LocalCache.addressables.filter { _, it -> it.liveSet != null }.size +
-            " / " +
             LocalCache.addressables.filter { _, it -> it.flowSet != null }.size +
             " / " +
             LocalCache.addressables.filter { _, it -> it.event != null }.size +
@@ -123,8 +100,6 @@ fun debugState(context: Context) {
     Log.d(
         "STATE DUMP",
         "Users: " +
-            LocalCache.users.filter { _, it -> it.liveSet != null }.size +
-            " / " +
             LocalCache.users.filter { _, it -> it.flowSet != null }.size +
             " / " +
             LocalCache.users.filter { _, it -> it.latestMetadata != null }.size +
@@ -147,7 +122,7 @@ fun debugState(context: Context) {
     Log.d(
         "STATE DUMP",
         "Spam: " +
-            LocalCache.antiSpam.spamMessages.size() + " / " + LocalCache.antiSpam.recentMessages.size(),
+            LocalCache.antiSpam.spamMessages.size() + " / " + LocalCache.antiSpam.recentEventIds.size() + " / " + LocalCache.antiSpam.recentAddressables.size(),
     )
 
     Log.d(
@@ -157,20 +132,68 @@ fun debugState(context: Context) {
             " MB",
     )
 
-    val qttNotes = LocalCache.notes.countByGroup { _, it -> it.event?.kind() }
-    val qttAddressables = LocalCache.addressables.countByGroup { _, it -> it.event?.kind() }
+    val qttNotes = LocalCache.notes.countByGroup { _, it -> it.event?.kind }
+    val qttAddressables = LocalCache.addressables.countByGroup { _, it -> it.event?.kind }
 
     val bytesNotes =
         LocalCache.notes
-            .sumByGroup(groupMap = { _, it -> it.event?.kind() }, sumOf = { _, it -> it.event?.countMemory() ?: 0L })
+            .sumByGroup(groupMap = { _, it -> it.event?.kind }, sumOf = { _, it -> it.event?.countMemory() ?: 0L })
     val bytesAddressables =
         LocalCache.addressables
-            .sumByGroup(groupMap = { _, it -> it.event?.kind() }, sumOf = { _, it -> it.event?.countMemory() ?: 0L })
+            .sumByGroup(groupMap = { _, it -> it.event?.kind }, sumOf = { _, it -> it.event?.countMemory() ?: 0L })
 
-    qttNotes.toList().sortedByDescending { bytesNotes.get(it.first) }.forEach { (kind, qtt) ->
-        Log.d("STATE DUMP", "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesNotes.get(kind)?.div((1024 * 1024))}MB ")
+    qttNotes.toList().sortedByDescending { bytesNotes[it.first] }.forEach { (kind, qtt) ->
+        Log.d("STATE DUMP", "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesNotes[kind]?.div((1024 * 1024))}MB ")
     }
-    qttAddressables.toList().sortedByDescending { bytesNotes.get(it.first) }.forEach { (kind, qtt) ->
-        Log.d("STATE DUMP", "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesAddressables.get(kind)?.div((1024 * 1024))}MB ")
+    qttAddressables.toList().sortedByDescending { bytesNotes[it.first] }.forEach { (kind, qtt) ->
+        Log.d("STATE DUMP", "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesAddressables[kind]?.div((1024 * 1024))}MB ")
+    }
+}
+
+inline fun <T> logTime(
+    debugMessage: String,
+    minToReportMs: Int = 1,
+    block: () -> T,
+): T =
+    if (isDebug) {
+        val (result, elapsed) = measureTimedValue(block)
+        if (elapsed.inWholeMilliseconds > minToReportMs) {
+            Log.d("DEBUG-TIME", "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: $debugMessage")
+        }
+        result
+    } else {
+        block()
+    }
+
+inline fun <T> logTime(
+    debugMessage: (T) -> String,
+    minToReportMs: Int = 1,
+    block: () -> T,
+): T =
+    if (isDebug) {
+        val (result, elapsed) = measureTimedValue(block)
+        if (elapsed.inWholeMilliseconds > minToReportMs) {
+            Log.d("DEBUG-TIME", "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: ${debugMessage(result)}")
+        }
+        result
+    } else {
+        block()
+    }
+
+fun debug(
+    tag: String,
+    debugMessage: String,
+) {
+    if (isDebug) {
+        Log.d(tag, debugMessage)
+    }
+}
+
+inline fun debug(
+    tag: String,
+    debugMessage: () -> String,
+) {
+    if (isDebug) {
+        Log.d(tag, debugMessage())
     }
 }

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -25,41 +25,40 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.util.Log
 import androidx.compose.runtime.Immutable
+import androidx.core.content.edit
 import com.fasterxml.jackson.module.kotlin.readValue
-import com.vitorpamplona.amethyst.model.AccountLanguagePreferencesInternal
-import com.vitorpamplona.amethyst.model.AccountReactionPreferencesInternal
-import com.vitorpamplona.amethyst.model.AccountSecurityPreferencesInternal
+import com.vitorpamplona.amethyst.model.ALL_FOLLOWS
 import com.vitorpamplona.amethyst.model.AccountSettings
-import com.vitorpamplona.amethyst.model.AccountSyncedSettingsInternal
-import com.vitorpamplona.amethyst.model.AccountZapPreferencesInternal
-import com.vitorpamplona.amethyst.model.DefaultReactions
-import com.vitorpamplona.amethyst.model.DefaultZapAmounts
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
-import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.model.Settings
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.DEFAULT_MEDIA_SERVERS
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
 import com.vitorpamplona.amethyst.ui.tor.TorSettings
 import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
-import com.vitorpamplona.amethyst.ui.tor.TorType
-import com.vitorpamplona.ammolite.relays.RelaySetupInfo
-import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
-import com.vitorpamplona.quartz.encoders.hexToByteArray
-import com.vitorpamplona.quartz.encoders.toHexKey
-import com.vitorpamplona.quartz.encoders.toNpub
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.AppSpecificDataEvent
-import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
-import com.vitorpamplona.quartz.events.ContactListEvent
-import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
-import com.vitorpamplona.quartz.events.MuteListEvent
-import com.vitorpamplona.quartz.events.PrivateOutboxRelayListEvent
-import com.vitorpamplona.quartz.events.SearchRelayListEvent
+import com.vitorpamplona.quartz.experimental.ephemChat.list.EphemeralChatListEvent
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray
+import com.vitorpamplona.quartz.nip01Core.core.toHexKey
+import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
+import com.vitorpamplona.quartz.nip01Core.jackson.JsonMapper
+import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
+import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
+import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent
+import com.vitorpamplona.quartz.nip19Bech32.toNpub
+import com.vitorpamplona.quartz.nip28PublicChat.list.ChannelListEvent
+import com.vitorpamplona.quartz.nip37Drafts.privateOutbox.PrivateOutboxRelayListEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.Nip47WalletConnect
+import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.geohashList.GeohashListEvent
+import com.vitorpamplona.quartz.nip51Lists.hashtagList.HashtagListEvent
+import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.follow.CommunityListEvent
+import com.vitorpamplona.quartz.nip78AppData.AppSpecificDataEvent
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -67,7 +66,6 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import java.io.File
-import java.util.Locale
 
 // Release mode (!BuildConfig.DEBUG) always uses encrypted preferences
 // To use plaintext SharedPreferences for debugging, set this to true
@@ -88,14 +86,7 @@ private object PrefKeys {
     const val SAVED_ACCOUNTS = "all_saved_accounts"
     const val NOSTR_PRIVKEY = "nostr_privkey"
     const val NOSTR_PUBKEY = "nostr_pubkey"
-    const val RELAYS = "relays"
-    const val DONT_TRANSLATE_FROM = "dontTranslateFrom"
     const val LOCAL_RELAY_SERVERS = "localRelayServers"
-    const val LANGUAGE_PREFS = "languagePreferences"
-    const val TRANSLATE_TO = "translateTo"
-    const val ZAP_AMOUNTS = "zapAmounts"
-    const val REACTION_CHOICES = "reactionChoices"
-    const val DEFAULT_ZAPTYPE = "defaultZapType"
     const val DEFAULT_FILE_SERVER = "defaultFileServer"
     const val DEFAULT_HOME_FOLLOW_LIST = "defaultHomeFollowList"
     const val DEFAULT_STORIES_FOLLOW_LIST = "defaultStoriesFollowList"
@@ -107,18 +98,22 @@ private object PrefKeys {
     const val LATEST_DM_RELAY_LIST = "latestDMRelayList"
     const val LATEST_NIP65_RELAY_LIST = "latestNIP65RelayList"
     const val LATEST_SEARCH_RELAY_LIST = "latestSearchRelayList"
+    const val LATEST_BLOCKED_RELAY_LIST = "latestBlockedRelayList"
+    const val LATEST_TRUSTED_RELAY_LIST = "latestTrustedRelayList"
     const val LATEST_MUTE_LIST = "latestMuteList"
     const val LATEST_PRIVATE_HOME_RELAY_LIST = "latestPrivateHomeRelayList"
     const val LATEST_APP_SPECIFIC_DATA = "latestAppSpecificData"
+    const val LATEST_CHANNEL_LIST = "latestChannelList"
+    const val LATEST_COMMUNITY_LIST = "latestCommunityList"
+    const val LATEST_HASHTAG_LIST = "latestHashtagList"
+    const val LATEST_GEOHASH_LIST = "latestGeohashList"
+    const val LATEST_EPHEMERAL_LIST = "latestEphemeralChatList"
     const val HIDE_DELETE_REQUEST_DIALOG = "hide_delete_request_dialog"
     const val HIDE_BLOCK_ALERT_DIALOG = "hide_block_alert_dialog"
     const val HIDE_NIP_17_WARNING_DIALOG = "hide_nip24_warning_dialog" // delete later
     const val TOR_SETTINGS = "tor_settings"
     const val USE_PROXY = "use_proxy"
     const val PROXY_PORT = "proxy_port"
-    const val SHOW_SENSITIVE_CONTENT = "show_sensitive_content"
-    const val WARN_ABOUT_REPORTS = "warn_about_reports"
-    const val FILTER_SPAM_FROM_STRANGERS = "filter_spam_from_strangers"
     const val LAST_READ_PER_ROUTE = "last_read_route_per_route"
     const val LOGIN_WITH_EXTERNAL_SIGNER = "login_with_external_signer"
     const val SIGNER_PACKAGE_NAME = "signer_package_name"
@@ -133,8 +128,8 @@ object LocalPreferences {
     private const val COMMA = ","
 
     private var currentAccount: String? = null
-    private var savedAccounts: MutableStateFlow<List<AccountInfo>?> = MutableStateFlow(null)
-    private var cachedAccounts: MutableMap<String, AccountSettings?> = mutableMapOf()
+    private val savedAccounts: MutableStateFlow<List<AccountInfo>?> = MutableStateFlow(null)
+    private val cachedAccounts: MutableMap<String, AccountSettings?> = mutableMapOf()
 
     suspend fun currentAccount(): String? {
         if (currentAccount == null) {
@@ -150,13 +145,13 @@ object LocalPreferences {
         if (info == null) {
             currentAccount = null
             withContext(Dispatchers.IO) {
-                encryptedPreferences().edit().clear().apply()
+                encryptedPreferences().edit { clear() }
             }
         } else if (currentAccount != info.npub) {
             currentAccount = info.npub
             if (!info.isTransient) {
                 withContext(Dispatchers.IO) {
-                    encryptedPreferences().edit().apply { putString(PrefKeys.CURRENT_ACCOUNT, info.npub) }.apply()
+                    encryptedPreferences().edit { putString(PrefKeys.CURRENT_ACCOUNT, info.npub) }
                 }
             }
         }
@@ -168,7 +163,7 @@ object LocalPreferences {
                 with(encryptedPreferences()) {
                     val newSystemOfAccounts =
                         getString(PrefKeys.ALL_ACCOUNT_INFO, "[]")?.let {
-                            Event.mapper.readValue<List<AccountInfo>>(it)
+                            JsonMapper.mapper.readValue<List<AccountInfo>>(it)
                         }
 
                     if (!newSystemOfAccounts.isNullOrEmpty()) {
@@ -188,7 +183,7 @@ object LocalPreferences {
 
                         savedAccounts.emit(migrated)
 
-                        edit().apply { putString(PrefKeys.ALL_ACCOUNT_INFO, Event.mapper.writeValueAsString(savedAccounts.value)) }.apply()
+                        edit { putString(PrefKeys.ALL_ACCOUNT_INFO, JsonMapper.mapper.writeValueAsString(savedAccounts.value)) }
                     }
                 }
             }
@@ -205,13 +200,12 @@ object LocalPreferences {
                 savedAccounts.emit(accounts)
 
                 encryptedPreferences()
-                    .edit()
-                    .apply {
+                    .edit {
                         putString(
                             PrefKeys.ALL_ACCOUNT_INFO,
-                            Event.mapper.writeValueAsString(accounts.filter { !it.isTransient }),
+                            JsonMapper.mapper.writeValueAsString(accounts.filter { !it.isTransient }),
                         )
-                    }.apply()
+                    }
             }
         }
 
@@ -263,7 +257,7 @@ object LocalPreferences {
                 if (npub == null) DEBUG_PREFERENCES_NAME else "${DEBUG_PREFERENCES_NAME}_$npub"
             Amethyst.instance.getSharedPreferences(preferenceFile, Context.MODE_PRIVATE)
         } else {
-            return Amethyst.instance.encryptedStorage(npub)
+            Amethyst.instance.encryptedStorage(npub)
         }
     }
 
@@ -276,10 +270,10 @@ object LocalPreferences {
      * deleted
      */
     @SuppressLint("ApplySharedPref")
-    suspend fun updatePrefsForLogout(accountInfo: AccountInfo) {
+    suspend fun deleteAccount(accountInfo: AccountInfo) {
         Log.d("LocalPreferences", "Saving to encrypted storage updatePrefsForLogout ${accountInfo.npub}")
         withContext(Dispatchers.IO) {
-            encryptedPreferences(accountInfo.npub).edit().clear().commit()
+            encryptedPreferences(accountInfo.npub).edit(commit = true) { clear() }
             removeAccount(accountInfo)
             deleteUserPreferenceFile(accountInfo.npub)
 
@@ -291,7 +285,7 @@ object LocalPreferences {
         }
     }
 
-    suspend fun updatePrefsForLogin(accountSettings: AccountSettings) {
+    suspend fun setDefaultAccount(accountSettings: AccountSettings) {
         setCurrentAccount(accountSettings)
         saveToEncryptedStorage(accountSettings)
     }
@@ -303,142 +297,202 @@ object LocalPreferences {
         if (!settings.transientAccount) {
             withContext(Dispatchers.IO) {
                 val prefs = encryptedPreferences(settings.keyPair.pubKey.toNpub())
-                prefs
-                    .edit()
-                    .apply {
-                        putBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, settings.externalSignerPackageName != null)
-                        if (settings.externalSignerPackageName != null) {
-                            remove(PrefKeys.NOSTR_PRIVKEY)
-                            putString(PrefKeys.SIGNER_PACKAGE_NAME, settings.externalSignerPackageName)
-                        } else {
-                            remove(PrefKeys.SIGNER_PACKAGE_NAME)
-                            settings.keyPair.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHexKey()) }
-                        }
-                        settings.keyPair.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHexKey()) }
-                        putString(PrefKeys.RELAYS, Event.mapper.writeValueAsString(settings.localRelays))
+                prefs.edit {
+                    putBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, settings.externalSignerPackageName != null)
+                    if (settings.externalSignerPackageName != null) {
+                        remove(PrefKeys.NOSTR_PRIVKEY)
+                        putString(PrefKeys.SIGNER_PACKAGE_NAME, settings.externalSignerPackageName)
+                    } else {
+                        remove(PrefKeys.SIGNER_PACKAGE_NAME)
+                        settings.keyPair.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHexKey()) }
+                    }
+                    settings.keyPair.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHexKey()) }
 
+                    putString(
+                        PrefKeys.DEFAULT_FILE_SERVER,
+                        JsonMapper.mapper.writeValueAsString(settings.defaultFileServer),
+                    )
+                    putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, settings.defaultHomeFollowList.value)
+                    putString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, settings.defaultStoriesFollowList.value)
+                    putString(
+                        PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST,
+                        settings.defaultNotificationFollowList.value,
+                    )
+                    putString(
+                        PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST,
+                        settings.defaultDiscoveryFollowList.value,
+                    )
+                    putString(
+                        PrefKeys.ZAP_PAYMENT_REQUEST_SERVER,
+                        JsonMapper.mapper.writeValueAsString(settings.zapPaymentRequest.value?.denormalize()),
+                    )
+                    if (settings.backupContactList != null) {
                         putString(
-                            PrefKeys.DEFAULT_FILE_SERVER,
-                            Event.mapper.writeValueAsString(settings.defaultFileServer),
+                            PrefKeys.LATEST_CONTACT_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupContactList),
                         )
-                        putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, settings.defaultHomeFollowList.value)
-                        putString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, settings.defaultStoriesFollowList.value)
+                    } else {
+                        remove(PrefKeys.LATEST_CONTACT_LIST)
+                    }
+
+                    if (settings.backupUserMetadata != null) {
                         putString(
-                            PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST,
-                            settings.defaultNotificationFollowList.value,
+                            PrefKeys.LATEST_USER_METADATA,
+                            JsonMapper.mapper.writeValueAsString(settings.backupUserMetadata),
                         )
+                    } else {
+                        remove(PrefKeys.LATEST_USER_METADATA)
+                    }
+
+                    if (settings.backupDMRelayList != null) {
                         putString(
-                            PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST,
-                            settings.defaultDiscoveryFollowList.value,
+                            PrefKeys.LATEST_DM_RELAY_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupDMRelayList),
                         )
+                    } else {
+                        remove(PrefKeys.LATEST_DM_RELAY_LIST)
+                    }
+
+                    if (settings.backupNIP65RelayList != null) {
                         putString(
-                            PrefKeys.ZAP_PAYMENT_REQUEST_SERVER,
-                            Event.mapper.writeValueAsString(settings.zapPaymentRequest),
+                            PrefKeys.LATEST_NIP65_RELAY_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupNIP65RelayList),
                         )
-                        if (settings.backupContactList != null) {
-                            putString(
-                                PrefKeys.LATEST_CONTACT_LIST,
-                                Event.mapper.writeValueAsString(settings.backupContactList),
-                            )
-                        } else {
-                            remove(PrefKeys.LATEST_CONTACT_LIST)
-                        }
-
-                        if (settings.backupUserMetadata != null) {
-                            putString(
-                                PrefKeys.LATEST_USER_METADATA,
-                                Event.mapper.writeValueAsString(settings.backupUserMetadata),
-                            )
-                        } else {
-                            remove(PrefKeys.LATEST_USER_METADATA)
-                        }
-
-                        if (settings.backupDMRelayList != null) {
-                            putString(
-                                PrefKeys.LATEST_DM_RELAY_LIST,
-                                Event.mapper.writeValueAsString(settings.backupDMRelayList),
-                            )
-                        } else {
-                            remove(PrefKeys.LATEST_DM_RELAY_LIST)
-                        }
-
-                        if (settings.backupNIP65RelayList != null) {
-                            putString(
-                                PrefKeys.LATEST_NIP65_RELAY_LIST,
-                                Event.mapper.writeValueAsString(settings.backupNIP65RelayList),
-                            )
-                        } else {
-                            remove(PrefKeys.LATEST_NIP65_RELAY_LIST)
-                        }
-
-                        if (settings.backupSearchRelayList != null) {
-                            putString(
-                                PrefKeys.LATEST_SEARCH_RELAY_LIST,
-                                Event.mapper.writeValueAsString(settings.backupSearchRelayList),
-                            )
-                        } else {
-                            remove(PrefKeys.LATEST_SEARCH_RELAY_LIST)
-                        }
-
-                        if (settings.localRelayServers.isNotEmpty()) {
-                            putStringSet(PrefKeys.LOCAL_RELAY_SERVERS, settings.localRelayServers)
-                        } else {
-                            remove(PrefKeys.LOCAL_RELAY_SERVERS)
-                        }
-
-                        if (settings.backupMuteList != null) {
-                            putString(
-                                PrefKeys.LATEST_MUTE_LIST,
-                                Event.mapper.writeValueAsString(settings.backupMuteList),
-                            )
-                        } else {
-                            remove(PrefKeys.LATEST_MUTE_LIST)
-                        }
-
-                        if (settings.backupPrivateHomeRelayList != null) {
-                            putString(
-                                PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST,
-                                Event.mapper.writeValueAsString(settings.backupPrivateHomeRelayList),
-                            )
-                        } else {
-                            remove(PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST)
-                        }
-
-                        if (settings.backupAppSpecificData != null) {
-                            putString(
-                                PrefKeys.LATEST_APP_SPECIFIC_DATA,
-                                Event.mapper.writeValueAsString(settings.backupAppSpecificData),
-                            )
-                        } else {
-                            remove(PrefKeys.LATEST_APP_SPECIFIC_DATA)
-                        }
-
-                        putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, settings.hideDeleteRequestDialog)
-                        putBoolean(PrefKeys.HIDE_NIP_17_WARNING_DIALOG, settings.hideNIP17WarningDialog)
-                        putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, settings.hideBlockAlertDialog)
-
-                        // migrating from previous design
-                        remove(PrefKeys.USE_PROXY)
-                        remove(PrefKeys.PROXY_PORT)
-
-                        putString(PrefKeys.TOR_SETTINGS, Event.mapper.writeValueAsString(settings.torSettings.toSettings()))
-
-                        val regularMap =
-                            settings.lastReadPerRoute.value.mapValues {
-                                it.value.value
-                            }
+                    } else {
+                        remove(PrefKeys.LATEST_NIP65_RELAY_LIST)
+                    }
 
+                    if (settings.backupSearchRelayList != null) {
                         putString(
-                            PrefKeys.LAST_READ_PER_ROUTE,
-                            Event.mapper.writeValueAsString(regularMap),
+                            PrefKeys.LATEST_SEARCH_RELAY_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupSearchRelayList),
                         )
-                        putStringSet(PrefKeys.HAS_DONATED_IN_VERSION, settings.hasDonatedInVersion.value)
+                    } else {
+                        remove(PrefKeys.LATEST_SEARCH_RELAY_LIST)
+                    }
 
+                    if (settings.backupBlockedRelayList != null) {
                         putString(
-                            PrefKeys.PENDING_ATTESTATIONS,
-                            Event.mapper.writeValueAsString(settings.pendingAttestations.value),
+                            PrefKeys.LATEST_BLOCKED_RELAY_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupBlockedRelayList),
                         )
-                    }.apply()
+                    } else {
+                        remove(PrefKeys.LATEST_BLOCKED_RELAY_LIST)
+                    }
+
+                    if (settings.backupTrustedRelayList != null) {
+                        putString(
+                            PrefKeys.LATEST_TRUSTED_RELAY_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupTrustedRelayList),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_TRUSTED_RELAY_LIST)
+                    }
+
+                    if (settings.localRelayServers.value.isNotEmpty()) {
+                        putStringSet(PrefKeys.LOCAL_RELAY_SERVERS, settings.localRelayServers.value)
+                    } else {
+                        remove(PrefKeys.LOCAL_RELAY_SERVERS)
+                    }
+
+                    if (settings.backupMuteList != null) {
+                        putString(
+                            PrefKeys.LATEST_MUTE_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupMuteList),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_MUTE_LIST)
+                    }
+
+                    if (settings.backupPrivateHomeRelayList != null) {
+                        putString(
+                            PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupPrivateHomeRelayList),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST)
+                    }
+
+                    if (settings.backupAppSpecificData != null) {
+                        putString(
+                            PrefKeys.LATEST_APP_SPECIFIC_DATA,
+                            JsonMapper.mapper.writeValueAsString(settings.backupAppSpecificData),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_APP_SPECIFIC_DATA)
+                    }
+
+                    if (settings.backupChannelList != null) {
+                        putString(
+                            PrefKeys.LATEST_CHANNEL_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupChannelList),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_CHANNEL_LIST)
+                    }
+
+                    if (settings.backupCommunityList != null) {
+                        putString(
+                            PrefKeys.LATEST_COMMUNITY_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupCommunityList),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_COMMUNITY_LIST)
+                    }
+
+                    if (settings.backupHashtagList != null) {
+                        putString(
+                            PrefKeys.LATEST_HASHTAG_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupHashtagList),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_HASHTAG_LIST)
+                    }
+
+                    if (settings.backupGeohashList != null) {
+                        putString(
+                            PrefKeys.LATEST_GEOHASH_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupGeohashList),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_GEOHASH_LIST)
+                    }
+
+                    if (settings.backupEphemeralChatList != null) {
+                        putString(
+                            PrefKeys.LATEST_EPHEMERAL_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupEphemeralChatList),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_EPHEMERAL_LIST)
+                    }
+
+                    putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, settings.hideDeleteRequestDialog)
+                    putBoolean(PrefKeys.HIDE_NIP_17_WARNING_DIALOG, settings.hideNIP17WarningDialog)
+                    putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, settings.hideBlockAlertDialog)
+
+                    // migrating from previous design
+                    remove(PrefKeys.USE_PROXY)
+                    remove(PrefKeys.PROXY_PORT)
+
+                    putString(PrefKeys.TOR_SETTINGS, JsonMapper.mapper.writeValueAsString(settings.torSettings.toSettings()))
+
+                    val regularMap =
+                        settings.lastReadPerRoute.value.mapValues {
+                            it.value.value
+                        }
+
+                    putString(
+                        PrefKeys.LAST_READ_PER_ROUTE,
+                        JsonMapper.mapper.writeValueAsString(regularMap),
+                    )
+                    putStringSet(PrefKeys.HAS_DONATED_IN_VERSION, settings.hasDonatedInVersion.value)
+
+                    putString(
+                        PrefKeys.PENDING_ATTESTATIONS,
+                        JsonMapper.mapper.writeValueAsString(settings.pendingAttestations.value),
+                    )
+                }
             }
         }
         Log.d("LocalPreferences", "Saved to encrypted storage")
@@ -451,9 +505,8 @@ object LocalPreferences {
         prefs: SharedPreferences = encryptedPreferences(),
     ) {
         Log.d("LocalPreferences", "Saving to shared settings")
-        with(prefs.edit()) {
-            putString(PrefKeys.SHARED_SETTINGS, Event.mapper.writeValueAsString(sharedSettings))
-            apply()
+        prefs.edit {
+            putString(PrefKeys.SHARED_SETTINGS, JsonMapper.mapper.writeValueAsString(sharedSettings))
         }
     }
 
@@ -461,7 +514,7 @@ object LocalPreferences {
         Log.d("LocalPreferences", "Load shared settings")
         with(prefs) {
             return try {
-                getString(PrefKeys.SHARED_SETTINGS, "{}")?.let { Event.mapper.readValue<Settings>(it) }
+                getString(PrefKeys.SHARED_SETTINGS, "{}")?.let { JsonMapper.mapper.readValue<Settings>(it) }
             } catch (e: Throwable) {
                 if (e is CancellationException) throw e
                 Log.w(
@@ -469,7 +522,6 @@ object LocalPreferences {
                     "Unable to decode shared preferences: ${getString(PrefKeys.SHARED_SETTINGS, null)}",
                     e,
                 )
-                e.printStackTrace()
                 null
             }
         }
@@ -500,161 +552,100 @@ object LocalPreferences {
 
     private suspend fun innerLoadCurrentAccountFromEncryptedStorage(npub: String?): AccountSettings? {
         Log.d("LocalPreferences", "Load account from file $npub")
+        val result =
+            withContext(Dispatchers.IO) {
+                checkNotInMainThread()
 
-        return withContext(Dispatchers.IO) {
-            checkNotInMainThread()
+                return@withContext with(encryptedPreferences(npub)) {
+                    val privKey = getString(PrefKeys.NOSTR_PRIVKEY, null)
+                    val pubKey = getString(PrefKeys.NOSTR_PUBKEY, null) ?: return@with null
+                    val externalSignerPackageName =
+                        getString(PrefKeys.SIGNER_PACKAGE_NAME, null)
+                            ?: if (getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)) "com.greenart7c3.nostrsigner" else null
 
-            return@withContext with(encryptedPreferences(npub)) {
-                val privKey = getString(PrefKeys.NOSTR_PRIVKEY, null)
-                val pubKey = getString(PrefKeys.NOSTR_PUBKEY, null) ?: return@with null
-                val externalSignerPackageName =
-                    getString(PrefKeys.SIGNER_PACKAGE_NAME, null)
-                        ?: if (getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)) "com.greenart7c3.nostrsigner" else null
+                    val defaultHomeFollowList =
+                        getString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, null) ?: ALL_FOLLOWS
+                    val defaultStoriesFollowList =
+                        getString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
+                    val defaultNotificationFollowList =
+                        getString(PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
+                    val defaultDiscoveryFollowList =
+                        getString(PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
 
-                val defaultHomeFollowList =
-                    getString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, null) ?: KIND3_FOLLOWS
-                val defaultStoriesFollowList =
-                    getString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
-                val defaultNotificationFollowList =
-                    getString(PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
-                val defaultDiscoveryFollowList =
-                    getString(PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
+                    val zapPaymentRequestServer = parseOrNull<Nip47WalletConnect.Nip47URI>(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER)
+                    val defaultFileServer = parseOrNull<ServerName>(PrefKeys.DEFAULT_FILE_SERVER) ?: DEFAULT_MEDIA_SERVERS[0]
 
-                val defaultZapType =
-                    getString(PrefKeys.DEFAULT_ZAPTYPE, "")?.let { serverName ->
-                        LnZapEvent.ZapType.entries.firstOrNull { it.name == serverName }
-                    } ?: LnZapEvent.ZapType.PUBLIC
+                    val pendingAttestations = parseOrNull<Map<HexKey, String>>(PrefKeys.PENDING_ATTESTATIONS) ?: mapOf()
+                    val localRelayServers = getStringSet(PrefKeys.LOCAL_RELAY_SERVERS, null) ?: setOf()
 
-                val localRelays = parseOrNull<Set<RelaySetupInfo>>(PrefKeys.RELAYS) ?: emptySet()
+                    val latestUserMetadata = parseEventOrNull<MetadataEvent>(PrefKeys.LATEST_USER_METADATA)
+                    val latestContactList = parseEventOrNull<ContactListEvent>(PrefKeys.LATEST_CONTACT_LIST)
+                    val latestDmRelayList = parseEventOrNull<ChatMessageRelayListEvent>(PrefKeys.LATEST_DM_RELAY_LIST)
+                    val latestNip65RelayList = parseEventOrNull<AdvertisedRelayListEvent>(PrefKeys.LATEST_NIP65_RELAY_LIST)
+                    val latestSearchRelayList = parseEventOrNull<SearchRelayListEvent>(PrefKeys.LATEST_SEARCH_RELAY_LIST)
+                    val latestBlockedRelayList = parseEventOrNull<BlockedRelayListEvent>(PrefKeys.LATEST_BLOCKED_RELAY_LIST)
+                    val latestTrustedRelayList = parseEventOrNull<TrustedRelayListEvent>(PrefKeys.LATEST_TRUSTED_RELAY_LIST)
+                    val latestMuteList = parseEventOrNull<MuteListEvent>(PrefKeys.LATEST_MUTE_LIST)
+                    val latestPrivateHomeRelayList = parseEventOrNull<PrivateOutboxRelayListEvent>(PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST)
+                    val latestAppSpecificData = parseEventOrNull<AppSpecificDataEvent>(PrefKeys.LATEST_APP_SPECIFIC_DATA)
+                    val latestChannelList = parseEventOrNull<ChannelListEvent>(PrefKeys.LATEST_CHANNEL_LIST)
+                    val latestCommunityList = parseEventOrNull<CommunityListEvent>(PrefKeys.LATEST_COMMUNITY_LIST)
+                    val latestHashtagList = parseEventOrNull<HashtagListEvent>(PrefKeys.LATEST_HASHTAG_LIST)
+                    val latestGeohashList = parseEventOrNull<GeohashListEvent>(PrefKeys.LATEST_GEOHASH_LIST)
+                    val latestEphemeralList = parseEventOrNull<EphemeralChatListEvent>(PrefKeys.LATEST_EPHEMERAL_LIST)
 
-                val zapPaymentRequestServer = parseOrNull<Nip47WalletConnect.Nip47URI>(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER)
-                val defaultFileServer = parseOrNull<ServerName>(PrefKeys.DEFAULT_FILE_SERVER) ?: DEFAULT_MEDIA_SERVERS[0]
+                    val hideDeleteRequestDialog = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
+                    val hideBlockAlertDialog = getBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, false)
+                    val hideNIP17WarningDialog = getBoolean(PrefKeys.HIDE_NIP_17_WARNING_DIALOG, false)
 
-                val pendingAttestations = parseOrNull<Map<HexKey, String>>(PrefKeys.PENDING_ATTESTATIONS) ?: mapOf()
-                val localRelayServers = getStringSet(PrefKeys.LOCAL_RELAY_SERVERS, null) ?: setOf()
+                    val torSettings = parseOrNull<TorSettings>(PrefKeys.TOR_SETTINGS) ?: TorSettings()
 
-                val latestUserMetadata = parseEventOrNull<MetadataEvent>(PrefKeys.LATEST_USER_METADATA)
-                val latestContactList = parseEventOrNull<ContactListEvent>(PrefKeys.LATEST_CONTACT_LIST)
-                val latestDmRelayList = parseEventOrNull<ChatMessageRelayListEvent>(PrefKeys.LATEST_DM_RELAY_LIST)
-                val latestNip65RelayList = parseEventOrNull<AdvertisedRelayListEvent>(PrefKeys.LATEST_NIP65_RELAY_LIST)
-                val latestSearchRelayList = parseEventOrNull<SearchRelayListEvent>(PrefKeys.LATEST_SEARCH_RELAY_LIST)
-                val latestMuteList = parseEventOrNull<MuteListEvent>(PrefKeys.LATEST_MUTE_LIST)
-                val latestPrivateHomeRelayList = parseEventOrNull<PrivateOutboxRelayListEvent>(PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST)
-                val latestAppSpecificData = parseEventOrNull<AppSpecificDataEvent>(PrefKeys.LATEST_APP_SPECIFIC_DATA)
+                    val lastReadPerRoute =
+                        parseOrNull<Map<String, Long>>(PrefKeys.LAST_READ_PER_ROUTE)?.mapValues {
+                            MutableStateFlow(it.value)
+                        } ?: mapOf()
 
-                val syncedSettings =
-                    if (latestAppSpecificData != null) {
-                        null
-                    } else {
-                        // previous version. Delete this when ready.
-                        val reactionChoices = parseOrNull<List<String>>(PrefKeys.REACTION_CHOICES)?.ifEmpty { DefaultReactions } ?: DefaultReactions
-                        val zapAmountChoices = parseOrNull<List<Long>>(PrefKeys.ZAP_AMOUNTS)?.ifEmpty { DefaultZapAmounts } ?: DefaultZapAmounts
+                    val keyPair = KeyPair(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray())
+                    val hasDonatedInVersion = getStringSet(PrefKeys.HAS_DONATED_IN_VERSION, null) ?: setOf()
 
-                        val languagePreferences = parseOrNull<Map<String, String>>(PrefKeys.LANGUAGE_PREFS) ?: mapOf()
-
-                        val showSensitiveContent =
-                            if (contains(PrefKeys.SHOW_SENSITIVE_CONTENT)) {
-                                getBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, false)
-                            } else {
-                                null
-                            }
-                        val filterSpam = getBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, true)
-                        val warnAboutReports = getBoolean(PrefKeys.WARN_ABOUT_REPORTS, true)
-
-                        val dontTranslateFrom = getStringSet(PrefKeys.DONT_TRANSLATE_FROM, null) ?: setOf()
-                        val translateTo = getString(PrefKeys.TRANSLATE_TO, null) ?: Locale.getDefault().language
-
-                        AccountSyncedSettingsInternal(
-                            reactions =
-                                AccountReactionPreferencesInternal(
-                                    reactionChoices = reactionChoices,
-                                ),
-                            zaps =
-                                AccountZapPreferencesInternal(
-                                    zapAmountChoices = zapAmountChoices,
-                                    defaultZapType = defaultZapType,
-                                ),
-                            languages =
-                                AccountLanguagePreferencesInternal(
-                                    dontTranslateFrom = dontTranslateFrom,
-                                    languagePreferences = languagePreferences,
-                                    translateTo = translateTo,
-                                ),
-                            security =
-                                AccountSecurityPreferencesInternal(
-                                    showSensitiveContent = showSensitiveContent,
-                                    warnAboutPostsWithReports = warnAboutReports,
-                                    filterSpamFromStrangers = filterSpam,
-                                ),
-                        )
-                    }
-
-                val hideDeleteRequestDialog = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
-                val hideBlockAlertDialog = getBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, false)
-                val hideNIP17WarningDialog = getBoolean(PrefKeys.HIDE_NIP_17_WARNING_DIALOG, false)
-                val useProxy = getBoolean(PrefKeys.USE_PROXY, false)
-
-                val torSettings =
-                    if (useProxy) {
-                        // old settings, means Orbot
-                        TorSettings(
-                            TorType.EXTERNAL,
-                            getInt(PrefKeys.PROXY_PORT, 9050),
-                            true,
-                            true,
-                            true,
-                            true,
-                            true,
-                            true,
-                            true,
-                            true,
-                            true,
-                            true,
-                            true,
-                        )
-                    } else {
-                        parseOrNull<TorSettings>(PrefKeys.TOR_SETTINGS) ?: TorSettings()
-                    }
-
-                val lastReadPerRoute =
-                    parseOrNull<Map<String, Long>>(PrefKeys.LAST_READ_PER_ROUTE)?.mapValues {
-                        MutableStateFlow(it.value)
-                    } ?: mapOf()
-
-                val keyPair = KeyPair(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray())
-                val hasDonatedInVersion = getStringSet(PrefKeys.HAS_DONATED_IN_VERSION, null) ?: setOf()
-
-                return@with AccountSettings(
-                    keyPair = keyPair,
-                    transientAccount = false,
-                    externalSignerPackageName = externalSignerPackageName,
-                    localRelays = localRelays,
-                    localRelayServers = localRelayServers,
-                    defaultFileServer = defaultFileServer,
-                    defaultHomeFollowList = MutableStateFlow(defaultHomeFollowList),
-                    defaultStoriesFollowList = MutableStateFlow(defaultStoriesFollowList),
-                    defaultNotificationFollowList = MutableStateFlow(defaultNotificationFollowList),
-                    defaultDiscoveryFollowList = MutableStateFlow(defaultDiscoveryFollowList),
-                    zapPaymentRequest = zapPaymentRequestServer,
-                    hideDeleteRequestDialog = hideDeleteRequestDialog,
-                    hideBlockAlertDialog = hideBlockAlertDialog,
-                    hideNIP17WarningDialog = hideNIP17WarningDialog,
-                    backupUserMetadata = latestUserMetadata,
-                    backupContactList = latestContactList,
-                    backupNIP65RelayList = latestNip65RelayList,
-                    backupDMRelayList = latestDmRelayList,
-                    backupSearchRelayList = latestSearchRelayList,
-                    backupPrivateHomeRelayList = latestPrivateHomeRelayList,
-                    backupMuteList = latestMuteList,
-                    backupAppSpecificData = latestAppSpecificData,
-                    backupSyncedSettings = syncedSettings,
-                    torSettings = TorSettingsFlow.build(torSettings),
-                    lastReadPerRoute = MutableStateFlow(lastReadPerRoute),
-                    hasDonatedInVersion = MutableStateFlow(hasDonatedInVersion),
-                    pendingAttestations = MutableStateFlow(pendingAttestations),
-                )
+                    return@with AccountSettings(
+                        keyPair = keyPair,
+                        transientAccount = false,
+                        externalSignerPackageName = externalSignerPackageName,
+                        localRelayServers = MutableStateFlow(localRelayServers),
+                        defaultFileServer = defaultFileServer,
+                        defaultHomeFollowList = MutableStateFlow(defaultHomeFollowList),
+                        defaultStoriesFollowList = MutableStateFlow(defaultStoriesFollowList),
+                        defaultNotificationFollowList = MutableStateFlow(defaultNotificationFollowList),
+                        defaultDiscoveryFollowList = MutableStateFlow(defaultDiscoveryFollowList),
+                        zapPaymentRequest = MutableStateFlow(zapPaymentRequestServer?.normalize()),
+                        hideDeleteRequestDialog = hideDeleteRequestDialog,
+                        hideBlockAlertDialog = hideBlockAlertDialog,
+                        hideNIP17WarningDialog = hideNIP17WarningDialog,
+                        backupUserMetadata = latestUserMetadata,
+                        backupContactList = latestContactList,
+                        backupNIP65RelayList = latestNip65RelayList,
+                        backupDMRelayList = latestDmRelayList,
+                        backupSearchRelayList = latestSearchRelayList,
+                        backupBlockedRelayList = latestBlockedRelayList,
+                        backupTrustedRelayList = latestTrustedRelayList,
+                        backupPrivateHomeRelayList = latestPrivateHomeRelayList,
+                        backupMuteList = latestMuteList,
+                        backupAppSpecificData = latestAppSpecificData,
+                        backupChannelList = latestChannelList,
+                        backupCommunityList = latestCommunityList,
+                        backupHashtagList = latestHashtagList,
+                        backupGeohashList = latestGeohashList,
+                        backupEphemeralChatList = latestEphemeralList,
+                        torSettings = TorSettingsFlow.build(torSettings),
+                        lastReadPerRoute = MutableStateFlow(lastReadPerRoute),
+                        hasDonatedInVersion = MutableStateFlow(hasDonatedInVersion),
+                        pendingAttestations = MutableStateFlow(pendingAttestations),
+                    )
+                }
             }
-        }
+        Log.d("LocalPreferences", "Loaded account from file $npub")
+        return result
     }
 
     private inline fun <reified T> SharedPreferences.parseOrNull(key: String): T? {
@@ -666,12 +657,11 @@ object LocalPreferences {
             if (T::class.java.isInstance(Event::class.java)) {
                 Event.fromJson(value) as T?
             } else {
-                Event.mapper.readValue<T?>(value)
+                JsonMapper.mapper.readValue<T?>(value)
             }
         } catch (e: Throwable) {
             if (e is CancellationException) throw e
             Log.w("LocalPreferences", "Error Decoding $key from Preferences with value $value", e)
-            e.printStackTrace()
             null
         }
     }
@@ -686,7 +676,6 @@ object LocalPreferences {
         } catch (e: Throwable) {
             if (e is CancellationException) throw e
             Log.w("LocalPreferences", "Error Decoding $key from Preferences with value $value", e)
-            e.printStackTrace()
             null
         }
     }

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

@@ -1,95 +0,0 @@
-/**
- * Copyright (c) 2024 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.vitorpamplona.amethyst
-
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.joinAll
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.withTimeoutOrNull
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.resume
-
-/**
- * Launches an async coroutine for each item, runs the
- * function and waits for everybody to finsih
- */
-suspend fun <T> launchAndWaitAll(
-    items: List<T>,
-    asyncFunc: suspend (T) -> Unit,
-) {
-    coroutineScope {
-        val jobs =
-            items.map { next ->
-                async {
-                    asyncFunc(next)
-                }
-            }
-
-        // runs in parallel to avoid overcrowding Amber.
-        withTimeoutOrNull(15000) {
-            jobs.joinAll()
-        }
-    }
-}
-
-/**
- * Runs the function and waits for 10 seconds for any result.
- */
-suspend inline fun <T> tryAndWait(
-    timeoutMillis: Long = 10000,
-    crossinline asyncFunc: (Continuation<T>) -> Unit,
-): T? =
-    withTimeoutOrNull(timeoutMillis) {
-        suspendCancellableCoroutine { continuation ->
-            asyncFunc(continuation)
-        }
-    }
-
-/**
- * Runs an async coroutine for each one of the items,
- * runs the request for that item,
- * and gathers all the results in the output map.
- */
-suspend fun <T, K> collectSuccessfulOperations(
-    items: List<T>,
-    runRequestFor: (T, (K) -> Unit) -> Unit,
-    output: MutableList<K> = mutableListOf(),
-    onReady: suspend (List<K>) -> Unit,
-) {
-    if (items.isEmpty()) {
-        onReady(output)
-        return
-    }
-
-    launchAndWaitAll(items) {
-        val result =
-            tryAndWait { continuation ->
-                runRequestFor(it) { result: K -> continuation.resume(result) }
-            }
-
-        if (result != null) {
-            output.add(result)
-        }
-    }
-
-    onReady(output)
-}

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

@@ -1,307 +0,0 @@
-/**
- * Copyright (c) 2024 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.vitorpamplona.amethyst
-
-import android.os.Build
-import android.util.Log
-import androidx.compose.runtime.Stable
-import coil3.SingletonImageLoader
-import coil3.annotation.DelicateCoilApi
-import coil3.gif.AnimatedImageDecoder
-import coil3.gif.GifDecoder
-import coil3.network.okhttp.OkHttpNetworkFetcherFactory
-import coil3.size.Precision
-import coil3.svg.SvgDecoder
-import coil3.util.DebugLogger
-import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.service.Base64Fetcher
-import com.vitorpamplona.amethyst.service.BlurHashFetcher
-import com.vitorpamplona.amethyst.service.NostrAccountDataSource
-import com.vitorpamplona.amethyst.service.NostrChannelDataSource
-import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
-import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
-import com.vitorpamplona.amethyst.service.NostrCommunityDataSource
-import com.vitorpamplona.amethyst.service.NostrDiscoveryDataSource
-import com.vitorpamplona.amethyst.service.NostrGeohashDataSource
-import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
-import com.vitorpamplona.amethyst.service.NostrHomeDataSource
-import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
-import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
-import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
-import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
-import com.vitorpamplona.amethyst.service.NostrThreadDataSource
-import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
-import com.vitorpamplona.amethyst.service.NostrVideoDataSource
-import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
-import com.vitorpamplona.amethyst.service.ots.OkHttpBlockstreamExplorer
-import com.vitorpamplona.amethyst.service.ots.OkHttpCalendarBuilder
-import com.vitorpamplona.amethyst.ui.tor.TorManager
-import com.vitorpamplona.amethyst.ui.tor.TorType
-import com.vitorpamplona.ammolite.relays.NostrClient
-import com.vitorpamplona.quartz.encoders.bechToBytes
-import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
-import com.vitorpamplona.quartz.encoders.toHexKey
-import com.vitorpamplona.quartz.events.OtsEvent
-import com.vitorpamplona.quartz.ots.OpenTimestamps
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-
-@Stable
-class ServiceManager(
-    val client: NostrClient,
-    val scope: CoroutineScope,
-) {
-    // to not open amber in a loop trying to use auth relays and registering for notifications
-    private var isStarted: Boolean = false
-
-    private var account: Account? = null
-
-    private var collectorJob: Job? = null
-
-    private fun start(account: Account) {
-        this.account = account
-        start()
-    }
-
-    @OptIn(DelicateCoilApi::class)
-    private fun start() {
-        Log.d("ServiceManager", "Pre Starting Relay Services $isStarted $account")
-        if (isStarted && account != null) {
-            return
-        }
-        Log.d("ServiceManager", "Starting Relay Services Tor: ${account?.settings?.torSettings?.torType?.value}")
-
-        val myAccount = account
-
-        // Resets Proxy Use
-        if (myAccount != null) {
-            when (myAccount.settings.torSettings.torType.value) {
-                TorType.INTERNAL -> {
-                    Log.d("TorManager", "Relays Service Connected ${TorManager.socksPort()}")
-                    HttpClientManager.setDefaultProxyOnPort(TorManager.socksPort())
-                }
-                TorType.EXTERNAL -> HttpClientManager.setDefaultProxyOnPort(myAccount.settings.torSettings.externalSocksPort.value)
-                else -> HttpClientManager.setDefaultProxy(null)
-            }
-
-            OtsEvent.otsInstance =
-                OpenTimestamps(
-                    OkHttpBlockstreamExplorer(myAccount::shouldUseTorForMoneyOperations),
-                    OkHttpCalendarBuilder(myAccount::shouldUseTorForMoneyOperations),
-                )
-        } else {
-            OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer { false }, OkHttpCalendarBuilder { false })
-
-            HttpClientManager.setDefaultProxy(null)
-        }
-
-        // Convert this into a flow
-        LocalCache.antiSpam.active = account
-            ?.settings
-            ?.syncedSettings
-            ?.security
-            ?.filterSpamFromStrangers ?: true
-
-        SingletonImageLoader.setUnsafe {
-            Amethyst.instance
-                .imageLoaderBuilder()
-                .components {
-                    if (Build.VERSION.SDK_INT >= 28) {
-                        add(AnimatedImageDecoder.Factory())
-                    } else {
-                        add(GifDecoder.Factory())
-                    }
-                    add(SvgDecoder.Factory())
-                    add(Base64Fetcher.Factory)
-                    add(BlurHashFetcher.Factory)
-                    add(Base64Fetcher.BKeyer)
-                    add(BlurHashFetcher.BKeyer)
-                    add(
-                        OkHttpNetworkFetcherFactory(
-                            callFactory = {
-                                myAccount?.shouldUseTorForImageDownload()?.let { HttpClientManager.getHttpClient(it) }
-                                    ?: HttpClientManager.getHttpClient(false)
-                            },
-                        ),
-                    )
-                }.apply {
-                    if (BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "benchmark") {
-                        this.logger(DebugLogger())
-                    }
-                }.precision(Precision.INEXACT)
-                .build()
-        }
-
-        if (myAccount != null) {
-            val relaySet = myAccount.connectToRelaysWithProxy.value
-            client.reconnect(relaySet)
-
-            collectorJob?.cancel()
-            collectorJob = null
-            collectorJob =
-                scope.launch {
-                    myAccount.connectToRelaysWithProxy.collectLatest {
-                        delay(500)
-                        if (isStarted) {
-                            client.reconnect(it, onlyIfChanged = true)
-                        }
-                    }
-                }
-
-            // start services
-            NostrAccountDataSource.account = myAccount
-            NostrHomeDataSource.account = myAccount
-            NostrChatroomListDataSource.account = myAccount
-            NostrVideoDataSource.account = myAccount
-            NostrDiscoveryDataSource.account = myAccount
-
-            NostrAccountDataSource.otherAccounts =
-                runBlocking {
-                    LocalPreferences.allSavedAccounts().mapNotNull {
-                        try {
-                            it.npub.bechToBytes().toHexKey()
-                        } catch (e: Exception) {
-                            if (e is CancellationException) throw e
-                            null
-                        }
-                    }
-                }
-
-            // Notification Elements
-            NostrHomeDataSource.start()
-            NostrAccountDataSource.start()
-            GlobalScope.launch(Dispatchers.IO) {
-                delay(3000)
-                NostrChatroomListDataSource.start()
-                NostrDiscoveryDataSource.start()
-                NostrVideoDataSource.start()
-            }
-
-            // More Info Data Sources
-            NostrSingleEventDataSource.start()
-            NostrSingleChannelDataSource.start()
-            NostrSingleUserDataSource.start()
-            isStarted = true
-        }
-    }
-
-    private fun pause() {
-        Log.d("ServiceManager", "Pausing Relay Services")
-
-        collectorJob?.cancel()
-        collectorJob = null
-
-        NostrAccountDataSource.stopSync()
-        NostrHomeDataSource.stopSync()
-        NostrChannelDataSource.stopSync()
-        NostrChatroomDataSource.stopSync()
-        NostrChatroomListDataSource.stopSync()
-        NostrDiscoveryDataSource.stopSync()
-
-        NostrCommunityDataSource.stopSync()
-        NostrHashtagDataSource.stopSync()
-        NostrGeohashDataSource.stopSync()
-        NostrSearchEventOrUserDataSource.stopSync()
-        NostrSingleChannelDataSource.stopSync()
-        NostrSingleEventDataSource.stopSync()
-        NostrSingleUserDataSource.stopSync()
-        NostrThreadDataSource.stopSync()
-        NostrUserProfileDataSource.stopSync()
-        NostrVideoDataSource.stopSync()
-
-        client.reconnect(null)
-        isStarted = false
-    }
-
-    fun cleanObservers() {
-        LocalCache.cleanObservers()
-    }
-
-    suspend fun trimMemory() {
-        LocalCache.cleanObservers()
-
-        val accounts =
-            LocalPreferences.allSavedAccounts().mapNotNull { decodePublicKeyAsHexOrNull(it.npub) }.toSet()
-
-        account?.let {
-            LocalCache.pruneOldAndHiddenMessages(it)
-            NostrChatroomDataSource.clearEOSEs(it)
-
-            LocalCache.pruneHiddenMessages(it)
-            LocalCache.pruneContactLists(accounts)
-            LocalCache.pruneRepliesAndReactions(accounts)
-            LocalCache.prunePastVersionsOfReplaceables()
-            LocalCache.pruneExpiredEvents()
-        }
-    }
-
-    // This method keeps the pause/start in a Syncronized block to
-    // avoid concurrent pauses and starts.
-    @Synchronized
-    fun forceRestart(
-        account: Account? = null,
-        start: Boolean = true,
-        pause: Boolean = true,
-    ) {
-        if (pause) {
-            pause()
-        }
-
-        if (start) {
-            if (account != null) {
-                start(account)
-            } else {
-                start()
-            }
-        }
-    }
-
-    fun restartIfDifferentAccount(account: Account) {
-        if (this.account != account) {
-            forceRestart(account, true, true)
-        }
-    }
-
-    fun forceRestart() {
-        forceRestart(null, true, true)
-    }
-
-    fun justStart() {
-        forceRestart(null, true, false)
-    }
-
-    fun pauseForGood() {
-        forceRestart(null, false, true)
-    }
-
-    fun pauseForGoodAndClearAccount() {
-        account = null
-        forceRestart(null, false, true)
-    }
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -20,32 +20,42 @@
  */
 package com.vitorpamplona.amethyst.model
 
-import android.util.Log
+import android.content.ContentResolver
 import androidx.compose.runtime.Stable
-import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.DEFAULT_MEDIA_SERVERS
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
+import com.vitorpamplona.amethyst.ui.screen.FeedDefinition
 import com.vitorpamplona.amethyst.ui.tor.TorSettings
 import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
-import com.vitorpamplona.ammolite.relays.Constants
-import com.vitorpamplona.ammolite.relays.RelaySetupInfo
-import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
-import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
-import com.vitorpamplona.quartz.encoders.toHexKey
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.AppSpecificDataEvent
-import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
-import com.vitorpamplona.quartz.events.ContactListEvent
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
-import com.vitorpamplona.quartz.events.MuteListEvent
-import com.vitorpamplona.quartz.events.PrivateOutboxRelayListEvent
-import com.vitorpamplona.quartz.events.SearchRelayListEvent
-import com.vitorpamplona.quartz.signers.ExternalSignerLauncher
-import com.vitorpamplona.quartz.signers.NostrSignerExternal
-import com.vitorpamplona.quartz.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.experimental.ephemChat.list.EphemeralChatListEvent
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.core.toHexKey
+import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
+import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
+import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent
+import com.vitorpamplona.quartz.nip28PublicChat.list.ChannelListEvent
+import com.vitorpamplona.quartz.nip28PublicChat.list.tags.ChannelTag
+import com.vitorpamplona.quartz.nip37Drafts.DraftWrapEvent
+import com.vitorpamplona.quartz.nip37Drafts.privateOutbox.PrivateOutboxRelayListEvent
+import com.vitorpamplona.quartz.nip42RelayAuth.RelayAuthEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.Nip47WalletConnect
+import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.geohashList.GeohashListEvent
+import com.vitorpamplona.quartz.nip51Lists.hashtagList.HashtagListEvent
+import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
+import com.vitorpamplona.quartz.nip55AndroidSigner.api.CommandType
+import com.vitorpamplona.quartz.nip55AndroidSigner.api.permission.Permission
+import com.vitorpamplona.quartz.nip55AndroidSigner.client.NostrSignerExternal
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip65RelayList.tags.AdvertisedRelayInfo
+import com.vitorpamplona.quartz.nip65RelayList.tags.AdvertisedRelayType
+import com.vitorpamplona.quartz.nip72ModCommunities.follow.CommunityListEvent
+import com.vitorpamplona.quartz.nip78AppData.AppSpecificDataEvent
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -54,40 +64,44 @@ import kotlinx.coroutines.flow.update
 import java.util.Locale
 
 val DefaultChannels =
-    setOf(
+    listOf(
         // Anigma's Nostr
-        "25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb",
+        ChannelTag("25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb", Constants.nos),
         // Amethyst's Group
-        "42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5",
+        ChannelTag("42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5", Constants.nos),
     )
 
+val DefaultNIP65RelaySet = setOf(Constants.mom, Constants.nos, Constants.bitcoiner)
+
 val DefaultNIP65List =
     listOf(
-        AdvertisedRelayListEvent.AdvertisedRelayInfo(RelayUrlFormatter.normalize("wss://nostr.mom/"), AdvertisedRelayListEvent.AdvertisedRelayType.BOTH),
-        AdvertisedRelayListEvent.AdvertisedRelayInfo(RelayUrlFormatter.normalize("wss://nos.lol/"), AdvertisedRelayListEvent.AdvertisedRelayType.BOTH),
-        AdvertisedRelayListEvent.AdvertisedRelayInfo(RelayUrlFormatter.normalize("wss://nostr.bitcoiner.social/"), AdvertisedRelayListEvent.AdvertisedRelayType.BOTH),
+        AdvertisedRelayInfo(Constants.mom, AdvertisedRelayType.BOTH),
+        AdvertisedRelayInfo(Constants.nos, AdvertisedRelayType.BOTH),
+        AdvertisedRelayInfo(Constants.bitcoiner, AdvertisedRelayType.BOTH),
     )
 
-val DefaultDMRelayList =
-    listOf(
-        RelayUrlFormatter.normalize("wss://auth.nostr1.com"),
-        RelayUrlFormatter.normalize("wss://relay.0xchat.com"),
-        RelayUrlFormatter.normalize("wss://nos.lol"),
-    )
+val DefaultDMRelayList = listOf(Constants.auth, Constants.oxchat, Constants.nos)
 
-val DefaultSearchRelayList =
+val DefaultSearchRelayList = setOf(Constants.band, Constants.wine, Constants.where, Constants.nostoday)
+
+val DefaultIndexerRelayList = setOf(Constants.purplepages, Constants.coracle, Constants.userkinds)
+
+val DefaultSignerPermissions =
     listOf(
-        RelayUrlFormatter.normalize("wss://relay.nostr.band"),
-        RelayUrlFormatter.normalize("wss://nostr.wine"),
-        RelayUrlFormatter.normalize("wss://relay.noswhere.com"),
-        RelayUrlFormatter.normalize("wss://search.nos.today"),
+        Permission(CommandType.SIGN_EVENT, RelayAuthEvent.KIND),
+        Permission(CommandType.SIGN_EVENT, DraftWrapEvent.KIND),
+        Permission(CommandType.NIP04_ENCRYPT),
+        Permission(CommandType.NIP04_DECRYPT),
+        Permission(CommandType.NIP44_DECRYPT),
+        Permission(CommandType.NIP44_DECRYPT),
+        Permission(CommandType.DECRYPT_ZAP_EVENT),
     )
 
 // This has spaces to avoid mixing with a potential NIP-51 list with the same name.
 val GLOBAL_FOLLOWS = " Global "
 
 // This has spaces to avoid mixing with a potential NIP-51 list with the same name.
-val KIND3_FOLLOWS = " All Follows "
+val ALL_FOLLOWS = " All Follows "
 
 // This has spaces to avoid mixing with a potential NIP-51 list with the same name.
 val AROUND_ME = " Around Me "
@@ -97,14 +111,13 @@ class AccountSettings(
     val keyPair: KeyPair,
     val transientAccount: Boolean = false,
     var externalSignerPackageName: String? = null,
-    var localRelays: Set<RelaySetupInfo> = Constants.defaultRelays.toSet(),
-    var localRelayServers: Set<String> = setOf(),
+    var localRelayServers: MutableStateFlow<Set<String>> = MutableStateFlow(setOf()),
     var defaultFileServer: ServerName = DEFAULT_MEDIA_SERVERS[0],
-    val defaultHomeFollowList: MutableStateFlow<String> = MutableStateFlow(KIND3_FOLLOWS),
+    val defaultHomeFollowList: MutableStateFlow<String> = MutableStateFlow(ALL_FOLLOWS),
     val defaultStoriesFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
     val defaultNotificationFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
     val defaultDiscoveryFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
-    var zapPaymentRequest: Nip47WalletConnect.Nip47URI? = null,
+    var zapPaymentRequest: MutableStateFlow<Nip47WalletConnect.Nip47URINorm?> = MutableStateFlow(null),
     var hideDeleteRequestDialog: Boolean = false,
     var hideBlockAlertDialog: Boolean = false,
     var hideNIP17WarningDialog: Boolean = false,
@@ -113,22 +126,26 @@ class AccountSettings(
     var backupDMRelayList: ChatMessageRelayListEvent? = null,
     var backupNIP65RelayList: AdvertisedRelayListEvent? = null,
     var backupSearchRelayList: SearchRelayListEvent? = null,
+    var backupBlockedRelayList: BlockedRelayListEvent? = null,
+    var backupTrustedRelayList: TrustedRelayListEvent? = null,
     var backupMuteList: MuteListEvent? = null,
     var backupPrivateHomeRelayList: PrivateOutboxRelayListEvent? = null,
     var backupAppSpecificData: AppSpecificDataEvent? = null,
-    backupSyncedSettings: AccountSyncedSettingsInternal? = null, // only exist for migration purposes
+    var backupChannelList: ChannelListEvent? = null,
+    var backupCommunityList: CommunityListEvent? = null,
+    var backupHashtagList: HashtagListEvent? = null,
+    var backupGeohashList: GeohashListEvent? = null,
+    var backupEphemeralChatList: EphemeralChatListEvent? = null,
     val torSettings: TorSettingsFlow = TorSettingsFlow(),
     val lastReadPerRoute: MutableStateFlow<Map<String, MutableStateFlow<Long>>> = MutableStateFlow(mapOf()),
     var hasDonatedInVersion: MutableStateFlow<Set<String>> = MutableStateFlow(setOf<String>()),
     val pendingAttestations: MutableStateFlow<Map<HexKey, String>> = MutableStateFlow<Map<HexKey, String>>(mapOf()),
 ) {
-    val saveable = MutableStateFlow(AccountSettingsUpdater(this))
-    val syncedSettings: AccountSyncedSettings =
-        backupSyncedSettings?.let { AccountSyncedSettings(it) }
-            ?: AccountSyncedSettings(AccountSyncedSettingsInternal())
+    val saveable = MutableStateFlow(AccountSettingsUpdater(null))
+    val syncedSettings: AccountSyncedSettings = AccountSyncedSettings(AccountSyncedSettingsInternal())
 
     class AccountSettingsUpdater(
-        val accountSettings: AccountSettings,
+        val accountSettings: AccountSettings?,
     )
 
     fun saveAccountSettings() {
@@ -137,25 +154,18 @@ class AccountSettings(
 
     fun isWriteable(): Boolean = keyPair.privKey != null || externalSignerPackageName != null
 
-    fun createSigner() =
+    fun createSigner(contentResolver: ContentResolver) =
         if (keyPair.privKey != null) {
             NostrSignerInternal(keyPair)
         } else {
             when (val packageName = externalSignerPackageName) {
                 null -> NostrSignerInternal(keyPair)
-                else -> {
-                    val externalSignerLauncher = ExternalSignerLauncher(keyPair.pubKey.toHexKey(), packageName)
-                    // TODO: How to handle the launcher here?
-                    try {
-                        externalSignerLauncher.registerLauncher(
-                            launcher = { },
-                            contentResolver = Amethyst.instance::contentResolverFn,
-                        )
-                    } catch (e: Exception) {
-                        Log.d("AccountSettings", "Failed to initialize external signer", e)
-                    }
-                    NostrSignerExternal(keyPair.pubKey.toHexKey(), externalSignerLauncher)
-                }
+                else ->
+                    NostrSignerExternal(
+                        pubKey = keyPair.pubKey.toHexKey(),
+                        packageName = packageName,
+                        contentResolver = contentResolver,
+                    )
             }
         }
 
@@ -190,9 +200,9 @@ class AccountSettings(
         return false
     }
 
-    fun changeZapPaymentRequest(newServer: Nip47WalletConnect.Nip47URI?): Boolean {
-        if (zapPaymentRequest != newServer) {
-            zapPaymentRequest = newServer
+    fun changeZapPaymentRequest(newServer: Nip47WalletConnect.Nip47URINorm?): Boolean {
+        if (zapPaymentRequest.value != newServer) {
+            zapPaymentRequest.tryEmit(newServer)
             saveAccountSettings()
             return true
         }
@@ -214,6 +224,10 @@ class AccountSettings(
     // list names
     // ---
 
+    fun changeDefaultHomeFollowList(name: FeedDefinition) {
+        changeDefaultHomeFollowList(name.code)
+    }
+
     fun changeDefaultHomeFollowList(name: String) {
         if (defaultHomeFollowList.value != name) {
             defaultHomeFollowList.tryEmit(name)
@@ -221,6 +235,10 @@ class AccountSettings(
         }
     }
 
+    fun changeDefaultStoriesFollowList(name: FeedDefinition) {
+        changeDefaultStoriesFollowList(name.code)
+    }
+
     fun changeDefaultStoriesFollowList(name: String) {
         if (defaultStoriesFollowList.value != name) {
             defaultStoriesFollowList.tryEmit(name)
@@ -228,6 +246,10 @@ class AccountSettings(
         }
     }
 
+    fun changeDefaultNotificationFollowList(name: FeedDefinition) {
+        changeDefaultNotificationFollowList(name.code)
+    }
+
     fun changeDefaultNotificationFollowList(name: String) {
         if (defaultNotificationFollowList.value != name) {
             defaultNotificationFollowList.tryEmit(name)
@@ -235,6 +257,10 @@ class AccountSettings(
         }
     }
 
+    fun changeDefaultDiscoveryFollowList(name: FeedDefinition) {
+        changeDefaultDiscoveryFollowList(name.code)
+    }
+
     fun changeDefaultDiscoveryFollowList(name: String) {
         if (defaultDiscoveryFollowList.value != name) {
             defaultDiscoveryFollowList.tryEmit(name)
@@ -245,14 +271,13 @@ class AccountSettings(
     // ---
     // proxy settings
     // ---
-    fun setTorSettings(newTorSettings: TorSettings): Boolean {
+    fun setTorSettings(newTorSettings: TorSettings): Boolean =
         if (torSettings.update(newTorSettings)) {
             saveAccountSettings()
-            return true
+            true
         } else {
-            return false
+            false
         }
-    }
 
     // ---
     // language services
@@ -291,8 +316,8 @@ class AccountSettings(
     // ----
 
     fun updateLocalRelayServers(servers: Set<String>) {
-        if (localRelayServers != servers) {
-            localRelayServers = servers
+        if (localRelayServers.value != servers) {
+            localRelayServers.update { servers }
             saveAccountSettings()
         }
     }
@@ -347,6 +372,26 @@ class AccountSettings(
         }
     }
 
+    fun updateBlockedRelayList(newBlockedRelayList: BlockedRelayListEvent?) {
+        if (newBlockedRelayList == null || newBlockedRelayList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupBlockedRelayList?.id != newBlockedRelayList.id) {
+            backupBlockedRelayList = newBlockedRelayList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateTrustedRelayList(newTrustedRelayList: TrustedRelayListEvent?) {
+        if (newTrustedRelayList == null || newTrustedRelayList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupTrustedRelayList?.id != newTrustedRelayList.id) {
+            backupTrustedRelayList = newTrustedRelayList
+            saveAccountSettings()
+        }
+    }
+
     fun updatePrivateHomeRelayList(newPrivateHomeRelayList: PrivateOutboxRelayListEvent?) {
         if (newPrivateHomeRelayList == null || newPrivateHomeRelayList.tags.isEmpty()) return
 
@@ -357,6 +402,56 @@ class AccountSettings(
         }
     }
 
+    fun updateChannelListTo(newChannelList: ChannelListEvent?) {
+        if (newChannelList == null || newChannelList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupChannelList?.id != newChannelList.id) {
+            backupChannelList = newChannelList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateGeohashListTo(newGeohashList: GeohashListEvent?) {
+        if (newGeohashList == null || newGeohashList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupGeohashList?.id != newGeohashList.id) {
+            backupGeohashList = newGeohashList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateHashtagListTo(newHashtagList: HashtagListEvent?) {
+        if (newHashtagList == null || newHashtagList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupHashtagList?.id != newHashtagList.id) {
+            backupHashtagList = newHashtagList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateCommunityListTo(newCommunityList: CommunityListEvent?) {
+        if (newCommunityList == null || newCommunityList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupCommunityList?.id != newCommunityList.id) {
+            backupCommunityList = newCommunityList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateEphemeralChatListTo(newEphemeralChatList: EphemeralChatListEvent?) {
+        if (newEphemeralChatList == null || newEphemeralChatList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupEphemeralChatList?.id != newEphemeralChatList.id) {
+            backupEphemeralChatList = newEphemeralChatList
+            saveAccountSettings()
+        }
+    }
+
     fun updateMuteList(newMuteList: MuteListEvent?) {
         if (newMuteList == null || newMuteList.tags.isEmpty()) return
 
@@ -371,7 +466,7 @@ class AccountSettings(
         appSettings: AppSpecificDataEvent?,
         newSyncedSettings: AccountSyncedSettingsInternal,
     ) {
-        if (appSettings == null || appSettings.content().isEmpty()) return
+        if (appSettings == null || appSettings.content.isEmpty()) return
 
         // Events might be different objects, we have to compare their ids.
         if (backupAppSpecificData?.id != appSettings.id) {
@@ -462,17 +557,6 @@ class AccountSettings(
         }
     }
 
-    // ----
-    // local relays
-    // ----
-
-    fun updateLocalRelays(newLocalRelays: Set<RelaySetupInfo>) {
-        if (!localRelays.equals(newLocalRelays)) {
-            localRelays = newLocalRelays
-            saveAccountSettings()
-        }
-    }
-
     // ---
     // attestations
     // ---
@@ -508,11 +592,16 @@ class AccountSettings(
         return false
     }
 
-    fun updateOptOutOptions(
-        warnReports: Boolean,
-        filterSpam: Boolean,
-    ): Boolean =
-        if (syncedSettings.security.updateOptOutOptions(warnReports, filterSpam)) {
+    fun updateWarnReports(warnReports: Boolean): Boolean =
+        if (syncedSettings.security.updateWarnReports(warnReports)) {
+            saveAccountSettings()
+            true
+        } else {
+            false
+        }
+
+    fun updateFilterSpam(filterSpam: Boolean): Boolean =
+        if (syncedSettings.security.updateFilterSpam(filterSpam)) {
             saveAccountSettings()
             true
         } else {

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSyncedSettings.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.equalImmutableLists
-import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -49,7 +49,7 @@ class AccountSyncedSettings(
         AccountSecurityPreferences(
             MutableStateFlow(internalSettings.security.showSensitiveContent),
             internalSettings.security.warnAboutPostsWithReports,
-            internalSettings.security.filterSpamFromStrangers,
+            MutableStateFlow(internalSettings.security.filterSpamFromStrangers),
         )
 
     fun toInternal(): AccountSyncedSettingsInternal =
@@ -70,7 +70,7 @@ class AccountSyncedSettings(
                 AccountSecurityPreferencesInternal(
                     security.showSensitiveContent.value,
                     security.warnAboutPostsWithReports,
-                    security.filterSpamFromStrangers,
+                    security.filterSpamFromStrangers.value,
                 ),
         )
 
@@ -105,14 +105,16 @@ class AccountSyncedSettings(
             security.showSensitiveContent.tryEmit(syncedSettingsInternal.security.showSensitiveContent)
         }
 
-        if (security.filterSpamFromStrangers != syncedSettingsInternal.security.filterSpamFromStrangers) {
-            security.filterSpamFromStrangers = syncedSettingsInternal.security.filterSpamFromStrangers
+        if (security.filterSpamFromStrangers.value != syncedSettingsInternal.security.filterSpamFromStrangers) {
+            security.filterSpamFromStrangers.tryEmit(syncedSettingsInternal.security.filterSpamFromStrangers)
         }
 
         if (security.warnAboutPostsWithReports != syncedSettingsInternal.security.warnAboutPostsWithReports) {
             security.warnAboutPostsWithReports = syncedSettingsInternal.security.warnAboutPostsWithReports
         }
     }
+
+    fun dontTranslateFromFilteredBySpokenLanguages(): Set<String> = languages.dontTranslateFrom - getLanguagesSpokenByUser()
 }
 
 @Stable
@@ -136,11 +138,12 @@ class AccountLanguagePreferences(
     // language services
     // ---
     fun toggleDontTranslateFrom(languageCode: String) {
-        if (!dontTranslateFrom.contains(languageCode)) {
-            dontTranslateFrom = dontTranslateFrom.plus(languageCode)
-        } else {
-            dontTranslateFrom = dontTranslateFrom.minus(languageCode)
-        }
+        dontTranslateFrom =
+            if (!dontTranslateFrom.contains(languageCode)) {
+                dontTranslateFrom.plus(languageCode)
+            } else {
+                dontTranslateFrom.minus(languageCode)
+            }
     }
 
     fun translateToContains(languageCode: Locale) = translateTo.contains(languageCode.language)
@@ -180,7 +183,7 @@ class AccountLanguagePreferences(
 class AccountSecurityPreferences(
     val showSensitiveContent: MutableStateFlow<Boolean?> = MutableStateFlow(null),
     var warnAboutPostsWithReports: Boolean = true,
-    var filterSpamFromStrangers: Boolean = true,
+    var filterSpamFromStrangers: MutableStateFlow<Boolean> = MutableStateFlow(true),
 ) {
     fun updateShowSensitiveContent(show: Boolean?): Boolean {
         if (showSensitiveContent.value != show) {
@@ -190,17 +193,17 @@ class AccountSecurityPreferences(
         return false
     }
 
-    // ---
-    // filters
-    // ---
-    fun updateOptOutOptions(
-        warnReports: Boolean,
-        filterSpam: Boolean,
-    ): Boolean =
-        if (warnAboutPostsWithReports != warnReports || filterSpam != filterSpamFromStrangers) {
+    fun updateWarnReports(warnReports: Boolean): Boolean =
+        if (warnAboutPostsWithReports != warnReports) {
             warnAboutPostsWithReports = warnReports
-            filterSpamFromStrangers = filterSpam
+            true
+        } else {
+            false
+        }
 
+    fun updateFilterSpam(filterSpam: Boolean): Boolean =
+        if (filterSpam != filterSpamFromStrangers.value) {
+            filterSpamFromStrangers.tryEmit(filterSpam)
             true
         } else {
             false

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSyncedSettingsInternal.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.model
 
 import android.content.res.Resources
 import androidx.core.os.ConfigurationCompat
-import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
 import java.util.Locale
 
 val DefaultReactions =

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -22,74 +22,114 @@ package com.vitorpamplona.amethyst.model
 
 import android.util.Log
 import android.util.LruCache
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.note.njumpLink
-import com.vitorpamplona.ammolite.relays.Relay
-import com.vitorpamplona.ammolite.relays.RelayStats
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.Nip19Bech32
-import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.relay.client.stats.RelayStats
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.Address
+import com.vitorpamplona.quartz.nip19Bech32.Nip19Parser
+import com.vitorpamplona.quartz.nip19Bech32.entities.NAddress
+import com.vitorpamplona.quartz.nip19Bech32.entities.NEvent
 import kotlinx.coroutines.flow.MutableStateFlow
 
 data class Spammer(
     val pubkeyHex: HexKey,
-    var duplicatedMessages: Set<HexKey>,
-)
+    var duplicatedEventIds: Set<HexKey>,
+    var duplicatedEventAddresses: Set<Address>,
+) {
+    fun shouldHide() = duplicatedEventIds.size >= 5 || duplicatedEventAddresses.size >= 5
+}
 
 class AntiSpamFilter {
-    val recentMessages = LruCache<Int, String>(1000)
+    val recentEventIds = LruCache<Int, String>(2000)
+    val recentAddressables = LruCache<Int, Address>(2000)
     val spamMessages = LruCache<Int, Spammer>(1000)
 
     var active: Boolean = true
 
+    fun spamHashCode(event: Event): Int = 31 * event.content.hashCode() + event.tags.contentDeepHashCode()
+
     fun isSpam(
         event: Event,
-        relay: Relay?,
+        relay: NormalizedRelayUrl?,
     ): Boolean {
-        checkNotInMainThread()
-
         if (!active) return false
 
-        val idHex = event.id
-
         // if short message, ok
         // The idea here is to avoid considering repeated "GM" messages spam.
-        if (event.content.length < 50) return false
+        if (event.content.length < 60) return false
 
         // if the message is actually short but because it cites a user/event, the nostr: string is
         // really long, make it ok.
         // The idea here is to avoid considering repeated "@Bot, command" messages spam, while still
         // blocking repeated "lnbc..." invoices or fishing urls
-        if (event.content.length < 180 && Nip19Bech32.nip19regex.matcher(event.content).find()) return false
+        if (event.content.length < 180 && event.content.startsWith("nostr:") && Nip19Parser.nip19regex.matcher(event.content).find()) return false
 
         // double list strategy:
         // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
 
         // Considers tags so that same replies to different people don't count.
-        val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()
+        val hash = spamHashCode(event)
 
-        if (
-            (recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null
-        ) {
-            Log.w(
-                "Potential SPAM Message",
-                "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${relay?.url} ${event.content.replace("\n", " | ")}",
-            )
+        // ignores multiple versions of the same addressable.
+        if (event is AddressableEvent) {
+            val address = event.address()
 
-            // Log down offenders
-            logOffender(hash, event)
+            // normal event
+            if (
+                (recentAddressables[hash] != null && recentAddressables[hash] != address) ||
+                (spamMessages[hash] != null && !spamMessages[hash].duplicatedEventAddresses.contains(address))
+            ) {
+                val existingAddress = recentAddressables[hash]
 
-            if (relay != null) {
-                RelayStats.newSpam(relay.url, njumpLink(Nip19Bech32.createNEvent(event.id, event.pubKey, event.kind, relay.url)))
+                val link1 = njumpLink(NAddress.create(existingAddress.kind, existingAddress.pubKeyHex, existingAddress.dTag, relay))
+                val link2 = njumpLink(NAddress.create(event.kind, event.pubKey, event.dTag(), relay))
+
+                Log.w("Duplicated/SPAM", "${relay?.url} $link1 $link2")
+
+                // Log down offenders
+                val spammer = logOffender(hash, event)
+
+                if (spammer.shouldHide() && relay != null) {
+                    RelayStats.newSpam(relay, "$link1 $link2")
+                }
+
+                flowSpam.tryEmit(AntiSpamState(this))
+
+                return true
             }
 
-            flowSpam.tryEmit(AntiSpamState(this))
+            recentAddressables.put(hash, address)
+        } else {
+            // normal event
+            if (
+                (recentEventIds[hash] != null && recentEventIds[hash] != event.id) ||
+                (spamMessages[hash] != null && !spamMessages[hash].duplicatedEventIds.contains(event.id))
+            ) {
+                val existingEvent = recentEventIds[hash]
 
-            return true
+                val link1 = njumpLink(NEvent.create(existingEvent, null, null, relay))
+                val link2 = njumpLink(NEvent.create(event.id, null, null, relay))
+
+                Log.w("Duplicated/SPAM", "${relay?.url} $link1 $link2")
+
+                // Log down offenders
+                val spammer = logOffender(hash, event)
+
+                if (spammer.shouldHide() && relay != null) {
+                    RelayStats.newSpam(relay, "$link1 $link2")
+                }
+
+                flowSpam.tryEmit(AntiSpamState(this))
+
+                return true
+            }
+
+            recentEventIds.put(hash, event.id)
         }
 
-        recentMessages.put(hash, idHex)
-
         return false
     }
 
@@ -97,12 +137,33 @@ class AntiSpamFilter {
     private fun logOffender(
         hashCode: Int,
         event: Event,
-    ) {
-        if (spamMessages.get(hashCode) == null) {
-            spamMessages.put(hashCode, Spammer(event.pubKey, setOf(recentMessages[hashCode], event.id)))
+    ): Spammer {
+        val spammer = spamMessages.get(hashCode)
+
+        if (spammer == null) {
+            val newSpammer =
+                if (event is AddressableEvent) {
+                    Spammer(
+                        pubkeyHex = event.pubKey,
+                        duplicatedEventIds = setOf(),
+                        duplicatedEventAddresses = setOf(recentAddressables[hashCode], event.address()),
+                    )
+                } else {
+                    Spammer(
+                        pubkeyHex = event.pubKey,
+                        duplicatedEventIds = setOf(recentEventIds[hashCode], event.id),
+                        duplicatedEventAddresses = setOf(),
+                    )
+                }
+            spamMessages.put(hashCode, newSpammer)
+            return newSpammer
         } else {
-            val spammer = spamMessages.get(hashCode)
-            spammer.duplicatedMessages += event.id
+            if (event is AddressableEvent) {
+                spammer.duplicatedEventAddresses += event.address()
+            } else {
+                spammer.duplicatedEventIds += event.id
+            }
+            return spammer
         }
     }
 

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -21,141 +21,107 @@
 package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Stable
-import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.commons.data.LargeCache
-import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
-import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import com.vitorpamplona.ammolite.relays.BundledUpdate
-import com.vitorpamplona.quartz.encoders.ATag
-import com.vitorpamplona.quartz.encoders.Hex
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.toNEvent
-import com.vitorpamplona.quartz.events.ChannelCreateEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesEvent
-import kotlinx.coroutines.Dispatchers
+import com.vitorpamplona.amethyst.ui.dal.ListChange
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.utils.LargeCache
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import java.lang.ref.WeakReference
 
 @Stable
-class PublicChatChannel(
-    idHex: String,
-) : Channel(idHex) {
-    var info = ChannelCreateEvent.ChannelData(null, null, null)
-
-    fun updateChannelInfo(
-        creator: User,
-        channelInfo: ChannelCreateEvent.ChannelData,
-        updatedAt: Long,
-    ) {
-        this.info = channelInfo
-        super.updateChannelInfo(creator, updatedAt)
-    }
-
-    override fun toBestDisplayName(): String = info.name ?: super.toBestDisplayName()
-
-    override fun summary(): String? = info.about
-
-    override fun profilePicture(): String? {
-        if (info.picture.isNullOrBlank()) return super.profilePicture()
-        return info.picture ?: super.profilePicture()
-    }
-
-    override fun anyNameStartsWith(prefix: String): Boolean = listOfNotNull(info.name, info.about).filter { it.contains(prefix, true) }.isNotEmpty()
-}
-
-@Stable
-class LiveActivitiesChannel(
-    val address: ATag,
-) : Channel(address.toTag()) {
-    var info: LiveActivitiesEvent? = null
-
-    override fun idNote() = address.toNAddr()
-
-    override fun idDisplayNote() = idNote().toShortenHex()
-
-    fun address() = address
-
-    fun updateChannelInfo(
-        creator: User,
-        channelInfo: LiveActivitiesEvent,
-        updatedAt: Long,
-    ) {
-        this.info = channelInfo
-        super.updateChannelInfo(creator, updatedAt)
-    }
-
-    override fun toBestDisplayName(): String = info?.title() ?: super.toBestDisplayName()
-
-    override fun summary(): String? = info?.summary()
-
-    override fun profilePicture(): String? = info?.image()?.ifBlank { null }
-
-    override fun anyNameStartsWith(prefix: String): Boolean =
-        listOfNotNull(info?.title(), info?.summary())
-            .filter { it.contains(prefix, true) }
-            .isNotEmpty()
-}
-
-@Stable
-abstract class Channel(
-    val idHex: String,
-) {
-    var creator: User? = null
-    var updatedMetadataAt: Long = 0
+abstract class Channel : NotesGatherer {
     val notes = LargeCache<HexKey, Note>()
-    var lastNoteCreatedAt: Long = 0
+    var lastNote: Note? = null
 
-    open fun id() = Hex.decode(idHex)
+    private var relays = mapOf<NormalizedRelayUrl, Counter>()
 
-    open fun idNote() = id().toNEvent()
+    private var changesFlow: WeakReference<MutableSharedFlow<ListChange<Note>>> = WeakReference(null)
 
-    open fun idDisplayNote() = idNote().toShortenHex()
-
-    open fun toBestDisplayName(): String = idDisplayNote()
-
-    open fun summary(): String? = null
-
-    open fun creatorName(): String? = creator?.toBestDisplayName()
-
-    open fun profilePicture(): String? = creator?.info?.banner
-
-    open fun updateChannelInfo(
-        creator: User,
-        updatedAt: Long,
-    ) {
-        this.creator = creator
-        this.updatedMetadataAt = updatedAt
-
-        live.invalidateData()
+    fun changesFlow(): MutableSharedFlow<ListChange<Note>> {
+        val current = changesFlow.get()
+        if (current != null) return current
+        val new = MutableSharedFlow<ListChange<Note>>(0, 100, BufferOverflow.DROP_OLDEST)
+        changesFlow = WeakReference(new)
+        return new
     }
 
-    fun addNote(note: Note) {
-        notes.put(note.idHex, note)
+    open fun participatingAuthors() = notes.mapNotNull { key, value -> value.author }
 
-        if ((note.createdAt() ?: 0) > lastNoteCreatedAt) {
-            lastNoteCreatedAt = note.createdAt() ?: 0
+    abstract fun toBestDisplayName(): String
+
+    open fun relays(): Set<NormalizedRelayUrl> =
+        relays.keys
+            .toSortedSet { o1, o2 ->
+                val o1Count = relays[o1]?.number ?: 0
+                val o2Count = relays[o2]?.number ?: 0
+                o2Count.compareTo(o1Count) // descending
+            }
+
+    fun updateChannelInfo() {
+        flowSet?.metadata?.invalidateData()
+    }
+
+    @Synchronized
+    fun addRelaySync(briefInfo: NormalizedRelayUrl) {
+        if (briefInfo !in relays) {
+            relays = relays + Pair(briefInfo, Counter(1))
         }
     }
 
-    fun removeNote(note: Note) {
-        notes.remove(note.idHex)
+    fun addRelay(relay: NormalizedRelayUrl) {
+        val counter = relays[relay]
+        if (counter != null) {
+            counter.number++
+        } else {
+            addRelaySync(relay)
+        }
     }
 
-    fun removeNote(noteHex: String) {
-        notes.remove(noteHex)
+    fun addNote(
+        note: Note,
+        relay: NormalizedRelayUrl? = null,
+    ) {
+        if (!notes.containsKey(note.idHex)) {
+            notes.put(note.idHex, note)
+            note.addGatherer(this)
+
+            if ((note.createdAt() ?: 0) > (lastNote?.createdAt() ?: 0)) {
+                lastNote = note
+            }
+
+            if (relay != null) {
+                addRelay(relay)
+            }
+
+            changesFlow.get()?.tryEmit(ListChange.Addition(note))
+
+            flowSet?.notes?.invalidateData()
+        }
     }
 
-    abstract fun anyNameStartsWith(prefix: String): Boolean
+    override fun removeNote(note: Note) {
+        if (notes.containsKey(note.idHex)) {
+            notes.remove(note.idHex)
+            note.removeGatherer(this)
 
-    // Observers line up here.
-    val live: ChannelLiveData = ChannelLiveData(this)
+            if (note == lastNote) {
+                lastNote = notes.values().sortedWith(DefaultFeedOrder).firstOrNull()
+            }
 
-    fun pruneOldAndHiddenMessages(account: Account): Set<Note> {
+            changesFlow.get()?.tryEmit(ListChange.Deletion(note))
+
+            flowSet?.notes?.invalidateData()
+        }
+    }
+
+    fun pruneOldMessages(): Set<Note> {
         val important =
             notes
-                .filter { key, it ->
-                    it.author?.let { author -> account.isHidden(author) } == false
-                }.sortedWith(DefaultFeedOrder)
+                .values()
+                .sortedWith(DefaultFeedOrder)
                 .take(500)
                 .toSet()
 
@@ -163,38 +129,87 @@ abstract class Channel(
 
         toBeRemoved.forEach { notes.remove(it.idHex) }
 
+        changesFlow.get()?.tryEmit(ListChange.SetDeletion(toBeRemoved.toSet()))
+
+        flowSet?.notes?.invalidateData()
+
         return toBeRemoved.toSet()
     }
-}
 
-class ChannelLiveData(
-    val channel: Channel,
-) : LiveData<ChannelState>(ChannelState(channel)) {
-    // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO)
+    fun pruneHiddenMessages(account: Account): Set<Note> {
+        val hidden =
+            notes
+                .filter { key, it ->
+                    it.author?.let { author -> account.isHidden(author) } == true
+                }.toSet()
 
-    fun invalidateData() {
-        checkNotInMainThread()
+        hidden.forEach { notes.remove(it.idHex) }
 
-        bundler.invalidate {
-            checkNotInMainThread()
-            if (hasActiveObservers()) {
-                postValue(ChannelState(channel))
+        changesFlow.get()?.tryEmit(ListChange.SetDeletion(hidden))
+
+        flowSet?.notes?.invalidateData()
+
+        return hidden.toSet()
+    }
+
+    var flowSet: ChannelFlowSet? = null
+
+    @Synchronized
+    fun createOrDestroyFlowSync(create: Boolean) {
+        if (create) {
+            if (flowSet == null) {
+                flowSet = ChannelFlowSet(this)
+            }
+        } else {
+            if (flowSet != null && flowSet?.isInUse() == false) {
+                flowSet = null
             }
         }
     }
 
-    override fun onActive() {
-        super.onActive()
-        NostrSingleChannelDataSource.add(channel)
+    fun flow(): ChannelFlowSet {
+        if (flowSet == null) {
+            createOrDestroyFlowSync(true)
+        }
+        return flowSet!!
     }
 
-    override fun onInactive() {
-        super.onInactive()
-        NostrSingleChannelDataSource.remove(channel)
+    fun clearFlow() {
+        if (flowSet != null && flowSet?.isInUse() == false) {
+            createOrDestroyFlowSync(false)
+        }
     }
 }
 
+data class Counter(
+    var number: Int = 0,
+)
+
+@Stable
+class ChannelFlowSet(
+    u: Channel,
+) {
+    // Observers line up here.
+    val metadata = ChannelFlow(u)
+    val notes = ChannelFlow(u)
+
+    fun isInUse(): Boolean =
+        metadata.hasObservers() ||
+            notes.hasObservers()
+}
+
+class ChannelFlow(
+    val channel: Channel,
+) {
+    val stateFlow = MutableStateFlow(ChannelState(channel))
+
+    fun invalidateData() {
+        stateFlow.tryEmit(ChannelState(channel))
+    }
+
+    fun hasObservers() = stateFlow.subscriptionCount.value > 0
+}
+
 class ChannelState(
     val channel: Channel,
 )

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Chatroom.kt

@@ -1,95 +0,0 @@
-/**
- * Copyright (c) 2024 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.vitorpamplona.amethyst.model
-
-import androidx.compose.runtime.Stable
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.events.PrivateDmEvent
-import com.vitorpamplona.quartz.utils.TimeUtils
-
-@Stable
-class Chatroom {
-    var authors: Set<User> = setOf()
-    var roomMessages: Set<Note> = setOf()
-    var subject: String? = null
-    var subjectCreatedAt: Long? = null
-
-    @Synchronized
-    fun addMessageSync(msg: Note) {
-        checkNotInMainThread()
-
-        if (msg !in roomMessages) {
-            roomMessages = roomMessages + msg
-
-            msg.author?.let { author ->
-                if (author !in authors) {
-                    authors += author
-                }
-            }
-
-            val newSubject = msg.event?.subject()
-
-            if (newSubject != null && (msg.createdAt() ?: 0) > (subjectCreatedAt ?: 0)) {
-                subject = newSubject
-                subjectCreatedAt = msg.createdAt()
-            }
-        }
-    }
-
-    @Synchronized
-    fun removeMessageSync(msg: Note) {
-        checkNotInMainThread()
-
-        if (msg in roomMessages) {
-            roomMessages = roomMessages - msg
-
-            roomMessages
-                .filter { it.event?.subject() != null }
-                .sortedBy { it.createdAt() }
-                .lastOrNull()
-                ?.let {
-                    subject = it.event?.subject()
-                    subjectCreatedAt = it.createdAt()
-                }
-        }
-    }
-
-    fun senderIntersects(keySet: Set<HexKey>): Boolean = authors.any { it.pubkeyHex in keySet }
-
-    fun pruneMessagesToTheLatestOnly(): Set<Note> {
-        val sorted = roomMessages.sortedWith(DefaultFeedOrder)
-
-        val toKeep =
-            if ((sorted.firstOrNull()?.createdAt() ?: 0) > TimeUtils.oneWeekAgo()) {
-                // Recent messages, keep last 100
-                sorted.take(100).toSet()
-            } else {
-                // Old messages, keep the last one.
-                sorted.take(1).toSet()
-            } + sorted.filter { it.liveSet?.isInUse() ?: false } + sorted.filter { it.event !is PrivateDmEvent }
-
-        val toRemove = roomMessages.minus(toKeep)
-        roomMessages = toKeep
-        return toRemove
-    }
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Constants.kt

@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model
+
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer
+
+object Constants {
+    val nos = RelayUrlNormalizer.normalize("wss://nos.lol")
+    val mom = RelayUrlNormalizer.normalize("wss://nostr.mom")
+    val primal = RelayUrlNormalizer.normalize("wss://relay.primal.net")
+    val damus = RelayUrlNormalizer.normalize("wss://relay.damus.io")
+    val wine = RelayUrlNormalizer.normalize("wss://nostr.wine")
+    val band = RelayUrlNormalizer.normalize("wss://relay.nostr.band")
+
+    val where = RelayUrlNormalizer.normalize("wss://relay.noswhere.com")
+    val elites = RelayUrlNormalizer.normalize("wss://nostrelites.org")
+
+    val bitcoiner = RelayUrlNormalizer.normalize("wss://nostr.bitcoiner.social")
+    val oxtr = RelayUrlNormalizer.normalize("wss://nostr.oxtr.dev")
+    val fmtwiz = RelayUrlNormalizer.normalize("wss://nostr.fmt.wiz.biz")
+
+    val nostoday = RelayUrlNormalizer.normalize("wss://search.nos.today")
+
+    val auth = RelayUrlNormalizer.normalize("wss://auth.nostr1.com")
+    val oxchat = RelayUrlNormalizer.normalize("wss://relay.0xchat.com")
+
+    val purplepages = RelayUrlNormalizer.normalize("wss://purplepag.es")
+    val coracle = RelayUrlNormalizer.normalize("wss://indexer.coracle.social")
+    val userkinds = RelayUrlNormalizer.normalize("wss://user.kindpag.es")
+
+    val bootstrapInbox = setOf(band, damus, primal, mom, nos, bitcoiner, oxtr, fmtwiz)
+    val eventFinderRelays = setOf(band, wine, damus, primal, mom, nos, bitcoiner, oxtr, fmtwiz)
+
+    val defaultSearchRelaySet = setOf(band, wine, where)
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -33,6 +33,7 @@ import com.vitorpamplona.amethyst.commons.hashtags.Btc
 import com.vitorpamplona.amethyst.commons.hashtags.Cashu
 import com.vitorpamplona.amethyst.commons.hashtags.Coffee
 import com.vitorpamplona.amethyst.commons.hashtags.CustomHashTagIcons
+import com.vitorpamplona.amethyst.commons.hashtags.Flowerstr
 import com.vitorpamplona.amethyst.commons.hashtags.Footstr
 import com.vitorpamplona.amethyst.commons.hashtags.Gamestr
 import com.vitorpamplona.amethyst.commons.hashtags.Grownostr
@@ -48,20 +49,22 @@ import com.vitorpamplona.amethyst.commons.richtext.HashTagSegment
 import com.vitorpamplona.amethyst.commons.richtext.RegularTextSegment
 import com.vitorpamplona.amethyst.ui.components.HashTag
 import com.vitorpamplona.amethyst.ui.components.RenderRegular
-import com.vitorpamplona.amethyst.ui.navigation.EmptyNav
+import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.mockAccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonColumn
-import com.vitorpamplona.quartz.events.EmptyTagList
+import com.vitorpamplona.quartz.nip02FollowList.EmptyTagList
 
 @Preview
 @Composable
 fun RenderHashTagIconsPreview() {
+    val accountViewModel = mockAccountViewModel()
     ThemeComparisonColumn {
         RenderRegular(
-            "Testing rendering of hashtags: #Bitcoin, #nostr, #lightning, #zap, #amethyst, #cashu, #plebs, #coffee, #skullofsatoshi, #grownostr, #footstr, #tunestr, #weed, #mate, #gamestr, #gamechain",
+            "Testing rendering of hashtags: #flowerstr #Bitcoin, #nostr, #lightning, #zap, #amethyst, #cashu, #plebs, #coffee, #skullofsatoshi, #grownostr, #footstr, #tunestr, #weed, #mate, #gamestr, #gamechain",
             EmptyTagList,
         ) { word, state ->
             when (word) {
-                is HashTagSegment -> HashTag(word, EmptyNav)
+                is HashTagSegment -> HashTag(word, accountViewModel, EmptyNav)
                 is RegularTextSegment -> Text(word.segmentText)
             }
         }
@@ -81,6 +84,7 @@ fun checkForHashtagWithIcon(tag: String): HashtagIcon? =
         "skullofsatoshi" -> skull
         "grownostr", "gardening", "garden" -> growstr
         "footstr" -> footstr
+        "flowerstr" -> flowerstr
         "tunestr", "music", "nowplaying" -> tunestr
         "mate", "matechain", "matestr" -> matestr
         "weed", "weedstr", "420", "cannabis", "marijuana" -> weed
@@ -99,6 +103,7 @@ val coffee = HashtagIcon(CustomHashTagIcons.Coffee, "Coffee", Modifier.padding(s
 val skull = HashtagIcon(CustomHashTagIcons.Skull, "SkullofSatoshi", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
 val growstr = HashtagIcon(CustomHashTagIcons.Grownostr, "GrowNostr", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
 val footstr = HashtagIcon(CustomHashTagIcons.Footstr, "Footstr", Modifier.padding(start = 2.dp, bottom = 1.dp, top = 1.dp))
+val flowerstr = HashtagIcon(CustomHashTagIcons.Flowerstr, "Flowerstr", Modifier.padding(start = 2.dp, bottom = 1.dp, top = 1.dp))
 val tunestr = HashtagIcon(CustomHashTagIcons.Tunestr, "Tunestr", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
 val weed = HashtagIcon(CustomHashTagIcons.Weed, "Weed", Modifier.padding(start = 1.dp, bottom = 0.dp, top = 0.dp))
 val matestr = HashtagIcon(CustomHashTagIcons.Mate, "Mate", Modifier.padding(start = 1.dp, bottom = 0.dp, top = 0.dp))

amethyst/src/main/java/com/vitorpamplona/amethyst/model/MediaAspectRatioCache.kt

@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model
+
+import android.util.LruCache
+
+interface MutableMediaAspectRatioCache {
+    fun get(url: String): Float?
+
+    fun add(
+        url: String,
+        width: Int,
+        height: Int,
+    )
+}
+
+object MediaAspectRatioCache : MutableMediaAspectRatioCache {
+    val mediaAspectRatioCacheByUrl = LruCache<String, Float>(1000)
+
+    override fun get(url: String): Float? = mediaAspectRatioCacheByUrl.get(url)
+
+    override fun add(
+        url: String,
+        width: Int,
+        height: Int,
+    ) {
+        if (height > 1) {
+            mediaAspectRatioCacheByUrl.put(url, width.toFloat() / height.toFloat())
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/MiniFhir.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

amethyst/src/main/java/com/vitorpamplona/amethyst/model/ParticipantListBuilder.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -20,7 +20,7 @@
  */
 package com.vitorpamplona.amethyst.model
 
-import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
 
 class ParticipantListBuilder {
     private fun addFollowsThatDirectlyParticipateOnToSet(
@@ -96,7 +96,7 @@ class ParticipantListBuilder {
             it.replyTo?.forEach { addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet) }
         }
 
-        LocalCache.getChannelIfExists(baseNote.idHex)?.notes?.forEach { key, it ->
+        LocalCache.getPublicChatChannelIfExists(baseNote.idHex)?.notes?.forEach { key, it ->
             addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet)
         }
 

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -35,6 +35,7 @@ data class Settings(
     val dontShowPushNotificationSelector: Boolean = false,
     val dontAskForNotificationPermissions: Boolean = false,
     val featureSet: FeatureSetType = FeatureSetType.SIMPLIFIED,
+    val gallerySet: ProfileGalleryType = ProfileGalleryType.CLASSIC,
 )
 
 enum class ThemeType(
@@ -75,6 +76,14 @@ enum class FeatureSetType(
     PERFORMANCE(2, R.string.ui_feature_set_type_performance),
 }
 
+enum class ProfileGalleryType(
+    val screenCode: Int,
+    val resourceId: Int,
+) {
+    CLASSIC(0, R.string.gallery_type_classic),
+    MODERN(1, R.string.gallery_type_modern),
+}
+
 fun parseConnectivityType(code: Boolean?): ConnectivityType =
     when (code) {
         ConnectivityType.ALWAYS.prefCode -> ConnectivityType.ALWAYS
@@ -105,6 +114,15 @@ fun parseFeatureSetType(screenCode: Int): FeatureSetType =
         }
     }
 
+fun parseGalleryType(screenCode: Int): ProfileGalleryType =
+    when (screenCode) {
+        ProfileGalleryType.CLASSIC.screenCode -> ProfileGalleryType.CLASSIC
+        ProfileGalleryType.MODERN.screenCode -> ProfileGalleryType.MODERN
+        else -> {
+            ProfileGalleryType.CLASSIC
+        }
+    }
+
 enum class BooleanType(
     val prefCode: Boolean?,
     val screenCode: Int,
@@ -131,3 +149,33 @@ fun parseBooleanType(screenCode: Int): BooleanType =
             BooleanType.ALWAYS
         }
     }
+
+enum class WarningType(
+    val prefCode: Boolean?,
+    val screenCode: Int,
+    val resourceId: Int,
+) {
+    WARN(null, 0, R.string.content_warning_see_warnings_option),
+    SHOW(true, 1, R.string.content_warning_show_all_sensitive_content_option),
+    HIDE(false, 2, R.string.content_warning_hide_all_sensitive_content_option),
+}
+
+fun parseWarningType(screenCode: Int): WarningType =
+    when (screenCode) {
+        WarningType.WARN.screenCode -> WarningType.WARN
+        WarningType.SHOW.screenCode -> WarningType.SHOW
+        WarningType.HIDE.screenCode -> WarningType.HIDE
+        else -> {
+            WarningType.WARN
+        }
+    }
+
+fun parseWarningType(code: Boolean?): WarningType =
+    when (code) {
+        WarningType.WARN.prefCode -> WarningType.WARN
+        WarningType.HIDE.prefCode -> WarningType.HIDE
+        WarningType.SHOW.prefCode -> WarningType.SHOW
+        else -> {
+            WarningType.WARN
+        }
+    }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -22,10 +22,10 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.quartz.encoders.ATag
-import com.vitorpamplona.quartz.events.AddressableEvent
-import com.vitorpamplona.quartz.events.GenericRepostEvent
-import com.vitorpamplona.quartz.events.RepostEvent
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.Address
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.toImmutableSet
 
@@ -36,13 +36,15 @@ class ThreadAssembler {
     ): Note? {
         if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
 
-        if (note.event is RepostEvent || note.event is GenericRepostEvent) return note
+        val noteEvent = note.event
+
+        if (noteEvent is RepostEvent || noteEvent is GenericRepostEvent) return note
 
         testedNotes.add(note)
 
         val markedAsRoot =
-            note.event
-                ?.tags()
+            noteEvent
+                ?.tags
                 ?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }
                 ?.getOrNull(1)
         if (markedAsRoot != null) {
@@ -52,19 +54,21 @@ class ThreadAssembler {
             }
         }
 
-        val hasNoReplyTo = note.replyTo?.reversed()?.firstOrNull { it.replyTo?.isEmpty() == true }
+        val hasNoReplyTo =
+            note.replyTo?.lastOrNull {
+                it.replyTo?.isEmpty() == true
+            }
         if (hasNoReplyTo != null) return hasNoReplyTo
 
         // recursive
         val roots =
-            note.replyTo
-                ?.map {
-                    if (it !in testedNotes) {
-                        searchRoot(it, testedNotes)
-                    } else {
-                        null
-                    }
-                }?.filterNotNull()
+            note.replyTo?.mapNotNull {
+                if (it !in testedNotes) {
+                    searchRoot(it, testedNotes)
+                } else {
+                    null
+                }
+            }
 
         if (roots != null && roots.isNotEmpty()) {
             return roots[0]
@@ -79,6 +83,18 @@ class ThreadAssembler {
         val allNotes: ImmutableSet<Note>,
     )
 
+    fun findRoot(noteId: String): Note? {
+        val note = LocalCache.checkGetOrCreateNote(noteId) ?: return null
+
+        return if (note.event != null) {
+            val thread = OnlyLatestVersionSet()
+
+            searchRoot(note, thread) ?: note
+        } else {
+            note
+        }
+    }
+
     fun findThreadFor(noteId: String): ThreadInfo? {
         checkNotInMainThread()
 
@@ -132,7 +148,7 @@ class ThreadAssembler {
 }
 
 class OnlyLatestVersionSet : MutableSet<Note> {
-    val map = hashMapOf<ATag, Long>()
+    val map = hashMapOf<Address, Long>()
     val set = hashSetOf<Note>()
 
     override fun add(element: Note): Boolean {
@@ -149,7 +165,7 @@ class OnlyLatestVersionSet : MutableSet<Note> {
     }
 
     private fun innerAdd(
-        address: ATag,
+        address: Address,
         element: Note,
         loadedCreatedAt: Long,
     ): Boolean {

amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadLevelCalculator.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -20,9 +20,9 @@
  */
 package com.vitorpamplona.amethyst.model
 
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.events.GenericRepostEvent
-import com.vitorpamplona.quartz.events.RepostEvent
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
 import java.lang.Long.min
 import java.time.Instant
 import java.time.ZoneId

amethyst/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -24,6 +24,7 @@ import android.util.LruCache
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.service.previews.UrlPreview
 import com.vitorpamplona.amethyst.ui.components.UrlPreviewState
+import okhttp3.OkHttpClient
 
 @Stable
 object UrlCachedPreviewer {
@@ -32,7 +33,7 @@ object UrlCachedPreviewer {
 
     suspend fun previewInfo(
         url: String,
-        forceProxy: Boolean,
+        okHttpClient: (String) -> OkHttpClient,
         onReady: suspend (UrlPreviewState) -> Unit,
     ) {
         cache[url]?.let {
@@ -42,7 +43,7 @@ object UrlCachedPreviewer {
 
         UrlPreview().fetch(
             url,
-            forceProxy,
+            okHttpClient,
             onComplete = { urlInfo ->
                 cache[url]?.let {
                     if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -22,80 +22,78 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.distinctUntilChanged
-import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import com.vitorpamplona.ammolite.relays.BundledUpdate
-import com.vitorpamplona.ammolite.relays.Relay
-import com.vitorpamplona.ammolite.relays.filters.EOSETime
-import com.vitorpamplona.quartz.encoders.Hex
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.Lud06
-import com.vitorpamplona.quartz.encoders.Nip19Bech32
-import com.vitorpamplona.quartz.encoders.toNpub
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.BookmarkListEvent
-import com.vitorpamplona.quartz.events.ChatroomKey
-import com.vitorpamplona.quartz.events.ContactListEvent
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
-import com.vitorpamplona.quartz.events.ReportEvent
-import com.vitorpamplona.quartz.events.UserMetadata
-import com.vitorpamplona.quartz.events.toImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.note.toShortDisplay
+import com.vitorpamplona.quartz.lightning.Lud06
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
+import com.vitorpamplona.quartz.nip01Core.metadata.UserMetadata
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.isTaggedGeoHash
+import com.vitorpamplona.quartz.nip01Core.tags.hashtags.isTaggedHash
+import com.vitorpamplona.quartz.nip01Core.tags.people.PTag
+import com.vitorpamplona.quartz.nip01Core.tags.people.isTaggedUser
+import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
+import com.vitorpamplona.quartz.nip02FollowList.toImmutableListOfLists
+import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent
+import com.vitorpamplona.quartz.nip19Bech32.entities.NProfile
+import com.vitorpamplona.quartz.nip19Bech32.toNpub
+import com.vitorpamplona.quartz.nip56Reports.ReportEvent
+import com.vitorpamplona.quartz.nip56Reports.ReportType
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.utils.DualCase
+import com.vitorpamplona.quartz.utils.Hex
 import com.vitorpamplona.quartz.utils.containsAny
-import kotlinx.collections.immutable.persistentSetOf
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import java.math.BigDecimal
 
 @Stable
 class User(
     val pubkeyHex: String,
+    val nip65RelayListNote: Note,
+    val dmRelayListNote: Note,
 ) {
     var info: UserMetadata? = null
 
     var latestMetadata: MetadataEvent? = null
-    var latestMetadataRelay: String? = null
+    var latestMetadataRelay: NormalizedRelayUrl? = null
     var latestContactList: ContactListEvent? = null
-    var latestBookmarkList: BookmarkListEvent? = null
 
     var reports = mapOf<User, Set<Note>>()
         private set
 
-    var latestEOSEs: Map<String, EOSETime> = emptyMap()
-
     var zaps = mapOf<Note, Note?>()
         private set
 
-    var relaysBeingUsed = mapOf<String, RelayInfo>()
-        private set
-
-    var privateChatrooms = mapOf<ChatroomKey, Chatroom>()
+    var relaysBeingUsed = mapOf<NormalizedRelayUrl, RelayInfo>()
         private set
 
     fun pubkey() = Hex.decode(pubkeyHex)
 
     fun pubkeyNpub() = pubkey().toNpub()
 
-    fun pubkeyDisplayHex() = pubkeyNpub().toShortenHex()
+    fun pubkeyDisplayHex() = pubkeyNpub().toShortDisplay()
 
-    fun toNProfile(): String {
-        val relayList = (LocalCache.getAddressableNoteIfExists(AdvertisedRelayListEvent.createAddressTag(pubkeyHex))?.event as? AdvertisedRelayListEvent)?.writeRelays()
+    fun dmInboxRelayList() = dmRelayListNote.event as? ChatMessageRelayListEvent
 
-        return Nip19Bech32.createNProfile(
-            pubkeyHex,
-            relayList?.take(3) ?: listOfNotNull(latestMetadataRelay),
-        )
-    }
+    fun authorRelayList() = nip65RelayListNote.event as? AdvertisedRelayListEvent
+
+    fun toNProfile() = NProfile.create(pubkeyHex, relayHints())
+
+    fun outboxRelays() = authorRelayList()?.writeRelaysNorm()
+
+    fun relayHints() = authorRelayList()?.writeRelaysNorm()?.take(3) ?: listOfNotNull(latestMetadataRelay)
+
+    fun inboxRelays() = authorRelayList()?.readRelaysNorm()
+
+    fun dmInboxRelays() = dmInboxRelayList()?.relays()?.ifEmpty { null } ?: inboxRelays()
+
+    fun bestRelayHint() = authorRelayList()?.writeRelaysNorm()?.firstOrNull() ?: latestMetadataRelay
+
+    fun toPTag() = PTag(pubkeyHex, bestRelayHint())
 
     fun toNostrUri() = "nostr:${toNProfile()}"
 
-    override fun toString(): String = pubkeyHex
-
     fun toBestShortFirstName(): String {
         val fullName = toBestDisplayName()
 
@@ -118,17 +116,6 @@ class User(
 
     fun profilePicture(): String? = info?.picture
 
-    fun updateBookmark(event: BookmarkListEvent) {
-        if (event.id == latestBookmarkList?.id) return
-
-        latestBookmarkList = event
-        liveSet?.innerBookmarks?.invalidateData()
-    }
-
-    fun clearEOSE() {
-        latestEOSEs = emptyMap()
-    }
-
     fun updateContactList(event: ContactListEvent) {
         if (event.id == latestContactList?.id) return
 
@@ -136,7 +123,6 @@ class User(
         latestContactList = event
 
         // Update following of the current user
-        liveSet?.innerFollows?.invalidateData()
         flowSet?.follows?.invalidateData()
 
         // Update Followers of the past user list
@@ -144,20 +130,17 @@ class User(
         (oldContactListEvent)?.unverifiedFollowKeySet()?.forEach {
             LocalCache
                 .getUserIfExists(it)
-                ?.liveSet
-                ?.innerFollowers
+                ?.flowSet
+                ?.followers
                 ?.invalidateData()
         }
         (latestContactList)?.unverifiedFollowKeySet()?.forEach {
             LocalCache
                 .getUserIfExists(it)
-                ?.liveSet
-                ?.innerFollowers
+                ?.flowSet
+                ?.followers
                 ?.invalidateData()
         }
-
-        liveSet?.innerRelays?.invalidateData()
-        flowSet?.relays?.invalidateData()
     }
 
     fun addReport(note: Note) {
@@ -166,10 +149,10 @@ class User(
         val reportsBy = reports[author]
         if (reportsBy == null) {
             reports = reports + Pair(author, setOf(note))
-            liveSet?.innerReports?.invalidateData()
+            flowSet?.reports?.invalidateData()
         } else if (!reportsBy.contains(note)) {
             reports = reports + Pair(author, reportsBy + note)
-            liveSet?.innerReports?.invalidateData()
+            flowSet?.reports?.invalidateData()
         }
     }
 
@@ -179,7 +162,7 @@ class User(
         if (reports[author]?.contains(deleteNote) == true) {
             reports[author]?.let {
                 reports = reports + Pair(author, it.minus(deleteNote))
-                liveSet?.innerReports?.invalidateData()
+                flowSet?.reports?.invalidateData()
             }
         }
     }
@@ -190,17 +173,17 @@ class User(
     ) {
         if (zaps[zapRequest] == null) {
             zaps = zaps + Pair(zapRequest, zap)
-            liveSet?.innerZaps?.invalidateData()
+            flowSet?.zaps?.invalidateData()
         }
     }
 
     fun removeZap(zapRequestOrZapEvent: Note) {
         if (zaps.containsKey(zapRequestOrZapEvent)) {
             zaps = zaps.minus(zapRequestOrZapEvent)
-            liveSet?.innerZaps?.invalidateData()
+            flowSet?.zaps?.invalidateData()
         } else if (zaps.containsValue(zapRequestOrZapEvent)) {
             zaps = zaps.filter { it.value != zapRequestOrZapEvent }
-            liveSet?.innerZaps?.invalidateData()
+            flowSet?.zaps?.invalidateData()
         }
     }
 
@@ -230,83 +213,13 @@ class User(
                 }
             }.flatten()
 
-    @Synchronized
-    private fun getOrCreatePrivateChatroomSync(key: ChatroomKey): Chatroom {
-        checkNotInMainThread()
-
-        return privateChatrooms[key]
-            ?: run {
-                val privateChatroom = Chatroom()
-                privateChatrooms = privateChatrooms + Pair(key, privateChatroom)
-                privateChatroom
-            }
-    }
-
-    private fun getOrCreatePrivateChatroom(user: User): Chatroom {
-        val key = ChatroomKey(persistentSetOf(user.pubkeyHex))
-        return getOrCreatePrivateChatroom(key)
-    }
-
-    private fun getOrCreatePrivateChatroom(key: ChatroomKey): Chatroom = privateChatrooms[key] ?: getOrCreatePrivateChatroomSync(key)
-
-    fun addMessage(
-        room: ChatroomKey,
-        msg: Note,
-    ) {
-        val privateChatroom = getOrCreatePrivateChatroom(room)
-        if (msg !in privateChatroom.roomMessages) {
-            privateChatroom.addMessageSync(msg)
-            liveSet?.innerMessages?.invalidateData()
-        }
-    }
-
-    fun addMessage(
-        user: User,
-        msg: Note,
-    ) {
-        val privateChatroom = getOrCreatePrivateChatroom(user)
-        if (msg !in privateChatroom.roomMessages) {
-            privateChatroom.addMessageSync(msg)
-            liveSet?.innerMessages?.invalidateData()
-        }
-    }
-
-    fun createChatroom(withKey: ChatroomKey) {
-        getOrCreatePrivateChatroom(withKey)
-    }
-
-    fun removeMessage(
-        user: User,
-        msg: Note,
-    ) {
-        checkNotInMainThread()
-
-        val privateChatroom = getOrCreatePrivateChatroom(user)
-        if (msg in privateChatroom.roomMessages) {
-            privateChatroom.removeMessageSync(msg)
-            liveSet?.innerMessages?.invalidateData()
-        }
-    }
-
-    fun removeMessage(
-        room: ChatroomKey,
-        msg: Note,
-    ) {
-        checkNotInMainThread()
-        val privateChatroom = getOrCreatePrivateChatroom(room)
-        if (msg in privateChatroom.roomMessages) {
-            privateChatroom.removeMessageSync(msg)
-            liveSet?.innerMessages?.invalidateData()
-        }
-    }
-
     fun addRelayBeingUsed(
-        relay: Relay,
+        relay: NormalizedRelayUrl,
         eventTime: Long,
     ) {
-        val here = relaysBeingUsed[relay.url]
+        val here = relaysBeingUsed[relay]
         if (here == null) {
-            relaysBeingUsed = relaysBeingUsed + Pair(relay.url, RelayInfo(relay.url, eventTime, 1))
+            relaysBeingUsed = relaysBeingUsed + Pair(relay, RelayInfo(relay, eventTime, 1))
         } else {
             if (eventTime > here.lastEvent) {
                 here.lastEvent = eventTime
@@ -314,7 +227,7 @@ class User(
             here.counter++
         }
 
-        liveSet?.innerRelayInfo?.invalidateData()
+        flowSet?.usedRelays?.invalidateData()
     }
 
     fun updateUserInfo(
@@ -334,7 +247,6 @@ class User(
         }
 
         flowSet?.metadata?.invalidateData()
-        liveSet?.innerMetadata?.invalidateData()
     }
 
     fun isFollowing(user: User): Boolean = latestContactList?.isTaggedUser(user.pubkeyHex) ?: false
@@ -347,19 +259,12 @@ class User(
 
     suspend fun transientFollowerCount(): Int = LocalCache.users.count { _, it -> it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
 
-    fun hasSentMessagesTo(key: ChatroomKey?): Boolean {
-        val messagesToUser = privateChatrooms[key] ?: return false
-
-        return messagesToUser.authors.any { this == it }
-    }
-
     fun hasReport(
         loggedIn: User,
-        type: ReportEvent.ReportType,
+        type: ReportType,
     ): Boolean =
         reports[loggedIn]?.firstOrNull {
-            it.event is ReportEvent &&
-                (it.event as ReportEvent).reportedAuthor().any { it.reportType == type }
+            (it.event as? ReportEvent)?.reportedAuthor()?.any { it.type == type } ?: false
         } != null
 
     fun containsAny(hiddenWordsCase: List<DualCase>): Boolean {
@@ -398,36 +303,8 @@ class User(
 
     fun anyNameStartsWith(username: String): Boolean = info?.anyNameStartsWith(username) ?: false
 
-    var liveSet: UserLiveSet? = null
     var flowSet: UserFlowSet? = null
 
-    fun live(): UserLiveSet {
-        if (liveSet == null) {
-            createOrDestroyLiveSync(true)
-        }
-        return liveSet!!
-    }
-
-    fun clearLive() {
-        if (liveSet != null && liveSet?.isInUse() == false) {
-            createOrDestroyLiveSync(false)
-        }
-    }
-
-    @Synchronized
-    fun createOrDestroyLiveSync(create: Boolean) {
-        if (create) {
-            if (liveSet == null) {
-                liveSet = UserLiveSet(this)
-            }
-        } else {
-            if (liveSet != null && liveSet?.isInUse() == false) {
-                liveSet?.destroy()
-                liveSet = null
-            }
-        }
-    }
-
     @Synchronized
     fun createOrDestroyFlowSync(create: Boolean) {
         if (create) {
@@ -436,7 +313,6 @@ class User(
             }
         } else {
             if (flowSet != null && flowSet?.isInUse() == false) {
-                flowSet?.destroy()
                 flowSet = null
             }
         }
@@ -463,157 +339,43 @@ class UserFlowSet(
     // Observers line up here.
     val metadata = UserBundledRefresherFlow(u)
     val follows = UserBundledRefresherFlow(u)
-    val relays = UserBundledRefresherFlow(u)
-
-    fun isInUse(): Boolean =
-        metadata.stateFlow.subscriptionCount.value > 0 ||
-            relays.stateFlow.subscriptionCount.value > 0 ||
-            follows.stateFlow.subscriptionCount.value > 0
-
-    fun destroy() {
-        metadata.destroy()
-        relays.destroy()
-        follows.destroy()
-    }
-}
-
-@Stable
-class UserLiveSet(
-    u: User,
-) {
-    val innerMetadata = UserBundledRefresherLiveData(u)
-
-    // UI Observers line up here.
-    val innerFollows = UserBundledRefresherLiveData(u)
-    val innerFollowers = UserBundledRefresherLiveData(u)
-    val innerReports = UserBundledRefresherLiveData(u)
-    val innerMessages = UserBundledRefresherLiveData(u)
-    val innerRelays = UserBundledRefresherLiveData(u)
-    val innerRelayInfo = UserBundledRefresherLiveData(u)
-    val innerZaps = UserBundledRefresherLiveData(u)
-    val innerBookmarks = UserBundledRefresherLiveData(u)
-    val innerStatuses = UserBundledRefresherLiveData(u)
-
-    // UI Observers line up here.
-    val metadata = innerMetadata.map { it }
-    val follows = innerFollows.map { it }
-    val followers = innerFollowers.map { it }
-    val reports = innerReports.map { it }
-    val messages = innerMessages.map { it }
-    val relays = innerRelays.map { it }
-    val relayInfo = innerRelayInfo.map { it }
-    val zaps = innerZaps.map { it }
-    val bookmarks = innerBookmarks.map { it }
-    val statuses = innerStatuses.map { it }
-
-    val profilePictureChanges = innerMetadata.map { it.user.profilePicture() }.distinctUntilChanged()
-
-    val nip05Changes = innerMetadata.map { it.user.nip05() }.distinctUntilChanged()
-
-    val userMetadataInfo = innerMetadata.map { it.user.info }.distinctUntilChanged()
+    val followers = UserBundledRefresherFlow(u)
+    val reports = UserBundledRefresherFlow(u)
+    val usedRelays = UserBundledRefresherFlow(u)
+    val zaps = UserBundledRefresherFlow(u)
+    val statuses = UserBundledRefresherFlow(u)
 
     fun isInUse(): Boolean =
         metadata.hasObservers() ||
             follows.hasObservers() ||
             followers.hasObservers() ||
             reports.hasObservers() ||
-            messages.hasObservers() ||
-            relays.hasObservers() ||
-            relayInfo.hasObservers() ||
+            usedRelays.hasObservers() ||
             zaps.hasObservers() ||
-            bookmarks.hasObservers() ||
-            statuses.hasObservers() ||
-            profilePictureChanges.hasObservers() ||
-            nip05Changes.hasObservers() ||
-            userMetadataInfo.hasObservers()
-
-    fun destroy() {
-        innerMetadata.destroy()
-        innerFollows.destroy()
-        innerFollowers.destroy()
-        innerReports.destroy()
-        innerMessages.destroy()
-        innerRelays.destroy()
-        innerRelayInfo.destroy()
-        innerZaps.destroy()
-        innerBookmarks.destroy()
-        innerStatuses.destroy()
-    }
+            statuses.hasObservers()
 }
 
 @Immutable
 data class RelayInfo(
-    val url: String,
+    val url: NormalizedRelayUrl,
     var lastEvent: Long,
     var counter: Long,
 )
 
-class UserBundledRefresherLiveData(
-    val user: User,
-) : LiveData<UserState>(UserState(user)) {
-    // Refreshes observers in batches.
-    private val bundler = BundledUpdate(500, Dispatchers.IO)
-
-    fun destroy() {
-        bundler.cancel()
-    }
-
-    fun invalidateData() {
-        checkNotInMainThread()
-
-        bundler.invalidate {
-            checkNotInMainThread()
-
-            postValue(UserState(user))
-        }
-    }
-
-    fun <Y> map(transform: (UserState) -> Y): UserLoadingLiveData<Y> {
-        val initialValue = this.value?.let { transform(it) }
-        val result = UserLoadingLiveData(user, initialValue)
-        result.addSource(this) { x -> result.value = transform(x) }
-        return result
-    }
-}
-
 @Stable
 class UserBundledRefresherFlow(
     val user: User,
 ) {
-    // Refreshes observers in batches.
-    private val bundler = BundledUpdate(500, Dispatchers.IO)
     val stateFlow = MutableStateFlow(UserState(user))
 
-    fun destroy() {
-        bundler.cancel()
-    }
-
     fun invalidateData() {
-        checkNotInMainThread()
-
-        bundler.invalidate {
-            checkNotInMainThread()
-
-            stateFlow.emit(UserState(user))
-        }
+        stateFlow.tryEmit(UserState(user))
     }
+
+    fun hasObservers() = stateFlow.subscriptionCount.value > 0
 }
 
-class UserLoadingLiveData<Y>(
-    val user: User,
-    initialValue: Y?,
-) : MediatorLiveData<Y>(initialValue) {
-    override fun onActive() {
-        super.onActive()
-        NostrSingleUserDataSource.add(user)
-    }
-
-    override fun onInactive() {
-        super.onInactive()
-        NostrSingleUserDataSource.remove(user)
-    }
-}
-
-@Immutable class UserState(
+@Immutable
+class UserState(
     val user: User,
 )

amethyst/src/main/java/com/vitorpamplona/amethyst/model/edits/PrivateStorageRelayListDecryptionCache.kt

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.edits
+
+import com.vitorpamplona.amethyst.model.nip51Lists.relayLists.GenericRelayListCache
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip37Drafts.privateOutbox.PrivateOutboxRelayListEvent
+
+class PrivateStorageRelayListDecryptionCache(
+    signer: NostrSigner,
+) : GenericRelayListCache<PrivateOutboxRelayListEvent>(signer)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/edits/PrivateStorageRelayListState.kt

@@ -0,0 +1,112 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.edits
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip37Drafts.privateOutbox.PrivateOutboxRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+class PrivateStorageRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: PrivateStorageRelayListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    // Creates a long-term reference for this note so that the GC doesn't collect the note it self
+    val privateOutboxListNote = cache.getOrCreateAddressableNote(getPrivateOutboxRelayListAddress())
+
+    fun getPrivateOutboxRelayListAddress() = PrivateOutboxRelayListEvent.createAddress(signer.pubKey)
+
+    fun getPrivateOutboxRelayListFlow(): StateFlow<NoteState> = privateOutboxListNote.flow().metadata.stateFlow
+
+    fun getPrivateOutboxRelayList(): PrivateOutboxRelayListEvent? = privateOutboxListNote.event as? PrivateOutboxRelayListEvent
+
+    suspend fun normalizePrivateOutboxRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? PrivateOutboxRelayListEvent ?: settings.backupPrivateHomeRelayList
+        return event?.let { decryptionCache.relays(it) } ?: emptySet()
+    }
+
+    val flow =
+        getPrivateOutboxRelayListFlow()
+            .map { normalizePrivateOutboxRelayListWithBackup(it.note) }
+            .onStart {
+                emit(normalizePrivateOutboxRelayListWithBackup(privateOutboxListNote))
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun saveRelayList(relays: List<NormalizedRelayUrl>): PrivateOutboxRelayListEvent {
+        val relayListForPrivateOutbox = getPrivateOutboxRelayList()
+
+        return if (relayListForPrivateOutbox != null) {
+            PrivateOutboxRelayListEvent.updateRelayList(
+                earlierVersion = relayListForPrivateOutbox,
+                relays = relays,
+                signer = signer,
+            )
+        } else {
+            PrivateOutboxRelayListEvent.create(
+                relays = relays,
+                signer = signer,
+            )
+        }
+    }
+
+    init {
+        settings.backupPrivateHomeRelayList?.let { event ->
+            Log.d("AccountRegisterObservers", "Loading saved private home relay list ${event.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(event)
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Private Home Relay List Collector Start")
+            getPrivateOutboxRelayListFlow().collect { noteState ->
+                Log.d("AccountRegisterObservers", "Updating Private Home Relay List for ${signer.pubKey}")
+                (noteState.note.event as? PrivateOutboxRelayListEvent)?.let {
+                    settings.updatePrivateHomeRelayList(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/emphChat/EphemeralChatChannel.kt

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.emphChat
+
+import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.quartz.experimental.ephemChat.chat.RoomId
+
+@Stable
+class EphemeralChatChannel(
+    val roomId: RoomId,
+) : Channel() {
+    override fun relays() = setOf(roomId.relayUrl)
+
+    override fun toBestDisplayName() = roomId.toDisplayKey()
+
+    fun anyNameStartsWith(prefix: String): Boolean = roomId.id.contains(prefix, true)
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/emphChat/EphemeralChatListDecryptionCache.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -18,32 +18,24 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.ammolite.relays.filters
+package com.vitorpamplona.amethyst.model.emphChat
 
-import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.experimental.ephemChat.list.EphemeralChatListEvent
+import com.vitorpamplona.quartz.experimental.ephemChat.list.roomSet
+import com.vitorpamplona.quartz.experimental.ephemChat.list.rooms
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
 
-class Filter(
-    val ids: List<String>? = null,
-    val authors: List<String>? = null,
-    val kinds: List<Int>? = null,
-    val tags: Map<String, List<String>>? = null,
-    val since: Long? = null,
-    val until: Long? = null,
-    val limit: Int? = null,
-    val search: String? = null,
+class EphemeralChatListDecryptionCache(
+    val signer: NostrSigner,
 ) {
-    fun toJson() = FilterSerializer.toJson(ids, authors, kinds, tags, since, until, limit, search)
+    val cachedPrivateLists = PrivateTagArrayEventCache<EphemeralChatListEvent>(signer)
 
-    fun match(event: Event) = FilterMatcher.match(event, ids, authors, kinds, tags, since, until)
+    fun cachedRoomSet(event: EphemeralChatListEvent) = cachedPrivateLists.mergeTagListPrecached(event).roomSet()
 
-    fun copy(
-        ids: List<String>? = this.ids,
-        authors: List<String>? = this.authors,
-        kinds: List<Int>? = this.kinds,
-        tags: Map<String, List<String>>? = this.tags,
-        since: Long? = this.since,
-        until: Long? = this.until,
-        limit: Int? = this.limit,
-        search: String? = this.search,
-    ) = Filter(ids, authors, kinds, tags, since, until, limit, search)
+    fun cachedRooms(event: EphemeralChatListEvent) = cachedPrivateLists.mergeTagListPrecached(event).rooms()
+
+    suspend fun roomSet(event: EphemeralChatListEvent) = cachedPrivateLists.mergeTagList(event).roomSet()
+
+    suspend fun rooms(event: EphemeralChatListEvent) = cachedPrivateLists.mergeTagList(event).rooms()
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/emphChat/EphemeralChatListState.kt

@@ -0,0 +1,130 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.emphChat
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.experimental.ephemChat.chat.RoomId
+import com.vitorpamplona.quartz.experimental.ephemChat.list.EphemeralChatListEvent
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+import kotlinx.coroutines.launch
+
+class EphemeralChatListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: EphemeralChatListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    // Creates a long-term reference for this note so that the GC doesn't collect the note it self
+    val ephemeralChatListNote = cache.getOrCreateAddressableNote(getEphemeralChatListAddress())
+
+    fun getEphemeralChatListAddress() = EphemeralChatListEvent.createAddress(signer.pubKey)
+
+    fun getEphemeralChatListFlow(): StateFlow<NoteState> = ephemeralChatListNote.flow().metadata.stateFlow
+
+    fun getEphemeralChatList(): EphemeralChatListEvent? = ephemeralChatListNote.event as? EphemeralChatListEvent
+
+    suspend fun ephemeralChatListWithBackup(note: Note): Set<RoomId> {
+        val event = note.event as? EphemeralChatListEvent ?: settings.backupEphemeralChatList
+        return event?.let { decryptionCache.roomSet(it) } ?: emptySet()
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val liveEphemeralChatList: StateFlow<Set<RoomId>> =
+        getEphemeralChatListFlow()
+            .transformLatest { noteState ->
+                emit(ephemeralChatListWithBackup(noteState.note))
+            }.onStart {
+                emit(ephemeralChatListWithBackup(ephemeralChatListNote))
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun follow(channel: EphemeralChatChannel): EphemeralChatListEvent {
+        val ephemeralChatList = getEphemeralChatList()
+
+        return if (ephemeralChatList == null) {
+            EphemeralChatListEvent.create(
+                room = channel.roomId,
+                isPrivate = true,
+                signer = signer,
+            )
+        } else {
+            EphemeralChatListEvent.add(
+                earlierVersion = ephemeralChatList,
+                room = channel.roomId,
+                isPrivate = true,
+                signer = signer,
+            )
+        }
+    }
+
+    suspend fun unfollow(channel: EphemeralChatChannel): EphemeralChatListEvent? {
+        val ephemeralChatList = getEphemeralChatList()
+        return if (ephemeralChatList != null) {
+            EphemeralChatListEvent.remove(
+                earlierVersion = ephemeralChatList,
+                room = channel.roomId,
+                signer = signer,
+            )
+        } else {
+            null
+        }
+    }
+
+    init {
+        settings.backupEphemeralChatList?.let { event ->
+            Log.d("AccountRegisterObservers", "Loading saved ephemeral chat list")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(event)
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "EphemeralChatList Collector Start")
+            getEphemeralChatListFlow().collect { noteState ->
+                Log.d("AccountRegisterObservers", "EphemeralChatList List for ${signer.pubKey}")
+                (noteState.note.event as? EphemeralChatListEvent)?.let {
+                    settings.updateEphemeralChatListTo(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/localRelays/LocalRelayListState.kt

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.localRelays
+
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+
+class LocalRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun normalizeLocalRelayListWithBackup(relayList: Set<String>): Set<NormalizedRelayUrl> = relayList.mapNotNull { RelayUrlNormalizer.normalizeOrNull(it) }.toSet()
+
+    val flow =
+        settings.localRelayServers
+            .map { normalizeLocalRelayListWithBackup(it) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                normalizeLocalRelayListWithBackup(settings.localRelayServers.value),
+            )
+
+    fun saveRelayList(
+        relays: List<NormalizedRelayUrl>,
+        onDone: () -> Unit,
+    ) {
+        settings.updateLocalRelayServers(relays.map { it.url }.toSet())
+        onDone()
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/AccountHomeRelayState.kt

@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip01UserMetadata
+
+import com.vitorpamplona.amethyst.model.edits.PrivateStorageRelayListState
+import com.vitorpamplona.amethyst.model.localRelays.LocalRelayListState
+import com.vitorpamplona.amethyst.model.nip65RelayList.Nip65RelayListState
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.stateIn
+
+class AccountHomeRelayState(
+    nip65: Nip65RelayListState,
+    privateStorage: PrivateStorageRelayListState,
+    local: LocalRelayListState,
+    scope: CoroutineScope,
+) {
+    val flow =
+        combine(
+            nip65.outboxFlow,
+            privateStorage.flow,
+            local.flow,
+        ) { nip65Outbox, privateOutBox, localRelays ->
+            nip65Outbox + privateOutBox + localRelays
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                nip65.outboxFlow.value +
+                    privateStorage.flow.value +
+                    local.flow.value,
+            )
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/AccountOutboxRelayState.kt

@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip01UserMetadata
+
+import com.vitorpamplona.amethyst.model.edits.PrivateStorageRelayListState
+import com.vitorpamplona.amethyst.model.localRelays.LocalRelayListState
+import com.vitorpamplona.amethyst.model.nip51Lists.broadcastRelays.BroadcastRelayListState
+import com.vitorpamplona.amethyst.model.nip65RelayList.Nip65RelayListState
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.stateIn
+
+class AccountOutboxRelayState(
+    nip65: Nip65RelayListState,
+    privateStorage: PrivateStorageRelayListState,
+    local: LocalRelayListState,
+    broadcast: BroadcastRelayListState,
+    scope: CoroutineScope,
+) {
+    val flow =
+        combine(
+            nip65.outboxFlow,
+            privateStorage.flow,
+            local.flow,
+            broadcast.flow,
+        ) { nip65Outbox, privateOutBox, localRelays, broadcastRelays ->
+            nip65Outbox + privateOutBox + localRelays + broadcastRelays
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                nip65.outboxFlow.value +
+                    privateStorage.flow.value +
+                    local.flow.value +
+                    broadcast.flow.value,
+            )
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/NotificationInboxRelayState.kt

@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip01UserMetadata
+
+import com.vitorpamplona.amethyst.model.localRelays.LocalRelayListState
+import com.vitorpamplona.amethyst.model.nip65RelayList.Nip65RelayListState
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.stateIn
+
+class NotificationInboxRelayState(
+    nip65RelayList: Nip65RelayListState,
+    localRelayList: LocalRelayListState,
+    scope: CoroutineScope,
+) {
+    val flow =
+        combine(
+            nip65RelayList.inboxFlow,
+            localRelayList.flow,
+        ) { nip65Inbox, localRelays ->
+            nip65Inbox + localRelays
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                nip65RelayList.inboxFlow.value + localRelayList.flow.value,
+            )
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/UserMetadataState.kt

@@ -0,0 +1,123 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip01UserMetadata
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.UserState
+import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+
+class UserMetadataState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    // fun getEphemeralChatListAddress() = cache.getOrCreateUser(signer.pubKey)
+
+    fun getUserMetadataUser(): User = cache.getOrCreateUser(signer.pubKey)
+
+    fun getUserMetadataFlow(): StateFlow<UserState> = getUserMetadataUser().flow().metadata.stateFlow
+
+    fun getUserMetadataEvent(): MetadataEvent? = getUserMetadataUser().latestMetadata
+
+    suspend fun sendNewUserMetadata(
+        name: String? = null,
+        picture: String? = null,
+        banner: String? = null,
+        website: String? = null,
+        pronouns: String? = null,
+        about: String? = null,
+        nip05: String? = null,
+        lnAddress: String? = null,
+        lnURL: String? = null,
+        twitter: String? = null,
+        mastodon: String? = null,
+        github: String? = null,
+    ): MetadataEvent {
+        val latest = getUserMetadataEvent()
+
+        val template =
+            if (latest != null) {
+                MetadataEvent.updateFromPast(
+                    latest = latest,
+                    name = name,
+                    displayName = name,
+                    picture = picture,
+                    banner = banner,
+                    website = website,
+                    pronouns = pronouns,
+                    about = about,
+                    nip05 = nip05,
+                    lnAddress = lnAddress,
+                    lnURL = lnURL,
+                    twitter = twitter,
+                    mastodon = mastodon,
+                    github = github,
+                )
+            } else {
+                MetadataEvent.createNew(
+                    name = name,
+                    displayName = name,
+                    picture = picture,
+                    banner = banner,
+                    website = website,
+                    pronouns = pronouns,
+                    about = about,
+                    nip05 = nip05,
+                    lnAddress = lnAddress,
+                    lnURL = lnURL,
+                    twitter = twitter,
+                    mastodon = mastodon,
+                    github = github,
+                )
+            }
+
+        return signer.sign(template)
+    }
+
+    init {
+        settings.backupUserMetadata?.let {
+            Log.d("AccountRegisterObservers", "Loading saved user metadata ${it.toJson()}")
+
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
+        }
+
+        // saves contact list for the next time.
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Kind 0 Collector Start")
+            getUserMetadataFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating Kind 0 ${it.user.toBestDisplayName()}")
+                settings.updateUserMetadata(it.user.latestMetadata)
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/FollowListOutboxOrProxyRelays.kt

@@ -0,0 +1,142 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip02FollowLists
+
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.amethyst.model.nip51Lists.blockedRelays.BlockedRelayListState
+import com.vitorpamplona.amethyst.model.nip51Lists.proxyRelays.ProxyRelayListState
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+
+class FollowListOutboxOrProxyRelays(
+    kind3Follows: FollowListState,
+    blockedRelayList: BlockedRelayListState,
+    proxyRelayList: ProxyRelayListState,
+    val cache: LocalCache,
+    scope: CoroutineScope,
+) {
+    fun getNIP65RelayListAddress(pubkey: HexKey) = AdvertisedRelayListEvent.createAddress(pubkey)
+
+    fun getNIP65RelayListNote(pubkey: HexKey): AddressableNote = cache.getOrCreateAddressableNote(getNIP65RelayListAddress(pubkey))
+
+    fun getNIP65RelayListFlow(pubkey: HexKey): StateFlow<NoteState> = getNIP65RelayListNote(pubkey).flow().metadata.stateFlow
+
+    fun getNIP65RelayList(pubkey: HexKey): AdvertisedRelayListEvent? = getNIP65RelayListNote(pubkey).event as? AdvertisedRelayListEvent
+
+    fun allRelayListFlows(followList: Set<HexKey>): List<StateFlow<NoteState>> = followList.map { getNIP65RelayListFlow(it) }
+
+    fun combineAllFlows(flows: List<StateFlow<NoteState>>): Flow<Set<NormalizedRelayUrl>> =
+        combine(flows) { relayListNotes: Array<NoteState> ->
+            relayListNotes
+                .mapNotNull {
+                    (it.note.event as? AdvertisedRelayListEvent)?.writeRelaysNorm()
+                }.flatten()
+                .toSet()
+        }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val outboxRelayFlow: StateFlow<Set<NormalizedRelayUrl>> =
+        kind3Follows.flow
+            .transformLatest {
+                emitAll(combineAllFlows(allRelayListFlows(it.authors)))
+            }.onStart {
+                emit(
+                    kind3Follows.flow.value.authors
+                        .mapNotNull {
+                            getNIP65RelayList(it)?.writeRelaysNorm()
+                        }.flatten()
+                        .toSet(),
+                )
+            }.distinctUntilChanged()
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    val outboxRelayMinusBlockedFlow: StateFlow<Set<NormalizedRelayUrl>> =
+        combine(outboxRelayFlow, blockedRelayList.flow) { followList, blockedRelays ->
+            followList.minus(blockedRelays)
+        }.onStart {
+            emit(outboxRelayFlow.value.minus(blockedRelayList.flow.value.toSet()))
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flow: StateFlow<Set<NormalizedRelayUrl>> =
+        proxyRelayList.flow
+            .flatMapLatest { proxyRelays ->
+                if (proxyRelays.isEmpty()) {
+                    outboxRelayMinusBlockedFlow
+                } else {
+                    MutableStateFlow(proxyRelays)
+                }
+            }.onStart {
+                emit(
+                    proxyRelayList.flow.value.ifEmpty {
+                        outboxRelayMinusBlockedFlow.value
+                    },
+                )
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flowSet: StateFlow<Set<String>> =
+        flow
+            .map { relayList ->
+                relayList.mapTo(mutableSetOf()) { it.url }
+            }.onStart {
+                emit(flow.value.mapTo(mutableSetOf()) { it.url })
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/FollowListState.kt

@@ -0,0 +1,178 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip02FollowLists
+
+import android.util.Log
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.UserState
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashes
+import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
+import com.vitorpamplona.quartz.nip02FollowList.tags.ContactTag
+import com.vitorpamplona.quartz.nip73ExternalIds.location.GeohashId
+import com.vitorpamplona.quartz.nip73ExternalIds.topics.HashtagId
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+import kotlinx.coroutines.launch
+
+class FollowListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    // Creates a long-term reference for this note so that the GC doesn't collect the note it self
+    val user = cache.getOrCreateUser(signer.pubKey)
+
+    fun getFollowListFlow(): StateFlow<UserState> = user.flow().follows.stateFlow
+
+    fun getFollowListEvent(): ContactListEvent? = user.latestContactList
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private val innerFlow: Flow<Kind3Follows> =
+        getFollowListFlow().transformLatest {
+            emit(buildKind3Follows(it.user.latestContactList ?: settings.backupContactList))
+        }
+
+    val flow =
+        innerFlow
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                // this has priority.
+                buildKind3Follows(getFollowListEvent() ?: settings.backupContactList),
+            )
+
+    // Creates a long-term reference for all follows of a user
+    val userList =
+        flow
+            .map {
+                it.authors.map {
+                    cache.checkGetOrCreateUser(it)
+                }
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                // this has priority.
+                flow.value.authors.map {
+                    cache.checkGetOrCreateUser(it)
+                },
+            )
+
+    /**
+     This contains a big OR of everything the user wants to see in the a single feed.
+     */
+    @Immutable
+    class Kind3Follows(
+        val authors: Set<String> = emptySet(),
+        val authorsPlusMe: Set<String>,
+        val hashtags: Set<String> = emptySet(),
+        val geotags: Set<String> = emptySet(),
+        val communities: Set<String> = emptySet(),
+    ) {
+        val geotagScopes: Set<String> = geotags.mapTo(mutableSetOf<String>()) { GeohashId.toScope(it) }
+        val hashtagScopes: Set<String> = hashtags.mapTo(mutableSetOf<String>()) { HashtagId.toScope(it) }
+    }
+
+    fun buildKind3Follows(latestContactList: ContactListEvent?): Kind3Follows {
+        // makes sure the output include only valid p tags
+        val verifiedFollowingUsers = latestContactList?.verifiedFollowKeySet() ?: emptySet()
+
+        return Kind3Follows(
+            authors = verifiedFollowingUsers,
+            authorsPlusMe = verifiedFollowingUsers + signer.pubKey,
+            hashtags =
+                latestContactList
+                    ?.unverifiedFollowTagSet()
+                    ?.map { it.lowercase() }
+                    ?.toSet() ?: emptySet(),
+            geotags =
+                latestContactList
+                    ?.geohashes()
+                    ?.toSet() ?: emptySet(),
+            communities =
+                latestContactList
+                    ?.verifiedFollowAddressSet()
+                    ?.toSet() ?: emptySet(),
+        )
+    }
+
+    suspend fun follow(user: User): ContactListEvent {
+        val contactList = getFollowListEvent()
+
+        return if (contactList != null) {
+            ContactListEvent.followUser(contactList, user.pubkeyHex, signer)
+        } else {
+            ContactListEvent.createFromScratch(
+                followUsers = listOf(ContactTag(user.pubkeyHex, user.bestRelayHint(), null)),
+                relayUse = emptyMap(),
+                signer = signer,
+            )
+        }
+    }
+
+    suspend fun unfollow(user: User): ContactListEvent? {
+        val contactList = getFollowListEvent()
+
+        return if (contactList != null && contactList.tags.isNotEmpty()) {
+            ContactListEvent.unfollowUser(
+                contactList,
+                user.pubkeyHex,
+                signer,
+            )
+        } else {
+            null
+        }
+    }
+
+    init {
+        settings.backupContactList?.let {
+            Log.d("AccountRegisterObservers", "Loading saved contacts ${it.toJson()}")
+
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
+        }
+
+        // saves contact list for the next time.
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Kind 3 Collector Start")
+            getFollowListFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating Kind 3 ${signer.pubKey}")
+                settings.updateContactListTo(it.user.latestContactList)
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/FollowsPerOutboxRelay.kt

@@ -0,0 +1,145 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip02FollowLists
+
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.Constants
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.amethyst.model.nip51Lists.blockedRelays.BlockedRelayListState
+import com.vitorpamplona.amethyst.model.nip51Lists.proxyRelays.ProxyRelayListState
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.utils.mapOfSet
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+
+class FollowsPerOutboxRelay(
+    kind3Follows: FollowListState,
+    blockedRelayList: BlockedRelayListState,
+    proxyRelayList: ProxyRelayListState,
+    val cache: LocalCache,
+    scope: CoroutineScope,
+) {
+    fun getNIP65RelayListAddress(pubkey: HexKey) = AdvertisedRelayListEvent.createAddress(pubkey)
+
+    fun getNIP65RelayListNote(pubkey: HexKey): AddressableNote = cache.getOrCreateAddressableNote(getNIP65RelayListAddress(pubkey))
+
+    fun getNIP65RelayListFlow(pubkey: HexKey): StateFlow<NoteState> = getNIP65RelayListNote(pubkey).flow().metadata.stateFlow
+
+    fun getNIP65RelayList(pubkey: HexKey): AdvertisedRelayListEvent? = getNIP65RelayListNote(pubkey).event as? AdvertisedRelayListEvent
+
+    fun allRelayListFlows(followList: Set<HexKey>): List<StateFlow<NoteState>> = followList.map { getNIP65RelayListFlow(it) }
+
+    fun combineAllRelayListFlows(flows: List<StateFlow<NoteState>>): Flow<Map<NormalizedRelayUrl, Set<HexKey>>> =
+        combine(flows) { relayListNotes: Array<NoteState> ->
+            mapOfSet {
+                relayListNotes.forEach { noteState ->
+                    noteState.note.author?.pubkeyHex?.let { authorHex ->
+                        val outboxRelayList =
+                            getNIP65RelayList(authorHex)?.writeRelaysNorm()
+                                ?: LocalCache.relayHints.hintsForKey(authorHex).ifEmpty { null }
+                                ?: Constants.eventFinderRelays
+                        outboxRelayList.forEach { relay ->
+                            add(relay, authorHex)
+                        }
+                    }
+                }
+            }
+        }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val outboxPerRelayFlow: StateFlow<Map<NormalizedRelayUrl, Set<HexKey>>> =
+        kind3Follows.flow
+            .transformLatest {
+                emitAll(combineAllRelayListFlows(allRelayListFlows(it.authors)))
+            }.onStart {
+                emit(
+                    mapOfSet {
+                        kind3Follows.flow.value.authors.map { authorHex ->
+                            val outboxRelayList =
+                                getNIP65RelayList(authorHex)?.writeRelaysNorm()
+                                    ?: LocalCache.relayHints.hintsForKey(authorHex).ifEmpty { null }
+                                    ?: Constants.eventFinderRelays
+                            outboxRelayList.forEach { relay ->
+                                add(relay, authorHex)
+                            }
+                        }
+                    },
+                )
+            }.distinctUntilChanged()
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyMap(),
+            )
+
+    val outboxPerRelayMinusBlockedFlow: StateFlow<Map<NormalizedRelayUrl, Set<HexKey>>> =
+        combine(outboxPerRelayFlow, blockedRelayList.flow) { followList, blockedRelays ->
+            followList.minus(blockedRelays)
+        }.onStart {
+            emit(outboxPerRelayFlow.value.minus(blockedRelayList.flow.value.toSet()))
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyMap(),
+            )
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flow: StateFlow<Map<NormalizedRelayUrl, Set<HexKey>>> =
+        proxyRelayList.flow
+            .flatMapLatest { proxyRelays ->
+                if (proxyRelays.isEmpty()) {
+                    outboxPerRelayMinusBlockedFlow
+                } else {
+                    kind3Follows.flow.map { follows ->
+                        proxyRelays.associateWith { follows.authors }
+                    }
+                }
+            }.onStart {
+                if (proxyRelayList.flow.value.isEmpty()) {
+                    emit(outboxPerRelayMinusBlockedFlow.value)
+                } else {
+                    emit(proxyRelayList.flow.value.associateWith { kind3Follows.flow.value.authors })
+                }
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyMap(),
+            )
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip03Timestamp/OtsState.kt

@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip03Timestamp
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip03Timestamp.OtsEvent
+import com.vitorpamplona.quartz.nip03Timestamp.ots.okhttp.OkHttpOtsResolverBuilder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.update
+import java.util.Base64
+
+class OtsState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val otsResolver: OkHttpOtsResolverBuilder,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    suspend fun updateAttestations(): List<OtsEvent> {
+        Log.d("Pending Attestations", "Updating ${settings.pendingAttestations.value.size} pending attestations")
+
+        return settings.pendingAttestations.value.toList().mapNotNull { (key, value) ->
+            val otsState = OtsEvent.upgrade(Base64.getDecoder().decode(value), key, otsResolver.build())
+
+            if (otsState != null) {
+                val hint = cache.getNoteIfExists(key)?.toEventHint<Event>()
+                val template =
+                    if (hint != null) {
+                        OtsEvent.build(hint, otsState)
+                    } else {
+                        OtsEvent.build(key, otsState)
+                    }
+
+                val otsEvent = signer.sign(template)
+
+                settings.pendingAttestations.update { it - key }
+
+                otsEvent
+            } else {
+                null
+            }
+        }
+    }
+
+    fun hasPendingAttestations(note: Note): Boolean {
+        val id = note.event?.id ?: note.idHex
+        return settings.pendingAttestations.value[id] != null
+    }
+
+    fun timestamp(note: Note) {
+        if (note.isDraft()) return
+
+        val id = note.event?.id ?: note.idHex
+
+        settings.addPendingAttestation(
+            id = id,
+            stamp =
+                Base64.getEncoder().encodeToString(
+                    OtsEvent.stamp(
+                        id,
+                        otsResolver.build(),
+                    ),
+                ),
+        )
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip17Dms/DmInboxRelayState.kt

@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip17Dms
+
+import com.vitorpamplona.amethyst.model.edits.PrivateStorageRelayListState
+import com.vitorpamplona.amethyst.model.localRelays.LocalRelayListState
+import com.vitorpamplona.amethyst.model.nip65RelayList.Nip65RelayListState
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.stateIn
+
+class DmInboxRelayState(
+    // main relay
+    dmRelayList: DmRelayListState,
+    // backup relays
+    nip65RelayList: Nip65RelayListState,
+    privateOutbox: PrivateStorageRelayListState,
+    localRelayList: LocalRelayListState,
+    scope: CoroutineScope,
+) {
+    val flow =
+        combine(
+            nip65RelayList.inboxFlow,
+            dmRelayList.flow,
+            privateOutbox.flow,
+            localRelayList.flow,
+        ) { nip65Inbox, dmRelayList, privateOutBox, localRelays ->
+            nip65Inbox + dmRelayList + privateOutBox + localRelays
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                nip65RelayList.inboxFlow.value +
+                    dmRelayList.flow.value +
+                    privateOutbox.flow.value +
+                    localRelayList.flow.value,
+            )
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip17Dms/DmRelayListState.kt

@@ -0,0 +1,109 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip17Dms
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+class DmRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    // Creates a long-term reference for this note so that the GC doesn't collect the note it self
+    val dmListNote = cache.getOrCreateAddressableNote(getDMRelayListAddress())
+
+    fun getDMRelayListAddress() = ChatMessageRelayListEvent.createAddress(signer.pubKey)
+
+    fun getDMRelayListFlow(): StateFlow<NoteState> = dmListNote.flow().metadata.stateFlow
+
+    fun getDMRelayList(): ChatMessageRelayListEvent? = dmListNote.event as? ChatMessageRelayListEvent
+
+    fun normalizeDMRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? ChatMessageRelayListEvent ?: settings.backupDMRelayList
+        return event?.relays()?.toSet() ?: emptySet()
+    }
+
+    val flow =
+        getDMRelayListFlow()
+            .map { normalizeDMRelayListWithBackup(it.note) }
+            .onStart { emit(normalizeDMRelayListWithBackup(dmListNote)) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun saveRelayList(dmRelays: List<NormalizedRelayUrl>): ChatMessageRelayListEvent {
+        val relayListForDMs = getDMRelayList()
+        return if (relayListForDMs != null && relayListForDMs.tags.isNotEmpty()) {
+            ChatMessageRelayListEvent.updateRelayList(
+                earlierVersion = relayListForDMs,
+                relays = dmRelays,
+                signer = signer,
+            )
+        } else {
+            ChatMessageRelayListEvent.create(
+                relays = dmRelays,
+                signer = signer,
+            )
+        }
+    }
+
+    init {
+        settings.backupDMRelayList?.let {
+            Log.d("AccountRegisterObservers", "Loading saved DM Relay List ${it.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(it)
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "NIP-17 Relay List Collector Start")
+            getDMRelayListFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating DM Relay List for ${signer.pubKey}")
+                (it.note.event as? ChatMessageRelayListEvent)?.let {
+                    settings.updateDMRelayList(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip18Reposts/RepostAction.kt

@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip18Reposts
+
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
+
+class RepostAction {
+    companion object {
+        suspend fun repost(
+            note: Note,
+            signer: NostrSigner,
+        ): Event? {
+            val noteEvent = note.event ?: return null
+
+            if (note.hasBoostedInTheLast5Minutes(signer.pubKey)) {
+                // has already bosted in the past 5mins
+                return null
+            }
+
+            val noteHint = note.relayHintUrl()
+            val authorHint = note.author?.bestRelayHint()
+
+            val template =
+                if (noteEvent.kind == 1) {
+                    RepostEvent.build(noteEvent, noteHint, authorHint)
+                } else {
+                    GenericRepostEvent.build(noteEvent, noteHint, authorHint)
+                }
+
+            return signer.sign(template)
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip25Reactions/ReactionAction.kt

@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip25Reactions
+
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.hints.EventHintBundle
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip17Dm.NIP17Factory
+import com.vitorpamplona.quartz.nip17Dm.base.NIP17Group
+import com.vitorpamplona.quartz.nip25Reactions.ReactionEvent
+import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiUrlTag
+
+class ReactionAction {
+    companion object {
+        suspend fun reactTo(
+            note: Note,
+            reaction: String,
+            by: User,
+            signer: NostrSigner,
+            onPublic: (ReactionEvent) -> Unit,
+            onPrivate: suspend (NIP17Factory.Result) -> Unit,
+        ) {
+            if (!signer.isWriteable()) return
+
+            if (note.hasReacted(by, reaction)) {
+                // has already liked this note
+                return
+            }
+
+            val noteEvent = note.event
+            if (noteEvent is NIP17Group) {
+                val users = noteEvent.groupMembers().toList()
+
+                if (reaction.startsWith(":")) {
+                    val emojiUrl = EmojiUrlTag.decode(reaction)
+                    if (emojiUrl != null) {
+                        note.toEventHint<Event>()?.let {
+                            onPrivate(
+                                NIP17Factory().createReactionWithinGroup(
+                                    emojiUrl = emojiUrl,
+                                    originalNote = it,
+                                    to = users,
+                                    signer = signer,
+                                ),
+                            )
+                        }
+
+                        return
+                    }
+                }
+
+                note.toEventHint<Event>()?.let {
+                    onPrivate(
+                        NIP17Factory().createReactionWithinGroup(
+                            content = reaction,
+                            originalNote = it,
+                            to = users,
+                            signer = signer,
+                        ),
+                    )
+                }
+                return
+            } else {
+                if (reaction.startsWith(":")) {
+                    val emojiUrl = EmojiUrlTag.decode(reaction)
+                    if (emojiUrl != null) {
+                        note.event?.let {
+                            val template = ReactionEvent.build(emojiUrl, EventHintBundle(it, note.relayHintUrl()))
+
+                            onPublic(signer.sign(template))
+                        }
+
+                        return
+                    }
+                }
+
+                note.toEventHint<Event>()?.let {
+                    onPublic(signer.sign(ReactionEvent.build(reaction, it)))
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip28PublicChats/PublicChatChannel.kt

@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip28PublicChats
+
+import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.note.toShortDisplay
+import com.vitorpamplona.quartz.nip01Core.hints.EventHintBundle
+import com.vitorpamplona.quartz.nip01Core.hints.types.EventIdHintOptional
+import com.vitorpamplona.quartz.nip02FollowList.EmptyTagList
+import com.vitorpamplona.quartz.nip02FollowList.toImmutableListOfLists
+import com.vitorpamplona.quartz.nip19Bech32.entities.NEvent
+import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent
+import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelMetadataEvent
+import com.vitorpamplona.quartz.nip28PublicChat.base.ChannelDataNorm
+
+@Stable
+class PublicChatChannel(
+    val idHex: String,
+) : Channel() {
+    var creator: User? = null
+    var event: ChannelCreateEvent? = null
+
+    // Important to keep this long-term reference because LocalCache uses WeakReferences.
+    var creationEventNote: Note? = null
+    var updateEventNote: Note? = null
+
+    var info = ChannelDataNorm(null, null, null, null)
+    var infoTags = EmptyTagList
+    var updatedMetadataAt: Long = 0
+
+    override fun relays() = info.relays?.toSet() ?: super.relays()
+
+    fun relayHintUrls() = relays().take(3)
+
+    fun relayHintUrl() = relays().firstOrNull()
+
+    fun toNEvent() = NEvent.create(idHex, event?.pubKey, ChannelCreateEvent.KIND, relayHintUrls())
+
+    fun toNostrUri() = "nostr:${toNEvent()}"
+
+    fun toEventHint() = event?.let { EventHintBundle(it, relayHintUrl(), null) }
+
+    fun toEventId() = EventIdHintOptional(idHex, relayHintUrl())
+
+    fun updateChannelInfo(
+        creator: User,
+        event: ChannelCreateEvent,
+        eventNote: Note? = null,
+    ) {
+        this.creator = creator
+        this.event = event
+        this.info = event.channelInfo()
+
+        this.infoTags = event.tags.toImmutableListOfLists()
+        this.updatedMetadataAt = event.createdAt
+        this.creationEventNote = eventNote
+
+        updateChannelInfo()
+    }
+
+    fun updateChannelInfo(
+        creator: User,
+        event: ChannelMetadataEvent,
+        eventNote: Note? = null,
+    ) {
+        this.creator = creator
+        this.info = event.channelInfo()
+
+        this.infoTags = event.tags.toImmutableListOfLists()
+        this.updatedMetadataAt = event.createdAt
+        this.updateEventNote = eventNote
+
+        super.updateChannelInfo()
+    }
+
+    override fun toBestDisplayName(): String = info.name ?: toNEvent().toShortDisplay()
+
+    fun summary(): String? = info.about
+
+    fun profilePicture(): String? {
+        if (info.picture.isNullOrBlank()) return creator?.info?.banner
+        return info.picture ?: creator?.info?.banner
+    }
+
+    fun anyNameStartsWith(prefix: String): Boolean =
+        idHex.startsWith(prefix) ||
+            info.name?.contains(prefix, true) == true ||
+            info.about?.contains(prefix, true) == true
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip28PublicChats/PublicChatListDecryptionCache.kt

@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip28PublicChats
+
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip28PublicChat.list.ChannelListEvent
+import com.vitorpamplona.quartz.nip28PublicChat.list.channelSet
+import com.vitorpamplona.quartz.nip28PublicChat.list.channels
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
+
+class PublicChatListDecryptionCache(
+    val signer: NostrSigner,
+) {
+    val cachedPrivateLists = PrivateTagArrayEventCache<ChannelListEvent>(signer)
+
+    fun cachedChannelSet(event: ChannelListEvent) = cachedPrivateLists.mergeTagListPrecached(event).channelSet()
+
+    fun cachedChannels(event: ChannelListEvent) = cachedPrivateLists.mergeTagListPrecached(event).channels()
+
+    suspend fun channelSet(event: ChannelListEvent) = cachedPrivateLists.mergeTagList(event).channelSet()
+
+    suspend fun channels(event: ChannelListEvent) = cachedPrivateLists.mergeTagList(event).channels()
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip28PublicChats/PublicChatListState.kt

@@ -0,0 +1,145 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip28PublicChats
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip28PublicChat.list.ChannelListEvent
+import com.vitorpamplona.quartz.nip28PublicChat.list.tags.ChannelTag
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+import kotlinx.coroutines.launch
+
+class PublicChatListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: PublicChatListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    // Creates a long-term reference for this note so that the GC doesn't collect the note it self
+    val publicChatListNote = cache.getOrCreateAddressableNote(getChannelListAddress())
+
+    fun getChannelListAddress() = ChannelListEvent.createAddress(signer.pubKey)
+
+    fun getChannelListFlow(): StateFlow<NoteState> = publicChatListNote.flow().metadata.stateFlow
+
+    fun getChannelList(): ChannelListEvent? = publicChatListNote.event as? ChannelListEvent
+
+    suspend fun publicChatListWithBackup(note: Note): Set<ChannelTag> {
+        val event = note.event as? ChannelListEvent ?: settings.backupChannelList
+        return event?.let { decryptionCache.channelSet(it) } ?: emptySet()
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flow: StateFlow<Set<ChannelTag>> =
+        getChannelListFlow()
+            .transformLatest { noteState ->
+                emit(publicChatListWithBackup(noteState.note))
+            }.onStart {
+                emit(publicChatListWithBackup(publicChatListNote))
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flowSet: StateFlow<Set<HexKey>> =
+        flow
+            .map {
+                it.mapTo(mutableSetOf()) { it.eventId }
+            }.onStart {
+                emit(flow.value.mapTo(mutableSetOf()) { it.eventId })
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun follow(channel: PublicChatChannel): ChannelListEvent {
+        val publicChatList = getChannelList()
+
+        return if (publicChatList == null) {
+            ChannelListEvent.create(ChannelTag(channel.idHex, channel.relayHintUrl()), true, signer)
+        } else {
+            ChannelListEvent.add(publicChatList, ChannelTag(channel.idHex, channel.relayHintUrl()), true, signer)
+        }
+    }
+
+    suspend fun follow(channels: List<PublicChatChannel>): ChannelListEvent {
+        val publicChatList = getChannelList()
+
+        val channelTags = channels.map { ChannelTag(it.idHex, it.relayHintUrl()) }
+        return if (publicChatList == null) {
+            ChannelListEvent.create(channelTags, true, signer)
+        } else {
+            ChannelListEvent.add(publicChatList, channelTags, true, signer)
+        }
+    }
+
+    suspend fun unfollow(channel: PublicChatChannel): ChannelListEvent? {
+        val publicChatList = getChannelList()
+
+        return if (publicChatList != null) {
+            ChannelListEvent.remove(publicChatList, ChannelTag(channel.idHex, channel.relayHintUrl()), signer)
+        } else {
+            null
+        }
+    }
+
+    init {
+        settings.backupChannelList?.let { event ->
+            Log.d("AccountRegisterObservers", "Loading saved channel list ${event.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(event)
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Channel List Collector Start")
+            getChannelListFlow().collect {
+                Log.d("AccountRegisterObservers", "Channel List for ${signer.pubKey}")
+                (it.note.event as? ChannelListEvent)?.let {
+                    settings.updateChannelListTo(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip30CustomEmojis/EmojiPackState.kt

@@ -0,0 +1,155 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip30CustomEmojis
+
+import com.vitorpamplona.amethyst.commons.richtext.MediaUrlImage
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.taggedAddresses
+import com.vitorpamplona.quartz.nip30CustomEmoji.pack.EmojiPackEvent
+import com.vitorpamplona.quartz.nip30CustomEmoji.selection.EmojiPackSelectionEvent
+import com.vitorpamplona.quartz.nip30CustomEmoji.taggedEmojis
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combineTransform
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+
+class EmojiPackState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+) {
+    class EmojiMedia(
+        val code: String,
+        val link: MediaUrlImage,
+    )
+
+    // Creates a long-term reference for this note so that the GC doesn't collect the note it self
+    val emojiPackListNote = cache.getOrCreateAddressableNote(getEmojiPackSelectionAddress())
+
+    fun getEmojiPackSelectionAddress() = EmojiPackSelectionEvent.createAddress(signer.pubKey)
+
+    fun getEmojiPackSelection(): EmojiPackSelectionEvent? = emojiPackListNote.event as? EmojiPackSelectionEvent
+
+    fun getEmojiPackSelectionFlow(): StateFlow<NoteState> = emojiPackListNote.flow().metadata.stateFlow
+
+    fun convertEmojiSelectionPack(selection: EmojiPackSelectionEvent?): List<StateFlow<NoteState>>? =
+        selection?.taggedAddresses()?.map {
+            cache
+                .getOrCreateAddressableNote(it)
+                .flow()
+                .metadata.stateFlow
+        }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flow: StateFlow<List<StateFlow<NoteState>>?> =
+        getEmojiPackSelectionFlow()
+            .transformLatest {
+                emit(convertEmojiSelectionPack(it.note.event as? EmojiPackSelectionEvent))
+            }.onStart {
+                emit(convertEmojiSelectionPack(getEmojiPackSelection()))
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    fun convertEmojiPack(pack: EmojiPackEvent): List<EmojiMedia> =
+        pack.taggedEmojis().map {
+            EmojiMedia(it.code, MediaUrlImage(it.url))
+        }
+
+    fun mergePack(list: Array<NoteState>): List<EmojiMedia> =
+        list
+            .mapNotNull {
+                val ev = it.note.event as? EmojiPackEvent
+                if (ev != null) {
+                    convertEmojiPack(ev)
+                } else {
+                    null
+                }
+            }.flatten()
+            .distinctBy { it.link }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val myEmojis =
+        flow
+            .transformLatest { emojiList ->
+                if (emojiList != null) {
+                    emitAll(
+                        combineTransform(emojiList) {
+                            emit(mergePack(it))
+                        },
+                    )
+                } else {
+                    emit(emptyList())
+                }
+            }.onStart {
+                emit(
+                    mergePack(
+                        convertEmojiSelectionPack(
+                            getEmojiPackSelection(),
+                        )?.map { it.value }?.toTypedArray() ?: emptyArray(),
+                    ),
+                )
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    suspend fun addEmojiPack(emojiPack: Note): EmojiPackSelectionEvent {
+        val emojiPackEvent = emojiPack.event
+        if (emojiPackEvent !is EmojiPackEvent) throw IllegalArgumentException("Cannot add an emoji pack to this kind of event.")
+
+        val eventHint = emojiPack.toEventHint<EmojiPackEvent>() ?: throw IllegalArgumentException("Cannot add an emoji pack to this kind of event.")
+
+        val usersEmojiList = getEmojiPackSelection()
+        return if (usersEmojiList == null) {
+            val template = EmojiPackSelectionEvent.build(listOf(eventHint))
+            signer.sign(template)
+        } else {
+            val template = EmojiPackSelectionEvent.add(usersEmojiList, eventHint)
+            signer.sign(template)
+        }
+    }
+
+    suspend fun removeEmojiPack(emojiPack: Note): EmojiPackSelectionEvent? {
+        val usersEmojiList = getEmojiPackSelection() ?: throw IllegalArgumentException("Cannot remove an emoji pack to this kind of event.")
+
+        val emojiPackEvent = emojiPack.event
+        if (emojiPackEvent !is EmojiPackEvent) return null
+
+        val template = EmojiPackSelectionEvent.remove(usersEmojiList, emojiPackEvent)
+        return signer.sign(template)
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip38UserStatuses/UserStatusAction.kt

@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip38UserStatuses
+
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip09Deletions.DeletionEvent
+import com.vitorpamplona.quartz.nip38UserStatus.StatusEvent
+
+class UserStatusAction {
+    companion object {
+        suspend fun create(
+            newStatus: String,
+            signer: NostrSigner,
+        ): StatusEvent = StatusEvent.create(newStatus, "general", expiration = null, signer)
+
+        suspend fun update(
+            oldStatus: AddressableNote,
+            newStatus: String,
+            signer: NostrSigner,
+        ): StatusEvent {
+            val oldEvent = oldStatus.event as? StatusEvent ?: throw IllegalStateException("Tried to update a non-status event")
+
+            return StatusEvent.update(oldEvent, newStatus, signer)
+        }
+
+        suspend fun delete(
+            oldStatus: AddressableNote,
+            signer: NostrSigner,
+        ): List<Event> {
+            val oldEvent = oldStatus.event as? StatusEvent ?: throw IllegalStateException("Tried to update a non-status event")
+
+            val event = StatusEvent.clear(oldEvent, signer)
+
+            val deletion =
+                signer.sign(
+                    DeletionEvent.buildForVersionOnly(listOf(event)),
+                )
+
+            return listOf(event, deletion)
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip47WalletConnect/NwcSignerState.kt

@@ -0,0 +1,181 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip47WalletConnect
+
+import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.relayClient.reqCommand.nwc.NWCPaymentQueryState
+import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray
+import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentRequestEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentResponseEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.Nip47WalletConnect
+import com.vitorpamplona.quartz.nip47WalletConnect.NostrWalletConnectRequestCache
+import com.vitorpamplona.quartz.nip47WalletConnect.NostrWalletConnectResponseCache
+import com.vitorpamplona.quartz.nip47WalletConnect.Request
+import com.vitorpamplona.quartz.nip47WalletConnect.Response
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+/**
+ * Manages NIP-47 (Nostr Wallet Connect) related signing operations and decryption cache for a given account.
+ *
+ * Key Responsibilities:
+ *
+ * - Dynamically creates a NIP-47 signer if the wallet setup changes in the account settings.
+ * - Provides decryption caches to manage decrypted NIP-47 requests and responses efficiently.
+ * - Handles creating of zap payment requests and waits for responses.
+ *
+ * @property signer the main Nostr signer used for general Nostr operations
+ * @property cache the local cache for handling notes and events
+ * @property scope the coroutine scope used for async operations
+ * @property settings the account settings containing NIP-47 configuration
+ */
+class NwcSignerState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    /**
+     * Derives a NIP-47 signer from the zap payment request in settings.
+     * If there's no valid configuration, it defaults to the main signer.
+     * Flows updates whenever settings change.
+     */
+    val nip47Signer =
+        settings.zapPaymentRequest
+            .map {
+                buildSigner(it) ?: signer
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                buildSigner(settings.zapPaymentRequest.value) ?: signer,
+            )
+
+    /**
+     * Creates a dedicated request decryption cache for the NIP-47 signer.
+     * Flows updates whenever the signer changes.
+     */
+    val zapPaymentRequestDecryptionCache =
+        nip47Signer
+            .map {
+                NostrWalletConnectRequestCache(it)
+            }.flowOn(Dispatchers.Default)
+            .stateIn(scope, SharingStarted.Eagerly, NostrWalletConnectRequestCache(nip47Signer.value))
+
+    /**
+     * Creates a dedicated response decryption cache for the NIP-47 signer.
+     * Flows updates whenever the signer changes.
+     */
+    val zapPaymentResponseDecryptionCache =
+        nip47Signer
+            .map {
+                NostrWalletConnectResponseCache(it)
+            }.flowOn(Dispatchers.Default)
+            .stateIn(scope, SharingStarted.Eagerly, NostrWalletConnectResponseCache(nip47Signer.value))
+
+    fun buildSigner(uri: Nip47WalletConnect.Nip47URINorm?) =
+        uri?.secret?.hexToByteArray()?.let {
+            NostrSignerInternal(KeyPair(it))
+        }
+
+    fun hasWalletConnectSetup(): Boolean = settings.zapPaymentRequest.value != null
+
+    fun isNIP47Author(pubkeyHex: String?): Boolean = nip47Signer.value.pubKey == pubkeyHex
+
+    /**
+     * Decrypts a NIP-47 payment request using the current signer.
+     *
+     * @param nwcRequest the NIP-47 payment request event to decrypt
+     * @return the decrypted request or null if not set up or decryption fails
+     */
+    suspend fun decryptRequest(nwcRequest: LnZapPaymentRequestEvent): Request? {
+        if (!hasWalletConnectSetup()) return null
+        return zapPaymentRequestDecryptionCache.value.decryptRequest(nwcRequest)
+    }
+
+    /**
+     * Decrypts a NIP-47 payment response using the current signer.
+     *
+     * @param nwsResponse the NIP-47 payment response event to decrypt
+     * @return the decrypted response or null if not set up or decryption fails
+     */
+    suspend fun decryptResponse(nwsResponse: LnZapPaymentResponseEvent): Response? {
+        if (!hasWalletConnectSetup()) return null
+        return zapPaymentResponseDecryptionCache.value.decryptResponse(nwsResponse)
+    }
+
+    /**
+     * Sends a zap payment request to a connected Lightning wallet.
+     * Subscribes to responses and waits up to 60s for a reply.
+     *
+     * @param bolt11 the BOLT-11 invoice to pay
+     * @param zappedNote the note being zapped (if any)
+     * @param onResponse callback to handle the response from the wallet
+     * @return a pair containing the payment request event and target relay URL
+     * @throws IllegalArgumentException if no NIP-47 wallet is set up
+     */
+    suspend fun sendZapPaymentRequestFor(
+        bolt11: String,
+        zappedNote: Note?,
+        onResponse: (Response?) -> Unit,
+    ): Pair<LnZapPaymentRequestEvent, NormalizedRelayUrl> {
+        val walletService = settings.zapPaymentRequest.value
+        if (walletService == null) throw IllegalArgumentException("No NIP47 setup")
+
+        val event = LnZapPaymentRequestEvent.create(bolt11, walletService.pubKeyHex, nip47Signer.value)
+
+        val filter =
+            NWCPaymentQueryState(
+                fromServiceHex = walletService.pubKeyHex,
+                toUserHex = event.pubKey,
+                replyingToHex = event.id,
+                relay = walletService.relayUri,
+            )
+
+        Amethyst.instance.sources.nwc
+            .subscribe(filter)
+
+        scope.launch(Dispatchers.IO) {
+            delay(60000) // waits 1 minute to complete payment.
+            Amethyst.instance.sources.nwc
+                .unsubscribe(filter)
+        }
+
+        cache.consume(event, zappedNote, true, walletService.relayUri) {
+            onResponse(decryptResponse(it))
+        }
+
+        return Pair(event, walletService.relayUri)
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/BookmarkListState.kt

@@ -0,0 +1,277 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists
+
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.bookmarkList.BookmarkListEvent
+import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.AddressBookmark
+import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.BookmarkIdTag
+import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.EventBookmark
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combineTransform
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+
+class BookmarkListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+) {
+    class BookmarkList(
+        val public: List<Note> = emptyList(),
+        val private: List<Note> = emptyList(),
+    )
+
+    // Creates a long-term reference for this note so that the GC doesn't collect the note it self
+    val bookmarkList = cache.getOrCreateAddressableNote(getBookmarkListAddress())
+
+    fun getBookmarkListAddress() = BookmarkListEvent.createBookmarkAddress(signer.pubKey)
+
+    fun getBookmarkListFlow(): StateFlow<NoteState> = bookmarkList.flow().metadata.stateFlow
+
+    fun getBookmarkList(): BookmarkListEvent? = bookmarkList.event as? BookmarkListEvent
+
+    suspend fun publicBookmarks(note: Note): List<BookmarkIdTag> {
+        val noteEvent = note.event as? BookmarkListEvent
+        return noteEvent?.publicBookmarks() ?: emptyList()
+    }
+
+    suspend fun privateBookmarks(note: Note): List<BookmarkIdTag> {
+        val noteEvent = note.event as? BookmarkListEvent
+        return noteEvent?.privateBookmarks(signer) ?: emptyList()
+    }
+
+    @OptIn(FlowPreview::class)
+    val publicBookmarks: StateFlow<List<BookmarkIdTag>> =
+        getBookmarkListFlow()
+            .map { noteState ->
+                publicBookmarks(noteState.note)
+            }.onStart {
+                emit(publicBookmarks(bookmarkList))
+            }.debounce(100)
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    @OptIn(FlowPreview::class)
+    val privateBookmarks: StateFlow<List<BookmarkIdTag>> =
+        getBookmarkListFlow()
+            .map { noteState ->
+                privateBookmarks(noteState.note)
+            }.onStart {
+                emit(privateBookmarks(bookmarkList))
+            }.debounce(100)
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    val publicBookmarkEventIdSet =
+        publicBookmarks
+            .map { bookmark ->
+                bookmark
+                    .mapNotNull {
+                        if (it is EventBookmark) it.eventId else null
+                    }.toSet()
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    val publicBookmarkAddressIdSet =
+        publicBookmarks
+            .map { bookmark ->
+                bookmark
+                    .mapNotNull {
+                        if (it is AddressBookmark) it.address else null
+                    }.toSet()
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    val privateBookmarkEventIdSet =
+        privateBookmarks
+            .map { bookmark ->
+                bookmark
+                    .mapNotNull {
+                        if (it is EventBookmark) it.eventId else null
+                    }.toSet()
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    val privateBookmarkAddressIdSet =
+        privateBookmarks
+            .map { bookmark ->
+                bookmark
+                    .mapNotNull {
+                        if (it is AddressBookmark) it.address else null
+                    }.toSet()
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    fun bookmarkList(
+        privateBookmarks: List<BookmarkIdTag>,
+        publicBookmarks: List<BookmarkIdTag>,
+    ): BookmarkList =
+        BookmarkList(
+            public =
+                publicBookmarks
+                    .mapNotNull {
+                        when (it) {
+                            is EventBookmark -> cache.checkGetOrCreateNote(it.eventId)
+                            is AddressBookmark -> cache.getOrCreateAddressableNote(it.address)
+                        }
+                    }.reversed(),
+            private =
+                privateBookmarks
+                    .mapNotNull {
+                        when (it) {
+                            is EventBookmark -> cache.checkGetOrCreateNote(it.eventId)
+                            is AddressBookmark -> cache.getOrCreateAddressableNote(it.address)
+                        }
+                    }.reversed(),
+        )
+
+    @OptIn(FlowPreview::class)
+    val bookmarks: StateFlow<BookmarkList> =
+        combineTransform(privateBookmarks, publicBookmarks) { private, public ->
+            emit(bookmarkList(private, public))
+        }.onStart {
+            emit(bookmarkList(privateBookmarks.value, publicBookmarks.value))
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                BookmarkList(),
+            )
+
+    fun isInPrivateBookmarks(note: Note): Boolean {
+        if (!signer.isWriteable()) return false
+
+        return if (note is AddressableNote) {
+            privateBookmarkAddressIdSet.value.contains(note.address)
+        } else {
+            privateBookmarkEventIdSet.value.contains(note.idHex)
+        }
+    }
+
+    fun isInPublicBookmarks(note: Note): Boolean =
+        if (note is AddressableNote) {
+            publicBookmarkAddressIdSet.value.contains(note.address)
+        } else {
+            publicBookmarkEventIdSet.value.contains(note.idHex)
+        }
+
+    suspend fun addBookmark(
+        note: Note,
+        isPrivate: Boolean,
+    ): BookmarkListEvent {
+        val bookmarkList = getBookmarkList()
+
+        return if (bookmarkList == null) {
+            if (note is AddressableNote) {
+                BookmarkListEvent.create(
+                    bookmarkIdTag = AddressBookmark(note.address, note.relayHintUrl()),
+                    isPrivate = isPrivate,
+                    signer = signer,
+                )
+            } else {
+                BookmarkListEvent.create(
+                    bookmarkIdTag = EventBookmark(note.idHex, note.relayHintUrl()),
+                    isPrivate = isPrivate,
+                    signer = signer,
+                )
+            }
+        } else {
+            if (note is AddressableNote) {
+                BookmarkListEvent.add(
+                    earlierVersion = bookmarkList,
+                    bookmarkIdTag = AddressBookmark(note.address, note.relayHintUrl()),
+                    isPrivate = isPrivate,
+                    signer = signer,
+                )
+            } else {
+                BookmarkListEvent.add(
+                    earlierVersion = bookmarkList,
+                    bookmarkIdTag = EventBookmark(note.idHex, note.relayHintUrl()),
+                    isPrivate = isPrivate,
+                    signer = signer,
+                )
+            }
+        }
+    }
+
+    suspend fun removeBookmark(
+        note: Note,
+        isPrivate: Boolean,
+    ): BookmarkListEvent? {
+        val bookmarkList = getBookmarkList()
+
+        return if (bookmarkList != null) {
+            if (note is AddressableNote) {
+                BookmarkListEvent.remove(
+                    earlierVersion = bookmarkList,
+                    bookmarkIdTag = AddressBookmark(note.address, note.relayHintUrl()),
+                    isPrivate = isPrivate,
+                    signer = signer,
+                )
+            } else {
+                BookmarkListEvent.remove(
+                    earlierVersion = bookmarkList,
+                    bookmarkIdTag = EventBookmark(note.idHex, note.relayHintUrl()),
+                    isPrivate = isPrivate,
+                    signer = signer,
+                )
+            }
+        } else {
+            null
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/HiddenUsersState.kt

@@ -0,0 +1,118 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.MuteTag
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.UserTag
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.WordTag
+import com.vitorpamplona.quartz.utils.DualCase
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combineTransform
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
+
+class HiddenUsersState(
+    val muteList: StateFlow<List<MuteTag>>,
+    val blockList: StateFlow<List<MuteTag>>,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    var transientHiddenUsers: MutableStateFlow<Set<String>> = MutableStateFlow(setOf())
+
+    @Immutable
+    class LiveHiddenUsers(
+        val hiddenUsers: Set<String>,
+        val spammers: Set<String>,
+        val hiddenWords: Set<String>,
+        val showSensitiveContent: Boolean?,
+    ) {
+        // speeds up isHidden calculations
+        val hiddenUsersHashCodes = hiddenUsers.mapTo(HashSet()) { it.hashCode() }
+        val spammersHashCodes = spammers.mapTo(HashSet()) { it.hashCode() }
+        val hiddenWordsCase = hiddenWords.map { DualCase(it.lowercase(), it.uppercase()) }
+
+        fun isUserHidden(userHex: HexKey) = hiddenUsers.contains(userHex) || spammers.contains(userHex)
+    }
+
+    suspend fun assembleLiveHiddenUsers(
+        blockList: List<MuteTag>,
+        muteList: List<MuteTag>,
+        transientHiddenUsers: Set<String>,
+        showSensitiveContent: Boolean?,
+    ): LiveHiddenUsers =
+        LiveHiddenUsers(
+            hiddenUsers = blockList.mapNotNullTo(mutableSetOf()) { if (it is UserTag) it.pubKey else null } + muteList.mapNotNull { if (it is UserTag) it.pubKey else null },
+            hiddenWords = blockList.mapNotNullTo(mutableSetOf()) { if (it is WordTag) it.word else null } + muteList.mapNotNull { if (it is WordTag) it.word else null },
+            spammers = transientHiddenUsers,
+            showSensitiveContent = showSensitiveContent,
+        )
+
+    val flow: StateFlow<LiveHiddenUsers> =
+        combineTransform(
+            blockList,
+            muteList,
+            transientHiddenUsers,
+            settings.syncedSettings.security.showSensitiveContent,
+        ) { blockList, muteList, transientHiddenUsers, showSensitiveContent ->
+            checkNotInMainThread()
+            emit(assembleLiveHiddenUsers(blockList, muteList, transientHiddenUsers, showSensitiveContent))
+        }.onStart {
+            emit(
+                assembleLiveHiddenUsers(
+                    blockList.value,
+                    muteList.value,
+                    transientHiddenUsers.value,
+                    settings.syncedSettings.security.showSensitiveContent.value,
+                ),
+            )
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                LiveHiddenUsers(emptySet(), emptySet(), emptySet(), null),
+            )
+
+    fun resetTransientUsers() {
+        transientHiddenUsers.update {
+            emptySet()
+        }
+    }
+
+    fun showUser(pubkeyHex: HexKey) {
+        transientHiddenUsers.update { it - pubkeyHex }
+    }
+
+    fun hideUser(pubkeyHex: HexKey) {
+        transientHiddenUsers.update { it + pubkeyHex }
+    }
+
+    fun isHidden(pubkeyHex: HexKey) = pubkeyHex in transientHiddenUsers.value
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockPeopleList/BlockPeopleListState.kt

@@ -0,0 +1,119 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.blockPeopleList
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.MuteTag
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.UserTag
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.WordTag
+import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+
+class BlockPeopleListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: PeopleListDecryptionCache,
+    val scope: CoroutineScope,
+) {
+    // Creates a long-term reference for this note so that the GC doesn't collect the note it self
+    val blockListNote = cache.getOrCreateAddressableNote(getBlockListAddress())
+
+    fun getBlockListAddress() = PeopleListEvent.createBlockAddress(signer.pubKey)
+
+    fun getBlockListFlow(): StateFlow<NoteState> = blockListNote.flow().metadata.stateFlow
+
+    fun getBlockList(): PeopleListEvent? = blockListNote.event as? PeopleListEvent
+
+    suspend fun blockListWithBackup(note: Note): List<MuteTag> {
+        val event = note.event as? PeopleListEvent
+        return event?.let { decryptionCache.usersAndWords(it) } ?: emptyList()
+    }
+
+    val flow =
+        getBlockListFlow()
+            .map { blockListWithBackup(it.note) }
+            .onStart { emit(blockListWithBackup(blockListNote)) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    suspend fun hideUser(pubkeyHex: String): PeopleListEvent {
+        val blockList = getBlockList()
+
+        return if (blockList != null) {
+            PeopleListEvent.add(
+                earlierVersion = blockList,
+                person = UserTag(pubkeyHex),
+                isPrivate = true,
+                signer = signer,
+            )
+        } else {
+            PeopleListEvent.create(
+                name = PeopleListEvent.BLOCK_LIST_D_TAG,
+                person = UserTag(pubkeyHex),
+                isPrivate = true,
+                signer = signer,
+                dTag = PeopleListEvent.BLOCK_LIST_D_TAG,
+            )
+        }
+    }
+
+    suspend fun showUser(pubkeyHex: String): PeopleListEvent? {
+        val blockList = getBlockList()
+
+        return if (blockList != null) {
+            PeopleListEvent.remove(
+                earlierVersion = blockList,
+                person = UserTag(pubkeyHex),
+                signer = signer,
+            )
+        } else {
+            null
+        }
+    }
+
+    suspend fun showWord(word: String): PeopleListEvent? {
+        val blockList = getBlockList()
+
+        return if (blockList != null) {
+            PeopleListEvent.remove(
+                earlierVersion = blockList,
+                person = WordTag(word),
+                signer = signer,
+            )
+        } else {
+            null
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockPeopleList/PeopleListDecryptionCache.kt

@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.blockPeopleList
+
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedUserIdSet
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedUsers
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedUsersAndWords
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedWordSet
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedWords
+import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
+
+class PeopleListDecryptionCache(
+    val signer: NostrSigner,
+) {
+    val cachedPrivateLists = PrivateTagArrayEventCache<PeopleListEvent>(signer)
+
+    fun cachedUsersAndWords(event: PeopleListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedUsersAndWords()
+
+    fun cachedUsers(event: PeopleListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedUsers()
+
+    fun cachedUserIdSet(event: PeopleListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedUserIdSet()
+
+    fun cachedWords(event: PeopleListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedWords()
+
+    fun cachedWordSet(event: PeopleListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedWordSet()
+
+    suspend fun usersAndWords(event: PeopleListEvent) = cachedPrivateLists.mergeTagList(event).mutedUsersAndWords()
+
+    suspend fun users(event: PeopleListEvent) = cachedPrivateLists.mergeTagList(event).mutedUsers()
+
+    suspend fun userIdSet(event: PeopleListEvent) = cachedPrivateLists.mergeTagList(event).mutedUserIdSet()
+
+    suspend fun words(event: PeopleListEvent) = cachedPrivateLists.mergeTagList(event).mutedWords()
+
+    suspend fun wordSet(event: PeopleListEvent) = cachedPrivateLists.mergeTagList(event).mutedWordSet()
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockedRelays/BlockedRelayListDecryptionCache.kt

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.blockedRelays
+
+import com.vitorpamplona.amethyst.model.nip51Lists.relayLists.GenericRelayListCache
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
+
+class BlockedRelayListDecryptionCache(
+    signer: NostrSigner,
+) : GenericRelayListCache<BlockedRelayListEvent>(signer)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockedRelays/BlockedRelayListState.kt

@@ -0,0 +1,112 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.blockedRelays
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions
+import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+class BlockedRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: BlockedRelayListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    // Creates a long-term reference for this note so that the GC doesn't collect the note it self
+    val blockedListNote = cache.getOrCreateAddressableNote(getBlockedRelayListAddress())
+
+    fun getBlockedRelayListAddress() = BlockedRelayListEvent.createAddress(signer.pubKey)
+
+    fun getBlockedRelayListFlow(): StateFlow<NoteState> = blockedListNote.flow().metadata.stateFlow
+
+    fun getBlockedRelayList(): BlockedRelayListEvent? = blockedListNote.event as? BlockedRelayListEvent
+
+    suspend fun normalizeBlockedRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? BlockedRelayListEvent ?: settings.backupBlockedRelayList
+        return event?.let { decryptionCache.relays(it) } ?: emptySet()
+    }
+
+    val flow =
+        getBlockedRelayListFlow()
+            .map {
+                normalizeBlockedRelayListWithBackup(it.note)
+            }.onStart { emit(normalizeBlockedRelayListWithBackup(blockedListNote)) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun saveRelayList(blockedRelays: List<NormalizedRelayUrl>): BlockedRelayListEvent {
+        if (!signer.isWriteable()) throw SignerExceptions.ReadOnlyException()
+        val relayListForBlocked = getBlockedRelayList()
+
+        return if (relayListForBlocked != null && relayListForBlocked.tags.isNotEmpty()) {
+            BlockedRelayListEvent.updateRelayList(
+                earlierVersion = relayListForBlocked,
+                relays = blockedRelays,
+                signer = signer,
+            )
+        } else {
+            BlockedRelayListEvent.create(
+                relays = blockedRelays,
+                signer = signer,
+            )
+        }
+    }
+
+    init {
+        settings.backupBlockedRelayList?.let {
+            Log.d("AccountRegisterObservers", "Loading saved Blocked relay list ${it.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Blocked Relay List Collector Start")
+            getBlockedRelayListFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating Blocked Relay List for ${signer.pubKey}")
+                (it.note.event as? BlockedRelayListEvent)?.let {
+                    settings.updateBlockedRelayList(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/broadcastRelays/BroadcastRelayListDecryptionCache.kt

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.broadcastRelays
+
+import com.vitorpamplona.amethyst.model.nip51Lists.relayLists.GenericRelayListCache
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
+
+class BroadcastRelayListDecryptionCache(
+    signer: NostrSigner,
+) : GenericRelayListCache<BroadcastRelayListEvent>(signer)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/broadcastRelays/BroadcastRelayListState.kt

@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.broadcastRelays
+
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+
+class BroadcastRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: BroadcastRelayListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    // Creates a long-term reference for this note so that the GC doesn't collect the note it self
+    val broadcastListNote = cache.getOrCreateAddressableNote(getBroadcastRelayListAddress())
+
+    fun getBroadcastRelayListAddress() = BroadcastRelayListEvent.createAddress(signer.pubKey)
+
+    fun getBroadcastRelayListFlow(): StateFlow<NoteState> = broadcastListNote.flow().metadata.stateFlow
+
+    fun getBroadcastRelayList(): BroadcastRelayListEvent? = broadcastListNote.event as? BroadcastRelayListEvent
+
+    suspend fun normalizeBroadcastRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? BroadcastRelayListEvent
+        return event?.let { decryptionCache.relays(it) } ?: emptySet()
+    }
+
+    val flow =
+        getBroadcastRelayListFlow()
+            .map { normalizeBroadcastRelayListWithBackup(it.note) }
+            .onStart { emit(normalizeBroadcastRelayListWithBackup(broadcastListNote)) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun saveRelayList(broadcastRelays: List<NormalizedRelayUrl>): BroadcastRelayListEvent {
+        val relayListForBroadcast = getBroadcastRelayList()
+
+        return if (relayListForBroadcast != null && relayListForBroadcast.tags.isNotEmpty()) {
+            BroadcastRelayListEvent.updateRelayList(
+                earlierVersion = relayListForBroadcast,
+                relays = broadcastRelays,
+                signer = signer,
+            )
+        } else {
+            BroadcastRelayListEvent.create(
+                relays = broadcastRelays,
+                signer = signer,
+            )
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListCard.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Vitor Pamplona
+ * Copyright (c) 2025 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -18,11 +18,10 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.ammolite.relays
+package com.vitorpamplona.amethyst.model.nip51Lists.geohashLists
 
-import com.vitorpamplona.ammolite.relays.filters.IPerRelayFilter
-
-class TypedFilter(
-    val types: Set<FeedType>,
-    val filter: IPerRelayFilter,
+data class GeohashListCard(
+    val relays: List<String>,
 )
+
+val EmptyGeohashListCard = GeohashListCard(emptyList())

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListDecryptionCache.kt

@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.geohashLists
+
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
+import com.vitorpamplona.quartz.nip51Lists.geohashList.GeohashListEvent
+import com.vitorpamplona.quartz.nip51Lists.geohashList.geohashSet
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.onStart
+
+class GeohashListDecryptionCache(
+    val signer: NostrSigner,
+) {
+    val cachedPrivateLists = PrivateTagArrayEventCache<GeohashListEvent>(signer)
+
+    fun cachedGeohashes(event: GeohashListEvent) = cachedPrivateLists.mergeTagListPrecached(event).geohashSet()
+
+    suspend fun geohashes(event: GeohashListEvent) = cachedPrivateLists.mergeTagList(event).geohashSet()
+
+    fun fastStartValueForGeohashList(note: Note): GeohashListCard {
+        val noteEvent = note.event as? GeohashListEvent
+        return if (noteEvent != null) {
+            GeohashListCard(cachedGeohashes(noteEvent).toList())
+        } else {
+            EmptyGeohashListCard
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    fun observeDecryptedGeohashList(note: Note): Flow<GeohashListCard> =
+        note
+            .flow()
+            .metadata.stateFlow
+            .mapLatest { noteState ->
+                val event = noteState.note.event as? GeohashListEvent
+                GeohashListCard(event?.let { geohashes(it).toList() } ?: emptyList())
+            }.onStart {
+                val event = note.event as? GeohashListEvent
+                if (event != null) {
+                    val list = geohashes(event)
+                    if (list.isNotEmpty()) {
+                        emit(GeohashListCard(list.toList()))
+                    } else {
+                        emit(EmptyGeohashListCard)
+                    }
+                } else {
+                    emit(EmptyGeohashListCard)
+                }
+            }.distinctUntilChanged()
+            .flowOn(Dispatchers.Default)
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListState.kt

@@ -0,0 +1,127 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.geohashLists
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.geohashList.GeohashListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+import kotlinx.coroutines.launch
+
+class GeohashListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: GeohashListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    // Creates a long-term reference for this note so that the GC doesn't collect the note it self
+    val geohashListNote = cache.getOrCreateAddressableNote(getGeohashListAddress())
+
+    fun getGeohashListAddress() = GeohashListEvent.createAddress(signer.pubKey)
+
+    fun getGeohashListFlow(): StateFlow<NoteState> = geohashListNote.flow().metadata.stateFlow
+
+    fun getGeohashList(): GeohashListEvent? = geohashListNote.event as? GeohashListEvent
+
+    suspend fun geohashListWithBackup(note: Note): Set<String> {
+        val event = note.event as? GeohashListEvent ?: settings.backupGeohashList
+        return event?.let { decryptionCache.geohashes(it) } ?: emptySet()
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flow: StateFlow<Set<String>> =
+        getGeohashListFlow()
+            .transformLatest { noteState ->
+                emit(geohashListWithBackup(noteState.note))
+            }.onStart {
+                emit(geohashListWithBackup(geohashListNote))
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun follow(geohashes: List<String>): GeohashListEvent {
+        val geohashList = getGeohashList()
+
+        return if (geohashList == null) {
+            GeohashListEvent.create(geohashes, true, signer)
+        } else {
+            GeohashListEvent.add(geohashList, geohashes, true, signer)
+        }
+    }
+
+    suspend fun follow(geohash: String): GeohashListEvent {
+        val geohashList = getGeohashList()
+
+        return if (geohashList == null) {
+            GeohashListEvent.create(geohash, true, signer)
+        } else {
+            GeohashListEvent.add(geohashList, geohash, true, signer)
+        }
+    }
+
+    suspend fun unfollow(geohash: String): GeohashListEvent? {
+        val geohashList = getGeohashList()
+
+        return if (geohashList != null) {
+            GeohashListEvent.remove(geohashList, geohash, signer)
+        } else {
+            null
+        }
+    }
+
+    init {
+        settings.backupGeohashList?.let { event ->
+            Log.d("AccountRegisterObservers", "Loading saved Geohash list ${event.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(event)
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Geohash List Collector Start")
+            getGeohashListFlow().collect { noteState ->
+                Log.d("AccountRegisterObservers", "Geohash List for ${signer.pubKey}")
+                (noteState.note.event as? GeohashListEvent)?.let {
+                    settings.updateGeohashListTo(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/hashtagLists/HashtagListDecryptionCache.kt

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.hashtagLists
+
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
+import com.vitorpamplona.quartz.nip51Lists.hashtagList.HashtagListEvent
+import com.vitorpamplona.quartz.nip51Lists.hashtagList.hashtagSet
+
+class HashtagListDecryptionCache(
+    val signer: NostrSigner,
+) {
+    val cachedPrivateLists = PrivateTagArrayEventCache<HashtagListEvent>(signer)
+
+    fun cachedHashtags(event: HashtagListEvent) = cachedPrivateLists.mergeTagListPrecached(event).hashtagSet()
+
+    suspend fun hashtags(event: HashtagListEvent) = cachedPrivateLists.mergeTagList(event).hashtagSet()
+}