Fixes release Id for the zap the devs button

* 'main' of https://github.com/vitorpamplona/amethyst:
  New Crowdin translations by GitHub Action

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+
+[*.{kt,kts}]
+max_line_length = 5000
+ij_kotlin_allow_trailing_comma=true
+ij_kotlin_allow_trailing_comma_on_call_site=true
+ktlint_function_naming_ignore_when_annotated_with=Composable
+ktlint_standard_no-unused-imports=enabled
+
+[*.gradle]
+indent_size = 4

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,9 +24,13 @@ A clear and concise description of what you expected to happen.
 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]: 
+ - Phone Brand/Model [e.g. Pixel 7 Pro]:
+ - 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**
-Incentivize developers to work on your issue. Describe clear milestones to claim payment.
+The size of the bounty is proportional to how much this matters to you. If no bounty is offered,
+not even a small one, this bug will not be worked on because it doesn't matter to you. We prioritize
+bug fixing to issues that have bounties, even small ones.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,14 +7,10 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
 **Bounty (in Bitcoin sats) offered for the implementation**
-Incentivize developers to work on your feature. Describe clear milestones to claim payment. 
-
-**Additional context**
-Add any other context, video, or screenshots about the feature request here.
+The size of the bounty is proportional to how much this matters to you. If no bounty is offered,
+not even a small one, this feature will not be coded because it doesn't actually matter to you.
+We prioritize feature development by its bounty size compared to how much work is required to get it done.

.github/workflows/build.yml

@@ -12,15 +12,17 @@ jobs:
     timeout-minutes: 30
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 17
+          distribution: 'zulu'
+          java-version: 21
 
       - name: Cache gradle
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
@@ -28,7 +30,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Linter (gradle)
-        run: ./gradlew ktlintCheck
+        run: ./gradlew spotlessCheck
 
       - name: Test (gradle)
         run: ./gradlew test --no-daemon
@@ -38,17 +40,44 @@ jobs:
         if: ${{ always() }} # IMPORTANT: run Android Test Report regardless
 
       - name: Build APK (gradle)
-        run: ./gradlew assembleDebug --no-daemon
+        run: ./gradlew assembleDebug
 
-      - name: Upload APK
-        uses: actions/upload-artifact@v2
+      - name: Upload Play APK
+        uses: actions/upload-artifact@v4
         with:
-          name: Debug APK
-          path: app/build/outputs/apk/debug/app-debug.apk
+          name: Play Debug APK
+          path: amethyst/build/outputs/apk/play/debug/amethyst-play-universal-debug.apk
+
+      - name: Upload FDroid APK
+        uses: actions/upload-artifact@v4
+        with:
+          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/benchmark/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/benchmark/amethyst-fdroid-universal-benchmark.apk
+
+      - name: Upload Compose Reports
+        uses: actions/upload-artifact@v4
+        with:
+          name: Compose Reports
+          path: amethyst/build/compose_compiler
 
       - name: Upload Test Results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: Build Reports
-          path: app/build/reports
+          name: Test Reports
+          path: amethyst/build/reports
 

.github/workflows/create-release.yml

@@ -10,15 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 17
+          distribution: 'zulu'
+          java-version: 21
 
       - name: Cache gradle
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
@@ -31,20 +32,26 @@ jobs:
       - name: Sign AAB (Google Play)
         uses: r0adkll/sign-android-release@v1
         with:
-          releaseDirectory: app/build/outputs/bundle/playRelease
+          releaseDirectory: amethyst/build/outputs/bundle/playRelease
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+        env:
+          # override default build-tools version (29.0.3) -- optional
+          BUILD_TOOLS_VERSION: "36.0.0"
 
       - name: Sign AAB (F-Droid)
         uses: r0adkll/sign-android-release@v1
         with:
-          releaseDirectory: app/build/outputs/bundle/fdroidRelease
+          releaseDirectory: amethyst/build/outputs/bundle/fdroidRelease
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+        env:
+          # override default build-tools version (29.0.3) -- optional
+          BUILD_TOOLS_VERSION: "36.0.0"
 
       - name: Build APK
         run: ./gradlew assembleRelease --stacktrace
@@ -52,20 +59,26 @@ jobs:
       - name: Sign APK (Google Play)
         uses: r0adkll/sign-android-release@v1
         with:
-          releaseDirectory: app/build/outputs/apk/play/release
+          releaseDirectory: amethyst/build/outputs/apk/play/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+        env:
+          # override default build-tools version (29.0.3) -- optional
+          BUILD_TOOLS_VERSION: "36.0.0"
 
       - name: Sign APK (F-Droid)
         uses: r0adkll/sign-android-release@v1
         with:
-          releaseDirectory: app/build/outputs/apk/fdroid/release
+          releaseDirectory: amethyst/build/outputs/apk/fdroid/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+        env:
+          # override default build-tools version (29.0.3) -- optional
+          BUILD_TOOLS_VERSION: "36.0.0"
 
       - name: Create Release
         id: create_release
@@ -76,7 +89,7 @@ jobs:
           tag_name: ${{ github.ref }}
           release_name: Release ${{ github.ref }}
           draft: false
-          prerelease: false
+          prerelease: true
 
       # Google Play APK
       - name: Upload Play APK Universal Asset
@@ -86,7 +99,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/play/release/app-play-universal-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-universal-release-unsigned-signed.apk
           asset_name: amethyst-googleplay-universal-${{ github.ref_name }}.apk
           asset_content_type: application/zip
 
@@ -97,7 +110,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/play/release/app-play-x86-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-x86-release-unsigned-signed.apk
           asset_name: amethyst-googleplay-x86-${{ github.ref_name }}.apk
           asset_content_type: application/zip
 
@@ -108,10 +121,32 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/play/release/app-play-x86_64-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-x86_64-release-unsigned-signed.apk
           asset_name: amethyst-googleplay-x86_64-${{ github.ref_name }}.apk
           asset_content_type: application/zip
 
+      - name: Upload Play APK arm64-v8a Asset
+        id: upload-release-asset-play-arm64-v8a-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-arm64-v8a-release-unsigned-signed.apk
+          asset_name: amethyst-googleplay-arm64-v8a-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+      - name: Upload Play APK armeabi-v7a Asset
+        id: upload-release-asset-play-armeabi-v7a-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-armeabi-v7a-release-unsigned-signed.apk
+          asset_name: amethyst-googleplay-armeabi-v7a-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
       # F-Droid APK
       - name: Upload F-Droid APK Universal Asset
         id: upload-release-asset-fdroid-universal-apk
@@ -120,7 +155,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-universal-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-universal-release-unsigned-signed.apk
           asset_name: amethyst-fdroid-universal-${{ github.ref_name }}.apk
           asset_content_type: application/zip
 
@@ -131,7 +166,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-x86-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-x86-release-unsigned-signed.apk
           asset_name: amethyst-fdroid-x86-${{ github.ref_name }}.apk
           asset_content_type: application/zip
 
@@ -142,10 +177,32 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-x86_64-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-x86_64-release-unsigned-signed.apk
           asset_name: amethyst-fdroid-x86_64-${{ github.ref_name }}.apk
           asset_content_type: application/zip
 
+      - name: Upload F-Droid APK arm64-v8a Asset
+        id: upload-release-asset-fdroid-arm64-v8a-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-arm64-v8a-release-unsigned-signed.apk
+          asset_name: amethyst-fdroid-arm64-v8a-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+      - name: Upload F-Droid APK armeabi-v7a Asset
+        id: upload-release-asset-fdroid-armeabi-v7a-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-armeabi-v7a-release-unsigned-signed.apk
+          asset_name: amethyst-fdroid-armeabi-v7a-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
 
 
       # Google Play AAB
@@ -156,7 +213,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/bundle/playRelease/app-play-release.aab
+          asset_path: amethyst/build/outputs/bundle/playRelease/amethyst-play-release.aab
           asset_name: amethyst-googleplay-${{ github.ref_name }}.aab
           asset_content_type: application/zip
 
@@ -168,6 +225,14 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/bundle/fdroidRelease/app-fdroid-release.aab
+          asset_path: amethyst/build/outputs/bundle/fdroidRelease/amethyst-fdroid-release.aab
           asset_name: amethyst-fdroid-${{ github.ref_name }}.aab
-          asset_content_type: application/zip
+          asset_content_type: application/zip
+
+      - name: Publish Quartz Lib
+        run: ./gradlew publishAllPublicationsToMavenCentral --no-configuration-cache
+        env:
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_PRIVATE_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}

.github/workflows/crowdin.yml

@@ -0,0 +1,30 @@
+name: Crowdin Action
+
+on:
+  push:
+    # paths: ["app/src/main/res/**/strings.xml"] // removes filter to allow downloads at any moment.
+    branches: [ main ]
+
+jobs:
+  synchronize-with-crowdin:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: crowdin action
+        uses: crowdin/github-action@v2
+        with:
+          upload_sources: true
+          upload_translations: true
+          download_translations: true
+          localization_branch_name: l10n_crowdin_translations
+          create_pull_request: true
+          pull_request_title: 'New Crowdin Translations'
+          pull_request_body: 'New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)'
+          pull_request_base_branch_name: 'main'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.gitignore

@@ -7,6 +7,18 @@
 /.idea/assetWizardSettings.xml
 /.idea/androidTestResultsUserPreferences.xml
 /.idea/deploymentTargetDropDown.xml
+/.idea/deploymentTargetSelector.xml
+/.idea/appInsightsSettings.xml
+/.idea/ktlint-plugin.xml
+/.idea/ktfmt.xml
+/.idea/studiobot.xml
+/.idea/other.xml
+/.idea/runConfigurations.xml
+/.idea/ChatHistory_schema_v2.xml
+/.idea/artifacts/*
+/.idea/kotlinNotebook.xml
+/.idea/ChatHistory_schema_v3.xml
+/.idea/markdown.xml
 .DS_Store
 /build
 /captures
@@ -36,6 +48,7 @@ out/
 .gradle
 .gradle/
 build/
+.kotlin/
 
 # Local configuration file (sdk path, etc)
 local.properties

.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

.idea/.name

@@ -1 +0,0 @@
-Amethyst

.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

@@ -1,12 +1,45 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
@@ -32,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,6 +1,12 @@
 <?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="1.9.0" />
+    <option name="version" value="2.1.0" />
   </component>
 </project>

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,135 +1,190 @@
-# Amethyst: Nostr client for Android
+ <div align="center">
 
-<img align="right" src="./docs/screenshots/home.png" data-canonical-src="./docs/screenshots/home.png" width="350px"/>
+<a href="https://amethyst.social">
+    <img src="./docs/design/3rd%20Logo%20-%20Zitron/amethyst.svg" alt="Amethyst Logo" title="Amethyst logo" width="80"/>
+</a>
 
-Amethyst brings the best social network to your Android phone. Just insert your Nostr private key and start posting. 
+# Amethyst
 
+## Nostr Client for Android
+
+Join the social network you control.
+
+[![GitHub downloads](https://img.shields.io/github/downloads/vitorpamplona/amethyst/total?label=Downloads&labelColor=27303D&color=0D1117&logo=github&logoColor=FFFFFF&style=flat)](https://github.com/vitorpamplona/amethyst/releases)
+[![PlayStore downloads](https://img.shields.io/endpoint?color=green&logo=google-play&logoColor=green&url=https%3A%2F%2Fplay.cuzi.workers.dev%2Fplay%3Fi%3Dcom.vitorpamplona.amethyst%26gl%3DUS%26hl%3Den%26l%3DPlayStore%26m%3D%24shortinstalls)](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
+
+[![Last Version](https://img.shields.io/github/release/vitorpamplona/amethyst.svg?maxAge=3600&label=Stable&labelColor=06599d&color=043b69)](https://github.com/vitorpamplona/amethyst)
+[![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
+
+[<img src="./docs/design/zapstore.svg"
+alt="Get it on Zap Store"
+height="70">](https://github.com/zapstore/zapstore/releases)
 [<img src="./docs/design/obtainium.png"
 alt="Get it on Obtaininum"
-height="80">](https://github.com/ImranR98/Obtainium)
+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="80">](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="80">](https://f-droid.org/packages/com.vitorpamplona.amethyst/)
+height="70">](https://github.com/vitorpamplona/amethyst/releases)
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
      alt="Get it on Google Play"
-     height="80">](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
+     height="70">](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
 
-# Current Features
+</div>
 
-- [x] Event Builders / WebSocket Subscriptions (NIP-01)
-- [x] Home Feed
-- [x] Notifications Feed
-- [x] Global Feed
-- [x] Replies and mentions (NIP-10)
-- [x] Reactions (NIP-25)
-- [x] Reposts (NIP-18)
-- [x] Image/Video/Url/LnInvoice Previews
-- [x] View Threads
+## Supported Features
+
+<img align="right" src="./docs/screenshots/home.png" data-canonical-src="./docs/screenshots/home.png" width="350px">
+
+- [x] Events / Relay Subscriptions (NIP-01)
+- [x] Follow List (NIP-02)
+- [x] OpenTimestamps Attestations (NIP-03)
 - [x] Private Messages (NIP-04)
-- [x] User Profiles (edit/follow/unfollow - NIP-02)
-- [x] Public Chats (NIP-28)
-- [x] Bech Encoding support (NIP-19)
-- [x] Notification Dots
-- [x] Reporting and Hide User capability (NIP-56)
-- [x] Automatic Translations
-- [x] Relay Sets (home, dms, public chats, global)
-- [x] User/Note Tagging (NIP-08, NIP-10)
-- [x] Lightning Tips
-- [x] Zaps (private, public, anon, non-zap) (NIP-57)
-- [x] URI Support (NIP-21)
-- [x] Created_at Limits (NIP-22)
+- [x] DNS Address (NIP-05)
+- [x] Mnemonic seed phrase (NIP-06)
+- [ ] WebBrowser Signer (NIP-07, Not applicable)
+- [x] Old-style mentions (NIP-08)
 - [x] Event Deletion (NIP-09)
-- [x] Nostr Address (NIP-05)
-- [x] Long-form Content (NIP-23)
+- [x] Replies, mentions, Threads, and Notifications (NIP-10)
+- [x] Relay Information Document (NIP-11)
+- [x] Generic Tag Queries (NIP-12)
+- [x] Proof of Work Display (NIP-13)
+- [ ] Proof of Work Calculations (NIP-13)
+- [x] Events with a Subject (NIP-14)
+- [ ] Marketplace (NIP-15)
+- [x] Event Treatment (NIP-16)
+- [x] Private Direct Messages (NIP-17)
+- [x] Image/Video/Url/LnInvoice Previews
+- [x] Reposts, Quotes, Generic Reposts (NIP-18)
+- [x] Bech Encoding support (NIP-19)
+- [x] Command Results (NIP-20)
+- [x] URI Support (NIP-21)
+- [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)
+- [x] Text Note References (NIP-27)
+- [x] Public Chats (NIP-28)
+- [ ] Relay-based Groups (NIP-29)
+- [x] Custom Emoji (NIP-30)
+- [x] Event kind summaries (NIP-31)
+- [ ] Labeling (NIP-32)
 - [x] Parameterized Replaceable Events (NIP-33)
-- [x] Online Relay Search (NIP-50)
-- [x] Internationalization
-- [x] Badges (NIP-58)
-- [x] Hashtag Following and Custom Hashtags
-- [x] Polls (NIP-69)
-- [x] Verifiable static content in URLs (NIP-94)
-- [x] Login with QR
+- [x] Git Stuff (NIP-34)
+- [ ] Torrents (NIP-35)
+- [x] Sensitive Content (NIP-36)
+- [x] Edits (NIP-37/Draft)
+- [x] User Status Event (NIP-38)
+- [x] External Identities (NIP-39)
+- [x] Expiration Support (NIP-40)
+- [x] Relay Authentication (NIP-42)
+- [x] Versioned Encrypted Payloads (NIP-44)
+- [ ] Event Counts (NIP-45, Will not implement)
+- [ ] Nostr Connect (NIP-46)
 - [x] Wallet Connect API (NIP-47)
-- [x] Accessible uploads
+- [ ] Proxy Tags (NIP-48, Not applicable)
+- [x] Private key encryption for import/export (NIP-49)
+- [x] Online Relay Search (NIP-50)
+- [x] Lists (NIP-51)
+- [ ] Calendar Events (NIP-52)
+- [x] Live Activities & Live Chats (NIP-53)
+- [x] Wiki (NIP-54)
+- [x] Inline Metadata (NIP-55 - Draft)
+- [x] Reporting (NIP-56)
+- [x] Lightning Tips
+- [x] Zaps (NIP-57)
+- [x] Private Zaps
+- [x] Zap Splits (NIP-57)
+- [x] Badges (NIP-58)
+- [x] Gift Wraps & Seals (NIP-59)
+- [x] Zapraiser (NIP-TBD)
+- [ ] Relay List Metadata (NIP-65)
+- [x] Polls (NIP-69)
+- [x] Video Events (NIP-71)
+- [x] Moderated Communities (NIP-72)
+- [ ] Zap Goals (NIP-75)
+- [x] Arbitrary Custom App Data (NIP-78)
+- [x] Highlights (NIP-84)
+- [x] Notify Request (NIP-88/Draft)
+- [x] Recommended Application Handlers (NIP-89)
+- [x] Data Vending Machine (NIP-90)
+- [x] Inline Metadata (NIP-92)
+- [x] Verifiable file URLs (NIP-94)
+- [x] Binary Blobs (NIP-95/Draft)
+- [x] HTTP File Storage Integration (NIP-96)
+- [x] HTTP Auth (NIP-98)
+- [x] Classifieds (NIP-99)
+- [x] Audio Tracks (zapstr.live) (kind:31337)
+- [x] Push Notifications (Google and Unified Push)
+- [x] In-Device Automatic Translations
+- [x] Hashtag Following and Custom Hashtags
+- [x] Login with QR
 - [x] Bounty support (nostrbounties.com)
 - [x] De-googled F-Droid flavor
-- [x] External Identity Support (NIP-39)
 - [x] Multiple Accounts
 - [x] Markdown Support
-- [x] Relay Authentication (NIP-42)
-- [x] Content stored in relays themselves (NIP-95)
-- [x] Custom Emoji (NIP-30)
-- [x] Zap Forwarding (NIP-57)
-- [x] Text Note References (NIP-27)
-- [x] Audio Tracks (zapstr.live) (Kind:31337)
-- [x] Push Notifications (Zaps and Messages)
-- [x] Generic Tags (NIP-12)
-- [x] Sensitive Content (NIP-36)
-- [x] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
-- [x] Recommended Application Handlers (NIP-89)
-- [x] Events with a Subject (NIP-14)
-- [x] Generic Reposts (kind:16)
-- [x] Live Activities & Live Chats (NIP-53)
-- [x] Relay Pages (NIP-11)
-- [x] HTTP Auth (NIP-98)
-- [x] Zapraiser (NIP-TBD)
-- [x] Moderated Communities (NIP-172)
-- [x] Emoji Packs (Kind:30030)
-- [x] Personal Emoji Lists (Kind:10030)
-- [x] Classifieds (Kind:30403)
-- [ ] Marketplace (NIP-15)
-- [ ] Image/Video Capture in the app
+- [x] Medical Data (NIP-xx/Draft)
+- [x] Embed events (NIP-xx/Draft)
+- [x] Draft Events (NIP-xx/Draft)
+- [ ] Event Sets (NIP-xx/Draft)
+- [ ] Topical Notes  (NIP-xx/Draft)
+- [ ] Relationship Status (NIP-xx/Draft)
+- [ ] Signed Filters (NIP-xx/Draft)
+- [ ] Key Migration (NIP-xx/Draft)
+- [ ] Time-based Sync (NIP-xx/Draft)
+- [x] Image Capture in the app
+- [x] Video Capture in the app
 - [ ] Local Database
-- [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
-- [ ] Proof of Work in the Phone (NIP-13, NIP-20)
 - [ ] Workspaces
-- [ ] Expiration Support (NIP-40)
 - [ ] Infinity Scroll
-- [ ] Relay List Metadata (NIP-65)
-- [ ] Signing Requests (NIP-46)
-- [ ] Delegated Event Signing (NIP-26)
-- [ ] Account Creation / Backup Guidance
-- [ ] Mnemonic seed phrase (NIP-06)
-- [ ] Message Sent feedback (NIP-20)
-- [ ] OpenTimestamps Attestations (NIP-03)
 
+## Privacy and Information Permanence
+
+Relays know your IP address, 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) except for Private Zaps and Private DMs. While the content of direct messages (DMs) is only visible to you and your DM counterparty, everyone can see when you and your counterparty DM each other.
+
+If you want to improve your privacy, consider utilizing a service that masks your IP address (e.g. a VPN or Tor) from trackers online.
+
+The relay also learns which public keys you are requesting, meaning your public key will be tied to your IP address.
+
+Information shared on Nostr can be re-broadcasted to other servers and should be assumed permanent for privacy purposes. There is no way to guarantee the deletion of any content once posted.
 
 # Development Overview
 
-## Overall Architecture 
+This repository is split between Amethyst and Quartz:
+- Amethyst is a native Android app made with Kotlin and Jetpack Compose.
+- Quartz is our own Nostr-commons library to host classes that are of interest to other Nostr Clients.
 
-This is a native Android app made with Kotlin and Jetpack Compose.
-The app uses a modified version of the [nostrpostrlib](https://github.com/Giszmo/NostrPostr/tree/master/nostrpostrlib) to talk to Nostr relays.
-The overall architecture consists in the UI, which uses the usual State/ViewModel/Composition, the service layer that connects with Nostr relays,
+The app architecture consists of the UI, which uses the usual State/ViewModel/Composition, the service layer that connects with Nostr relays,
 and the model/repository layer, which keeps all Nostr objects in memory, in a full OO graph.
 
-The repository layer stores Nostr Events as Notes and Users separately. Those classes use LiveData objects to
-allow the UI and other parts of the app to subscribe to each individual Note/User and receive updates when they happen.
-They are also responsible for updating viewModels when needed. Filters react to changes in the screen. As the user
-sees different Events, the Datasource classes are used to receive more information about those particular Events.
+The repository layer stores Nostr Events as Notes and Users separately. Those classes use LiveData and Flow objects to
+allow the UI and other parts of the app to subscribe to each Note/User and receive updates when they happen.
+They are also responsible for updating viewModels when needed. As the user scrolls through Events, the Datasource classes
+are updated to receive more information about those particular Events.
 
 Most of the UI is reactive to changes in the repository classes. The service layer assembles Nostr filters for each need of the app,
 receives the data from the Relay, and sends it to the repository. Connection with relays is never closed during the use of the app.
-The UI receives a notification that objects were updated. Instances of User and Notes are mutable directly.
+The UI receives a notification that objects have been updated. Instances of User and Notes are mutable directly.
 There will never be two Notes with the same ID or two User instances with the same pubkey.
 
-Lastly, the user's account information (priv key/pub key) is stored in the Android KeyStore for security.
+Lastly, the user's account information (private key/pub key) is stored in the Android KeyStore for security.
 
 ## 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
 
-Fork and clone this repository and import into Android Studio
+Fork and clone this repository and import it into Android Studio
 ```bash
 git clone https://github.com/vitorpamplona/amethyst.git
 ```
 
-Use one of the Android Studio builds to install and run the app in your device or a simulator.
+Use an Android Studio build action to install and run the app on your device or a simulator.
 
 ## Building
 Build the app:
@@ -145,8 +200,8 @@ Build the app:
 
 ## Linting
 ```bash
-./gradlew ktlintCheck
-./gradlew ktlintFormat
+./gradlew spotlessCheck
+./gradlew spotlessApply
 ```
 
 ## Installing on device
@@ -161,54 +216,163 @@ For the Play build:
 ./gradlew installPlayDebug
 ```
 
-## How to Deploy
+## Deploying
 
 1. Generate a new signing key
 ```
 keytool -genkey -v -keystore <my-release-key.keystore> -alias <alias_name> -keyalg RSA -keysize 2048 -validity 10000
 openssl base64 < <my-release-key.keystore> | tr -d '\n' | tee some_signing_key.jks.base64.txt
 ```
-2. Create 4 Secret Key variables on your GitHub repository and fill in with the signing key information
+2. Create four Secret Key variables on your GitHub repository and fill in the signing key information
     - `KEY_ALIAS` <- `<alias_name>`
     - `KEY_PASSWORD` <- `<your password>`
     - `KEY_STORE_PASSWORD` <- `<your key store password>`
     - `SIGNING_KEY` <- the data from `<my-release-key.keystore>`
-3. Change the `versionCode` and `versionName` on `app/build.gradle`
+3. Change the `versionCode` and `versionName` on `amethyst/build.gradle`
 4. Commit and push.
 5. Tag the commit with `v{x.x.x}`
 6. Let the [Create Release GitHub Action](https://github.com/vitorpamplona/amethyst/actions/workflows/create-release.yml) build a new `aab` file.
 7. Add your CHANGE LOG to the description of the new release
-8. Download the `aab` file and upload it to the` PlayStore.
+8. Download the `aab` file and upload it to the PlayStore.
 
-# Privacy on Relays & nostr
-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. 
+## Using the Quartz library
 
-The relay also learns which public keys you are requesting, meaning your public key will be tied to your IP address.
+### Installing
 
-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 Private Zaps and Private DMs.
+Add the following line to your `commonMain` dependencies:
 
-# DM Privacy #
-While the content of direct messages (DMs) is only visible to you, and your DM nostr counterparty, everyone can see that and when you and your counterparty are DM-ing each other.
+```gradle
+implementation('com.vitorpamplona.quartz:quartz:<Amethyst Version>')
+```
 
-# Visibility & Permanence of Your Content on nostr
-## Information Visibility ##
-Content that you share can be shared to other relays. 
-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.
+Variations to each platform are also available:
 
-## 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. 
+```gradle
+implementation('com.vitorpamplona.quartz:quartz-android:<Amethyst Version>')
+implementation('com.vitorpamplona.quartz:quartz-jvm:<Amethyst Version>')
+implementation('com.vitorpamplona.quartz:quartz-iosarm64:<Amethyst Version>')
+implementation('com.vitorpamplona.quartz:quartz-iossimulatorarm64:<Amethyst Version>')
+```
+
+### How to use
+
+Manage logged in users with the `KeyPair` class
+
+```kt
+val keyPair = KeyPair() // creates a random key
+val keyPair = KeyPair("hex...".hexToByteArray())
+val keyPair = KeyPair("nsec1...".bechToBytes())
+val keyPair = 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 a read-only public key,
+or External, when it is controlled by Amber in NIP-55.
+
+Use either the `NostrSignerInternal` or `NostrSignerExternal` class:
+
+```kt
+val signer = NostrSignerInternal(keyPair)
+val amberSigner = NostrSignerExternal(
+    pubKey = keyPair.pubKey.toHexKey(),
+    packageName = signerPackageName, // Amber package name
+    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, appScope) { challenge, relay ->
+    val authedEvent = RelayAuthEvent.create(relay.url, challenge, signer)
+    client.sendIfExists(authedEvent, relay.url)
+}
+```
+
+To make a request subscription simply do:
+
+```kt
+val metadataSub = client.req(
+    relays = listOf("wss://nos.lol", "wss://nostr.mom"),
+    filters = Filter(
+        kinds = listOf(MetadataEvent.KIND),
+        authors = listOf(signer.pubkey)
+    )
+) { event ->
+    /* consume event */
+}
+```
+
+The client will add the relay to the pool, connect to it and start receiving events. The
+`metadataSub` will be active until you call `metadataSub.close()`. If the client disconnects
+and reconnects, the sub will be active again.
+
+To manage subscriptions that change over time, the simplest approach is to build mutable
+subscriptions with a filters lambda that you can change at will.
+
+```kt
+val metadataSub = client.req(
+    filters = {
+        // Let's say you have a list of users that need to be rendered
+        val users = pubkeysSeeingInTheScreen()
+        // And a cache repository with their outbox relays
+        val outboxRelays = outboxRelays(users)
+
+        val filters = listOf(
+            Filter(
+                kinds = listOf(MetadataEvent.KIND),
+                authors = users
+            )
+        )
+
+        outboxRelays.associateWith { filters }
+    }
+) { event ->
+    /* consume event */
+}
+```
+
+In that way, you can simply call `metadataSub.updateFilter()` when you need to update
+subscriptions to all relays. Or call `metadataSub.close()` to stop the sub
+without deleting it.
+
+When your app goes to the background, you can use NostrClient's `connect` and `disconnect`
+methods to stop all communication to relays. Add the `connect` to your `onResume` and `disconnect`
+to `onPause` methods.
+
+## Contributing
+
+Issues can be logged on: [https://gitworkshop.dev/repo/amethyst](https://gitworkshop.dev/repo/amethyst)
+
+[GitHub issues](https://github.com/vitorpamplona/amethyst/issues) and [pull requests](https://github.com/vitorpamplona/amethyst/pulls) here are also welcome. Translations can be provided via [Crowdin](https://crowdin.com/project/amethyst-social)
+
+You can also send patches through Nostr using [GitStr](https://github.com/fiatjaf/gitstr) to [this nostr address](https://patch34.pages.dev/naddr1qqyxzmt9w358jum5qyg8v6t5daezumn0wd68yvfwvdhk6qg7waehxw309ahx7um5wgkhqatz9emk2mrvdaexgetj9ehx2ap0qy2hwumn8ghj7un9d3shjtnwdaehgu3wvfnj7q3qgcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqxpqqqpmej720gac)
+
+By contributing to this repository, you agree to license your work under the MIT license. Any work contributed where you are not the original author must contain its license header with the original author(s) and source.
 
 # Screenshots
 
-| Home Feed                                 | Messages                                     | Live Streams                                    | Notifications                                          |
+| FollowFeeds                              | ChatsGroup                              | LiveStreams                                    | Notifications                                          |
 |-------------------------------------------|----------------------------------------------|-------------------------------------------------|--------------------------------------------------------|
 | ![Home Feed](./docs/screenshots/home.png) | ![Messages](./docs/screenshots/messages.png) | ![Live Streams](./docs/screenshots/replies.png) | ![Notifications](./docs/screenshots/notifications.png) |
 
-# Contributing
-
-[Issues](https://github.com/vitorpamplona/amethyst/issues) and [pull requests](https://github.com/vitorpamplona/amethyst/pulls) are very welcome.
-
-## Contributors
+# Contributors
 
 <a align="center" href="https://github.com/vitorpamplona/amethyst/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=vitorpamplona/amethyst" />
@@ -216,6 +380,7 @@ Information shared on nostr should be assumed permanent for privacy purposes. Th
 
 # MIT License
 
+<pre>
 Copyright (c) 2023 Vitor Pamplona
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -235,3 +400,4 @@ 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.
+</pre>

amethyst/build.gradle

@@ -0,0 +1,379 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.jetbrainsKotlinAndroid)
+    alias(libs.plugins.googleServices)
+    alias(libs.plugins.jetbrainsComposeCompiler)
+    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()
+
+    defaultConfig {
+        applicationId = "com.vitorpamplona.amethyst"
+        minSdk = libs.versions.android.minSdk.get().toInteger()
+        targetSdk = libs.versions.android.targetSdk.get().toInteger()
+        versionCode = 429
+        versionName = generateVersionName("1.04.0")
+        buildConfigField "String", "RELEASE_NOTES_ID", "\"3a03c75d85aaf6b181d3b232d064c4d4feea5c73f0bea2bd91ed61b8da7cd6a6\""
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            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',
+            'nl',
+            'nl-rBE',
+            'nl-rNL',
+            'pcm-rNG',
+            'pl-rPL',
+            'pt-rBR',
+            'pt-rPT',
+            'ru',
+            'ru-rRU',
+            'ru-rUA',
+            'sa-rIN',
+            'sl-rSI',
+            'so-rSO',
+            'sr-rSP',
+            'ss-rZA',
+            'sv-rSE',
+            'sw-rKE',
+            'sw-rTZ',
+            'ta',
+            'ta-rIN',
+            'th',
+            'th-rTH',
+            'tr',
+            'tr-rTR',
+            'uk',
+            'uk-rUA',
+            'ur-rIN',
+            'uz-rUZ',
+            'vi-rVN',
+            'zh',
+            'zh-rCN',
+            'zh-rHK',
+            'zh-rSG',
+            'zh-rTW'
+        ]
+    }
+
+    buildTypes {
+        release {
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), 'proguard-rules.pro'
+            minifyEnabled = true
+        }
+        debug {
+            applicationIdSuffix '.debug'
+            versionNameSuffix '-DEBUG'
+            resValue "string", "app_name", "@string/app_name_debug"
+        }
+        create("benchmark") {
+            initWith(getByName("release"))
+            applicationIdSuffix '.benchmark'
+            versionNameSuffix '-BENCHMARK'
+            resValue "string", "app_name", "@string/app_name_benchmark"
+            profileable = true
+            signingConfig = signingConfigs.debug
+        }
+    }
+
+    // TODO: remove this when lightcompressor uses one MP4 parser only
+    packaging {
+        resources {
+            resources.pickFirsts.add('builddef.lst')
+            resources.pickFirsts.add('META-INF/LICENSE.md')
+            resources.pickFirsts.add('META-INF/LICENSE-notice.md')
+        }
+    }
+
+    flavorDimensions = ["channel"]
+
+    productFlavors {
+        play {
+            getIsDefault().set(true)
+            dimension "channel"
+        }
+
+        fdroid {
+            dimension "channel"
+        }
+    }
+
+    splits {
+        abi {
+            enable = true
+            reset()
+            include "x86", "x86_64", "arm64-v8a", "armeabi-v7a"
+            universalApk = true
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
+    }
+
+    buildFeatures {
+        compose = true
+        buildConfig = true
+    }
+
+    packagingOptions {
+        resources {
+            excludes += ['/META-INF/{AL2.0,LGPL2.1}', '**/libscrypt.dylib']
+        }
+    }
+
+    lint {
+        disable 'MissingTranslation'
+    }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
+}
+
+// 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_21
+    }
+}
+
+composeCompiler {
+    reportsDestination = layout.buildDirectory.dir("compose_compiler")
+    metricsDestination = layout.buildDirectory.dir("compose_compiler")
+}
+
+dependencies {
+    implementation platform(libs.androidx.compose.bom)
+
+    implementation project(path: ':quartz')
+    implementation project(path: ':commons')
+    implementation project(path: ':ammolite')
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.activity.compose
+
+    implementation libs.androidx.ui
+    implementation libs.androidx.ui.graphics
+    implementation libs.androidx.ui.tooling.preview
+
+    // Needs this to open gallery / image upload
+    implementation libs.androidx.fragment.ktx
+
+    // Navigation
+    implementation libs.androidx.navigation.compose
+
+    // Material 3 Design
+    implementation libs.androidx.material3
+    implementation libs.androidx.material.icons
+
+    // Adaptive Layout / Two Pane
+    implementation libs.androidx.material3.windowSize
+    implementation libs.accompanist.adaptive
+
+    // Lifecycle
+    implementation libs.androidx.lifecycle.runtime.ktx
+    implementation libs.androidx.lifecycle.runtime.compose
+    implementation libs.androidx.lifecycle.viewmodel.compose
+
+    // Zoomable images
+    implementation libs.zoomable
+
+    // Biometrics
+    implementation libs.androidx.biometric.ktx
+
+    // 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
+    implementation libs.androidx.media3.exoplayer.hls
+    implementation libs.androidx.media3.ui
+    implementation libs.androidx.media3.session
+
+    // important for proxy / tor
+    implementation libs.androidx.media3.datasource.okhttp
+
+    // Load images from the web.
+    implementation libs.coil.compose
+    // view gifs
+    implementation libs.coil.gif
+    // view svgs
+    implementation libs.coil.svg
+    // enables network for coil
+    implementation libs.coil.okhttp
+
+    // Permission to upload pictures:
+    implementation libs.accompanist.permissions
+
+    // For QR generation
+    implementation libs.zxing
+    implementation libs.zxing.embedded
+
+    // Markdown
+    //implementation "com.halilibo.compose-richtext:richtext-ui:0.16.0"
+    //implementation "com.halilibo.compose-richtext:richtext-ui-material:0.16.0"
+    //implementation "com.halilibo.compose-richtext:richtext-commonmark:0.16.0"
+
+    // Markdown (With fix for full-image bleeds)
+    implementation libs.markdown.ui
+    implementation libs.markdown.ui.material3
+    implementation libs.markdown.commonmark
+
+    // Language picker and Theme chooser
+    implementation libs.androidx.appcompat
+
+    // Dynamically adjust between phone and tablet UI
+    implementation libs.androidx.window.core.android
+
+    // Local model for language identification
+    playImplementation libs.google.mlkit.language.id
+
+    // Google services model the translate text
+    playImplementation libs.google.mlkit.translate
+
+    // PushNotifications
+    playImplementation platform(libs.firebase.bom)
+    playImplementation libs.firebase.messaging
+
+    //PushNotifications(FDroid)
+    fdroidImplementation libs.unifiedpush
+
+    // Charts
+    implementation libs.vico.charts.core
+    implementation libs.vico.charts.compose
+    implementation libs.vico.charts.views
+    implementation libs.vico.charts.m3
+
+    // GeoHash
+    implementation libs.drfonfon.geohash
+
+    // Waveform visualizer
+    implementation libs.audiowaveform
+
+    // Video compression lib
+    implementation libs.abedElazizShe.video.compressor.fork
+    // Image compression lib
+    implementation libs.zelory.image.compressor
+
+    // Cbor for cashuB format
+    implementation libs.kotlinx.serialization.cbor
+
+    // Kotlin serialization for the times where we need the Json tree and performance is not that important.
+    implementation(libs.kotlinx.serialization.json)
+
+    implementation libs.tor.android
+    implementation libs.jtorctl
+
+    testImplementation libs.junit
+    testImplementation libs.mockk
+    testImplementation libs.kotlinx.coroutines.test
+
+    androidTestImplementation platform(libs.androidx.compose.bom)
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.junit.ktx
+    androidTestImplementation libs.androidx.espresso.core
+    androidTestImplementation libs.androidx.ui.test.junit4
+    androidTestImplementation libs.mockk.android
+
+    debugImplementation platform(libs.androidx.compose.bom)
+    debugImplementation libs.androidx.ui.tooling
+    debugImplementation libs.androidx.ui.test.manifest
+
+    implementation libs.androidx.camera.core
+    implementation libs.androidx.camera.camera2
+    implementation libs.androidx.camera.lifecycle
+    implementation libs.androidx.camera.view
+    implementation libs.androidx.camera.extensions
+}

amethyst/google-services.json

@@ -0,0 +1,67 @@
+{
+  "project_info": {
+    "project_number": "768341258853",
+    "project_id": "amethyst-3057a",
+    "storage_bucket": "amethyst-3057a.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:768341258853:android:5d07c35a37b24ff36b8c8c",
+        "android_client_info": {
+          "package_name": "com.vitorpamplona.amethyst"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyB7ZxgdpgrN6R223HCFdfv4ulP8Egp7trE"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "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": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:768341258853:android:e0200680f552484d6b8c8c",
+        "android_client_info": {
+          "package_name": "com.vitorpamplona.amethyst.debug"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyB7ZxgdpgrN6R223HCFdfv4ulP8Egp7trE"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

amethyst/proguard-rules.pro

@@ -0,0 +1,65 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# preserve the line number information for debugging stack traces.
+-dontobfuscate
+-keepattributes LocalVariableTable
+-keepattributes LocalVariableTypeTable
+-keepattributes *Annotation*
+-keepattributes SourceFile
+-keepattributes LineNumberTable
+-keepattributes Signature
+-keepattributes Exceptions
+-keepattributes InnerClasses
+-keepattributes EnclosingMethod
+-keepattributes MethodParameters
+-keepparameternames
+
+-keepdirectories libs
+
+# Keep all names
+-keepnames class ** { *; }
+
+# Keep All enums
+-keep enum ** { *; }
+
+# preserve access to native classses
+-keep class fr.acinq.secp256k1.** { *; }
+
+# JNA For Libsodium
+-keep class com.goterl.lazysodium.** { *; }
+
+# libscrypt
+-keep class com.lambdaworks.codec.** { *; }
+-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 { *; }
+-keep class com.sun.jna.CallbackReference { *; }
+-keep class com.sun.jna.ptr.IntByReference { *; }
+-keep class com.sun.jna.NativeLong { *; }
+-keep class com.sun.jna.Structure { *; }
+-keep class com.sun.jna.Structure$* { *; }
+-keep class com.sun.jna.Native$ffi_callback { *; }
+-keep class * implements com.sun.jna.Structure$* { *; }
+-keep class * implements com.sun.jna.Native$* { *; }
+-keep class com.sun.jna.Native {
+    private static com.sun.jna.NativeMapped fromNative(java.lang.Class, java.lang.Object);
+    private static com.sun.jna.NativeMapped fromNative(java.lang.reflect.Method, java.lang.Object);
+    private static java.lang.Class nativeType(java.lang.Class);
+    private static java.lang.Object toNative(com.sun.jna.ToNativeConverter, java.lang.Object);
+    private static java.lang.Object fromNative(com.sun.jna.FromNativeConverter, java.lang.Object, java.lang.reflect.Method);
+}
+
+# JSON parsing
+-keep class com.vitorpamplona.quartz.** { *; }
+-keep class com.vitorpamplona.amethyst.** { *; }
+-keep class com.vitorpamplona.ammolite.** { *; }

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/CashuBTest.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
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.amethyst.service.cashu.CashuParser
+import com.vitorpamplona.amethyst.service.cashu.CashuToken
+import com.vitorpamplona.amethyst.ui.components.GenericLoadable
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class CashuBTest {
+    val cashuTokenA = "cashuAeyJ0b2tlbiI6W3sibWludCI6Imh0dHBzOi8vODMzMy5zcGFjZTozMzM4IiwicHJvb2ZzIjpbeyJhbW91bnQiOjIsImlkIjoiMDA5YTFmMjkzMjUzZTQxZSIsInNlY3JldCI6IjQwNzkxNWJjMjEyYmU2MWE3N2UzZTZkMmFlYjRjNzI3OTgwYmRhNTFjZDA2YTZhZmMyOWUyODYxNzY4YTc4MzciLCJDIjoiMDJiYzkwOTc5OTdkODFhZmIyY2M3MzQ2YjVlNDM0NWE5MzQ2YmQyYTUwNmViNzk1ODU5OGE3MmYwY2Y4NTE2M2VhIn0seyJhbW91bnQiOjgsImlkIjoiMDA5YTFmMjkzMjUzZTQxZSIsInNlY3JldCI6ImZlMTUxMDkzMTRlNjFkNzc1NmIwZjhlZTBmMjNhNjI0YWNhYTNmNGUwNDJmNjE0MzNjNzI4YzcwNTdiOTMxYmUiLCJDIjoiMDI5ZThlNTA1MGI4OTBhN2Q2YzA5NjhkYjE2YmMxZDVkNWZhMDQwZWExZGUyODRmNmVjNjlkNjEyOTlmNjcxMDU5In1dfV0sInVuaXQiOiJzYXQiLCJtZW1vIjoiVGhhbmsgeW91LiJ9"
+    val cashuTokenB1 = "cashuBo2F0gqJhaUgA_9SLj17PgGFwgaNhYQFhc3hAYWNjMTI0MzVlN2I4NDg0YzNjZjE4NTAxNDkyMThhZjkwZjcxNmE1MmJmNGE1ZWQzNDdlNDhlY2MxM2Y3NzM4OGFjWCECRFODGd5IXVW-07KaZCvuWHk3WrnnpiDhHki6SCQh88-iYWlIAK0mjE0fWCZhcIKjYWECYXN4QDEzMjNkM2Q0NzA3YTU4YWQyZTIzYWRhNGU5ZjFmNDlmNWE1YjRhYzdiNzA4ZWIwZDYxZjczOGY0ODMwN2U4ZWVhY1ghAjRWqhENhLSsdHrr2Cw7AFrKUL9Ffr1XN6RBT6w659lNo2FhAWFzeEA1NmJjYmNiYjdjYzY0MDZiM2ZhNWQ1N2QyMTc0ZjRlZmY4YjQ0MDJiMTc2OTI2ZDNhNTdkM2MzZGNiYjU5ZDU3YWNYIQJzEpxXGeWZN5qXSmJjY8MzxWyvwObQGr5G1YCCgHicY2FtdWh0dHA6Ly9sb2NhbGhvc3Q6MzMzOGF1Y3NhdA"
+    val cashuTokenB2 = "cashuBpGFkb01pbmliaXRzIHJ1bGVzIWFteEpodHRwOi8vbGJ1dGxoNWxmZ2dxNXI3eHBpd2hyYWpkbDdzeHB1cGdhZ2F6eGw2NXc0YzVjZzcyd3RvZmFzYWQub25pb246MzMzOGF0gaJhaUgAm7I9OpEuTmFwg6NhYRhAYWNYIQPfWR0mG80XbGnj6DO8q1NIyjHSGGIEkoWTA6H16HTpx2FzeEA3YThkY2Y5YjNlOGEyNDdjZTMzOWU3MzY5ZTliNGExOWYzMWVhY2I2OWQ4YjBjNjVkYWFlYjcyZDFhY2I5YWQzo2FhGCBhY1ghA55SwCFBc46dwnjbkb87Mzo30T2EE9Ws_nemuFneDegGYXN4QDlkODFjMWEyNjE2ODUzYWQ4MDQ5Y2JjZDFjN2MyNDdhZGQ4M2IzNzM4Mjg2MjBiYWMyZmQ3ZjNlNWE1OGFjZWKjYWEEYWNYIQM-yAQQTR2t6pIAmfmGM8Wxy7ajKVLOaUg7TrV8o-EdVWFzeEBmNmViMTI4ZmJlMDM3MTEzZTkzZjM3NjllYTYwMTk1NmY1N2NkZWNhNTYwOGY0NWUzMDhhZDU0ZmQ4YTQxNWVhYXVjc2F0"
+
+    @Test()
+    fun parseCashuA() {
+        runBlocking {
+            val parsed = (CashuParser().parse(cashuTokenA) as GenericLoadable.Loaded<ImmutableList<CashuToken>>).loaded[0]
+
+            assertEquals(cashuTokenA, parsed.token)
+            assertEquals("https://8333.space:3338", parsed.mint)
+            assertEquals(10, parsed.totalAmount)
+
+            assertEquals(2, parsed.proofs[0].amount)
+            assertEquals("407915bc212be61a77e3e6d2aeb4c727980bda51cd06a6afc29e2861768a7837", parsed.proofs[0].secret)
+            assertEquals("009a1f293253e41e", parsed.proofs[0].id)
+            assertEquals("02bc9097997d81afb2cc7346b5e4345a9346bd2a506eb7958598a72f0cf85163ea", parsed.proofs[0].C)
+
+            assertEquals(8, parsed.proofs[1].amount)
+            assertEquals("fe15109314e61d7756b0f8ee0f23a624acaa3f4e042f61433c728c7057b931be", parsed.proofs[1].secret)
+            assertEquals("009a1f293253e41e", parsed.proofs[1].id)
+            assertEquals("029e8e5050b890a7d6c0968db16bc1d5d5fa040ea1de284f6ec69d61299f671059", parsed.proofs[1].C)
+        }
+    }
+
+    @Test()
+    fun parseCashuB() =
+        runBlocking {
+            val parsed = (CashuParser().parse(cashuTokenB1) as GenericLoadable.Loaded<ImmutableList<CashuToken>>).loaded
+
+            assertEquals(cashuTokenB1, parsed[0].token)
+            assertEquals("http://localhost:3338", parsed[0].mint)
+            assertEquals(1, parsed[0].totalAmount)
+            assertEquals(1, parsed[0].proofs[0].amount)
+            assertEquals("acc12435e7b8484c3cf1850149218af90f716a52bf4a5ed347e48ecc13f77388", parsed[0].proofs[0].secret)
+            assertEquals("00ffd48b8f5ecf80", parsed[0].proofs[0].id)
+            assertEquals("0244538319de485d55bed3b29a642bee5879375ab9e7a620e11e48ba482421f3cf", parsed[0].proofs[0].C)
+
+            assertEquals(3, parsed[1].totalAmount)
+            assertEquals(2, parsed[1].proofs[0].amount)
+            assertEquals("1323d3d4707a58ad2e23ada4e9f1f49f5a5b4ac7b708eb0d61f738f48307e8ee", parsed[1].proofs[0].secret)
+            assertEquals("00ad268c4d1f5826", parsed[1].proofs[0].id)
+            assertEquals("023456aa110d84b4ac747aebd82c3b005aca50bf457ebd5737a4414fac3ae7d94d", parsed[1].proofs[0].C)
+
+            assertEquals(1, parsed[1].proofs[1].amount)
+            assertEquals("56bcbcbb7cc6406b3fa5d57d2174f4eff8b4402b176926d3a57d3c3dcbb59d57", parsed[1].proofs[1].secret)
+            assertEquals("00ad268c4d1f5826", parsed[1].proofs[1].id)
+            assertEquals("0273129c5719e599379a974a626363c333c56cafc0e6d01abe46d5808280789c63", parsed[1].proofs[1].C)
+        }
+
+    @Test()
+    fun parseCashuB2() =
+        runBlocking {
+            val parsed = (CashuParser().parse(cashuTokenB2) as GenericLoadable.Loaded<ImmutableList<CashuToken>>).loaded
+
+            assertEquals(cashuTokenB2, parsed[0].token)
+            assertEquals("http://lbutlh5lfggq5r7xpiwhrajdl7sxpupgagazxl65w4c5cg72wtofasad.onion:3338", parsed[0].mint)
+            assertEquals(100, parsed[0].totalAmount)
+            assertEquals(64, parsed[0].proofs[0].amount)
+            assertEquals("7a8dcf9b3e8a247ce339e7369e9b4a19f31eacb69d8b0c65daaeb72d1acb9ad3", parsed[0].proofs[0].secret)
+            assertEquals("009bb23d3a912e4e", parsed[0].proofs[0].id)
+            assertEquals("03df591d261bcd176c69e3e833bcab5348ca31d218620492859303a1f5e874e9c7", parsed[0].proofs[0].C)
+
+            assertEquals(32, parsed[0].proofs[1].amount)
+            assertEquals("9d81c1a2616853ad8049cbcd1c7c247add83b373828620bac2fd7f3e5a58aceb", parsed[0].proofs[1].secret)
+            assertEquals("009bb23d3a912e4e", parsed[0].proofs[1].id)
+            assertEquals("039e52c02141738e9dc278db91bf3b333a37d13d8413d5acfe77a6b859de0de806", parsed[0].proofs[1].C)
+        }
+}

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.utils.ciphers.AESGCM
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.junit.Assert.assertEquals
+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

@@ -0,0 +1,288 @@
+/**
+ * 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 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.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
+import com.vitorpamplona.amethyst.service.uploads.nip96.Nip96Uploader
+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.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.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.Assert.assertEquals
+import org.junit.Ignore
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.io.ByteArrayOutputStream
+import kotlin.random.Random
+
+@RunWith(AndroidJUnit4::class)
+class ImageUploadTesting {
+    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)
+        for (x in 0 until bitmap.width) {
+            for (y in 0 until bitmap.height) {
+                bitmap.setPixel(x, y, Color.rgb(Random.nextInt(), Random.nextInt(), Random.nextInt()))
+            }
+        }
+
+        val baos = ByteArrayOutputStream()
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, baos)
+        return baos.toByteArray()
+    }
+
+    private suspend fun testBase(server: ServerName) {
+        if (server.type == ServerType.NIP96) {
+            testNip96(server)
+        } else {
+            testBlossom(server)
+        }
+    }
+
+    private suspend fun testBlossom(server: ServerName) {
+        val paylod = getBitmap()
+        val initialHash = sha256(paylod).toHexKey()
+        val inputStream = paylod.inputStream()
+        val result =
+            BlossomUploader()
+                .upload(
+                    inputStream = inputStream,
+                    hash = initialHash,
+                    length = paylod.size,
+                    baseFileName = "filename.png",
+                    contentType = "image/png",
+                    alt = null,
+                    sensitiveContent = null,
+                    serverBaseUrl = server.baseUrl,
+                    okHttpClient = { client },
+                    httpAuth = blossomServerListState::createBlossomUploadAuth,
+                    context = InstrumentationRegistry.getInstrumentation().targetContext,
+                )
+
+        assertEquals("image/png", result.type)
+        assertEquals(paylod.size.toLong(), result.size)
+        assertEquals(initialHash, result.sha256)
+        assertEquals("${server.baseUrl}/$initialHash", result.url?.removeSuffix(".png"))
+
+        val imageData: ByteArray =
+            ImageDownloader().waitAndGetImage(result.url!!, { client })?.bytes
+                ?: run {
+                    fail("${server.name}: Should not be null")
+                    return
+                }
+
+        val downloadedHash = sha256(imageData).toHexKey()
+        assertEquals(initialHash, downloadedHash)
+    }
+
+    private suspend fun testNip96(server: ServerName) {
+        val serverInfo =
+            ServerInfoRetriever()
+                .loadInfo(
+                    server.baseUrl,
+                    { client },
+                )
+
+        val payload = getBitmap()
+        val inputStream = payload.inputStream()
+        val result =
+            Nip96Uploader()
+                .upload(
+                    inputStream = inputStream,
+                    length = payload.size.toLong(),
+                    contentType = "image/png",
+                    alt = null,
+                    sensitiveContent = null,
+                    server = serverInfo,
+                    okHttpClient = { client },
+                    onProgress = {},
+                    httpAuth = { url, method, body ->
+                        signer.sign(HTTPAuthorizationEvent.build(url, method, body))
+                    },
+                    context = InstrumentationRegistry.getInstrumentation().targetContext,
+                )
+
+        val url = result.url!!
+        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, { client })?.bytes
+                ?: run {
+                    fail("${server.name}: Should not be null")
+                    return
+                }
+
+        val prepared =
+            FileHeader.prepare(
+                imageData,
+                "image/png",
+                null,
+            )
+
+        prepared.fold(
+            onSuccess = {
+                if (dim != null) {
+                    assertEquals("${server.name}: Invalid dimensions", it.dim.toString(), dim.toString())
+                }
+                if (size != null) {
+                    assertEquals("${server.name}: Invalid size", it.size, size)
+                }
+            },
+            onFailure = { fail("${server.name}: It should not fail") },
+        )
+
+        // delay(1000)
+
+        // assertTrue(Nip96Uploader(account).delete(ox, contentType, serverInfo))
+    }
+
+    @Test
+    fun runTestOnDefaultServers() =
+        runBlocking {
+            DEFAULT_MEDIA_SERVERS.forEach {
+                // skip paid servers and primal server is buggy.
+                if (!it.name.contains("Paid") && !it.name.contains("Primal")) {
+                    testBase(it)
+                }
+            }
+        }
+
+    @Test()
+    fun testNostrCheck() =
+        runBlocking {
+            testBase(ServerName("nostrcheck.me", "https://nostrcheck.me", ServerType.NIP96))
+        }
+
+    @Test()
+    @Ignore("Not Working anymore")
+    fun testNostrage() =
+        runBlocking {
+            testBase(ServerName("nostrage", "https://nostrage.com", ServerType.NIP96))
+        }
+
+    @Test()
+    @Ignore("Not Working anymore")
+    fun testSove() =
+        runBlocking {
+            testBase(ServerName("sove", "https://sove.rent", ServerType.NIP96))
+        }
+
+    @Ignore("Not Working anymore")
+    @Test()
+    fun testNostrBuild() =
+        runBlocking {
+            testBase(ServerName("nostr.build", "https://nostr.build", ServerType.NIP96))
+        }
+
+    @Test()
+    @Ignore("Not Working anymore")
+    fun testSovbit() =
+        runBlocking {
+            testBase(ServerName("sovbit", "https://files.sovbit.host", ServerType.NIP96))
+        }
+
+    @Test()
+    @Ignore("Returns invalid image size")
+    fun testNostrPic() =
+        runBlocking {
+            testBase(ServerName("nostpic.com", "https://nostpic.com", ServerType.NIP96))
+        }
+
+    @Test(expected = RuntimeException::class)
+    fun testSprovoostNl() =
+        runBlocking {
+            testBase(ServerName("sprovoost.nl", "https://img.sprovoost.nl/", ServerType.NIP96))
+        }
+
+    @Test()
+    @Ignore("Not Working anymore")
+    fun testNostrOnch() =
+        runBlocking {
+            testBase(ServerName("nostr.onch.services", "https://nostr.onch.services", ServerType.NIP96))
+        }
+
+    @Ignore("Changes sha256")
+    fun testPrimalBlossom() =
+        runBlocking {
+            testBase(ServerName("primal.net", "https://blossom.primal.net", ServerType.Blossom))
+        }
+
+    @Test()
+    @Ignore("Not Working anymore/ Timeout")
+    fun testNostrCheckBlossom() =
+        runBlocking {
+            testBase(ServerName("nostrcheck", "https://cdn.nostrcheck.me", ServerType.Blossom))
+        }
+
+    @Ignore("Requires Payment")
+    fun testSatelliteBlossom() =
+        runBlocking {
+            testBase(ServerName("satellite", "https://cdn.satellite.earth", ServerType.Blossom))
+        }
+}

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

@@ -0,0 +1,92 @@
+/**
+ * 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.quartz.nip01Core.core.OptimizedJsonMapper
+import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.nip03Timestamp.OtsEvent
+import com.vitorpamplona.quartz.nip03Timestamp.okhttp.OkHttpOtsResolverBuilder
+import com.vitorpamplona.quartz.nip03Timestamp.ots.OtsBlockHeightCache
+import kotlinx.coroutines.runBlocking
+import okhttp3.OkHttpClient
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class OkHttpOtsTest {
+    val otsEvent = "{\"content\":\"AE9wZW5UaW1lc3RhbXBzAABQcm9vZgC/ieLohOiSlAEIqCiiW0FlsU9lqK5f1A+cL6CGJ1Ah4V/A1yNJY/stUE3wECJz6ng/QxU5Z6xwaMx97qkI//AQqJv8bEMrGTplGWRv5qm4DgjxIHkcQqzpL0Fjr9VBAAijDe0IsQYpOhw1SIjZIgQa6i16CPEEZck7CvAIxR0AloJzCZoAg9/jDS75DI4uLWh0dHBzOi8vYWxpY2UuYnRjLmNhbGVuZGFyLm9wZW50aW1lc3RhbXBzLm9yZ//wEOwPtjIkKI1hmtv9t1kuxZcI8QRlyTsK8Ahl0wrCSggZzgCD3+MNLvkMjiwraHR0cHM6Ly9ib2IuYnRjLmNhbGVuZGFyLm9wZW50aW1lc3RhbXBzLm9yZ//wEE1dVGa8JCuf2ek0c5ybDKII8SCBoVz8Sal45Kd1O8STWIGJTcl5JPtAZBZitqk3BE9MqAjxBGXJOwrwCHoGVgAZi9q9AIPf4w0u+QyOKShodHRwczovL2Zpbm5leS5jYWxlbmRhci5ldGVybml0eXdhbGwuY29t8BAFZFXFYg7DJJ0OzjmJ0FKWCPEEZck7CvAI0M49IcBR5bf/AIPf4w0u+QyOIyJodHRwczovL2J0Yy5jYWxlbmRhci5jYXRhbGxheHkuY29tCPEgoE3IfYTmxxo4W/x/QYp/NGX6Wu93gSQkwbpjpOhZORcI8SDWLLurVQaXHdUuwivCfTfuxYCaq+AzypSGqLDAVocrEgjwIBfgjta16y13Gp4etQOCa9YiKEcM+/9AieG/vZolr3IDCPAgMR2zFCb384CEi8tVuI2fHgLT3I9zpe7oqJTzCcEqxWEI8SAJSdgeeosr7IxdOt8r7f0ipWc8FI6GAhgep8zSRgWikAjxIGxYmtCsC79Tx4z4YsT1WuMo+ycMkwhGQsQltF597cchCPAgCLrBf9vR1Aex6yY+vSkXAvLjMKdMqM/a1g8zNPwLeJcI8SBDCbTk4CczTuiIyZeUyYRVh31BZdjaSd2nU/pBQxu+6QjwIOwqE9/WqGC6CHH0i+tr7edvYX5PstSDf08KmnMqsqCoCPEgQIdEBg358vfek3Qjfyrgl51iCU6WUWmThsGLPDTcB0QI8SAX4dp64iI8pBx+zBqAQwUN6XgZ1cEfT8+2vha/9I1vzwjxWQEAAAAB8YJxvxJJth8OnxIV6UOXveIZAcJPTHcAkWgnucpuYqYAAAAAAP3///8CRhoMAAAAAAAWABTUUZK82uAvbU3vVyaaPIOddZBicwAAAAAAAAAAImog8ARCqgwACAjwIB9TcMDLhzgeS1Uw647lNvCfWECkkUvfrrOe6nay0sGdCAjwICYfs90sbPggoMICyOHGYbmOzop2L9mlnh4xqiBLY7yPCAjxINDiVWOBHnRmGJleQdB9myvJAJbNJ9kciZlTOkgJy89mCAjwIHfxqDLdwycj1Vtyth2CaSDdLQwiey9oV6Xov4stLpWNCAjxIGurJYpKJnKp9+y7MAdC+gXgHOiAu5P3RRUFW9l5hGaCCAjxICXqs9hdY0QMP/MNeqlt6s7xaIYtEXZ1CLvou5gaZNEICAjxIHdYxVeI76NXbT2zHcv6lw+v819Ooib7KWxc1GAsiX2fCAjwICPWdi3uBXOlIdmYi+V9C7wAqLyGE4DMoHD+GtvLizqiCAjwIOF2vENtWN5okEMMS+JSf1SGTY9yYP9j0JjXLbC1s+N1CAjxINWsgCtsPxhRNbe372k8/20WDbiL9e8934hGF256DvRECAjwII3mi+Li06j10ORxg0dYMkcsyGb115Jiqq1YEV3K/u+aCAgABYiWDXPXGQEDw9Qy\",\"created_at\":1707690688,\"id\":\"759f9da5846e936fab06766a524b36ba71c03bbc69ad0944fb8ee4bb1f3dd705\",\"kind\":1040,\"pubkey\":\"82fbb08c8ef45c4d71c88368d0ae805bc62fb92f166ab04a0b7a0c83d8cbc29a\",\"sig\":\"07c7896c8cbb97b5d7483097590c9d31b73f35c1ad9e752002bb5c1776cbd852e1d32704333d6930c9bc3e40f8b899a1f2e9f91cc3bf797d86acdecba7792576\",\"tags\":[[\"e\",\"a828a25b4165b14f65a8ae5fd40f9c2fa086275021e15fc0d7234963fb2d504d\"],[\"p\",\"595ca8eaace5899cb6ab7e2542bfc972136376f2eabc09287f1857eb8f167e53\"],[\"alt\",\"NIP-03 time stamp\"]]}"
+    val otsEvent2 = "{\"content\":\"AE9wZW5UaW1lc3RhbXBzAABQcm9vZgC/ieLohOiSlAEIqGNPU2jhd4no+zg2ytDkuf5PIoivr8KHI8BL68aKGNbwENyCNtiEN98IzIZgEu3cl6YI//AQ6TkSRd3BTGhDHCK1KkJc+AjxIAHaizG++NNL3Vm13BJrIhT7Br6tEYpb0TVRGaadgiUMCPAgOSDREH9v1Y50UHu79LfC4Lcd9WklQJzRQpw+Unb/pyII8QRltDD58AgqrxfAVrLw7QCD3+MNLvkMji4taHR0cHM6Ly9hbGljZS5idGMuY2FsZW5kYXIub3BlbnRpbWVzdGFtcHMub3Jn//AQQMq/CLpGwY60nmddPS7OVgjxIDKxqd9nl+Mej41vP52Wd7gv7004r3n1rFGDObS8icRvCPAgH9TB/kwvXJEEw+h9Ce6fLaI3MORjtTEge0GbAefT6W4I8QRltDD58AhRcoU3gAo/swCD3+MNLvkMjiwraHR0cHM6Ly9ib2IuYnRjLmNhbGVuZGFyLm9wZW50aW1lc3RhbXBzLm9yZ//wECWtWsKo0uvSr8BYonjs3DEI8CBlsh2ng1Spl0K4oStYElGuMJsjd2uo5nXB+apo5A7ipwjxIM8oxynBwNA+QS/X7Ebtl1kyhFgfoOQioASNfCBzZ4gaCPEEZbQw+fAId6Yd5cw5gioAg9/jDS75DI4pKGh0dHBzOi8vZmlubmV5LmNhbGVuZGFyLmV0ZXJuaXR5d2FsbC5jb23wEJmPzXQbxv0AFTIyjTWjMskI8CAurbkrfrBtlinZXSDxj+m/oIkze57hGjTSxu1Xs87XYQjwIPk/LMD0zIgKoEE2dfeoYrrdHuO6dwmghTwUFajH2QzkCPEEZbQw+fAIE+Pq1/Wmdpj/AIPf4w0u+QyOIyJodHRwczovL2J0Yy5jYWxlbmRhci5jYXRhbGxheHkuY29tCPAgB2CbqkV7VpjRKIl3Ea6cBmB/EHcSN/YCgcc1E+mc07QI8CAfpkZ2Hh4Rukz3x4il3tZqQtlDlbna+I6so2t2YSEmMQjwIJOv32jbsMa2HJwpleRCKLEhgYOoHCSfpv1ZO0YNNNFsCPAgLMM7eFfCjokQfU4gdU5WpG/wBLkO9lDRF0GktL6ujt8I8SCRxJ0bC1PQ8qFmI/1jh8AS5d1/6VRJNMt1Hz41QmNr3QjwIBmgrKBF+OZ3y+XOMv2E7IZ4WwLr2u2H+ehsBfy7cPlICPEgm4ZMCSXzZVWu40d+zk2edaur6KOauo8X7V2KaFBR1VoI8SBKVVOiyq6IFqGn/15kLwk7L8upMAIZ0znjhYxYqSTQCQjwIMBD1twPZ33GxbwTiuOCeJPkoP++6R2wYpCii8UBTdgwCPAg84VkgMXwrt2xxRoeC1/6CtsFctki+w3m8Rs5/6g/IhEI8CCnzZQDhJyicX7bS7U8PMUObuC9Y4TXe+4THoXBMMXkxwjxIMZ0oAvshpcwowR3qPEDbwKZ6B4NPSU4Hz/+4PnD74gnCPAgIfLZEKqAvkMNXfakXoNq1UVqGSzL4Z86z5GzUfbvw8UI8SC8KoIeLvjd4vJ/xhNVphakPRd80YKeNkeYEuVH8k2EtAjwIPRtinLLxzt8iuw0XZtpTDzEstZOTNYVm+Bi3fEzdeIuCPFZAQAAAAE8vsasINN5DKon0KakX2HNdCB126ZLKXrw4PfvyEfqbwAAAAAA/f///wLPGw8AAAAAABYAFCvgxlh6msa4ZOtgvlc5KiZCx7IvAAAAAAAAAAAiaiDwBKygDAAICPEgB/2DJ3s6gMky/PceGZocTFRXjZUiCCAhHGYwQk/8yrUICPEgDuSd6+PJHUMuEHyLcKFxw7xfvRHRfInjkV3/Zy3BxqAICPEgZDgQ+4VXzlOIkGoO8EVxDgs2cWaeh4EEiaqa/y50gKAICPAgFI+zIuYcMF69GmPQVsXa9oy8eng7MeRZdIxArQyeX3oICPEgX5HYIuImpiSTEapgEssEW4l+W+4aRfNCG3pZf7z0hCoICPEgPkAbOSjFdtS4NT7MXgMYVQoQhI1JZtdFxUu4J3NTt7IICPEguW3qyuyGjctu5d9rM9P9ZCs/ZK4vAc+z21b9ygklgWAICPEgu4e2645xtvGhI1Zzuiv23vRhwE8uC9vj1TAgNg/C8UcICPAgwoQX8X0nY4HoQLRsJ0z8JCWQDzRh2iL2QXEb8z3gbjIICPAgzTwlPRtStsLJWhz3Q/0l8tMnrPSHVuh+zCiGk95dW2MICPAgGcBEuYZyzFNapHOfnJ9Q515QzO2VbIRhlVI0vIhd4jwICPAgidRMoM2pA+KmVJenVrLcbollsbUg9lL9bmv1C1dSxswICPAgZinGakwhbHdanTaRJeBkEUlbhfNokvj8b5KneyG+wzIICAAFiJYNc9cZAQOtwTI=\",\"created_at\":1706324334,\"id\":\"2ad074ddb7724eb13b4244b49cf2321b1057f37fdf8ce102e6329b839cf763a9\",\"kind\":1040,\"pubkey\":\"82fbb08c8ef45c4d71c88368d0ae805bc62fb92f166ab04a0b7a0c83d8cbc29a\",\"sig\":\"ad7274bb32ba9e9cfdbd52f4887e8a2fda1047c75a7185b2ab7ff254ebac14ed48a2b60737494d655e24c9400eeeec7e29293a77bfcaafaecd94b350c9a2c22b\",\"tags\":[[\"e\",\"a8634f5368e17789e8fb3836cad0e4b9fe4f2288afafc28723c04bebc68a18d6\"],[\"p\",\"c31e22c3715c1bde5608b7e0d04904f22f5fc453ba1806d21c9f2382e1e58c6c\"],[\"alt\",\"NIP-03 time stamp\"]]}"
+    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()
+
+    val resolver =
+        OkHttpOtsResolverBuilder(
+            otsCache,
+        ) { OkHttpClient.Builder().build() }.build()
+
+    @Test
+    fun verifyNostrEvent() =
+        runBlocking {
+            val ots = OptimizedJsonMapper.fromJson(otsEvent) as OtsEvent
+            println(resolver.info(ots.otsByteArray()))
+            assertEquals(1707688818L, ots.verify(resolver))
+        }
+
+    @Test
+    fun verifyNostrEvent2() =
+        runBlocking {
+            val ots = OptimizedJsonMapper.fromJson(otsEvent2) as OtsEvent
+            println(resolver.info(ots.otsByteArray()))
+            assertEquals(1706322179L, ots.verify(resolver))
+        }
+
+    @Test
+    fun verifyNostrPendingEvent() =
+        runBlocking {
+            val ots = OptimizedJsonMapper.fromJson(otsPendingEvent) as OtsEvent
+            println(resolver.info(ots.otsByteArray()))
+            assertEquals(null, ots.verify(resolver))
+        }
+
+    @Test
+    fun createOTSEventAndVerify() =
+        runBlocking {
+            val signer = NostrSignerInternal(KeyPair())
+
+            val otsFile = OtsEvent.stamp(otsEvent2Digest, resolver)
+
+            val ots =
+                runBlocking {
+                    signer.sign(OtsEvent.build(otsEvent2Digest, otsFile))
+                }
+
+            println(ots.toJson())
+            println(resolver.info(ots.otsByteArray()))
+
+            // Should not be valid because we need to wait for confirmations
+            assertEquals(null, ots.verify(resolver))
+        }
+}

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/URIParserTest.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
+
+import com.vitorpamplona.amethyst.ui.navigation.findParameterValue
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import java.net.URI
+
+class URIParserTest {
+    @Test
+    fun testNEventWithAccount() {
+        val test = "nevent1qqsp9wg5r3vkuv5al0459h3h44yxh6r0y7chgvu3pkdxhcj99t3msrgpzdmhxue69uhhwmm59e6hg7r09ehkuef0qgsdhcrqt2w8x9et446j8ge8kgmd2h4ykc6wsrnc4yqnmdu3lr74ktqrqsqqqqqp578kku?account=npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"
+        val testUri = URI(test)
+
+        // assertEquals("nostr", testUri.scheme)
+        assertEquals(null, testUri.authority)
+        assertEquals(null, testUri.host)
+        assertEquals(-1, testUri.port)
+        assertEquals(null, testUri.userInfo)
+        assertEquals("nevent1qqsp9wg5r3vkuv5al0459h3h44yxh6r0y7chgvu3pkdxhcj99t3msrgpzdmhxue69uhhwmm59e6hg7r09ehkuef0qgsdhcrqt2w8x9et446j8ge8kgmd2h4ykc6wsrnc4yqnmdu3lr74ktqrqsqqqqqp578kku", testUri.path)
+        assertEquals(null, testUri.fragment)
+        assertEquals("account=npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z", testUri.rawQuery)
+
+        assertEquals("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z", testUri.findParameterValue("account"))
+    }
+
+    @Test
+    fun testNotificationsWithAccount() {
+        val test = "notifications?account=npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"
+        val testUri = URI(test)
+
+        // assertEquals("nostr", testUri.scheme)
+        assertEquals(null, testUri.authority)
+        assertEquals(null, testUri.host)
+        assertEquals(-1, testUri.port)
+        assertEquals(null, testUri.userInfo)
+        assertEquals("notifications", testUri.path)
+        assertEquals(null, testUri.fragment)
+        assertEquals("account=npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z", testUri.rawQuery)
+
+        assertEquals("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z", testUri.findParameterValue("account"))
+    }
+}

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

@@ -0,0 +1,262 @@
+/**
+ * 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.compose.ui.graphics.Color
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.input.TransformedText
+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.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
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class UrlUserTagTransformationTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.vitorpamplona.amethyst", appContext.packageName.removeSuffix(".debug"))
+    }
+
+    fun debugCursor(
+        original: String,
+        transformedText: TransformedText,
+        offset: Int,
+    ): String {
+        val offsetTransformed = transformedText.offsetMapping.originalToTransformed(offset)
+        val originalWithCursor = original.substring(0, offset) + "|" + original.substring(offset, original.length)
+        val transformedWithCursor = transformedText.text.text.substring(0, offsetTransformed) + "|" + transformedText.text.text.substring(offsetTransformed, transformedText.text.text.length)
+        return "$originalWithCursor $transformedWithCursor"
+    }
+
+    fun debugCursorReverse(
+        original: String,
+        transformedText: TransformedText,
+        offsetTransformed: Int,
+    ): String {
+        val offset = transformedText.offsetMapping.transformedToOriginal(offsetTransformed)
+        val originalWithCursor = original.substring(0, offset) + "|" + original.substring(offset, original.length)
+        val transformedWithCursor = transformedText.text.text.substring(0, offsetTransformed) + "|" + transformedText.text.text.substring(offsetTransformed, transformedText.text.text.length)
+        return "$originalWithCursor $transformedWithCursor"
+    }
+
+    @Test
+    fun testKeepTransformedIndexFullyInsideTransformedText() {
+        val user =
+            LocalCache.getOrCreateUser(
+                decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z")
+                    .toHexKey(),
+            )
+        user.info = UserMetadata()
+        user.info?.displayName = "Vitor Pamplona"
+
+        val original = "@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"
+
+        val transformedText =
+            buildAnnotatedStringWithUrlHighlighting(
+                AnnotatedString(original),
+                Color.Red,
+            )
+
+        val expected = "@Vitor Pamplona"
+        assertEquals(expected, transformedText.text.text)
+
+        assertEquals("|@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z |@Vitor Pamplona", debugCursor(original, transformedText, 0))
+        assertEquals("@|npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z |@Vitor Pamplona", debugCursor(original, transformedText, 1))
+        assertEquals("@n|pub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z |@Vitor Pamplona", debugCursor(original, transformedText, 2))
+        assertEquals("@np|ub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z |@Vitor Pamplona", debugCursor(original, transformedText, 3))
+        assertEquals("@npu|b1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z |@Vitor Pamplona", debugCursor(original, transformedText, 4))
+        assertEquals("@npub|1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @|Vitor Pamplona", debugCursor(original, transformedText, 5))
+        assertEquals("@npub1|gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @|Vitor Pamplona", debugCursor(original, transformedText, 6))
+        assertEquals("@npub1g|cxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @|Vitor Pamplona", debugCursor(original, transformedText, 7))
+        assertEquals("@npub1gc|xzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @|Vitor Pamplona", debugCursor(original, transformedText, 8))
+        assertEquals("@npub1gcx|zte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @V|itor Pamplona", debugCursor(original, transformedText, 9))
+        assertEquals("@npub1gcxz|te5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @V|itor Pamplona", debugCursor(original, transformedText, 10))
+        assertEquals("@npub1gcxzt|e5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @V|itor Pamplona", debugCursor(original, transformedText, 11))
+        assertEquals("@npub1gcxzte|5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @V|itor Pamplona", debugCursor(original, transformedText, 12))
+        assertEquals("@npub1gcxzte5|zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vi|tor Pamplona", debugCursor(original, transformedText, 13))
+        assertEquals("@npub1gcxzte5z|lkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vi|tor Pamplona", debugCursor(original, transformedText, 14))
+        assertEquals("@npub1gcxzte5zl|kncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vi|tor Pamplona", debugCursor(original, transformedText, 15))
+        assertEquals("@npub1gcxzte5zlk|ncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vi|tor Pamplona", debugCursor(original, transformedText, 16))
+        assertEquals("@npub1gcxzte5zlkn|cx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vi|tor Pamplona", debugCursor(original, transformedText, 17))
+        assertEquals("@npub1gcxzte5zlknc|x26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vit|or Pamplona", debugCursor(original, transformedText, 18))
+        assertEquals("@npub1gcxzte5zlkncx|26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vit|or Pamplona", debugCursor(original, transformedText, 19))
+        assertEquals("@npub1gcxzte5zlkncx2|6j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vit|or Pamplona", debugCursor(original, transformedText, 20))
+        assertEquals("@npub1gcxzte5zlkncx26|j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vit|or Pamplona", debugCursor(original, transformedText, 21))
+        assertEquals("@npub1gcxzte5zlkncx26j|68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vito|r Pamplona", debugCursor(original, transformedText, 22))
+        assertEquals("@npub1gcxzte5zlkncx26j6|8ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vito|r Pamplona", debugCursor(original, transformedText, 23))
+        assertEquals("@npub1gcxzte5zlkncx26j68|ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vito|r Pamplona", debugCursor(original, transformedText, 24))
+        assertEquals("@npub1gcxzte5zlkncx26j68e|z60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vito|r Pamplona", debugCursor(original, transformedText, 25))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez|60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor| Pamplona", debugCursor(original, transformedText, 26))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez6|0fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor| Pamplona", debugCursor(original, transformedText, 27))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60|fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor| Pamplona", debugCursor(original, transformedText, 28))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60f|zkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor| Pamplona", debugCursor(original, transformedText, 29))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fz|kvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor |Pamplona", debugCursor(original, transformedText, 30))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzk|vtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor |Pamplona", debugCursor(original, transformedText, 31))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkv|tkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor |Pamplona", debugCursor(original, transformedText, 32))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvt|km9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor |Pamplona", debugCursor(original, transformedText, 33))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtk|m9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor |Pamplona", debugCursor(original, transformedText, 34))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm|9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor P|amplona", debugCursor(original, transformedText, 35))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9|e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor P|amplona", debugCursor(original, transformedText, 36))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e|0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor P|amplona", debugCursor(original, transformedText, 37))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0|vrwdcvsjakxf9mu9qewqlfnj5z @Vitor P|amplona", debugCursor(original, transformedText, 38))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0v|rwdcvsjakxf9mu9qewqlfnj5z @Vitor Pa|mplona", debugCursor(original, transformedText, 39))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vr|wdcvsjakxf9mu9qewqlfnj5z @Vitor Pa|mplona", debugCursor(original, transformedText, 40))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrw|dcvsjakxf9mu9qewqlfnj5z @Vitor Pa|mplona", debugCursor(original, transformedText, 41))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwd|cvsjakxf9mu9qewqlfnj5z @Vitor Pa|mplona", debugCursor(original, transformedText, 42))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdc|vsjakxf9mu9qewqlfnj5z @Vitor Pam|plona", debugCursor(original, transformedText, 43))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcv|sjakxf9mu9qewqlfnj5z @Vitor Pam|plona", debugCursor(original, transformedText, 44))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvs|jakxf9mu9qewqlfnj5z @Vitor Pam|plona", debugCursor(original, transformedText, 45))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsj|akxf9mu9qewqlfnj5z @Vitor Pam|plona", debugCursor(original, transformedText, 46))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsja|kxf9mu9qewqlfnj5z @Vitor Pamp|lona", debugCursor(original, transformedText, 47))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjak|xf9mu9qewqlfnj5z @Vitor Pamp|lona", debugCursor(original, transformedText, 48))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakx|f9mu9qewqlfnj5z @Vitor Pamp|lona", debugCursor(original, transformedText, 49))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf|9mu9qewqlfnj5z @Vitor Pamp|lona", debugCursor(original, transformedText, 50))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9|mu9qewqlfnj5z @Vitor Pamp|lona", debugCursor(original, transformedText, 51))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9m|u9qewqlfnj5z @Vitor Pampl|ona", debugCursor(original, transformedText, 52))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu|9qewqlfnj5z @Vitor Pampl|ona", debugCursor(original, transformedText, 53))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9|qewqlfnj5z @Vitor Pampl|ona", debugCursor(original, transformedText, 54))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9q|ewqlfnj5z @Vitor Pampl|ona", debugCursor(original, transformedText, 55))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qe|wqlfnj5z @Vitor Pamplo|na", debugCursor(original, transformedText, 56))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qew|qlfnj5z @Vitor Pamplo|na", debugCursor(original, transformedText, 57))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewq|lfnj5z @Vitor Pamplo|na", debugCursor(original, transformedText, 58))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewql|fnj5z @Vitor Pamplo|na", debugCursor(original, transformedText, 59))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlf|nj5z @Vitor Pamplon|a", debugCursor(original, transformedText, 60))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfn|j5z @Vitor Pamplon|a", debugCursor(original, transformedText, 61))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj|5z @Vitor Pamplon|a", debugCursor(original, transformedText, 62))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5|z @Vitor Pamplon|a", debugCursor(original, transformedText, 63))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z| @Vitor Pamplona|", debugCursor(original, transformedText, 64))
+
+        assertEquals("|@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z |@Vitor Pamplona", debugCursorReverse(original, transformedText, 0))
+        assertEquals("@npu|b1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @|Vitor Pamplona", debugCursorReverse(original, transformedText, 1))
+        assertEquals("@npub1gc|xzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @V|itor Pamplona", debugCursorReverse(original, transformedText, 2))
+        assertEquals("@npub1gcxzte|5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vi|tor Pamplona", debugCursorReverse(original, transformedText, 3))
+        assertEquals("@npub1gcxzte5zlkn|cx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vit|or Pamplona", debugCursorReverse(original, transformedText, 4))
+        assertEquals("@npub1gcxzte5zlkncx26|j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vito|r Pamplona", debugCursorReverse(original, transformedText, 5))
+        assertEquals("@npub1gcxzte5zlkncx26j68e|z60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor| Pamplona", debugCursorReverse(original, transformedText, 6))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60f|zkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor |Pamplona", debugCursorReverse(original, transformedText, 7))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtk|m9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor P|amplona", debugCursorReverse(original, transformedText, 8))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0|vrwdcvsjakxf9mu9qewqlfnj5z @Vitor Pa|mplona", debugCursorReverse(original, transformedText, 9))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwd|cvsjakxf9mu9qewqlfnj5z @Vitor Pam|plona", debugCursorReverse(original, transformedText, 10))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsj|akxf9mu9qewqlfnj5z @Vitor Pamp|lona", debugCursorReverse(original, transformedText, 11))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9|mu9qewqlfnj5z @Vitor Pampl|ona", debugCursorReverse(original, transformedText, 12))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9q|ewqlfnj5z @Vitor Pamplo|na", debugCursorReverse(original, transformedText, 13))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewql|fnj5z @Vitor Pamplon|a", debugCursorReverse(original, transformedText, 14))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z| @Vitor Pamplona|", debugCursorReverse(original, transformedText, 15))
+
+        assertEquals(0, transformedText.offsetMapping.originalToTransformed(0))
+        assertEquals(15, transformedText.offsetMapping.originalToTransformed(64))
+    }
+
+    @Test
+    fun transformationText() {
+        val user =
+            LocalCache.getOrCreateUser(
+                decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z")
+                    .toHexKey(),
+            )
+        user.info = UserMetadata()
+        user.info?.displayName = "Vitor Pamplona"
+
+        val transformedText =
+            buildAnnotatedStringWithUrlHighlighting(
+                AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
+                Color.Red,
+            )
+
+        assertEquals("New Hey @Vitor Pamplona", transformedText.text.text)
+
+        assertEquals(0, transformedText.offsetMapping.originalToTransformed(0)) // Before N
+        assertEquals(4, transformedText.offsetMapping.originalToTransformed(4)) // Before H
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(8)) // Before @
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(9)) // Before n
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(10)) // Before p
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(11)) // Before u
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(12)) // Before b
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(13)) // Before 1
+
+        assertEquals(22, transformedText.offsetMapping.originalToTransformed(71))
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(72))
+
+        assertEquals(0, transformedText.offsetMapping.transformedToOriginal(0))
+        assertEquals(4, transformedText.offsetMapping.transformedToOriginal(4))
+        assertEquals(8, transformedText.offsetMapping.transformedToOriginal(8))
+        assertEquals(12, transformedText.offsetMapping.transformedToOriginal(9))
+
+        assertEquals(72, transformedText.offsetMapping.transformedToOriginal(23))
+        assertEquals(73, transformedText.offsetMapping.transformedToOriginal(24))
+    }
+
+    @Test
+    fun transformationTextTwoKeys() {
+        val user =
+            LocalCache.getOrCreateUser(
+                decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z")
+                    .toHexKey(),
+            )
+        user.info = UserMetadata()
+        user.info?.displayName = "Vitor Pamplona"
+
+        val transformedText =
+            buildAnnotatedStringWithUrlHighlighting(
+                AnnotatedString(
+                    "New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z and @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z",
+                ),
+                Color.Red,
+            )
+
+        assertEquals("New Hey @Vitor Pamplona and @Vitor Pamplona", transformedText.text.text)
+
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(11))
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(12))
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(13))
+
+        assertEquals(22, transformedText.offsetMapping.originalToTransformed(70)) // Before 5
+        assertEquals(22, transformedText.offsetMapping.originalToTransformed(71)) // Before z
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(72)) // Before <space>
+        assertEquals(24, transformedText.offsetMapping.originalToTransformed(73)) // Before a
+        assertEquals(25, transformedText.offsetMapping.originalToTransformed(74)) // Before n
+        assertEquals(26, transformedText.offsetMapping.originalToTransformed(75)) // Before d
+        assertEquals(27, transformedText.offsetMapping.originalToTransformed(76)) // Before <space>
+        assertEquals(28, transformedText.offsetMapping.originalToTransformed(77)) // Before @
+        assertEquals(28, transformedText.offsetMapping.originalToTransformed(78)) // Before n
+
+        assertEquals(67, transformedText.offsetMapping.transformedToOriginal(22)) // Before a
+        assertEquals(72, transformedText.offsetMapping.transformedToOriginal(23)) // Before <space>
+        assertEquals(73, transformedText.offsetMapping.transformedToOriginal(24)) // Before a
+        assertEquals(74, transformedText.offsetMapping.transformedToOriginal(25)) // Before n
+        assertEquals(75, transformedText.offsetMapping.transformedToOriginal(26)) // Before d
+        assertEquals(76, transformedText.offsetMapping.transformedToOriginal(27)) // Before <space>
+        assertEquals(77, transformedText.offsetMapping.transformedToOriginal(28)) // Before @
+    }
+}

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

@@ -0,0 +1,5 @@
+<resources>
+    <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

@@ -0,0 +1,180 @@
+/**
+ * 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.google.android.gms.tasks.Tasks
+import com.vitorpamplona.amethyst.service.lang.LanguageTranslatorService
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.CancellationException
+
+@RunWith(AndroidJUnit4::class)
+class TranslationsTest {
+    fun translateTo(
+        text: String,
+        translateTo: String,
+    ): String? {
+        val task = LanguageTranslatorService.autoTranslate(text, emptySet(), translateTo)
+        return Tasks.await(task).result
+    }
+
+    fun assertTranslate(
+        expected: String,
+        input: String,
+        translateTo: String,
+    ) {
+        assertEquals(null, expected, translateTo(input, translateTo))
+    }
+
+    fun assertTranslateContains(
+        expected: String,
+        input: String,
+        translateTo: String,
+    ) {
+        val translated = translateTo(input, translateTo)!!
+        assertTrue("'$translated' does not contain '$expected'", translated.contains(expected))
+    }
+
+    @Test
+    fun testTranslation() {
+        assertTranslate("Olá mundo", "Hello World", "pt")
+    }
+
+    @Test
+    fun testTranslationName() {
+        assertTranslate("Olá Vitor, como você está?", "Hello Vitor, how are you doing?", "pt")
+    }
+
+    @Test
+    fun testTranslationTag() {
+        assertTranslate("Você já viu isso, #[0]", "Have you seen this, #[0]", "pt")
+    }
+
+    @Test
+    fun testTranslationUrl() {
+        assertTranslateContains("https://t.me/mygroup", "Have you seen this https://t.me/mygroup", "pt")
+        assertTranslateContains("http://bananas.com", "Have you seen this http://bananas.com", "pt")
+        assertTranslateContains(
+            "http://bananas.com/myimage.jpg",
+            "Have you seen this http://bananas.com/myimage.jpg",
+            "pt",
+        )
+        assertTranslateContains(
+            "http://bananas.com?search=true&image=myimage.jpg",
+            "Have you seen this http://bananas.com?search=true&image=myimage.jpg",
+            "pt",
+        )
+        assertTranslate("https://i.imgur.com/EZ3QPsw.jpg", "https://i.imgur.com/EZ3QPsw.jpg", "pt")
+        assertTranslate("https://HaveYouSeenThis.com", "https://HaveYouSeenThis.com", "pt")
+        assertTranslate("https://haveyouseenthis.com", "https://haveyouseenthis.com", "pt")
+        assertTranslate(
+            "https://i.imgur.com/asdEZ3QPsw.jpg",
+            "https://i.imgur.com/asdEZ3QPsw.jpg",
+            "pt",
+        )
+        assertTranslateContains(
+            "https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg",
+            "Hi there! \n How are you doing? \n https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg",
+            "pt",
+        )
+    }
+
+    @Test
+    fun testChineseWithUrlDetector() {
+        assertTranslate(
+            "I entered your home page is very carton, perhaps your attention or other data is too much, and the homepage of others is not so carton. From aMethyst client",
+            "我进入你的主页很卡顿，也许是你的关注人数或者其他数据太多了，其他人主页没有这么卡顿。来自amethyst客户端",
+            "en",
+        )
+    }
+
+    @Test
+    fun testTranslationEmail() {
+        assertTranslateContains(
+            "vitor@amethyst.social",
+            "Have you seen this vitor@amethyst.social",
+            "pt",
+        )
+    }
+
+    @Test
+    fun testTranslationLnInvoice() {
+        assertTranslateContains(
+            "lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn",
+            "Have you seen this: lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn I think I have to pay",
+            "pt",
+        )
+    }
+
+    @Test(expected = CancellationException::class)
+    fun testTranslationLnInvoice2() {
+        assertTranslateContains(
+            "lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
+            "Test lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
+            "pt",
+        )
+    }
+
+    @Test(expected = CancellationException::class)
+    fun testNostrEvents() {
+        assertTranslateContains(
+            "nostr:nevent1qqs0tsw8hjacs4fppgdg7f5yhgwwfkyua4xcs3re9wwkpkk2qeu6mhql22rcy",
+            "sure, nostr:nevent1qqs0tsw8hjacs4fppgdg7f5yhgwwfkyua4xcs3re9wwkpkk2qeu6mhql22rcy",
+            "en",
+        )
+    }
+
+    @Test
+    fun testJapaneseTranslationsOfUrl() {
+        assertTranslateContains(
+            "https://youtu.be/wMYFmCDy_Eg",
+            "うちの会社の小さい先輩の話 第1話「うちの会社の先輩は小さくて可愛い」\n" +
+                "\n" +
+                "https://youtu.be/wMYFmCDy_Eg\n" +
+                "\n" +
+                "先輩がうざい後輩の話と似たような話かと思ったけど、もっとオタクの妄想あるある的なものを詰め込んだやつだ。ワードとかシチュエーションとか、ヒロインのサイズ感とか。知らんけど",
+            "en",
+        )
+    }
+
+    @Test
+    fun testEmoji() {
+        assertTranslateContains(
+            "https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg",
+            "\uD83E\uDD23 https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg ",
+            "pt",
+        )
+    }
+
+    @Test
+    fun testHttp() {
+        val text = "https://m.primal.net/MdDd.png \nRunning... \uD83D\uDE01   nostr:npub126ntw5mnermmj0znhjhgdk8lh2af72sm8qfzq48umdlnhaj9kuns3le9ll  nostr:npub1getal6ykt05fsz5nqu4uld09nfj3y3qxmv8crys4aeut53unfvlqr80nfm"
+
+        assertTranslateContains(
+            "https://m.primal.net/MdDd.png",
+            text,
+            "pt",
+        )
+    }
+}

amethyst/src/fdroid/AndroidManifest.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:name=".Amethyst">
+
+        <receiver
+            android:exported="true"
+            android:enabled="true"
+            android:name=".service.notifications.PushMessageReceiver">
+            <intent-filter>
+                <action android:name="org.unifiedpush.android.connector.MESSAGE"/>
+                <action android:name="org.unifiedpush.android.connector.UNREGISTERED"/>
+                <action android:name="org.unifiedpush.android.connector.NEW_ENDPOINT"/>
+                <action android:name="org.unifiedpush.android.connector.REGISTRATION_FAILED"/>
+                <action android:name="org.unifiedpush.android.connector.REGISTRATION_REFUSED"/>
+            </intent-filter>
+        </receiver>
+
+    </application>
+
+</manifest>

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

@@ -0,0 +1,25 @@
+/**
+ * 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.service.lang
+
+object LanguageTranslatorService {
+    fun clear() {}
+}

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

@@ -0,0 +1,102 @@
+/**
+ * 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.service.notifications
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.quartz.utils.Log
+import org.unifiedpush.android.connector.UnifiedPush
+
+interface PushDistributorActions {
+    fun getSavedDistributor(): String
+
+    fun getInstalledDistributors(): List<String>
+
+    fun saveDistributor(distributor: String)
+
+    fun removeSavedDistributor()
+}
+
+object PushDistributorHandler : PushDistributorActions {
+    private val unifiedPush: UnifiedPush = UnifiedPush
+
+    private var endpointInternal = ""
+
+    fun getSavedEndpoint() = endpointInternal
+
+    fun setEndpoint(newEndpoint: String) {
+        endpointInternal = newEndpoint
+        Log.d("PushHandler", "New endpoint saved : $endpointInternal")
+    }
+
+    fun removeEndpoint() {
+        endpointInternal = ""
+    }
+
+    fun appContext(): Context = Amethyst.instance.appContext
+
+    override fun getSavedDistributor(): String = unifiedPush.getSavedDistributor(appContext()) ?: ""
+
+    fun savedDistributorExists(): Boolean = getSavedDistributor().isNotEmpty()
+
+    override fun getInstalledDistributors(): List<String> = unifiedPush.getDistributors(appContext())
+
+    fun formattedDistributorNames(): List<String> {
+        val distributorsArray = getInstalledDistributors().toTypedArray()
+        val distributorsNameArray =
+            distributorsArray
+                .map {
+                    try {
+                        val ai =
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                                appContext().packageManager.getApplicationInfo(
+                                    it,
+                                    PackageManager.ApplicationInfoFlags.of(
+                                        PackageManager.GET_META_DATA.toLong(),
+                                    ),
+                                )
+                            } else {
+                                appContext().packageManager.getApplicationInfo(it, 0)
+                            }
+                        appContext().packageManager.getApplicationLabel(ai)
+                    } catch (e: PackageManager.NameNotFoundException) {
+                        it
+                    }
+                        as String
+                }.toTypedArray()
+        return distributorsNameArray.toList()
+    }
+
+    override fun saveDistributor(distributor: String) {
+        unifiedPush.saveDistributor(appContext(), distributor)
+        unifiedPush.register(appContext())
+    }
+
+    override fun removeSavedDistributor() {
+        unifiedPush.removeDistributor(appContext())
+    }
+
+    fun forceRemoveDistributor(context: Context) {
+        UnifiedPush.removeDistributor(context)
+    }
+}

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.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.service.notifications
+
+import android.app.NotificationManager
+import android.content.Context
+import android.util.LruCache
+import androidx.core.content.ContextCompat
+import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.LocalPreferences
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent
+import com.vitorpamplona.quartz.utils.Log
+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 {
+        private val TAG = "Amethyst-OSSPushReceiver"
+    }
+
+    private val appContext = Amethyst.instance.appContext
+    private val scope = Amethyst.instance.applicationIOScope
+    private val eventCache = LruCache<String, String>(100)
+    private val pushHandler = PushDistributorHandler
+
+    override fun onMessage(
+        context: Context,
+        message: PushMessage,
+        instance: String,
+    ) {
+        val messageStr = message.content.decodeToString()
+        Log.d(TAG, "New message $messageStr for Instance: $instance")
+        scope.launch {
+            try {
+                parseMessage(messageStr)?.let {
+                    receiveIfNew(it)
+                }
+            } catch (e: Exception) {
+                if (e is CancellationException) throw e
+                Log.d(TAG, "Message could not be parsed: ${e.message}")
+            }
+        }
+    }
+
+    private suspend fun parseMessage(message: String): GiftWrapEvent? {
+        (Event.fromJson(message) as? GiftWrapEvent)?.let {
+            return it
+        }
+        return null
+    }
+
+    private suspend fun receiveIfNew(event: GiftWrapEvent) {
+        if (eventCache.get(event.id) == null) {
+            eventCache.put(event.id, event.id)
+            EventNotificationConsumer(appContext).consume(event)
+        }
+    }
+
+    override fun onNewEndpoint(
+        context: Context,
+        endpoint: PushEndpoint,
+        instance: String,
+    ) {
+        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) {
+                PushNotificationUtils.checkAndInit(sanitizedEndpoint, LocalPreferences.allSavedAccounts()) {
+                    Amethyst.instance.okHttpClients.getHttpClient(Amethyst.instance.torManager.isSocksReady())
+                }
+                NotificationUtils.getOrCreateZapChannel(appContext)
+                NotificationUtils.getOrCreateDMChannel(appContext)
+            }
+        } else {
+            Log.d(TAG, "Same endpoint provided:- $endpoint for Instance: $instance $sanitizedEndpoint")
+        }
+    }
+
+    override fun onRegistrationFailed(
+        context: Context,
+        reason: FailedReason,
+        instance: String,
+    ) {
+        Log.d(TAG, "Registration failed for Instance: $instance")
+        pushHandler.forceRemoveDistributor(context)
+    }
+
+    override fun onUnregistered(
+        context: Context,
+        instance: String,
+    ) {
+        val removedEndpoint = pushHandler.getSavedEndpoint()
+        Log.d(TAG, "Endpoint: $removedEndpoint removed for Instance: $instance")
+        Log.d(TAG, "App is unregistered. ")
+        pushHandler.forceRemoveDistributor(context)
+        pushHandler.removeEndpoint()
+    }
+
+    fun notificationManager(): NotificationManager =
+        ContextCompat.getSystemService(appContext, NotificationManager::class.java)
+            as NotificationManager
+}

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

@@ -0,0 +1,72 @@
+/**
+ * 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.service.notifications
+
+import com.vitorpamplona.amethyst.AccountInfo
+import com.vitorpamplona.amethyst.service.retryIfException
+import kotlinx.coroutines.Dispatchers
+import okhttp3.OkHttpClient
+
+object PushNotificationUtils {
+    var lastToken: String? = null
+    var hasInit: List<AccountInfo>? = null
+
+    private val pushHandler = PushDistributorHandler
+
+    suspend fun checkAndInit(
+        accounts: List<AccountInfo>,
+        okHttpClient: (String) -> OkHttpClient,
+    ) = with(Dispatchers.IO) {
+        if (!pushHandler.savedDistributorExists()) return
+
+        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

@@ -0,0 +1,230 @@
+/**
+ * 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.ui.components
+
+import android.Manifest
+import android.os.Build
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
+import com.halilibo.richtext.commonmark.CommonMarkdownParseOptions
+import com.halilibo.richtext.commonmark.CommonmarkAstNodeParser
+import com.halilibo.richtext.markdown.BasicMarkdown
+import com.halilibo.richtext.ui.RichTextStyle
+import com.halilibo.richtext.ui.material3.RichText
+import com.halilibo.richtext.ui.resolveDefaults
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.UiSettingsFlow
+import com.vitorpamplona.amethyst.service.notifications.PushDistributorHandler
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.SettingsRow
+import com.vitorpamplona.amethyst.ui.stringRes
+import com.vitorpamplona.quartz.utils.Log
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun SelectNotificationProvider(sharedPrefs: UiSettingsFlow) {
+    val notificationPermissionGranted =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            val notificationPermissionState = rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
+
+            if (!notificationPermissionState.status.isGranted) {
+                val dontAskForNotificationPermissions by sharedPrefs.dontAskForNotificationPermissions.collectAsStateWithLifecycle()
+                if (!dontAskForNotificationPermissions) {
+                    sharedPrefs.dontAskForNotificationPermissions()
+
+                    // This will pause the APP, including the connection with relays.
+                    LaunchedEffect(notificationPermissionState) {
+                        notificationPermissionState.launchPermissionRequest()
+                    }
+                }
+            }
+
+            notificationPermissionState.status.isGranted
+        } else {
+            true
+        }
+
+    if (notificationPermissionGranted) {
+        val pushNotificationSelector by sharedPrefs.dontShowPushNotificationSelector.collectAsStateWithLifecycle()
+        if (!pushNotificationSelector) {
+            val context = LocalContext.current
+            var distributorPresent by remember {
+                mutableStateOf(PushDistributorHandler.savedDistributorExists())
+            }
+            if (!distributorPresent) {
+                LoadDistributors { currentDistributor, list, readableListWithExplainer ->
+                    if (readableListWithExplainer.size > 1) {
+                        SpinnerSelectionDialog(
+                            title = stringRes(id = R.string.select_push_server),
+                            options = readableListWithExplainer,
+                            onSelect = { index ->
+                                if (list[index] == "None") {
+                                    PushDistributorHandler.forceRemoveDistributor(context)
+                                    sharedPrefs.dontAskForNotificationPermissions()
+                                    sharedPrefs.dontShowPushNotificationSelector()
+                                } else {
+                                    val fullDistributorName = list[index]
+                                    PushDistributorHandler.saveDistributor(fullDistributorName)
+                                }
+                                distributorPresent = true
+                                Log.d("Amethyst", "NotificationScreen: Distributor registered.")
+                            },
+                            onDismiss = {
+                                distributorPresent = true
+                                Log.d("Amethyst", "NotificationScreen: Distributor dialog dismissed.")
+                            },
+                        )
+                    } else {
+                        AlertDialog(
+                            onDismissRequest = { distributorPresent = true },
+                            title = { Text(stringRes(R.string.push_server_install_app)) },
+                            text = {
+                                val content = stringRes(R.string.push_server_install_app_description)
+
+                                val astNode =
+                                    remember {
+                                        CommonmarkAstNodeParser(CommonMarkdownParseOptions.MarkdownWithLinks).parse(content)
+                                    }
+
+                                RichText(
+                                    style = RichTextStyle().resolveDefaults(),
+                                    renderer = null,
+                                ) {
+                                    BasicMarkdown(astNode)
+                                }
+                            },
+                            confirmButton = {
+                                Row(
+                                    modifier = Modifier.padding(all = 8.dp).fillMaxWidth(),
+                                    horizontalArrangement = Arrangement.SpaceBetween,
+                                ) {
+                                    TextButton(
+                                        onClick = {
+                                            distributorPresent = true
+                                            sharedPrefs.dontShowPushNotificationSelector()
+                                        },
+                                    ) {
+                                        Text(stringRes(R.string.quick_action_dont_show_again_button))
+                                    }
+                                    Button(
+                                        onClick = { distributorPresent = true },
+                                        contentPadding = PaddingValues(horizontal = 16.dp),
+                                    ) {
+                                        Row(
+                                            verticalAlignment = Alignment.CenterVertically,
+                                        ) {
+                                            Icon(
+                                                imageVector = Icons.Default.Check,
+                                                contentDescription = null,
+                                            )
+                                            Spacer(Modifier.width(8.dp))
+                                            Text(stringRes(R.string.error_dialog_button_ok))
+                                        }
+                                    }
+                                }
+                            },
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun LoadDistributors(onInner: @Composable (String, ImmutableList<String>, ImmutableList<TitleExplainer>) -> Unit) {
+    val currentDistributor = PushDistributorHandler.getSavedDistributor().ifBlank { null } ?: "None"
+
+    val list =
+        remember {
+            PushDistributorHandler.getInstalledDistributors().plus("None").toImmutableList()
+        }
+
+    val readableListWithExplainer =
+        PushDistributorHandler
+            .formattedDistributorNames()
+            .mapIndexed { index, name ->
+                TitleExplainer(
+                    name,
+                    stringRes(id = R.string.push_server_uses_app_explainer, list[index]),
+                )
+            }.plus(
+                TitleExplainer(
+                    stringRes(id = R.string.push_server_none),
+                    stringRes(id = R.string.push_server_none_explainer),
+                ),
+            ).toImmutableList()
+
+    onInner(
+        currentDistributor,
+        list,
+        readableListWithExplainer,
+    )
+}
+
+@Composable
+fun PushNotificationSettingsRow(sharedPrefs: UiSettingsFlow) {
+    val context = LocalContext.current
+
+    LoadDistributors { currentDistributor, list, readableListWithExplainer ->
+        SettingsRow(
+            R.string.push_server_title,
+            R.string.push_server_explainer,
+            selectedItems = readableListWithExplainer,
+            selectedIndex = list.indexOf(currentDistributor),
+        ) { index ->
+            if (list[index] == "None") {
+                sharedPrefs.dontAskForNotificationPermissions()
+                sharedPrefs.dontShowPushNotificationSelector()
+                PushDistributorHandler.forceRemoveDistributor(context)
+            } else {
+                PushDistributorHandler.saveDistributor(list[index])
+            }
+        }
+    }
+}

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

@@ -0,0 +1,66 @@
+/**
+ * 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.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.navs.INav
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.MaxWidthPaddingTop5dp
+import com.vitorpamplona.quartz.nip01Core.core.ImmutableListOfLists
+
+@Composable
+fun TranslatableRichTextViewer(
+    content: String,
+    canPreview: Boolean,
+    quotesLeft: Int,
+    modifier: Modifier = Modifier,
+    tags: ImmutableListOfLists<String>,
+    backgroundColor: MutableState<Color>,
+    id: String,
+    callbackUri: String? = null,
+    accountViewModel: AccountViewModel,
+    nav: INav,
+) = ExpandableRichTextViewer(
+    content,
+    canPreview,
+    quotesLeft,
+    modifier,
+    tags,
+    backgroundColor,
+    id,
+    callbackUri,
+    accountViewModel,
+    nav,
+)
+
+@Composable
+fun TranslatableRichTextViewer(
+    content: String,
+    id: String,
+    translationMessageModifier: Modifier = MaxWidthPaddingTop5dp,
+    accountViewModel: AccountViewModel,
+    displayText: @Composable (String) -> Unit,
+) = displayText(content)

amethyst/src/main/AndroidManifest.xml

@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <queries>
+        <package android:name="org.torproject.android"/>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <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 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" />
+
+    <!-- To know receive notifications when the app connects/disconnects from the web -->
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+
+    <!-- Audio/Video Playback -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+
+    <!-- Keeps screen on while playing videos -->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <!-- This notification permission is needed for some phones -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
+    <!-- Adds Geohash to posts if active -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <!-- Old permission to access media -->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage" />
+
+    <application
+        android:allowBackup="false"
+        android:name=".Amethyst"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:enableOnBackInvokedCallback="true"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Amethyst"
+        android:largeHeap="true"
+        android:usesCleartextTraffic="true"
+        android:hardwareAccelerated="true"
+        android:localeConfig="@xml/locales_config"
+        tools:targetApi="34">
+        <activity
+            android:name=".ui.MainActivity"
+            android:exported="true"
+            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">
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <intent-filter android:label="Amethyst">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="nostr" />
+                <data android:scheme="amethyst" />
+            </intent-filter>
+
+            <intent-filter android:label="Amethyst">
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="nostr" />
+            </intent-filter>
+
+            <intent-filter android:label="Amethyst">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="nostrwalletconnect" />
+                <data android:scheme="nostr+walletconnect" />
+                <data android:scheme="amethyst+walletconnect" />
+            </intent-filter>
+
+            <intent-filter android:label="New Post">
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+
+            <intent-filter android:label="New Post">
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+
+            <intent-filter android:label="New Post">
+                <action android:name="android.intent.action.SEND" />
+                <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: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.service.PlaybackService"
+            android:foregroundServiceType="mediaPlayback"
+            android:stopWithTask="true"
+            android:exported="true"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="androidx.media3.session.MediaSessionService"/>
+                <action android:name="android.media.browse.MediaBrowserService"/>
+            </intent-filter>
+        </service>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
+        <receiver
+            android:name=".service.notifications.PokeyReceiver"
+            android:exported="true"
+            tools:ignore="ExportedReceiver"
+            >
+            <intent-filter>
+                <action android:name="com.shared.NOSTR" />
+            </intent-filter>
+        </receiver>
+    </application>
+
+
+</manifest>

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

@@ -0,0 +1,65 @@
+/**
+ * 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 android.app.Application
+import com.vitorpamplona.amethyst.service.logging.Logging
+import com.vitorpamplona.quartz.utils.Log
+
+class Amethyst : Application() {
+    init {
+        Log.d("AmethystApp", "Creating App $this")
+    }
+
+    companion object {
+        lateinit var instance: AppModules
+            private set
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        Log.d("AmethystApp", "onCreate $this")
+        instance = AppModules(this)
+
+        if (isDebug) {
+            Logging.setup()
+        }
+
+        instance.initiate(this)
+    }
+
+    override fun onTerminate() {
+        super.onTerminate()
+        Log.d("AmethystApp", "onTerminate $this")
+        instance.terminate(this)
+    }
+
+    /**
+     * Release memory when the UI becomes hidden or when system resources become low.
+     *
+     * @param level the memory-related event that was raised.
+     */
+    override fun onTrimMemory(level: Int) {
+        super.onTrimMemory(level)
+        Log.d("AmethystApp", "onTrimMemory $level")
+        instance.trim()
+    }
+}

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

@@ -0,0 +1,305 @@
+/**
+ * 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 android.content.ContentResolver
+import android.content.Context
+import androidx.security.crypto.EncryptedSharedPreferences
+import coil3.disk.DiskCache
+import coil3.memory.MemoryCache
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.accountsCache.AccountCacheState
+import com.vitorpamplona.amethyst.model.nip03Timestamp.IncomingOtsEventVerifier
+import com.vitorpamplona.amethyst.model.nip03Timestamp.TorAwareOkHttpOtsResolverBuilder
+import com.vitorpamplona.amethyst.model.nip11RelayInfo.Nip11CachedRetriever
+import com.vitorpamplona.amethyst.model.preferences.TorSharedPreferences
+import com.vitorpamplona.amethyst.model.preferences.UiSharedPreferences
+import com.vitorpamplona.amethyst.model.privacyOptions.RoleBasedHttpClientBuilder
+import com.vitorpamplona.amethyst.model.torState.AccountsTorStateConnector
+import com.vitorpamplona.amethyst.model.torState.TorRelayState
+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.notifications.PokeyReceiver
+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.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.screen.UiSettingsState
+import com.vitorpamplona.amethyst.ui.tor.TorManager
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.RelayLogger
+import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.RelayOfflineTracker
+import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.stats.RelayReqStats
+import com.vitorpamplona.quartz.nip01Core.relay.client.stats.RelayStats
+import com.vitorpamplona.quartz.nip03Timestamp.VerificationStateCache
+import com.vitorpamplona.quartz.nip03Timestamp.ots.OtsBlockHeightCache
+import com.vitorpamplona.quartz.utils.Log
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import java.io.File
+
+class AppModules(
+    val appContext: Context,
+) {
+    val appAgent = "Amethyst/${BuildConfig.VERSION_NAME}"
+
+    // Exists to avoid exceptions stopping the coroutine
+    val exceptionHandler =
+        CoroutineExceptionHandler { _, throwable ->
+            Log.e("AmethystCoroutine", "Caught exception: ${throwable.message}", throwable)
+        }
+
+    val applicationIOScope = CoroutineScope(Dispatchers.IO + SupervisorJob() + exceptionHandler)
+    val applicationDefaultScope = CoroutineScope(Dispatchers.IO + SupervisorJob() + exceptionHandler)
+
+    // Blocking load of UI Preferences to avoid theme/language blinking
+    val uiPrefs by lazy {
+        UiSharedPreferences(appContext, applicationIOScope)
+    }
+
+    // Blocking load of Tor Settings to avoid connection leaks
+    val torPrefs by lazy {
+        TorSharedPreferences(appContext, applicationIOScope)
+    }
+
+    // App services that should be run as soon as there are subscribers to their flows
+    val locationManager = LocationState(appContext, applicationIOScope)
+    val connManager = ConnectivityManager(appContext, applicationIOScope)
+
+    val uiState by lazy {
+        UiSettingsState(uiPrefs.value, connManager.isMobileOrFalse, applicationIOScope)
+    }
+
+    val torManager = TorManager(torPrefs, appContext, applicationIOScope)
+
+    // Service that will run at all times to receive events from Pokey
+    val pokeyReceiver = PokeyReceiver()
+
+    // Key cache service to download and decrypt encrypted files before caching them.
+    val keyCache = EncryptionKeyCache()
+
+    // 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,
+        )
+
+    // Offers easy methods to know when connections are happening through Tor or not
+    val roleBasedHttpClientBuilder = RoleBasedHttpClientBuilder(okHttpClients, torPrefs.value)
+
+    // Application-wide block height request cache
+    val otsBlockHeightCache by lazy { OtsBlockHeightCache() }
+
+    val otsResolverBuilder: TorAwareOkHttpOtsResolverBuilder =
+        TorAwareOkHttpOtsResolverBuilder(
+            roleBasedHttpClientBuilder::okHttpClientForMoney,
+            roleBasedHttpClientBuilder::shouldUseTorForMoneyOperations,
+            otsBlockHeightCache,
+        )
+
+    // Application-wide ots verification cache
+    val otsVerifCache by lazy { VerificationStateCache(otsResolverBuilder) }
+
+    val torEvaluatorFlow =
+        TorRelayState(
+            okHttpClients,
+            torPrefs.value,
+            applicationDefaultScope,
+        )
+
+    // Connects the NostrClient class with okHttp
+    val websocketBuilder =
+        OkHttpWebSocket.Builder { url ->
+            val useTor = torEvaluatorFlow.flow.value.useTor(url)
+            okHttpClientForRelays.getHttpClient(useTor)
+        }
+
+    // Caches all events in Memory
+    val cache: LocalCache = LocalCache
+
+    // Provides a relay pool
+    val client: INostrClient = NostrClient(websocketBuilder, applicationDefaultScope)
+
+    // Watches for changes on Tor and Relay List Settings
+    val relayProxyClientConnector =
+        RelayProxyClientConnector(
+            torEvaluatorFlow.flow,
+            okHttpClientForRelays,
+            connManager,
+            torManager,
+            client,
+            applicationDefaultScope,
+        )
+
+    // 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, applicationDefaultScope)
+
+    // Tries to verify new OTS events when they arrive.
+    val otsEventVerifier = IncomingOtsEventVerifier(otsVerifCache, cache, applicationDefaultScope)
+
+    // Tracks if it is possible to connect to relays.
+    val failureTracker = RelayOfflineTracker(client)
+
+    // Captures statistics about relays
+    val relayStats = RelayStats(client)
+
+    // Logs debug messages when needed
+    val detailedLogger = if (isDebug) RelayLogger(client, true, false) else null
+    val relayReqStats = if (isDebug) RelayReqStats(client) else null
+    val logger = if (isDebug) RelaySpeedLogger(client) else null
+
+    // Coordinates all subscriptions for the Nostr Client
+    val sources: RelaySubscriptionsCoordinator =
+        RelaySubscriptionsCoordinator(
+            LocalCache,
+            client,
+            authCoordinator.receiver,
+            failureTracker,
+            applicationDefaultScope,
+        )
+
+    // keeps all accounts live
+    val accountsCache =
+        AccountCacheState(
+            geolocationFlow = locationManager.geohashStateFlow,
+            nwcFilterAssembler = sources.nwc,
+            contentResolverFn = ::contentResolverFn,
+            otsResolverBuilder = otsResolverBuilder,
+            cache = cache,
+            client = client,
+        )
+
+    // Organizes cache clearing
+    val trimmingService = MemoryTrimmingService(cache)
+
+    // as new accounts are loaded, updates the state of the TorRelaySettings, which produces new TorRelayEvaluator
+    // and reconnects relays if the configuration has been changed.
+    val accountsTorStateConnector = AccountsTorStateConnector(accountsCache, torEvaluatorFlow, applicationDefaultScope)
+
+    // saves the .content of NIP-95 blobs in disk to save memory
+    val nip95cache: File by lazy { Nip95CacheFactory.new(appContext) }
+
+    // local video cache with disk + memory
+    val videoCache: VideoCache by lazy { VideoCacheFactory.new(appContext) }
+
+    // image cache in disk for coil
+    val diskCache: DiskCache by lazy { ImageCacheFactory.newDisk(appContext) }
+
+    // image cache in memory for coil
+    val memoryCache: MemoryCache by lazy { ImageCacheFactory.newMemory(appContext) }
+
+    // crash report storage
+    val crashReportCache: CrashReportCache by lazy { CrashReportCache(appContext) }
+
+    // cache for NIP-11 documents
+    val nip11Cache: Nip11CachedRetriever by lazy {
+        Nip11CachedRetriever(torEvaluatorFlow::okHttpClientForRelay)
+    }
+
+    fun contentResolverFn(): ContentResolver = appContext.contentResolver
+
+    fun setImageLoader() {
+        ImageLoaderSetup.setup(appContext, { diskCache }, { memoryCache }) { url ->
+            okHttpClients.getHttpClient(roleBasedHttpClientBuilder.shouldUseTorForImageDownload(url))
+        }
+    }
+
+    fun encryptedStorage(npub: String? = null): EncryptedSharedPreferences = EncryptedStorage.preferences(appContext, npub)
+
+    fun initiate(appContext: Context) {
+        Thread.setDefaultUncaughtExceptionHandler(UnexpectedCrashSaver(crashReportCache, applicationIOScope))
+
+        applicationIOScope.launch {
+            // loads main account quickly.
+            LocalPreferences.loadAccountConfigFromEncryptedStorage()
+        }
+
+        // forces initialization of uiPrefs in the main thread to avoid blinking themes
+        uiPrefs
+
+        // initializes diskcache on an IO thread.
+        applicationIOScope.launch {
+            // preloads tor preferences
+            torPrefs
+        }
+
+        // initializes diskcache on an IO thread.
+        applicationIOScope.launch {
+            // Sets Coil - Tor - OkHttp link
+            setImageLoader()
+        }
+
+        // registers to receive events
+        pokeyReceiver.register(appContext)
+    }
+
+    fun terminate(appContext: Context) {
+        pokeyReceiver.unregister(appContext)
+        applicationIOScope.cancel("Application onTerminate $appContext")
+        applicationDefaultScope.cancel("Application onTerminate $appContext")
+        accountsCache.clear()
+    }
+
+    fun trim() {
+        applicationDefaultScope.launch {
+            val loggedIn = accountsCache.accounts.value.values
+            trimmingService.run(loggedIn, LocalPreferences.allSavedAccounts())
+        }
+    }
+}

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

@@ -0,0 +1,241 @@
+/**
+ * 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 android.app.ActivityManager
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.os.Debug
+import androidx.core.content.getSystemService
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.normalizedUrls
+import com.vitorpamplona.quartz.utils.Log
+import kotlin.time.DurationUnit
+import kotlin.time.measureTimedValue
+
+@Suppress("SENSELESS_COMPARISON")
+val isDebug = BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "benchmark"
+
+private const val STATE_DUMP_TAG = "STATE DUMP"
+
+fun debugState(context: Context) {
+    val totalMemoryMb = Runtime.getRuntime().totalMemory() / (1024 * 1024)
+    val freeMemoryMb = Runtime.getRuntime().freeMemory() / (1024 * 1024)
+    val maxMemoryMb = Runtime.getRuntime().maxMemory() / (1024 * 1024)
+
+    val jvmHeapAllocatedMb = totalMemoryMb - freeMemoryMb
+
+    Log.d(STATE_DUMP_TAG, "Total Heap Allocated: $jvmHeapAllocatedMb/$maxMemoryMb MB")
+
+    val nativeHeap = Debug.getNativeHeapAllocatedSize() / (1024 * 1024)
+    val maxNative = Debug.getNativeHeapSize() / (1024 * 1024)
+
+    Log.d(STATE_DUMP_TAG, "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_TAG, "Memory Class $memClass MB (largeHeap $isLargeHeap)")
+    }
+
+    Log.d(
+        STATE_DUMP_TAG,
+        "Connected Relays: " +
+            Amethyst.instance.client
+                .relayStatusFlow()
+                .value.connected.size + "/" +
+            Amethyst.instance.client
+                .relayStatusFlow()
+                .value.available.size,
+    )
+
+    Log.d(
+        STATE_DUMP_TAG,
+        "Indexed Relays: " +
+            Amethyst.instance.cache.relayHints.relayDB
+                .size() + "/" + normalizedUrls.size(),
+    )
+
+    Log.d(
+        STATE_DUMP_TAG,
+        "Image Disk Cache ${(Amethyst.instance.diskCache.size) / (1024 * 1024)}/${(Amethyst.instance.diskCache.maxSize) / (1024 * 1024)} MB",
+    )
+    Log.d(
+        STATE_DUMP_TAG,
+        "Image Memory Cache ${(Amethyst.instance.memoryCache.size) / (1024 * 1024)}/${(Amethyst.instance.memoryCache.maxSize) / (1024 * 1024)} MB",
+    )
+
+    Log.d(
+        STATE_DUMP_TAG,
+        "Notes: " +
+            LocalCache.notes.filter { _, it -> it.flowSet != null }.size +
+            " / " +
+            LocalCache.notes.filter { _, it -> it.event != null }.size +
+            " / " +
+            LocalCache.notes.size(),
+    )
+    Log.d(
+        STATE_DUMP_TAG,
+        "Addressables: " +
+            LocalCache.addressables.filter { _, it -> it.flowSet != null }.size +
+            " / " +
+            LocalCache.addressables.filter { _, it -> it.event != null }.size +
+            " / " +
+            LocalCache.addressables.size(),
+    )
+    Log.d(
+        STATE_DUMP_TAG,
+        "Users: " +
+            LocalCache.users.filter { _, it -> it.flowSet != null }.size +
+            " / " +
+            LocalCache.users.filter { _, it -> it.latestMetadata != null }.size +
+            " / " +
+            LocalCache.users.size(),
+    )
+    Log.d(
+        STATE_DUMP_TAG,
+        "Public Chat Channels: " +
+            LocalCache.publicChatChannels.filter { _, it -> it.flowSet != null }.size +
+            " / " +
+            LocalCache.publicChatChannels.size() +
+            " / " +
+            LocalCache.publicChatChannels.values().sumOf { it.notes.size() },
+    )
+    Log.d(
+        STATE_DUMP_TAG,
+        "Live Chat Channels: " +
+            LocalCache.liveChatChannels.filter { _, it -> it.flowSet != null }.size +
+            " / " +
+            LocalCache.liveChatChannels.size() +
+            " / " +
+            LocalCache.liveChatChannels.values().sumOf { it.notes.size() },
+    )
+    Log.d(
+        STATE_DUMP_TAG,
+        "Ephemeral Chat Channels: " +
+            LocalCache.ephemeralChannels.filter { _, it -> it.flowSet != null }.size +
+            " / " +
+            LocalCache.ephemeralChannels.size() +
+            " / " +
+            LocalCache.ephemeralChannels.values().sumOf { it.notes.size() },
+    )
+    LocalCache.chatroomList.forEach { key, room ->
+        Log.d(
+            STATE_DUMP_TAG,
+            "Private Chats $key: " +
+                room.rooms.size() +
+                " / " +
+                room.rooms.sumOf { key, value -> value.messages.size },
+        )
+    }
+    Log.d(
+        STATE_DUMP_TAG,
+        "Deletion Events: " +
+            LocalCache.deletionIndex.size(),
+    )
+    Log.d(
+        STATE_DUMP_TAG,
+        "Observable Events: " +
+            LocalCache.observablesByKindAndETag.size +
+            " / " +
+            LocalCache.observablesByKindAndAuthor.size,
+    )
+
+    Log.d(
+        STATE_DUMP_TAG,
+        "Spam: " +
+            LocalCache.antiSpam.spamMessages.size() + " / " + LocalCache.antiSpam.recentEventIds.size() + " / " + LocalCache.antiSpam.recentAddressables.size(),
+    )
+
+    Log.d(
+        STATE_DUMP_TAG,
+        "Memory used by Events: " +
+            LocalCache.notes.sumOf { _, note -> note.event?.countMemory() ?: 0 } / (1024 * 1024) +
+            " MB",
+    )
+
+    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()?.toLong() ?: 0L })
+    val bytesAddressables =
+        LocalCache.addressables
+            .sumByGroup(groupMap = { _, it -> it.event?.kind }, sumOf = { _, it -> it.event?.countMemory()?.toLong() ?: 0L })
+
+    qttNotes.toList().sortedByDescending { bytesNotes[it.first] }.forEach { (kind, qtt) ->
+        Log.d(STATE_DUMP_TAG, "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesNotes[kind]?.div((1024 * 1024))}MB ")
+    }
+    qttAddressables.toList().sortedByDescending { bytesNotes[it.first] }.forEach { (kind, qtt) ->
+        Log.d(STATE_DUMP_TAG, "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

@@ -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
+
+import android.content.Context
+import androidx.security.crypto.EncryptedSharedPreferences
+import androidx.security.crypto.MasterKey
+
+class EncryptedStorage {
+    companion object {
+        private const val PREFERENCES_NAME = "secret_keeper"
+
+        // returns the preferences for each account or a global file if null.
+        fun prefsFileName(npub: String? = null): String = if (npub == null) PREFERENCES_NAME else "${PREFERENCES_NAME}_$npub"
+
+        fun preferences(
+            applicationContext: Context,
+            npub: String? = null,
+        ): EncryptedSharedPreferences {
+            val masterKey: MasterKey =
+                MasterKey
+                    .Builder(applicationContext, MasterKey.DEFAULT_MASTER_KEY_ALIAS)
+                    .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+                    .build()
+
+            return EncryptedSharedPreferences.create(
+                applicationContext,
+                prefsFileName(npub),
+                masterKey,
+                EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+                EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM,
+            ) as EncryptedSharedPreferences
+        }
+    }
+}

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

@@ -0,0 +1,602 @@
+/**
+ * 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 android.annotation.SuppressLint
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.compose.runtime.Immutable
+import androidx.core.content.edit
+import com.vitorpamplona.amethyst.model.ALL_FOLLOWS
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
+import com.vitorpamplona.amethyst.model.UiSettings
+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.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.JsonMapper
+import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper
+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.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.IndexerRelayListEvent
+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 com.vitorpamplona.quartz.utils.Log
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.Serializable
+import java.io.File
+
+// Release mode (!BuildConfig.DEBUG) always uses encrypted preferences
+// To use plaintext SharedPreferences for debugging, set this to true
+// It will only apply in Debug builds
+private const val DEBUG_PLAINTEXT_PREFERENCES = false
+private const val DEBUG_PREFERENCES_NAME = "debug_prefs"
+
+@Immutable
+@Serializable
+data class AccountInfo(
+    val npub: String,
+    val hasPrivKey: Boolean,
+    val loggedInWithExternalSigner: Boolean,
+    val isTransient: Boolean,
+)
+
+private object PrefKeys {
+    const val CURRENT_ACCOUNT = "currently_logged_in_account"
+    const val SAVED_ACCOUNTS = "all_saved_accounts"
+    const val NOSTR_PRIVKEY = "nostr_privkey"
+    const val NOSTR_PUBKEY = "nostr_pubkey"
+    const val LOCAL_RELAY_SERVERS = "localRelayServers"
+    const val DEFAULT_FILE_SERVER = "defaultFileServer"
+    const val DEFAULT_HOME_FOLLOW_LIST = "defaultHomeFollowList"
+    const val DEFAULT_STORIES_FOLLOW_LIST = "defaultStoriesFollowList"
+    const val DEFAULT_NOTIFICATION_FOLLOW_LIST = "defaultNotificationFollowList"
+    const val DEFAULT_DISCOVERY_FOLLOW_LIST = "defaultDiscoveryFollowList"
+    const val ZAP_PAYMENT_REQUEST_SERVER = "zapPaymentServer"
+    const val LATEST_USER_METADATA = "latestUserMetadata"
+    const val LATEST_CONTACT_LIST = "latestContactList"
+    const val LATEST_DM_RELAY_LIST = "latestDMRelayList"
+    const val LATEST_NIP65_RELAY_LIST = "latestNIP65RelayList"
+    const val LATEST_SEARCH_RELAY_LIST = "latestSearchRelayList"
+    const val LATEST_INDEX_RELAY_LIST = "latestIndexRelayList"
+    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 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"
+    const val HAS_DONATED_IN_VERSION = "has_donated_in_version"
+    const val PENDING_ATTESTATIONS = "pending_attestations"
+
+    const val ALL_ACCOUNT_INFO = "all_saved_accounts_info"
+    const val SHARED_SETTINGS = "shared_settings"
+}
+
+object LocalPreferences {
+    private const val COMMA = ","
+
+    private var currentAccount: String? = null
+    private val savedAccounts: MutableStateFlow<List<AccountInfo>?> = MutableStateFlow(null)
+    private val cachedAccounts: MutableMap<String, AccountSettings?> = mutableMapOf()
+
+    suspend fun currentAccount(): String? {
+        if (currentAccount == null) {
+            currentAccount =
+                withContext(Dispatchers.IO) {
+                    encryptedPreferences().getString(PrefKeys.CURRENT_ACCOUNT, null)
+                }
+        }
+        return currentAccount
+    }
+
+    private suspend fun updateCurrentAccount(info: AccountInfo?) {
+        if (info == null) {
+            currentAccount = null
+            withContext(Dispatchers.IO) {
+                encryptedPreferences().edit { clear() }
+            }
+        } else if (currentAccount != info.npub) {
+            currentAccount = info.npub
+            if (!info.isTransient) {
+                withContext(Dispatchers.IO) {
+                    encryptedPreferences().edit { putString(PrefKeys.CURRENT_ACCOUNT, info.npub) }
+                }
+            }
+        }
+    }
+
+    private suspend fun savedAccounts(): List<AccountInfo> {
+        if (savedAccounts.value == null) {
+            withContext(Dispatchers.IO) {
+                with(encryptedPreferences()) {
+                    val newSystemOfAccounts =
+                        getString(PrefKeys.ALL_ACCOUNT_INFO, "[]")?.let {
+                            JsonMapper.fromJson<List<AccountInfo>>(it)
+                        }
+
+                    if (!newSystemOfAccounts.isNullOrEmpty()) {
+                        savedAccounts.emit(newSystemOfAccounts)
+                    } else {
+                        val oldAccounts = getString(PrefKeys.SAVED_ACCOUNTS, null)?.split(COMMA) ?: listOf()
+
+                        val migrated =
+                            oldAccounts.map { npub ->
+                                AccountInfo(
+                                    npub,
+                                    encryptedPreferences(npub).getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false),
+                                    (encryptedPreferences(npub).getString(PrefKeys.NOSTR_PRIVKEY, "") ?: "").isNotBlank(),
+                                    false,
+                                )
+                            }
+
+                        savedAccounts.emit(migrated)
+
+                        edit {
+                            putString(PrefKeys.ALL_ACCOUNT_INFO, JsonMapper.toJson(migrated))
+                        }
+                    }
+                }
+            }
+        }
+        // it's always not null when it gets here.
+        return savedAccounts.value!!
+    }
+
+    fun accountsFlow() = savedAccounts
+
+    private suspend fun updateSavedAccounts(accounts: List<AccountInfo>) =
+        withContext(Dispatchers.IO) {
+            if (savedAccounts != accounts) {
+                savedAccounts.emit(accounts)
+
+                encryptedPreferences()
+                    .edit {
+                        putString(
+                            PrefKeys.ALL_ACCOUNT_INFO,
+                            JsonMapper.toJson(accounts.filter { !it.isTransient }),
+                        )
+                    }
+            }
+        }
+
+    private val prefsDirPath: String
+        get() = "${Amethyst.instance.appContext.filesDir.parent}/shared_prefs/"
+
+    private suspend fun addAccount(accInfo: AccountInfo) {
+        val accounts = savedAccounts().filter { it.npub != accInfo.npub }.plus(accInfo)
+        updateSavedAccounts(accounts)
+    }
+
+    private suspend fun setCurrentAccount(accountSettings: AccountSettings) {
+        val npub = accountSettings.keyPair.pubKey.toNpub()
+        val accInfo =
+            AccountInfo(
+                npub,
+                accountSettings.isWriteable(),
+                accountSettings.externalSignerPackageName != null,
+                accountSettings.transientAccount,
+            )
+        updateCurrentAccount(accInfo)
+        addAccount(accInfo)
+    }
+
+    suspend fun switchToAccount(accountInfo: AccountInfo) = updateCurrentAccount(accountInfo)
+
+    /** Removes the account from the app level shared preferences */
+    private suspend fun removeAccount(accountInfo: AccountInfo) {
+        updateSavedAccounts(savedAccounts().filter { it.npub != accountInfo.npub })
+    }
+
+    /** Deletes the npub-specific shared preference file */
+    private suspend fun deleteUserPreferenceFile(npub: String) {
+        withContext(Dispatchers.IO) {
+            val prefsDir = File(prefsDirPath)
+            prefsDir.list()?.forEach {
+                if (it.contains(npub)) {
+                    File(prefsDir, it).delete()
+                }
+            }
+        }
+    }
+
+    private fun encryptedPreferences(npub: String? = null): SharedPreferences {
+        checkNotInMainThread()
+
+        return if (BuildConfig.DEBUG && DEBUG_PLAINTEXT_PREFERENCES) {
+            val preferenceFile =
+                if (npub == null) DEBUG_PREFERENCES_NAME else "${DEBUG_PREFERENCES_NAME}_$npub"
+            Amethyst.instance.appContext.getSharedPreferences(preferenceFile, Context.MODE_PRIVATE)
+        } else {
+            Amethyst.instance.encryptedStorage(npub)
+        }
+    }
+
+    /**
+     * Clears the preferences for a given npub, deletes the preferences xml file, and switches the
+     * user to the first account in the list if it exists
+     *
+     * We need to use `commit()` to write changes to disk and release the file lock so that it can be
+     * deleted. If we use `apply()` there is a race condition and the file will probably not be
+     * deleted
+     */
+    @SuppressLint("ApplySharedPref")
+    suspend fun deleteAccount(accountInfo: AccountInfo) {
+        Log.d("LocalPreferences", "Saving to encrypted storage updatePrefsForLogout ${accountInfo.npub}")
+        withContext(Dispatchers.IO) {
+            encryptedPreferences(accountInfo.npub).edit(commit = true) { clear() }
+            removeAccount(accountInfo)
+            deleteUserPreferenceFile(accountInfo.npub)
+
+            if (savedAccounts().isEmpty()) {
+                updateCurrentAccount(null)
+            } else if (currentAccount() == accountInfo.npub) {
+                updateCurrentAccount(savedAccounts().elementAt(0))
+            }
+        }
+    }
+
+    suspend fun setDefaultAccount(accountSettings: AccountSettings) {
+        setCurrentAccount(accountSettings)
+        saveToEncryptedStorage(accountSettings)
+    }
+
+    suspend fun allSavedAccounts(): List<AccountInfo> = savedAccounts()
+
+    suspend fun saveToEncryptedStorage(settings: AccountSettings) {
+        Log.d("LocalPreferences", "Saving to encrypted storage")
+        if (!settings.transientAccount) {
+            withContext(Dispatchers.IO) {
+                val prefs = encryptedPreferences(settings.keyPair.pubKey.toNpub())
+                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.toJson(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,
+                    )
+
+                    putOrRemove(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, settings.zapPaymentRequest.value?.denormalize())
+
+                    putOrRemove(PrefKeys.LATEST_CONTACT_LIST, settings.backupContactList)
+
+                    putOrRemove(PrefKeys.LATEST_USER_METADATA, settings.backupUserMetadata)
+                    putOrRemove(PrefKeys.LATEST_DM_RELAY_LIST, settings.backupDMRelayList)
+                    putOrRemove(PrefKeys.LATEST_NIP65_RELAY_LIST, settings.backupNIP65RelayList)
+                    putOrRemove(PrefKeys.LATEST_SEARCH_RELAY_LIST, settings.backupSearchRelayList)
+                    putOrRemove(PrefKeys.LATEST_INDEX_RELAY_LIST, settings.backupIndexRelayList)
+                    putOrRemove(PrefKeys.LATEST_BLOCKED_RELAY_LIST, settings.backupBlockedRelayList)
+                    putOrRemove(PrefKeys.LATEST_TRUSTED_RELAY_LIST, settings.backupTrustedRelayList)
+
+                    if (settings.localRelayServers.value.isNotEmpty()) {
+                        putStringSet(PrefKeys.LOCAL_RELAY_SERVERS, settings.localRelayServers.value)
+                    } else {
+                        remove(PrefKeys.LOCAL_RELAY_SERVERS)
+                    }
+
+                    putOrRemove(PrefKeys.LATEST_MUTE_LIST, settings.backupMuteList)
+                    putOrRemove(PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST, settings.backupPrivateHomeRelayList)
+                    putOrRemove(PrefKeys.LATEST_APP_SPECIFIC_DATA, settings.backupAppSpecificData)
+
+                    putOrRemove(PrefKeys.LATEST_CHANNEL_LIST, settings.backupChannelList)
+                    putOrRemove(PrefKeys.LATEST_COMMUNITY_LIST, settings.backupCommunityList)
+                    putOrRemove(PrefKeys.LATEST_HASHTAG_LIST, settings.backupHashtagList)
+                    putOrRemove(PrefKeys.LATEST_GEOHASH_LIST, settings.backupGeohashList)
+                    putOrRemove(PrefKeys.LATEST_EPHEMERAL_LIST, settings.backupEphemeralChatList)
+
+                    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)
+
+                    val regularMap =
+                        settings.lastReadPerRoute.value.mapValues {
+                            it.value.value
+                        }
+
+                    putString(
+                        PrefKeys.LAST_READ_PER_ROUTE,
+                        JsonMapper.toJson(regularMap),
+                    )
+                    putStringSet(PrefKeys.HAS_DONATED_IN_VERSION, settings.hasDonatedInVersion.value)
+
+                    putString(
+                        PrefKeys.PENDING_ATTESTATIONS,
+                        JsonMapper.toJson(settings.pendingAttestations.value),
+                    )
+                }
+            }
+        }
+        Log.d("LocalPreferences", "Saved to encrypted storage")
+    }
+
+    suspend fun loadAccountConfigFromEncryptedStorage(): AccountSettings? = currentAccount()?.let { loadAccountConfigFromEncryptedStorage(it) }
+
+    fun saveSharedSettings(
+        sharedSettings: UiSettings,
+        prefs: SharedPreferences = encryptedPreferences(),
+    ) {
+        Log.d("LocalPreferences", "Saving to shared settings")
+        prefs.edit {
+            putString(PrefKeys.SHARED_SETTINGS, JsonMapper.toJson(sharedSettings))
+        }
+    }
+
+    fun loadSharedSettings(prefs: SharedPreferences = encryptedPreferences()): UiSettings? {
+        Log.d("LocalPreferences", "Load shared settings")
+        with(prefs) {
+            return try {
+                getString(PrefKeys.SHARED_SETTINGS, "{}")?.let {
+                    JsonMapper.fromJson<UiSettings>(it)
+                }
+            } catch (e: Throwable) {
+                if (e is CancellationException) throw e
+                Log.w(
+                    "LocalPreferences",
+                    "Unable to decode shared preferences: ${getString(PrefKeys.SHARED_SETTINGS, null)}",
+                    e,
+                )
+                null
+            }
+        }
+    }
+
+    val mutex = Mutex()
+
+    suspend fun loadAccountConfigFromEncryptedStorage(npub: String): AccountSettings? {
+        // if already loaded, return right away
+        if (cachedAccounts.containsKey(npub)) {
+            return cachedAccounts[npub]
+        }
+
+        return withContext(Dispatchers.IO) {
+            mutex.withLock {
+                if (cachedAccounts.containsKey(npub)) {
+                    return@withContext cachedAccounts.get(npub)
+                }
+
+                val accountSettings = innerLoadCurrentAccountFromEncryptedStorage(npub)
+
+                cachedAccounts.put(npub, accountSettings)
+
+                return@withContext accountSettings
+            }
+        }
+    }
+
+    private suspend fun innerLoadCurrentAccountFromEncryptedStorage(npub: String?): AccountSettings? {
+        Log.d("LocalPreferences", "Load account from file $npub")
+        val result =
+            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
+
+                    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 zapPaymentRequestServer = parseOrNull<Nip47WalletConnect.Nip47URI>(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER)
+                    val defaultFileServer = parseOrNull<ServerName>(PrefKeys.DEFAULT_FILE_SERVER) ?: DEFAULT_MEDIA_SERVERS[0]
+
+                    val pendingAttestations = parseOrNull<Map<HexKey, String>>(PrefKeys.PENDING_ATTESTATIONS) ?: mapOf()
+                    val localRelayServers = getStringSet(PrefKeys.LOCAL_RELAY_SERVERS, null) ?: setOf()
+
+                    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 latestIndexRelayList = parseEventOrNull<IndexerRelayListEvent>(PrefKeys.LATEST_INDEX_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 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 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,
+                        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,
+                        backupIndexRelayList = latestIndexRelayList,
+                        backupBlockedRelayList = latestBlockedRelayList,
+                        backupTrustedRelayList = latestTrustedRelayList,
+                        backupPrivateHomeRelayList = latestPrivateHomeRelayList,
+                        backupMuteList = latestMuteList,
+                        backupAppSpecificData = latestAppSpecificData,
+                        backupChannelList = latestChannelList,
+                        backupCommunityList = latestCommunityList,
+                        backupHashtagList = latestHashtagList,
+                        backupGeohashList = latestGeohashList,
+                        backupEphemeralChatList = latestEphemeralList,
+                        lastReadPerRoute = MutableStateFlow(lastReadPerRoute),
+                        hasDonatedInVersion = MutableStateFlow(hasDonatedInVersion),
+                        pendingAttestations = MutableStateFlow(pendingAttestations),
+                    )
+                }
+            }
+        Log.d("LocalPreferences", "Loaded account from file $npub")
+        return result
+    }
+
+    private inline fun <reified T : Any> SharedPreferences.parseOrNull(key: String): T? {
+        val value = getString(key, null)
+        if (value.isNullOrEmpty() || value == "null") {
+            return null
+        }
+        return try {
+            if (T::class.java.isInstance(Event::class.java)) {
+                Event.fromJson(value) as T?
+            } else {
+                JsonMapper.fromJson<T>(value)
+            }
+        } catch (e: Throwable) {
+            if (e is CancellationException) throw e
+            Log.w("LocalPreferences", "Error Decoding $key from Preferences with value $value", e)
+            null
+        }
+    }
+
+    private inline fun <reified T> SharedPreferences.parseEventOrNull(key: String): T? {
+        val value = getString(key, null)
+        if (value.isNullOrEmpty() || value == "null") {
+            return null
+        }
+        return try {
+            Event.fromJson(value) as T?
+        } catch (e: Throwable) {
+            if (e is CancellationException) throw e
+            Log.w("LocalPreferences", "Error Decoding $key from Preferences with value $value", e)
+            null
+        }
+    }
+
+    fun SharedPreferences.Editor.putOrRemove(
+        key: String,
+        event: Any?,
+    ) {
+        if (event != null) {
+            putString(key, JsonMapper.toJson(event))
+        } else {
+            remove(key)
+        }
+    }
+
+    fun SharedPreferences.Editor.putOrRemove(
+        key: String,
+        event: Event?,
+    ) {
+        if (event != null) {
+            putString(key, OptimizedJsonMapper.toJson(event))
+        } else {
+            remove(key)
+        }
+    }
+
+    fun SharedPreferences.Editor.putOrRemove(
+        key: String,
+        nwc: Nip47WalletConnect.Nip47URI?,
+    ) {
+        if (nwc != null) {
+            putString(key, JsonMapper.toJson(nwc))
+        } else {
+            remove(key)
+        }
+    }
+}

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

@@ -0,0 +1,595 @@
+/**
+ * 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 androidx.compose.runtime.Stable
+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.quartz.experimental.ephemChat.list.EphemeralChatListEvent
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
+import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
+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.IndexerRelayListEvent
+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.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
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
+import java.util.Locale
+
+val DefaultChannels =
+    listOf(
+        // Anigma's Nostr
+        ChannelTag("25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb", Constants.nos),
+        // Amethyst's Group
+        ChannelTag("42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5", Constants.nos),
+    )
+
+val DefaultNIP65RelaySet = setOf(Constants.mom, Constants.nos, Constants.bitcoiner)
+
+val DefaultNIP65List =
+    listOf(
+        AdvertisedRelayInfo(Constants.mom, AdvertisedRelayType.BOTH),
+        AdvertisedRelayInfo(Constants.nos, AdvertisedRelayType.BOTH),
+        AdvertisedRelayInfo(Constants.bitcoiner, AdvertisedRelayType.BOTH),
+    )
+
+val DefaultDMRelayList = listOf(Constants.auth, Constants.oxchat, Constants.nos)
+
+val DefaultSearchRelayList = setOf(Constants.band, Constants.wine, Constants.where, Constants.nostoday)
+
+val DefaultIndexerRelayList = setOf(Constants.purplepages, Constants.coracle, Constants.userkinds)
+
+val DefaultSignerPermissions =
+    listOf(
+        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 ALL_FOLLOWS = " All Follows "
+
+// This has spaces to avoid mixing with a potential NIP-51 list with the same name.
+val ALL_USER_FOLLOWS = " All User Follows "
+
+// This has spaces to avoid mixing with a potential NIP-51 list with the same name.
+val KIND3_FOLLOWS = " Main User Follows "
+
+// This has spaces to avoid mixing with a potential NIP-51 list with the same name.
+val AROUND_ME = " Around Me "
+
+@Stable
+class AccountSettings(
+    val keyPair: KeyPair,
+    val transientAccount: Boolean = false,
+    var externalSignerPackageName: String? = null,
+    var localRelayServers: MutableStateFlow<Set<String>> = MutableStateFlow(setOf()),
+    var defaultFileServer: ServerName = DEFAULT_MEDIA_SERVERS[0],
+    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: MutableStateFlow<Nip47WalletConnect.Nip47URINorm?> = MutableStateFlow(null),
+    var hideDeleteRequestDialog: Boolean = false,
+    var hideBlockAlertDialog: Boolean = false,
+    var hideNIP17WarningDialog: Boolean = false,
+    var backupUserMetadata: MetadataEvent? = null,
+    var backupContactList: ContactListEvent? = null,
+    var backupDMRelayList: ChatMessageRelayListEvent? = null,
+    var backupNIP65RelayList: AdvertisedRelayListEvent? = null,
+    var backupSearchRelayList: SearchRelayListEvent? = null,
+    var backupIndexRelayList: IndexerRelayListEvent? = null,
+    var backupBlockedRelayList: BlockedRelayListEvent? = null,
+    var backupTrustedRelayList: TrustedRelayListEvent? = null,
+    var backupMuteList: MuteListEvent? = null,
+    var backupPrivateHomeRelayList: PrivateOutboxRelayListEvent? = null,
+    var backupAppSpecificData: AppSpecificDataEvent? = null,
+    var backupChannelList: ChannelListEvent? = null,
+    var backupCommunityList: CommunityListEvent? = null,
+    var backupHashtagList: HashtagListEvent? = null,
+    var backupGeohashList: GeohashListEvent? = null,
+    var backupEphemeralChatList: EphemeralChatListEvent? = null,
+    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(null))
+    val syncedSettings: AccountSyncedSettings = AccountSyncedSettings(AccountSyncedSettingsInternal())
+
+    class AccountSettingsUpdater(
+        val accountSettings: AccountSettings?,
+    )
+
+    fun saveAccountSettings() {
+        saveable.update { AccountSettingsUpdater(this) }
+    }
+
+    fun isWriteable(): Boolean = keyPair.privKey != null || externalSignerPackageName != null
+
+    // ---
+    // Zaps and Reactions
+    // ---
+
+    fun changeDefaultZapType(zapType: LnZapEvent.ZapType): Boolean {
+        if (syncedSettings.zaps.defaultZapType.value != zapType) {
+            syncedSettings.zaps.defaultZapType.tryEmit(zapType)
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
+    fun changeZapAmounts(newAmounts: List<Long>): Boolean {
+        if (syncedSettings.zaps.zapAmountChoices.value != newAmounts) {
+            syncedSettings.zaps.zapAmountChoices.tryEmit(newAmounts.toImmutableList())
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
+    fun changeReactionTypes(newTypes: List<String>): Boolean {
+        if (syncedSettings.reactions.reactionChoices.value != newTypes) {
+            syncedSettings.reactions.reactionChoices.tryEmit(newTypes.toImmutableList())
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
+    fun changeZapPaymentRequest(newServer: Nip47WalletConnect.Nip47URINorm?): Boolean {
+        if (zapPaymentRequest.value != newServer) {
+            zapPaymentRequest.tryEmit(newServer)
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
+    // ---
+    // file servers
+    // ---
+
+    fun changeDefaultFileServer(server: ServerName) {
+        if (defaultFileServer != server) {
+            defaultFileServer = server
+            saveAccountSettings()
+        }
+    }
+
+    // ---
+    // list names
+    // ---
+
+    fun changeDefaultHomeFollowList(name: FeedDefinition) {
+        changeDefaultHomeFollowList(name.code)
+    }
+
+    fun changeDefaultHomeFollowList(name: String) {
+        if (defaultHomeFollowList.value != name) {
+            defaultHomeFollowList.tryEmit(name)
+            saveAccountSettings()
+        }
+    }
+
+    fun changeDefaultStoriesFollowList(name: FeedDefinition) {
+        changeDefaultStoriesFollowList(name.code)
+    }
+
+    fun changeDefaultStoriesFollowList(name: String) {
+        if (defaultStoriesFollowList.value != name) {
+            defaultStoriesFollowList.tryEmit(name)
+            saveAccountSettings()
+        }
+    }
+
+    fun changeDefaultNotificationFollowList(name: FeedDefinition) {
+        changeDefaultNotificationFollowList(name.code)
+    }
+
+    fun changeDefaultNotificationFollowList(name: String) {
+        if (defaultNotificationFollowList.value != name) {
+            defaultNotificationFollowList.tryEmit(name)
+            saveAccountSettings()
+        }
+    }
+
+    fun changeDefaultDiscoveryFollowList(name: FeedDefinition) {
+        changeDefaultDiscoveryFollowList(name.code)
+    }
+
+    fun changeDefaultDiscoveryFollowList(name: String) {
+        if (defaultDiscoveryFollowList.value != name) {
+            defaultDiscoveryFollowList.tryEmit(name)
+            saveAccountSettings()
+        }
+    }
+
+    // ---
+    // language services
+    // ---
+    fun toggleDontTranslateFrom(languageCode: String) {
+        syncedSettings.languages.toggleDontTranslateFrom(languageCode)
+        saveAccountSettings()
+    }
+
+    fun translateToContains(languageCode: Locale) = syncedSettings.languages.translateTo.contains(languageCode.language)
+
+    fun updateTranslateTo(languageCode: Locale): Boolean {
+        if (syncedSettings.languages.updateTranslateTo(languageCode)) {
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
+    fun prefer(
+        source: String,
+        target: String,
+        preference: String,
+    ) {
+        syncedSettings.languages.prefer(source, target, preference)
+        saveAccountSettings()
+    }
+
+    fun preferenceBetween(
+        source: String,
+        target: String,
+    ): String? = syncedSettings.languages.preferenceBetween(source, target)
+
+    // ----
+    // Backup Lists
+    // ----
+
+    fun updateLocalRelayServers(servers: Set<String>) {
+        if (localRelayServers.value != servers) {
+            localRelayServers.update { servers }
+            saveAccountSettings()
+        }
+    }
+
+    fun updateUserMetadata(newMetadata: MetadataEvent?) {
+        if (newMetadata == null) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupUserMetadata?.id != newMetadata.id) {
+            backupUserMetadata = newMetadata
+            saveAccountSettings()
+        }
+    }
+
+    fun updateContactListTo(newContactList: ContactListEvent?) {
+        if (newContactList == null || newContactList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupContactList?.id != newContactList.id) {
+            backupContactList = newContactList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateDMRelayList(newDMRelayList: ChatMessageRelayListEvent?) {
+        if (newDMRelayList == null || newDMRelayList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupDMRelayList?.id != newDMRelayList.id) {
+            backupDMRelayList = newDMRelayList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateNIP65RelayList(newNIP65RelayList: AdvertisedRelayListEvent?) {
+        if (newNIP65RelayList == null || newNIP65RelayList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupNIP65RelayList?.id != newNIP65RelayList.id) {
+            backupNIP65RelayList = newNIP65RelayList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateSearchRelayList(newSearchRelayList: SearchRelayListEvent?) {
+        if (newSearchRelayList == null || newSearchRelayList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupSearchRelayList?.id != newSearchRelayList.id) {
+            backupSearchRelayList = newSearchRelayList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateIndexRelayList(newIndexRelayList: IndexerRelayListEvent?) {
+        if (newIndexRelayList == null || newIndexRelayList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupIndexRelayList?.id != newIndexRelayList.id) {
+            backupIndexRelayList = newIndexRelayList
+            saveAccountSettings()
+        }
+    }
+
+    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
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupPrivateHomeRelayList?.id != newPrivateHomeRelayList.id) {
+            backupPrivateHomeRelayList = newPrivateHomeRelayList
+            saveAccountSettings()
+        }
+    }
+
+    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
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupMuteList?.id != newMuteList.id) {
+            backupMuteList = newMuteList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateAppSpecificData(
+        appSettings: AppSpecificDataEvent?,
+        newSyncedSettings: AccountSyncedSettingsInternal,
+    ) {
+        if (appSettings == null || appSettings.content.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupAppSpecificData?.id != appSettings.id) {
+            backupAppSpecificData = appSettings
+            syncedSettings.updateFrom(newSyncedSettings)
+
+            saveAccountSettings()
+        }
+    }
+
+    // ----
+    // Warning dialogs
+    // ----
+
+    fun setHideDeleteRequestDialog() {
+        if (!hideDeleteRequestDialog) {
+            hideDeleteRequestDialog = true
+            saveAccountSettings()
+        }
+    }
+
+    fun setHideNIP17WarningDialog() {
+        if (!hideNIP17WarningDialog) {
+            hideNIP17WarningDialog = true
+            saveAccountSettings()
+        }
+    }
+
+    fun setHideBlockAlertDialog() {
+        if (!hideBlockAlertDialog) {
+            hideBlockAlertDialog = true
+            saveAccountSettings()
+        }
+    }
+
+    // ---
+    // donations
+    // ---
+
+    fun hasDonatedInVersion(versionName: String) = hasDonatedInVersion.value.contains(versionName)
+
+    fun observeDonatedInVersion(versionName: String) =
+        hasDonatedInVersion
+            .map {
+                it.contains(versionName)
+            }
+
+    fun markDonatedInThisVersion(versionName: String): Boolean {
+        if (!hasDonatedInVersion.value.contains(versionName)) {
+            hasDonatedInVersion.update {
+                it + versionName
+            }
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
+    // ----
+    // last read flows
+    // ----
+
+    fun getLastReadFlow(route: String): StateFlow<Long> = lastReadPerRoute.value[route] ?: addLastRead(route, 0)
+
+    private fun addLastRead(
+        route: String,
+        timestampInSecs: Long,
+    ): MutableStateFlow<Long> =
+        MutableStateFlow<Long>(timestampInSecs).also { newFlow ->
+            lastReadPerRoute.update { it + Pair(route, newFlow) }
+            saveAccountSettings()
+        }
+
+    fun markAsRead(
+        route: String,
+        timestampInSecs: Long,
+    ): Boolean {
+        val lastTime = lastReadPerRoute.value[route]
+        return if (lastTime == null) {
+            addLastRead(route, timestampInSecs)
+            true
+        } else if (timestampInSecs > lastTime.value) {
+            lastTime.tryEmit(timestampInSecs)
+            saveAccountSettings()
+            true
+        } else {
+            false
+        }
+    }
+
+    // ---
+    // attestations
+    // ---
+
+    fun addPendingAttestation(
+        id: HexKey,
+        stamp: String,
+    ) {
+        val current = pendingAttestations.value.get(id)
+        if (current == null) {
+            pendingAttestations.update {
+                it + Pair(id, stamp)
+            }
+            saveAccountSettings()
+        } else {
+            if (current != stamp) {
+                pendingAttestations.update {
+                    it + Pair(id, stamp)
+                }
+                saveAccountSettings()
+            }
+        }
+    }
+
+    // ---
+    // filters
+    // ---
+    fun updateShowSensitiveContent(show: Boolean?): Boolean {
+        if (syncedSettings.security.updateShowSensitiveContent(show)) {
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
+    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 {
+            false
+        }
+}

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

@@ -0,0 +1,211 @@
+/**
+ * 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 androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.equalImmutableLists
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import java.util.Locale
+
+@Stable
+class AccountSyncedSettings(
+    internalSettings: AccountSyncedSettingsInternal,
+) {
+    val reactions = AccountReactionPreferences(MutableStateFlow(internalSettings.reactions.reactionChoices.toImmutableList()))
+    val zaps =
+        AccountZapPreferences(
+            MutableStateFlow(internalSettings.zaps.zapAmountChoices.toImmutableList()),
+            MutableStateFlow(internalSettings.zaps.defaultZapType),
+        )
+    val languages =
+        AccountLanguagePreferences(
+            internalSettings.languages.dontTranslateFrom,
+            internalSettings.languages.languagePreferences,
+            internalSettings.languages.translateTo,
+        )
+    val security =
+        AccountSecurityPreferences(
+            MutableStateFlow(internalSettings.security.showSensitiveContent),
+            internalSettings.security.warnAboutPostsWithReports,
+            MutableStateFlow(internalSettings.security.filterSpamFromStrangers),
+        )
+
+    fun toInternal(): AccountSyncedSettingsInternal =
+        AccountSyncedSettingsInternal(
+            reactions = AccountReactionPreferencesInternal(reactions.reactionChoices.value),
+            zaps =
+                AccountZapPreferencesInternal(
+                    zaps.zapAmountChoices.value,
+                    zaps.defaultZapType.value,
+                ),
+            languages =
+                AccountLanguagePreferencesInternal(
+                    languages.dontTranslateFrom,
+                    languages.languagePreferences,
+                    languages.translateTo,
+                ),
+            security =
+                AccountSecurityPreferencesInternal(
+                    security.showSensitiveContent.value,
+                    security.warnAboutPostsWithReports,
+                    security.filterSpamFromStrangers.value,
+                ),
+        )
+
+    fun updateFrom(syncedSettingsInternal: AccountSyncedSettingsInternal) {
+        val newReactionChoices = syncedSettingsInternal.reactions.reactionChoices.toImmutableList()
+        if (!equalImmutableLists(reactions.reactionChoices.value, newReactionChoices)) {
+            reactions.reactionChoices.tryEmit(newReactionChoices)
+        }
+
+        val newZapChoices = syncedSettingsInternal.zaps.zapAmountChoices.toImmutableList()
+        if (!equalImmutableLists(zaps.zapAmountChoices.value, newZapChoices)) {
+            zaps.zapAmountChoices.tryEmit(newZapChoices)
+        }
+
+        if (zaps.defaultZapType.value != syncedSettingsInternal.zaps.defaultZapType) {
+            zaps.defaultZapType.tryEmit(syncedSettingsInternal.zaps.defaultZapType)
+        }
+
+        if (languages.dontTranslateFrom != syncedSettingsInternal.languages.dontTranslateFrom) {
+            languages.dontTranslateFrom = syncedSettingsInternal.languages.dontTranslateFrom
+        }
+
+        if (languages.languagePreferences != syncedSettingsInternal.languages.languagePreferences) {
+            languages.languagePreferences = syncedSettingsInternal.languages.languagePreferences
+        }
+
+        if (languages.translateTo != syncedSettingsInternal.languages.translateTo) {
+            languages.translateTo = syncedSettingsInternal.languages.translateTo
+        }
+
+        if (security.showSensitiveContent.value != syncedSettingsInternal.security.showSensitiveContent) {
+            security.showSensitiveContent.tryEmit(syncedSettingsInternal.security.showSensitiveContent)
+        }
+
+        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
+class AccountReactionPreferences(
+    var reactionChoices: MutableStateFlow<ImmutableList<String>>,
+)
+
+@Stable
+class AccountZapPreferences(
+    var zapAmountChoices: MutableStateFlow<ImmutableList<Long>>,
+    val defaultZapType: MutableStateFlow<LnZapEvent.ZapType>,
+)
+
+@Stable
+class AccountLanguagePreferences(
+    var dontTranslateFrom: Set<String>,
+    var languagePreferences: Map<String, String>,
+    var translateTo: String,
+) {
+    // ---
+    // language services
+    // ---
+    fun toggleDontTranslateFrom(languageCode: String) {
+        dontTranslateFrom =
+            if (!dontTranslateFrom.contains(languageCode)) {
+                dontTranslateFrom.plus(languageCode)
+            } else {
+                dontTranslateFrom.minus(languageCode)
+            }
+    }
+
+    fun translateToContains(languageCode: Locale) = translateTo.contains(languageCode.language)
+
+    fun updateTranslateTo(languageCode: Locale): Boolean {
+        if (translateTo != languageCode.language) {
+            translateTo = languageCode.language
+            return true
+        }
+        return false
+    }
+
+    fun prefer(
+        source: String,
+        target: String,
+        preference: String,
+    ) {
+        val key = "$source,$target"
+        if (key !in languagePreferences) {
+            languagePreferences = languagePreferences + Pair(key, preference)
+        } else {
+            if (languagePreferences.get(key) == preference) {
+                languagePreferences = languagePreferences.minus(key)
+            } else {
+                languagePreferences = languagePreferences + Pair(key, preference)
+            }
+        }
+    }
+
+    fun preferenceBetween(
+        source: String,
+        target: String,
+    ): String? = languagePreferences["$source,$target"]
+}
+
+@Stable
+class AccountSecurityPreferences(
+    val showSensitiveContent: MutableStateFlow<Boolean?> = MutableStateFlow(null),
+    var warnAboutPostsWithReports: Boolean = true,
+    var filterSpamFromStrangers: MutableStateFlow<Boolean> = MutableStateFlow(true),
+) {
+    fun updateShowSensitiveContent(show: Boolean?): Boolean {
+        if (showSensitiveContent.value != show) {
+            showSensitiveContent.update { show }
+            return true
+        }
+        return false
+    }
+
+    fun updateWarnReports(warnReports: Boolean): Boolean =
+        if (warnAboutPostsWithReports != warnReports) {
+            warnAboutPostsWithReports = warnReports
+            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

@@ -0,0 +1,82 @@
+/**
+ * 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.content.res.Resources
+import androidx.core.os.ConfigurationCompat
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import kotlinx.serialization.Serializable
+import java.util.Locale
+
+val DefaultReactions =
+    listOf(
+        "\uD83D\uDE80",
+        "\uD83E\uDEC2",
+        "\uD83D\uDC40",
+        "\uD83D\uDE02",
+        "\uD83C\uDF89",
+        "\uD83E\uDD14",
+        "\uD83D\uDE31",
+    )
+
+val DefaultZapAmounts = listOf(100L, 500L, 1000L)
+
+fun getLanguagesSpokenByUser(): Set<String> {
+    val languageList = ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration())
+    val codedList = mutableSetOf<String>()
+    for (i in 0 until languageList.size()) {
+        languageList.get(i)?.let { codedList.add(it.language) }
+    }
+    return codedList
+}
+
+@Serializable
+class AccountSyncedSettingsInternal(
+    val reactions: AccountReactionPreferencesInternal = AccountReactionPreferencesInternal(),
+    val zaps: AccountZapPreferencesInternal = AccountZapPreferencesInternal(),
+    val languages: AccountLanguagePreferencesInternal = AccountLanguagePreferencesInternal(),
+    val security: AccountSecurityPreferencesInternal = AccountSecurityPreferencesInternal(),
+)
+
+@Serializable
+class AccountReactionPreferencesInternal(
+    var reactionChoices: List<String> = DefaultReactions,
+)
+
+@Serializable
+class AccountZapPreferencesInternal(
+    var zapAmountChoices: List<Long> = DefaultZapAmounts,
+    val defaultZapType: LnZapEvent.ZapType = LnZapEvent.ZapType.PUBLIC,
+)
+
+@Serializable
+class AccountLanguagePreferencesInternal(
+    var dontTranslateFrom: Set<String> = getLanguagesSpokenByUser(),
+    var languagePreferences: Map<String, String> = mapOf(),
+    var translateTo: String = Locale.getDefault().language,
+)
+
+@Serializable
+class AccountSecurityPreferencesInternal(
+    val showSensitiveContent: Boolean? = null,
+    var warnAboutPostsWithReports: Boolean = true,
+    var filterSpamFromStrangers: Boolean = true,
+)

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

@@ -0,0 +1,179 @@
+/**
+ * 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
+import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.ui.note.njumpLink
+import com.vitorpamplona.quartz.nip01Core.core.Address
+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.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip19Bech32.Nip19Parser
+import com.vitorpamplona.quartz.nip19Bech32.entities.NAddress
+import com.vitorpamplona.quartz.nip19Bech32.entities.NEvent
+import com.vitorpamplona.quartz.utils.Log
+import kotlinx.coroutines.flow.MutableStateFlow
+
+data class Spammer(
+    val pubkeyHex: HexKey,
+    var duplicatedEventIds: Set<HexKey>,
+    var duplicatedEventAddresses: Set<Address>,
+) {
+    fun shouldHide() = duplicatedEventIds.size >= 5 || duplicatedEventAddresses.size >= 5
+}
+
+class AntiSpamFilter {
+    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: NormalizedRelayUrl?,
+    ): Boolean {
+        if (!active) return false
+
+        // if short message, ok
+        // The idea here is to avoid considering repeated "GM" messages spam.
+        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 && event.content.startsWith("nostr:") && Nip19Parser.hasAny(event.content)) 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 = spamHashCode(event)
+
+        // ignores multiple versions of the same addressable.
+        if (event is AddressableEvent) {
+            val address = event.address()
+
+            // normal event
+            if (
+                (recentAddressables[hash] != null && recentAddressables[hash] != address) ||
+                (spamMessages[hash] != null && !spamMessages[hash].duplicatedEventAddresses.contains(address))
+            ) {
+                val existingAddress = recentAddressables[hash]
+
+                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) {
+                    Amethyst.instance.relayStats
+                        .get(relay)
+                        .newSpam("$link1 $link2")
+                }
+
+                flowSpam.tryEmit(AntiSpamState(this))
+
+                return true
+            }
+
+            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]
+
+                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) {
+                    Amethyst.instance.relayStats
+                        .get(relay)
+                        .newSpam("$link1 $link2")
+                }
+
+                flowSpam.tryEmit(AntiSpamState(this))
+
+                return true
+            }
+
+            recentEventIds.put(hash, event.id)
+        }
+
+        return false
+    }
+
+    @Synchronized
+    private fun logOffender(
+        hashCode: Int,
+        event: Event,
+    ): 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 {
+            if (event is AddressableEvent) {
+                spammer.duplicatedEventAddresses += event.address()
+            } else {
+                spammer.duplicatedEventIds += event.id
+            }
+            return spammer
+        }
+    }
+
+    val flowSpam = MutableStateFlow<AntiSpamState>(AntiSpamState(this))
+}
+
+class AntiSpamState(
+    val cache: AntiSpamFilter,
+)

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

@@ -0,0 +1,223 @@
+/**
+ * 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 androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
+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.cache.LargeCache
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import java.lang.ref.WeakReference
+
+@Stable
+abstract class Channel : NotesGatherer {
+    val notes = LargeCache<HexKey, Note>()
+    var lastNote: Note? = null
+
+    private var relays = mapOf<NormalizedRelayUrl, Counter>()
+
+    private var changesFlow: WeakReference<MutableSharedFlow<ListChange<Note>>> = WeakReference(null)
+
+    fun changesFlow(): MutableSharedFlow<ListChange<Note>> {
+        val current = changesFlow.get()
+        if (current != null) return current
+        val new = MutableSharedFlow<ListChange<Note>>(0, 10, BufferOverflow.DROP_OLDEST)
+        changesFlow = WeakReference(new)
+        return new
+    }
+
+    open fun participatingAuthors(maxTimeLimit: Long) =
+        notes.mapNotNull { key, value ->
+            val createdAt = value.createdAt()
+            if (createdAt != null && createdAt > maxTimeLimit) {
+                value.author
+            } else {
+                null
+            }
+        }
+
+    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 addRelay(relay: NormalizedRelayUrl) {
+        val counter = relays[relay]
+        if (counter != null) {
+            counter.number++
+        } else {
+            addRelaySync(relay)
+        }
+    }
+
+    fun addNote(
+        note: Note,
+        relay: NormalizedRelayUrl? = null,
+    ) {
+        if (!notes.containsKey(note.idHex)) {
+            notes.put(note.idHex, note)
+            note.addGatherer(this)
+
+            if ((note.createdAt() ?: 0L) > (lastNote?.createdAt() ?: 0L)) {
+                lastNote = note
+            }
+
+            if (relay != null) {
+                addRelay(relay)
+            }
+
+            changesFlow.get()?.tryEmit(ListChange.Addition(note))
+
+            flowSet?.notes?.invalidateData()
+        }
+    }
+
+    override fun removeNote(note: Note) {
+        if (notes.containsKey(note.idHex)) {
+            notes.remove(note.idHex)
+            note.removeGatherer(this)
+
+            if (note == lastNote) {
+                lastNote = notes.values().sortedWith(DefaultFeedOrder).firstOrNull()
+            }
+
+            changesFlow.get()?.tryEmit(ListChange.Deletion(note))
+
+            flowSet?.notes?.invalidateData()
+        }
+    }
+
+    fun pruneOldMessages(): Set<Note> {
+        val important =
+            notes
+                .values()
+                .sortedWith(DefaultFeedOrder)
+                .take(500)
+                .toSet()
+
+        val toBeRemoved = notes.filter { key, it -> it !in important }
+
+        toBeRemoved.forEach { notes.remove(it.idHex) }
+
+        changesFlow.get()?.tryEmit(ListChange.SetDeletion(toBeRemoved.toSet()))
+
+        flowSet?.notes?.invalidateData()
+
+        return toBeRemoved.toSet()
+    }
+
+    fun pruneHiddenMessages(account: Account): Set<Note> {
+        val hidden =
+            notes
+                .filter { key, it ->
+                    it.author?.let { author -> account.isHidden(author) } == true
+                }.toSet()
+
+        hidden.forEach { notes.remove(it.idHex) }
+
+        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
+            }
+        }
+    }
+
+    fun flow(): ChannelFlowSet {
+        if (flowSet == null) {
+            createOrDestroyFlowSync(true)
+        }
+        return flowSet!!
+    }
+
+    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/Constants.kt

@@ -0,0 +1,52 @@
+/**
+ * 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 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)
+    val eventFinderRelays = setOf(band, wine, damus, primal, mom, nos, bitcoiner, oxtr)
+
+    val defaultSearchRelaySet = setOf(band, wine, where)
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.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
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.commons.hashtags.Amethyst
+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
+import com.vitorpamplona.amethyst.commons.hashtags.Lightning
+import com.vitorpamplona.amethyst.commons.hashtags.Mate
+import com.vitorpamplona.amethyst.commons.hashtags.Nostr
+import com.vitorpamplona.amethyst.commons.hashtags.Plebs
+import com.vitorpamplona.amethyst.commons.hashtags.Skull
+import com.vitorpamplona.amethyst.commons.hashtags.Tunestr
+import com.vitorpamplona.amethyst.commons.hashtags.Weed
+import com.vitorpamplona.amethyst.commons.hashtags.Zap
+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.components.RenderTextParagraph
+import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav
+import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonColumn
+import com.vitorpamplona.quartz.nip01Core.core.EmptyTagList
+
+@Preview
+@Composable
+fun RenderHashTagIconsPreview() {
+    ThemeComparisonColumn {
+        RenderRegular(
+            "Testing rendering of hashtags: #flowerstr #Bitcoin, #nostr, #lightning, #zap, #amethyst, #cashu, #plebs, #coffee, #skullofsatoshi, #grownostr, #footstr, #tunestr, #weed, #mate, #gamestr, #gamechain",
+            EmptyTagList,
+        ) { paragraph, state, spaceWidth, modifier ->
+            RenderTextParagraph(paragraph, spaceWidth, modifier) { word ->
+                when (word) {
+                    is HashTagSegment -> HashTag(word, EmptyNav())
+                    is RegularTextSegment -> Text(word.segmentText)
+                }
+            }
+        }
+    }
+}
+
+fun checkForHashtagWithIcon(tag: String): HashtagIcon? =
+    when (tag.lowercase()) {
+        "₿itcoin", "bitcoin", "btc", "timechain", "bitcoiner", "bitcoiners" -> bitcoin
+        "nostr", "nostrich", "nostriches", "thenostr" -> nostr
+        "lightning", "lightningnetwork" -> lightning
+        "zap", "zaps", "zapper", "zappers", "zapping", "zapped", "zapathon", "zapraiser", "zaplife", "zapchain" -> zap
+        "amethyst" -> amethyst
+        "cashu", "ecash", "nut", "nuts", "deeznuts" -> cashu
+        "plebs", "pleb", "plebchain" -> plebs
+        "coffee", "coffeechain", "cafe" -> coffee
+        "skullofsatoshi" -> skull
+        "grownostr", "gardening", "garden" -> growstr
+        "footstr" -> footstr
+        "flowerstr" -> flowerstr
+        "tunestr", "music", "nowplaying" -> tunestr
+        "mate", "matechain", "matestr" -> matestr
+        "weed", "weedstr", "420", "cannabis", "marijuana" -> weed
+        "gamestr", "gaming", "gamechain" -> gamestr
+        else -> null
+    }
+
+val bitcoin = HashtagIcon(CustomHashTagIcons.Btc, "Bitcoin", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
+val nostr = HashtagIcon(CustomHashTagIcons.Nostr, "Nostr", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
+val lightning = HashtagIcon(CustomHashTagIcons.Lightning, "Lightning", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
+val zap = HashtagIcon(CustomHashTagIcons.Zap, "Zap", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
+val amethyst = HashtagIcon(CustomHashTagIcons.Amethyst, "Amethyst", Modifier.padding(start = 2.dp, bottom = 1.dp, top = 1.dp))
+val cashu = HashtagIcon(CustomHashTagIcons.Cashu, "Cashu", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
+val plebs = HashtagIcon(CustomHashTagIcons.Plebs, "Pleb", Modifier.padding(start = 2.dp, bottom = 1.dp, top = 1.dp))
+val coffee = HashtagIcon(CustomHashTagIcons.Coffee, "Coffee", Modifier.padding(start = 3.dp, bottom = 1.dp, top = 1.dp))
+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))
+val gamestr = HashtagIcon(CustomHashTagIcons.Gamestr, "GameStr", Modifier.padding(start = 1.dp, bottom = 0.dp, top = 0.dp))
+
+@Immutable
+class HashtagIcon(
+    val icon: ImageVector,
+    val description: String,
+    val modifier: Modifier = Modifier,
+)

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

@@ -0,0 +1,154 @@
+/**
+ * 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.utils.cache.CacheOperations
+import java.lang.ref.WeakReference
+import java.util.concurrent.ConcurrentSkipListMap
+import java.util.function.BiConsumer
+
+class LargeSoftCache<K, V> : CacheOperations<K, V> {
+    protected val cache = ConcurrentSkipListMap<K, WeakReference<V>>()
+
+    fun keys() = cache.keys
+
+    fun get(key: K): V? {
+        val softRef = cache.get(key)
+        if (softRef == null) return null
+        val value = softRef.get()
+
+        return if (value != null) {
+            value
+        } else {
+            cache.remove(key, softRef)
+            null
+        }
+    }
+
+    fun remove(key: K) = cache.remove(key)
+
+    fun removeIf(
+        key: K,
+        value: WeakReference<V>,
+    ) = cache.remove(key, value)
+
+    override fun size() = cache.size
+
+    fun isEmpty() = cache.isEmpty()
+
+    fun clear() = cache.clear()
+
+    fun containsKey(key: K) = cache.containsKey(key)
+
+    /**
+     * Puts an object into the cache with a specified key.
+     * The object is stored as a SoftReference.
+     *
+     * @param key The key to associate with the object.
+     * @param value The object to cache.
+     */
+    fun put(
+        key: K,
+        value: V,
+    ) {
+        cache.put(key, WeakReference(value))
+    }
+
+    /**
+     * Retrieves an object from the cache using its key.
+     * Returns the object if it's still available (not garbage collected),
+     * otherwise returns null. If the object has been garbage collected,
+     * its entry is also removed from the cache.
+     *
+     * @param key The key of the object to retrieve.
+     * @return The cached object, or null if it's no longer available.
+     */
+    fun getOrCreate(
+        key: K,
+        builder: (key: K) -> V,
+    ): V {
+        val softRef = cache[key]
+
+        return if (softRef == null) {
+            val newObject = builder(key)
+            cache.putIfAbsent(key, WeakReference(newObject))?.get() ?: newObject
+        } else {
+            val value = softRef.get()
+            if (value != null) {
+                value
+            } else {
+                // removes first to make sure the putIfAbsent works.
+                // another thread may put in between
+                cache.remove(key, softRef)
+                val newObject = builder(key)
+                return cache.putIfAbsent(key, WeakReference(newObject))?.get() ?: newObject
+            }
+        }
+    }
+
+    /**
+     * Proactively cleans up the cache by removing entries whose weakly referenced
+     * objects have been garbage collected. While `get` handles cleanup on access,
+     * this method can be called periodically or when memory pressure is high.
+     */
+    fun cleanUp() {
+        val keysToRemove = mutableMapOf<K, WeakReference<V>>()
+        cache.forEach { key, softRef ->
+            if (softRef.get() == null) {
+                keysToRemove.put(key, softRef)
+            }
+        }
+        keysToRemove.forEach { key, value ->
+            cache.remove(key, value)
+        }
+    }
+
+    override fun forEach(consumer: BiConsumer<K, V>) {
+        cache.forEach(BiConsumerWrapper(this, consumer))
+    }
+
+    override fun forEach(
+        from: K,
+        to: K,
+        consumer: BiConsumer<K, V>,
+    ) {
+        cache
+            .subMap(from, true, to, true)
+            .forEach(BiConsumerWrapper(this, consumer))
+    }
+
+    class BiConsumerWrapper<K, V>(
+        val cache: LargeSoftCache<K, V>,
+        val inner: BiConsumer<K, V>,
+    ) : BiConsumer<K, WeakReference<V>> {
+        override fun accept(
+            k: K,
+            ref: WeakReference<V>,
+        ) {
+            val value = ref.get()
+            if (value == null) {
+                cache.removeIf(k, ref)
+            } else {
+                inner.accept(k, value)
+            }
+        }
+    }
+}

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

@@ -0,0 +1,101 @@
+/**
+ * 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.core.Address
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.utils.cache.CacheCollectors
+
+const val START_KEY = "0000000000000000000000000000000000000000000000000000000000000000"
+const val END_KEY = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+const val START_D_TAG = ""
+const val END_D_TAG = "\uFFFF\uFFFF\uFFFF\uFFFF"
+
+fun kindStart(
+    kind: Int,
+    pubKey: HexKey,
+) = Address(kind, pubKey, "")
+
+fun kindEnd(
+    kind: Int,
+    pubKey: HexKey,
+) = Address(kind, pubKey, END_D_TAG)
+
+fun kindStart(kind: Int) = kindStart(kind, START_KEY)
+
+fun kindEnd(kind: Int) = kindEnd(kind, END_KEY)
+
+val ACCEPT_ALL_FILTER = CacheCollectors.BiFilter<Address, AddressableNote> { key, note -> true }
+
+fun LargeSoftCache<Address, AddressableNote>.filter(
+    kind: Int,
+    consumer: CacheCollectors.BiFilter<Address, AddressableNote> = ACCEPT_ALL_FILTER,
+): List<AddressableNote> = filter(kindStart(kind), kindEnd(kind), consumer)
+
+fun LargeSoftCache<Address, AddressableNote>.filter(
+    kinds: List<Int>,
+    consumer: CacheCollectors.BiFilter<Address, AddressableNote> = ACCEPT_ALL_FILTER,
+): List<AddressableNote> {
+    val set = mutableSetOf<AddressableNote>()
+    kinds.forEach {
+        set.addAll(filter(kindStart(it), kindEnd(it), consumer))
+    }
+    return set.toList()
+}
+
+fun LargeSoftCache<Address, AddressableNote>.filter(
+    kind: Int,
+    pubKey: HexKey,
+    consumer: CacheCollectors.BiFilter<Address, AddressableNote> = ACCEPT_ALL_FILTER,
+): List<AddressableNote> = filter(kindStart(kind, pubKey), kindEnd(kind, pubKey), consumer)
+
+fun LargeSoftCache<Address, AddressableNote>.filterIntoSet(
+    kind: Int,
+    consumer: CacheCollectors.BiFilter<Address, AddressableNote> = ACCEPT_ALL_FILTER,
+): Set<AddressableNote> = filterIntoSet(kindStart(kind), kindEnd(kind), consumer)
+
+fun LargeSoftCache<Address, AddressableNote>.filterIntoSet(
+    kinds: List<Int>,
+    consumer: CacheCollectors.BiFilter<Address, AddressableNote> = ACCEPT_ALL_FILTER,
+): Set<AddressableNote> {
+    val set = mutableSetOf<AddressableNote>()
+    kinds.forEach {
+        set.addAll(filterIntoSet(kindStart(it), kindEnd(it), consumer))
+    }
+    return set
+}
+
+fun LargeSoftCache<Address, AddressableNote>.filterIntoSet(
+    kind: Int,
+    pubKey: HexKey,
+    consumer: CacheCollectors.BiFilter<Address, AddressableNote> = ACCEPT_ALL_FILTER,
+): Set<AddressableNote> = filterIntoSet(kindStart(kind, pubKey), kindEnd(kind, pubKey), consumer)
+
+fun <R> LargeSoftCache<Address, AddressableNote>.mapNotNullIntoSet(
+    kind: Int,
+    consumer: CacheCollectors.BiMapper<Address, AddressableNote, R?>,
+): Set<R> = mapNotNullIntoSet(kindStart(kind), kindEnd(kind), consumer)
+
+fun <R> LargeSoftCache<Address, AddressableNote>.mapNotNullIntoSet(
+    kind: Int,
+    pubKey: HexKey,
+    consumer: CacheCollectors.BiMapper<Address, AddressableNote, R?>,
+): Set<R> = mapNotNullIntoSet(kindStart(kind, pubKey), kindEnd(kind, pubKey), consumer)

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

@@ -0,0 +1,184 @@
+/**
+ * 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 androidx.compose.runtime.Stable
+import com.fasterxml.jackson.annotation.JsonSubTypes
+import com.fasterxml.jackson.annotation.JsonTypeInfo
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
+import com.vitorpamplona.quartz.utils.Log
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.persistentMapOf
+import kotlinx.collections.immutable.toImmutableMap
+
+@JsonTypeInfo(
+    use = JsonTypeInfo.Id.NAME,
+    include = JsonTypeInfo.As.PROPERTY,
+    property = "resourceType",
+)
+@JsonSubTypes(
+    JsonSubTypes.Type(value = Practitioner::class, name = "Practitioner"),
+    JsonSubTypes.Type(value = Patient::class, name = "Patient"),
+    JsonSubTypes.Type(value = Bundle::class, name = "Bundle"),
+    JsonSubTypes.Type(value = VisionPrescription::class, name = "VisionPrescription"),
+)
+@Stable
+open class Resource(
+    var resourceType: String? = null,
+    var id: String = "",
+)
+
+@Stable
+class Practitioner(
+    resourceType: String? = null,
+    id: String = "",
+    var active: Boolean? = null,
+    var name: ArrayList<HumanName> = arrayListOf(),
+    var gender: String? = null,
+) : Resource(resourceType, id)
+
+@Stable
+class Patient(
+    resourceType: String? = null,
+    id: String = "",
+    var active: Boolean? = null,
+    var name: ArrayList<HumanName> = arrayListOf(),
+    var gender: String? = null,
+) : Resource(resourceType, id)
+
+@Stable
+class HumanName(
+    var use: String? = null,
+    var family: String? = null,
+    var given: ArrayList<String> = arrayListOf(),
+) {
+    fun assembleName(): String = given.joinToString(" ") + " " + family
+}
+
+@Stable
+class Bundle(
+    resourceType: String? = null,
+    id: String = "",
+    var type: String? = null,
+    var created: String? = null,
+    var entry: List<Resource> = arrayListOf(),
+) : Resource(resourceType, id)
+
+@Stable
+class VisionPrescription(
+    resourceType: String? = null,
+    id: String = "",
+    var status: String? = null,
+    var created: String? = null,
+    var patient: Reference? = Reference(),
+    var encounter: Reference? = Reference(),
+    var dateWritten: String? = null,
+    var prescriber: Reference? = Reference(),
+    var lensSpecification: List<LensSpecification> = arrayListOf(),
+) : Resource(resourceType, id) {
+    fun glasses() = lensSpecification.filter { it.product == "lens" }
+
+    fun contacts() = lensSpecification.filter { it.product == "contacts" }
+
+    fun glassesRightEyes() = lensSpecification.filter { it.product == "lens" && it.eye == "right" }
+
+    fun glassesLeftEyes() = lensSpecification.filter { it.product == "lens" && it.eye == "left" }
+
+    fun contactsRightEyes() = lensSpecification.filter { it.product == "contacts" && it.eye == "right" }
+
+    fun contactsLeftEyes() = lensSpecification.filter { it.product == "contacts" && it.eye == "left" }
+}
+
+@Stable
+class LensSpecification(
+    var product: String? = null,
+    var eye: String? = null,
+    var sphere: Double? = null,
+    var cylinder: Double? = null,
+    var axis: Double? = null,
+    var pd: Double? = null,
+    var interAdd: Double? = null,
+    var add: Double? = null,
+    var prism: Prism? = null,
+    // contact lenses
+    var power: Double? = null,
+    var backCurve: Double? = null,
+    var diameter: Double? = null,
+    var color: String? = null,
+    var brand: String? = null,
+    var note: String? = null,
+)
+
+@Stable
+class Prism(
+    var amount: Double? = null,
+    var base: String? = null,
+)
+
+class Reference(
+    var reference: String? = null,
+)
+
+data class FhirElementDatabase(
+    var baseResource: Resource? = null,
+    var localDb: ImmutableMap<String, Resource> = persistentMapOf(),
+)
+
+fun findReferenceInDb(
+    it: String,
+    db: Map<String, Resource>,
+): Resource? {
+    val parts = it.split("/")
+    return if (parts.size == 2) {
+        db.get(parts[1].removePrefix("#"))
+    } else {
+        db.get(it.removePrefix("#"))
+    }
+}
+
+fun parseResourceBundleOrNull(json: String): FhirElementDatabase? {
+    val mapper =
+        jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+
+    return try {
+        val resource = mapper.readValue<Resource>(json)
+
+        val db =
+            when (resource) {
+                is Bundle -> {
+                    resource.entry.associateBy { it.id }.toImmutableMap()
+                }
+                else -> {
+                    persistentMapOf(resource.id to resource)
+                }
+            }
+
+        FhirElementDatabase(
+            localDb = db,
+            baseResource = resource,
+        )
+    } catch (e: Exception) {
+        Log.e("RenderEyeGlassesPrescription", "Parser error", e)
+        null
+    }
+}

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

@@ -0,0 +1,116 @@
+/**
+ * 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.core.HexKey
+
+class ParticipantListBuilder {
+    private fun addFollowsThatDirectlyParticipateOnToSet(
+        baseNote: Note,
+        followingSet: Set<HexKey>?,
+        set: MutableSet<User>,
+    ) {
+        baseNote.author?.let { author ->
+            if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
+                set.add(author)
+            }
+        }
+
+        // Breaks these searchers down to avoid the memory use of creating multiple lists
+        baseNote.replies.forEach { reply ->
+            reply.author?.let { author ->
+                if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
+                    set.add(author)
+                }
+            }
+        }
+
+        baseNote.boosts.forEach { boost ->
+            boost.author?.let { author ->
+                if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
+                    set.add(author)
+                }
+            }
+        }
+
+        baseNote.zaps.forEach { zapPair ->
+            zapPair.key.author?.let { author ->
+                if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
+                    set.add(author)
+                }
+            }
+        }
+
+        baseNote.reactions.forEach { reactionSet ->
+            reactionSet.value.forEach { reaction ->
+                reaction.author?.let { author ->
+                    if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
+                        set.add(author)
+                    }
+                }
+            }
+        }
+    }
+
+    fun followsThatParticipateOnDirect(
+        baseNote: Note?,
+        followingSet: Set<HexKey>?,
+    ): Set<User> {
+        if (baseNote == null) return mutableSetOf()
+
+        val set = mutableSetOf<User>()
+        addFollowsThatDirectlyParticipateOnToSet(baseNote, followingSet, set)
+        return set
+    }
+
+    fun followsThatParticipateOn(
+        baseNote: Note?,
+        followingSet: Set<HexKey>?,
+    ): Set<User> {
+        if (baseNote == null) return mutableSetOf()
+
+        val mySet = mutableSetOf<User>()
+        addFollowsThatDirectlyParticipateOnToSet(baseNote, followingSet, mySet)
+
+        baseNote.replies.forEach { addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet) }
+
+        baseNote.boosts.forEach {
+            it.replyTo?.forEach { addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet) }
+        }
+
+        LocalCache.getPublicChatChannelIfExists(baseNote.idHex)?.notes?.forEach { key, it ->
+            addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet)
+        }
+
+        return mySet
+    }
+
+    fun countFollowsThatParticipateOn(
+        baseNote: Note?,
+        followingSet: Set<HexKey>?,
+    ): Int {
+        if (baseNote == null) return 0
+
+        val list = followsThatParticipateOn(baseNote, followingSet)
+
+        return list.size
+    }
+}

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

@@ -0,0 +1,218 @@
+/**
+ * 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 androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.quartz.nip01Core.core.Address
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
+import kotlinx.collections.immutable.ImmutableSet
+import kotlinx.collections.immutable.toImmutableSet
+
+class ThreadAssembler {
+    private fun searchRoot(
+        note: Note,
+        testedNotes: MutableSet<Note> = mutableSetOf(),
+    ): Note? {
+        if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
+
+        val noteEvent = note.event
+
+        if (noteEvent is RepostEvent || noteEvent is GenericRepostEvent) return note
+
+        testedNotes.add(note)
+
+        val markedAsRoot =
+            noteEvent
+                ?.tags
+                ?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }
+                ?.getOrNull(1)
+        if (markedAsRoot != null) {
+            // Check to ssee if there is an error in the tag and the root has replies
+            if (LocalCache.getNoteIfExists(markedAsRoot)?.replyTo?.isEmpty() == true) {
+                return LocalCache.checkGetOrCreateNote(markedAsRoot)
+            }
+        }
+
+        val hasNoReplyTo =
+            note.replyTo?.lastOrNull {
+                it.replyTo?.isEmpty() == true
+            }
+        if (hasNoReplyTo != null) return hasNoReplyTo
+
+        // recursive
+        val roots =
+            note.replyTo?.mapNotNull {
+                if (it !in testedNotes) {
+                    searchRoot(it, testedNotes)
+                } else {
+                    null
+                }
+            }
+
+        if (roots != null && roots.isNotEmpty()) {
+            return roots[0]
+        }
+
+        return null
+    }
+
+    @Stable
+    class ThreadInfo(
+        val root: Note,
+        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()
+
+        val note = LocalCache.checkGetOrCreateNote(noteId) ?: return null
+
+        return if (note.event != null) {
+            val thread = OnlyLatestVersionSet()
+
+            val threadRoot = searchRoot(note, thread) ?: note
+
+            loadUp(note, thread)
+
+            loadDown(threadRoot, thread)
+            // adds the replies of the note in case the search for Root
+            // did not added them.
+            note.replies.forEach { loadDown(it, thread) }
+
+            ThreadInfo(
+                root = note,
+                allNotes = thread.toImmutableSet(),
+            )
+        } else {
+            ThreadInfo(
+                root = note,
+                allNotes = setOf(note).toImmutableSet(),
+            )
+        }
+    }
+
+    fun loadUp(
+        note: Note,
+        thread: MutableSet<Note>,
+    ) {
+        if (note !in thread) {
+            thread.add(note)
+
+            note.replyTo?.forEach { loadUp(it, thread) }
+        }
+    }
+
+    fun loadDown(
+        note: Note,
+        thread: MutableSet<Note>,
+    ) {
+        if (note !in thread) {
+            thread.add(note)
+
+            note.replies.forEach { loadDown(it, thread) }
+        }
+    }
+}
+
+class OnlyLatestVersionSet : MutableSet<Note> {
+    val map = hashMapOf<Address, Long>()
+    val set = hashSetOf<Note>()
+
+    override fun add(element: Note): Boolean {
+        val loadedCreatedAt = element.createdAt()
+        val noteEvent = element.event
+
+        return if (element is AddressableNote && loadedCreatedAt != null) {
+            innerAdd(element.address, element, loadedCreatedAt)
+        } else if (noteEvent is AddressableEvent && loadedCreatedAt != null) {
+            innerAdd(noteEvent.address(), element, loadedCreatedAt)
+        } else {
+            set.add(element)
+        }
+    }
+
+    private fun innerAdd(
+        address: Address,
+        element: Note,
+        loadedCreatedAt: Long,
+    ): Boolean {
+        val existing = map.get(address)
+        return if (existing == null) {
+            map.put(address, loadedCreatedAt)
+            set.add(element)
+        } else {
+            if (loadedCreatedAt > existing) {
+                map.put(address, loadedCreatedAt)
+                set.add(element)
+            } else {
+                false
+            }
+        }
+    }
+
+    override fun addAll(elements: Collection<Note>): Boolean = elements.map { add(it) }.any()
+
+    override val size: Int
+        get() = set.size
+
+    override fun clear() {
+        set.clear()
+        map.clear()
+    }
+
+    override fun isEmpty(): Boolean = set.isEmpty()
+
+    override fun containsAll(elements: Collection<Note>): Boolean = set.containsAll(elements)
+
+    override fun contains(element: Note): Boolean = set.contains(element)
+
+    override fun iterator(): MutableIterator<Note> = set.iterator()
+
+    override fun retainAll(elements: Collection<Note>): Boolean = set.retainAll(elements)
+
+    override fun removeAll(elements: Collection<Note>): Boolean = elements.map { remove(it) }.any()
+
+    override fun remove(element: Note): Boolean {
+        element.address()?.let {
+            map.remove(it)
+        }
+        (element.event as? AddressableEvent)?.address()?.let {
+            map.remove(it)
+        }
+
+        return set.remove(element)
+    }
+}

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

@@ -0,0 +1,143 @@
+/**
+ * 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.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
+import java.time.format.DateTimeFormatter
+
+data class LevelSignature(
+    val signature: String,
+    val createdAt: Long?,
+    val author: User?,
+)
+
+object ThreadLevelCalculator {
+    val levelFormatter = DateTimeFormatter.ofPattern("uuuu-MM-dd-HH:mm:ss")
+
+    private fun formattedDateTime(timestamp: Long): String =
+        Instant
+            .ofEpochSecond(timestamp)
+            .atZone(ZoneId.systemDefault())
+            .format(levelFormatter)
+
+    /**
+     * This method caches signatures during each execution to avoid recalculation in longer threads
+     */
+    fun replyLevelSignature(
+        note: Note,
+        eventsToConsider: Set<HexKey>,
+        cachedSignatures: MutableMap<Note, LevelSignature>,
+        account: User,
+        accountFollowingSet: Set<String>,
+        now: Long,
+    ): LevelSignature {
+        val replyTo = note.replyTo
+
+        // estimates the min date by replies if it doesn't exist.
+        val createdAt =
+            note.createdAt() ?: min(
+                note.replies.minOfOrNull { it.createdAt() ?: now } ?: now,
+                note.reactions.values.minOfOrNull { it.minOfOrNull { it.createdAt() ?: now } ?: now } ?: now,
+            )
+
+        val noteAuthor = note.author
+
+        if (
+            note.event is RepostEvent || note.event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()
+        ) {
+            return LevelSignature(
+                signature = "/" + formattedDateTime(createdAt) + note.idHex.substring(0, 8) + ";",
+                createdAt = createdAt,
+                author = noteAuthor,
+            )
+        }
+
+        val parent =
+            (
+                replyTo
+                    .filter {
+                        it.idHex in eventsToConsider
+                    } // This forces the signature to be based on a branch, avoiding two roots
+                    .map {
+                        cachedSignatures[it]
+                            ?: replyLevelSignature(
+                                it,
+                                eventsToConsider,
+                                cachedSignatures,
+                                account,
+                                accountFollowingSet,
+                                now,
+                            ).apply { cachedSignatures.put(it, this) }
+                    }.maxByOrNull { it.signature.length }
+            )
+
+        val parentSignature = parent?.signature?.removeSuffix(";") ?: ""
+
+        val threadOrder =
+            if (noteAuthor != null && parent?.author == noteAuthor) {
+                // author of the thread first, in **ascending** order
+                "9" + formattedDateTime((parent.createdAt ?: 0) + (now - createdAt)) + note.idHex.substring(0, 8)
+            } else if (noteAuthor != null && noteAuthor.pubkeyHex == account.pubkeyHex) {
+                "8" + formattedDateTime(createdAt) + note.idHex.substring(0, 8) // my replies
+            } else if (noteAuthor != null && noteAuthor.pubkeyHex in accountFollowingSet) {
+                "7" + formattedDateTime(createdAt) + note.idHex.substring(0, 8) // my follows replies.
+            } else {
+                "0" + formattedDateTime(createdAt) + note.idHex.substring(0, 8) // everyone else.
+            }
+
+        val mySignature =
+            LevelSignature(
+                signature = "$parentSignature/$threadOrder;",
+                createdAt = createdAt,
+                author = note.author,
+            )
+
+        cachedSignatures[note] = mySignature
+        return mySignature
+    }
+
+    fun replyLevel(
+        note: Note,
+        cachedLevels: MutableMap<Note, Int> = mutableMapOf(),
+    ): Int {
+        val replyTo = note.replyTo
+        if (
+            note.event is RepostEvent || note.event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()
+        ) {
+            cachedLevels[note] = 0
+            return 0
+        }
+
+        val thisLevel =
+            replyTo.maxOf {
+                cachedLevels[it] ?: replyLevel(it, cachedLevels)
+            } + 1
+
+        cachedLevels[note] = thisLevel
+
+        return thisLevel
+    }
+}

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

@@ -0,0 +1,183 @@
+/**
+ * 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 androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.R
+import kotlinx.serialization.Serializable
+
+@Stable
+@Serializable
+data class UiSettings(
+    val theme: ThemeType = ThemeType.SYSTEM,
+    val preferredLanguage: String? = null,
+    val automaticallyShowImages: ConnectivityType = ConnectivityType.ALWAYS,
+    val automaticallyStartPlayback: ConnectivityType = ConnectivityType.ALWAYS,
+    val automaticallyShowUrlPreview: ConnectivityType = ConnectivityType.ALWAYS,
+    val automaticallyHideNavigationBars: BooleanType = BooleanType.ALWAYS,
+    val automaticallyShowProfilePictures: ConnectivityType = ConnectivityType.ALWAYS,
+    val dontShowPushNotificationSelector: Boolean = false,
+    val dontAskForNotificationPermissions: Boolean = false,
+    val featureSet: FeatureSetType = FeatureSetType.SIMPLIFIED,
+    val gallerySet: ProfileGalleryType = ProfileGalleryType.CLASSIC,
+)
+
+enum class ThemeType(
+    val screenCode: Int,
+    val resourceId: Int,
+) {
+    SYSTEM(0, R.string.system),
+    LIGHT(1, R.string.light),
+    DARK(2, R.string.dark),
+}
+
+fun parseThemeType(code: Int?): ThemeType =
+    when (code) {
+        ThemeType.SYSTEM.screenCode -> ThemeType.SYSTEM
+        ThemeType.LIGHT.screenCode -> ThemeType.LIGHT
+        ThemeType.DARK.screenCode -> ThemeType.DARK
+        else -> {
+            ThemeType.SYSTEM
+        }
+    }
+
+enum class ConnectivityType(
+    val prefCode: Boolean?,
+    val screenCode: Int,
+    val resourceId: Int,
+) {
+    ALWAYS(null, 0, R.string.connectivity_type_always),
+    WIFI_ONLY(true, 1, R.string.connectivity_type_unmetered_wifi_only),
+    NEVER(false, 2, R.string.connectivity_type_never),
+}
+
+enum class FeatureSetType(
+    val screenCode: Int,
+    val resourceId: Int,
+) {
+    COMPLETE(0, R.string.ui_feature_set_type_complete),
+    SIMPLIFIED(1, R.string.ui_feature_set_type_simplified),
+    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
+        ConnectivityType.WIFI_ONLY.prefCode -> ConnectivityType.WIFI_ONLY
+        ConnectivityType.NEVER.prefCode -> ConnectivityType.NEVER
+        else -> {
+            ConnectivityType.ALWAYS
+        }
+    }
+
+fun parseConnectivityType(screenCode: Int): ConnectivityType =
+    when (screenCode) {
+        ConnectivityType.ALWAYS.screenCode -> ConnectivityType.ALWAYS
+        ConnectivityType.WIFI_ONLY.screenCode -> ConnectivityType.WIFI_ONLY
+        ConnectivityType.NEVER.screenCode -> ConnectivityType.NEVER
+        else -> {
+            ConnectivityType.ALWAYS
+        }
+    }
+
+fun parseFeatureSetType(screenCode: Int): FeatureSetType =
+    when (screenCode) {
+        FeatureSetType.COMPLETE.screenCode -> FeatureSetType.COMPLETE
+        FeatureSetType.SIMPLIFIED.screenCode -> FeatureSetType.SIMPLIFIED
+        FeatureSetType.PERFORMANCE.screenCode -> FeatureSetType.PERFORMANCE
+        else -> {
+            FeatureSetType.COMPLETE
+        }
+    }
+
+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,
+    val reourceId: Int,
+) {
+    ALWAYS(null, 0, R.string.connectivity_type_always),
+    NEVER(false, 1, R.string.connectivity_type_never),
+}
+
+fun parseBooleanType(code: Boolean?): BooleanType =
+    when (code) {
+        BooleanType.ALWAYS.prefCode -> BooleanType.ALWAYS
+        BooleanType.NEVER.prefCode -> BooleanType.NEVER
+        else -> {
+            BooleanType.ALWAYS
+        }
+    }
+
+fun parseBooleanType(screenCode: Int): BooleanType =
+    when (screenCode) {
+        BooleanType.ALWAYS.screenCode -> BooleanType.ALWAYS
+        BooleanType.NEVER.screenCode -> BooleanType.NEVER
+        else -> {
+            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/UiSettingsFlow.kt

@@ -0,0 +1,165 @@
+/**
+ * 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 kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+
+class UiSettingsFlow(
+    val theme: MutableStateFlow<ThemeType> = MutableStateFlow(ThemeType.SYSTEM),
+    val preferredLanguage: MutableStateFlow<String?> = MutableStateFlow(null),
+    val automaticallyShowImages: MutableStateFlow<ConnectivityType> = MutableStateFlow(ConnectivityType.ALWAYS),
+    val automaticallyStartPlayback: MutableStateFlow<ConnectivityType> = MutableStateFlow(ConnectivityType.ALWAYS),
+    val automaticallyShowUrlPreview: MutableStateFlow<ConnectivityType> = MutableStateFlow(ConnectivityType.ALWAYS),
+    val automaticallyHideNavigationBars: MutableStateFlow<BooleanType> = MutableStateFlow(BooleanType.ALWAYS),
+    val automaticallyShowProfilePictures: MutableStateFlow<ConnectivityType> = MutableStateFlow(ConnectivityType.ALWAYS),
+    val dontShowPushNotificationSelector: MutableStateFlow<Boolean> = MutableStateFlow(false),
+    val dontAskForNotificationPermissions: MutableStateFlow<Boolean> = MutableStateFlow(false),
+    val featureSet: MutableStateFlow<FeatureSetType> = MutableStateFlow(FeatureSetType.SIMPLIFIED),
+    val gallerySet: MutableStateFlow<ProfileGalleryType> = MutableStateFlow(ProfileGalleryType.CLASSIC),
+) {
+    // emits at every change in any of the propertyes.
+    val propertyWatchFlow =
+        combine(
+            listOf(
+                theme,
+                preferredLanguage,
+                automaticallyShowImages,
+                automaticallyStartPlayback,
+                automaticallyShowUrlPreview,
+                automaticallyHideNavigationBars,
+                automaticallyShowProfilePictures,
+                dontShowPushNotificationSelector,
+                dontAskForNotificationPermissions,
+                featureSet,
+                gallerySet,
+            ),
+        ) { flows ->
+            UiSettings(
+                flows[0] as ThemeType,
+                flows[1] as String?,
+                flows[2] as ConnectivityType,
+                flows[3] as ConnectivityType,
+                flows[4] as ConnectivityType,
+                flows[5] as BooleanType,
+                flows[6] as ConnectivityType,
+                flows[7] as Boolean,
+                flows[8] as Boolean,
+                flows[9] as FeatureSetType,
+                flows[10] as ProfileGalleryType,
+            )
+        }
+
+    fun toSettings(): UiSettings =
+        UiSettings(
+            theme.value,
+            preferredLanguage.value,
+            automaticallyShowImages.value,
+            automaticallyStartPlayback.value,
+            automaticallyShowUrlPreview.value,
+            automaticallyHideNavigationBars.value,
+            automaticallyShowProfilePictures.value,
+            dontShowPushNotificationSelector.value,
+            dontAskForNotificationPermissions.value,
+            featureSet.value,
+            gallerySet.value,
+        )
+
+    fun update(torSettings: UiSettings): Boolean {
+        var any = false
+
+        if (theme.value != torSettings.theme) {
+            theme.tryEmit(torSettings.theme)
+            any = true
+        }
+        if (preferredLanguage.value != torSettings.preferredLanguage) {
+            preferredLanguage.tryEmit(torSettings.preferredLanguage)
+            any = true
+        }
+        if (automaticallyShowImages.value != torSettings.automaticallyShowImages) {
+            automaticallyShowImages.tryEmit(torSettings.automaticallyShowImages)
+            any = true
+        }
+        if (automaticallyStartPlayback.value != torSettings.automaticallyStartPlayback) {
+            automaticallyStartPlayback.tryEmit(torSettings.automaticallyStartPlayback)
+            any = true
+        }
+        if (automaticallyShowUrlPreview.value != torSettings.automaticallyShowUrlPreview) {
+            automaticallyShowUrlPreview.tryEmit(torSettings.automaticallyShowUrlPreview)
+            any = true
+        }
+        if (automaticallyHideNavigationBars.value != torSettings.automaticallyHideNavigationBars) {
+            automaticallyHideNavigationBars.tryEmit(torSettings.automaticallyHideNavigationBars)
+            any = true
+        }
+        if (automaticallyShowProfilePictures.value != torSettings.automaticallyShowProfilePictures) {
+            automaticallyShowProfilePictures.tryEmit(torSettings.automaticallyShowProfilePictures)
+            any = true
+        }
+        if (dontShowPushNotificationSelector.value != torSettings.dontShowPushNotificationSelector) {
+            dontShowPushNotificationSelector.tryEmit(torSettings.dontShowPushNotificationSelector)
+            any = true
+        }
+        if (dontAskForNotificationPermissions.value != torSettings.dontAskForNotificationPermissions) {
+            dontAskForNotificationPermissions.tryEmit(torSettings.dontAskForNotificationPermissions)
+            any = true
+        }
+        if (featureSet.value != torSettings.featureSet) {
+            featureSet.tryEmit(torSettings.featureSet)
+            any = true
+        }
+        if (gallerySet.value != torSettings.gallerySet) {
+            gallerySet.tryEmit(torSettings.gallerySet)
+            any = true
+        }
+
+        return any
+    }
+
+    fun dontShowPushNotificationSelector() {
+        if (!dontShowPushNotificationSelector.value) {
+            dontShowPushNotificationSelector.tryEmit(true)
+        }
+    }
+
+    fun dontAskForNotificationPermissions() {
+        if (!dontAskForNotificationPermissions.value) {
+            dontAskForNotificationPermissions.tryEmit(true)
+        }
+    }
+
+    companion object {
+        fun build(torSettings: UiSettings): UiSettingsFlow =
+            UiSettingsFlow(
+                MutableStateFlow(torSettings.theme),
+                MutableStateFlow(torSettings.preferredLanguage),
+                MutableStateFlow(torSettings.automaticallyShowImages),
+                MutableStateFlow(torSettings.automaticallyStartPlayback),
+                MutableStateFlow(torSettings.automaticallyShowUrlPreview),
+                MutableStateFlow(torSettings.automaticallyHideNavigationBars),
+                MutableStateFlow(torSettings.automaticallyShowProfilePictures),
+                MutableStateFlow(torSettings.dontShowPushNotificationSelector),
+                MutableStateFlow(torSettings.dontAskForNotificationPermissions),
+                MutableStateFlow(torSettings.featureSet),
+                MutableStateFlow(torSettings.gallerySet),
+            )
+    }
+}

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

@@ -0,0 +1,77 @@
+/**
+ * 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
+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 {
+    var cache = LruCache<String, UrlPreviewState>(100)
+        private set
+
+    suspend fun previewInfo(
+        url: String,
+        okHttpClient: (String) -> OkHttpClient,
+        onReady: suspend (UrlPreviewState) -> Unit,
+    ) {
+        cache[url]?.let {
+            onReady(it)
+            return
+        }
+
+        UrlPreview().fetch(
+            url,
+            okHttpClient,
+            onComplete = { urlInfo ->
+                cache[url]?.let {
+                    if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {
+                        onReady(it)
+                        return@fetch
+                    }
+                }
+
+                val state =
+                    if (urlInfo.fetchComplete() && urlInfo.url == url) {
+                        UrlPreviewState.Loaded(urlInfo)
+                    } else {
+                        UrlPreviewState.Empty
+                    }
+
+                cache.put(url, state)
+                onReady(state)
+            },
+            onFailed = { throwable ->
+                cache[url]?.let {
+                    onReady(it)
+                    return@fetch
+                }
+
+                val state = UrlPreviewState.Error(throwable.message ?: "Error Loading url preview")
+                cache.put(url, state)
+                onReady(state)
+            },
+        )
+    }
+}

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

@@ -0,0 +1,381 @@
+/**
+ * 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 androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
+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.core.toImmutableListOfLists
+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.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.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: NormalizedRelayUrl? = null
+    var latestContactList: ContactListEvent? = null
+
+    var reports = mapOf<User, Set<Note>>()
+        private set
+
+    var zaps = mapOf<Note, Note?>()
+        private set
+
+    var relaysBeingUsed = mapOf<NormalizedRelayUrl, RelayInfo>()
+        private set
+
+    fun pubkey() = Hex.decode(pubkeyHex)
+
+    fun pubkeyNpub() = pubkey().toNpub()
+
+    fun pubkeyDisplayHex() = pubkeyNpub().toShortDisplay()
+
+    fun dmInboxRelayList() = dmRelayListNote.event as? ChatMessageRelayListEvent
+
+    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()}"
+
+    fun toBestShortFirstName(): String {
+        val fullName = toBestDisplayName()
+
+        val names = fullName.split(' ')
+
+        val firstName =
+            if (names[0].length <= 3) {
+                // too short. Remove Dr.
+                "${names[0]} ${names.getOrNull(1) ?: ""}"
+            } else {
+                names[0]
+            }
+
+        return firstName
+    }
+
+    fun toBestDisplayName(): String = info?.bestName() ?: pubkeyDisplayHex()
+
+    fun nip05(): String? = info?.nip05
+
+    fun profilePicture(): String? = info?.picture
+
+    fun updateContactList(event: ContactListEvent) {
+        if (event.id == latestContactList?.id) return
+
+        val oldContactListEvent = latestContactList
+        latestContactList = event
+
+        // Update following of the current user
+        flowSet?.follows?.invalidateData()
+
+        // Update Followers of the past user list
+        // Update Followers of the new contact list
+        (oldContactListEvent)?.unverifiedFollowKeySet()?.forEach {
+            LocalCache
+                .getUserIfExists(it)
+                ?.flowSet
+                ?.followers
+                ?.invalidateData()
+        }
+        (latestContactList)?.unverifiedFollowKeySet()?.forEach {
+            LocalCache
+                .getUserIfExists(it)
+                ?.flowSet
+                ?.followers
+                ?.invalidateData()
+        }
+    }
+
+    fun addReport(note: Note) {
+        val author = note.author ?: return
+
+        val reportsBy = reports[author]
+        if (reportsBy == null) {
+            reports = reports + Pair(author, setOf(note))
+            flowSet?.reports?.invalidateData()
+        } else if (!reportsBy.contains(note)) {
+            reports = reports + Pair(author, reportsBy + note)
+            flowSet?.reports?.invalidateData()
+        }
+    }
+
+    fun removeReport(deleteNote: Note) {
+        val author = deleteNote.author ?: return
+
+        if (reports[author]?.contains(deleteNote) == true) {
+            reports[author]?.let {
+                reports = reports + Pair(author, it.minus(deleteNote))
+                flowSet?.reports?.invalidateData()
+            }
+        }
+    }
+
+    fun addZap(
+        zapRequest: Note,
+        zap: Note?,
+    ) {
+        if (zaps[zapRequest] == null) {
+            zaps = zaps + Pair(zapRequest, zap)
+            flowSet?.zaps?.invalidateData()
+        }
+    }
+
+    fun removeZap(zapRequestOrZapEvent: Note) {
+        if (zaps.containsKey(zapRequestOrZapEvent)) {
+            zaps = zaps.minus(zapRequestOrZapEvent)
+            flowSet?.zaps?.invalidateData()
+        } else if (zaps.containsValue(zapRequestOrZapEvent)) {
+            zaps = zaps.filter { it.value != zapRequestOrZapEvent }
+            flowSet?.zaps?.invalidateData()
+        }
+    }
+
+    fun zappedAmount(): BigDecimal {
+        var amount = BigDecimal.ZERO
+        zaps.forEach {
+            val itemValue = (it.value?.event as? LnZapEvent)?.amount
+            if (itemValue != null) {
+                amount += itemValue
+            }
+        }
+
+        return amount
+    }
+
+    fun reportsBy(user: User): Set<Note> = reports[user] ?: emptySet()
+
+    fun countReportAuthorsBy(users: Set<HexKey>): Int = reports.count { it.key.pubkeyHex in users }
+
+    fun reportsBy(users: Set<HexKey>): List<Note> =
+        reports
+            .mapNotNull {
+                if (it.key.pubkeyHex in users) {
+                    it.value
+                } else {
+                    null
+                }
+            }.flatten()
+
+    fun addRelayBeingUsed(
+        relay: NormalizedRelayUrl,
+        eventTime: Long,
+    ) {
+        val here = relaysBeingUsed[relay]
+        if (here == null) {
+            relaysBeingUsed = relaysBeingUsed + Pair(relay, RelayInfo(relay, eventTime, 1))
+        } else {
+            if (eventTime > here.lastEvent) {
+                here.lastEvent = eventTime
+            }
+            here.counter++
+        }
+
+        flowSet?.usedRelays?.invalidateData()
+    }
+
+    fun updateUserInfo(
+        newUserInfo: UserMetadata,
+        latestMetadata: MetadataEvent,
+    ) {
+        info = newUserInfo
+        info?.tags = latestMetadata.tags.toImmutableListOfLists()
+        info?.cleanBlankNames()
+
+        if (newUserInfo.lud16.isNullOrBlank()) {
+            info?.lud06?.let {
+                if (it.lowercase().startsWith("lnurl")) {
+                    info?.lud16 = Lud06().toLud16(it)
+                }
+            }
+        }
+
+        flowSet?.metadata?.invalidateData()
+    }
+
+    fun isFollowing(user: User): Boolean = latestContactList?.isTaggedUser(user.pubkeyHex) ?: false
+
+    fun isFollowingHashtag(tag: String) = latestContactList?.isTaggedHash(tag) ?: false
+
+    fun isFollowingGeohash(geoTag: String) = latestContactList?.isTaggedGeoHash(geoTag) ?: false
+
+    fun transientFollowCount(): Int? = latestContactList?.unverifiedFollowKeySet()?.size
+
+    suspend fun transientFollowerCount(): Int = LocalCache.users.count { _, it -> it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
+
+    fun hasReport(
+        loggedIn: User,
+        type: ReportType,
+    ): Boolean =
+        reports[loggedIn]?.firstOrNull {
+            (it.event as? ReportEvent)?.reportedAuthor()?.any { it.type == type } ?: false
+        } != null
+
+    fun containsAny(hiddenWordsCase: List<DualCase>): Boolean {
+        if (hiddenWordsCase.isEmpty()) return false
+
+        if (toBestDisplayName().containsAny(hiddenWordsCase)) {
+            return true
+        }
+
+        if (profilePicture()?.containsAny(hiddenWordsCase) == true) {
+            return true
+        }
+
+        if (info?.banner?.containsAny(hiddenWordsCase) == true) {
+            return true
+        }
+
+        if (info?.about?.containsAny(hiddenWordsCase) == true) {
+            return true
+        }
+
+        if (info?.lud06?.containsAny(hiddenWordsCase) == true) {
+            return true
+        }
+
+        if (info?.lud16?.containsAny(hiddenWordsCase) == true) {
+            return true
+        }
+
+        if (info?.nip05?.containsAny(hiddenWordsCase) == true) {
+            return true
+        }
+
+        return false
+    }
+
+    fun anyNameStartsWith(username: String): Boolean = info?.anyNameStartsWith(username) ?: false
+
+    var flowSet: UserFlowSet? = null
+
+    @Synchronized
+    fun createOrDestroyFlowSync(create: Boolean) {
+        if (create) {
+            if (flowSet == null) {
+                flowSet = UserFlowSet(this)
+            }
+        } else {
+            if (flowSet != null && flowSet?.isInUse() == false) {
+                flowSet = null
+            }
+        }
+    }
+
+    fun flow(): UserFlowSet {
+        if (flowSet == null) {
+            createOrDestroyFlowSync(true)
+        }
+        return flowSet!!
+    }
+
+    fun clearFlow() {
+        if (flowSet != null && flowSet?.isInUse() == false) {
+            createOrDestroyFlowSync(false)
+        }
+    }
+}
+
+@Stable
+class UserFlowSet(
+    u: User,
+) {
+    // Observers line up here.
+    val metadata = UserBundledRefresherFlow(u)
+    val follows = UserBundledRefresherFlow(u)
+    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() ||
+            usedRelays.hasObservers() ||
+            zaps.hasObservers() ||
+            statuses.hasObservers()
+}
+
+@Immutable
+data class RelayInfo(
+    val url: NormalizedRelayUrl,
+    var lastEvent: Long,
+    var counter: Long,
+)
+
+@Stable
+class UserBundledRefresherFlow(
+    val user: User,
+) {
+    val stateFlow = MutableStateFlow(UserState(user))
+
+    fun invalidateData() {
+        stateFlow.tryEmit(UserState(user))
+    }
+
+    fun hasObservers() = stateFlow.subscriptionCount.value > 0
+}
+
+@Immutable
+class UserState(
+    val user: User,
+)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/accountsCache/AccountCacheState.kt

@@ -0,0 +1,121 @@
+/**
+ * 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.accountsCache
+
+import android.content.ContentResolver
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.location.LocationState
+import com.vitorpamplona.amethyst.service.relayClient.reqCommand.nwc.NWCPaymentFilterAssembler
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.core.toHexKey
+import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.nip03Timestamp.OtsResolverBuilder
+import com.vitorpamplona.quartz.nip55AndroidSigner.client.NostrSignerExternal
+import com.vitorpamplona.quartz.utils.Log
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+
+class AccountCacheState(
+    val geolocationFlow: StateFlow<LocationState.LocationResult>,
+    val nwcFilterAssembler: NWCPaymentFilterAssembler,
+    val contentResolverFn: () -> ContentResolver,
+    val otsResolverBuilder: OtsResolverBuilder,
+    val cache: LocalCache,
+    val client: INostrClient,
+) {
+    val accounts = MutableStateFlow<Map<HexKey, Account>>(emptyMap())
+
+    fun removeAccount(pubkey: HexKey) {
+        accounts.update { existingAccounts ->
+            val oldValue = existingAccounts[pubkey]
+            oldValue?.scope?.cancel()
+            existingAccounts.minus(pubkey)
+        }
+    }
+
+    fun loadAccount(accountSettings: AccountSettings): Account =
+        loadAccount(
+            signer =
+                if (accountSettings.keyPair.privKey != null) {
+                    NostrSignerInternal(accountSettings.keyPair)
+                } else {
+                    when (val packageName = accountSettings.externalSignerPackageName) {
+                        null -> NostrSignerInternal(accountSettings.keyPair)
+                        else ->
+                            NostrSignerExternal(
+                                pubKey = accountSettings.keyPair.pubKey.toHexKey(),
+                                packageName = packageName,
+                                contentResolver = contentResolverFn(),
+                            )
+                    }
+                },
+            accountSettings = accountSettings,
+        )
+
+    fun loadAccount(
+        signer: NostrSigner,
+        accountSettings: AccountSettings,
+    ): Account {
+        val cached = accounts.value[signer.pubKey]
+        if (cached != null) return cached
+
+        return Account(
+            settings = accountSettings,
+            signer = signer,
+            geolocationFlow = geolocationFlow,
+            nwcFilterAssembler = nwcFilterAssembler,
+            otsResolverBuilder = otsResolverBuilder,
+            cache = cache,
+            client = client,
+            scope =
+                CoroutineScope(
+                    Dispatchers.IO +
+                        SupervisorJob() +
+                        CoroutineExceptionHandler { _, throwable ->
+                            Log.e("AccountCacheState", "Account ${signer.pubKey} caught exception: ${throwable.message}", throwable)
+                        },
+                ),
+        ).also { newAccount ->
+            accounts.update { existingAccounts ->
+                existingAccounts.plus(Pair(signer.pubKey, newAccount))
+            }
+        }
+    }
+
+    fun clear() {
+        accounts.update { existingAccounts ->
+            existingAccounts.forEach {
+                it.value.scope.cancel()
+            }
+            emptyMap()
+        }
+    }
+}

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 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 com.vitorpamplona.quartz.utils.Log
+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.IO)
+            .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.IO) {
+            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

@@ -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.emphChat
+
+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 EphemeralChatListDecryptionCache(
+    val signer: NostrSigner,
+) {
+    val cachedPrivateLists = PrivateTagArrayEventCache<EphemeralChatListEvent>(signer)
+
+    fun cachedRoomSet(event: EphemeralChatListEvent) = cachedPrivateLists.mergeTagListPrecached(event).roomSet()
+
+    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 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 com.vitorpamplona.quartz.utils.Log
+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.IO)
+            .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.IO) {
+            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.IO)
+            .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.IO)
+            .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.IO)
+            .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.IO)
+            .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 com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.UserState
+import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.utils.Log
+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,
+) {
+    // 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 getEphemeralChatListAddress() = cache.getOrCreateUser(signer.pubKey)
+
+    fun getUserMetadataFlow(): StateFlow<UserState> = user.flow().metadata.stateFlow
+
+    fun getUserMetadataEvent(): MetadataEvent? = user.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.IO) {
+            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/DeclaredFollowsPerOutboxRelay.kt

@@ -0,0 +1,64 @@
+/**
+ * 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.LocalCache
+import com.vitorpamplona.amethyst.model.topNavFeeds.OutboxRelayLoader
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+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.distinctUntilChanged
+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 DeclaredFollowsPerOutboxRelay(
+    kind3Follows: Kind3FollowListState,
+    val cache: LocalCache,
+    scope: CoroutineScope,
+) {
+    val calculator = OutboxRelayLoader(true)
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flow: StateFlow<Map<NormalizedRelayUrl, Set<HexKey>>> =
+        kind3Follows.flow
+            .transformLatest {
+                emitAll(
+                    calculator.toAuthorsPerRelayFlow(it.authors, cache) { it },
+                )
+            }.onStart {
+                emit(
+                    calculator.authorsPerRelaySnapshot(kind3Follows.flow.value.authors, cache) { it },
+                )
+            }.distinctUntilChanged()
+            .flowOn(Dispatchers.IO)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyMap(),
+            )
+}

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

@@ -0,0 +1,117 @@
+/**
+ * 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.LocalCache
+import com.vitorpamplona.amethyst.model.nip51Lists.blockedRelays.BlockedRelayListState
+import com.vitorpamplona.amethyst.model.nip51Lists.proxyRelays.ProxyRelayListState
+import com.vitorpamplona.amethyst.model.topNavFeeds.OutboxRelayLoader
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+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: Kind3FollowListState,
+    blockedRelayList: BlockedRelayListState,
+    proxyRelayList: ProxyRelayListState,
+    val cache: LocalCache,
+    scope: CoroutineScope,
+) {
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val outboxRelayFlow: StateFlow<Set<NormalizedRelayUrl>> =
+        kind3Follows.flow
+            .transformLatest { follows ->
+                emitAll(
+                    OutboxRelayLoader(true).toAuthorsPerRelayFlow(follows.authors, cache) { it.keys },
+                )
+            }.onStart {
+                emit(
+                    OutboxRelayLoader(true).authorsPerRelaySnapshot(kind3Follows.flow.value.authors, cache) { it.keys },
+                )
+            }.distinctUntilChanged()
+            .flowOn(Dispatchers.IO)
+            .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.IO)
+            .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.IO)
+            .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.IO)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+}

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

@@ -0,0 +1,135 @@
+/**
+ * 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.LocalCache
+import com.vitorpamplona.amethyst.model.nip51Lists.blockedRelays.BlockedRelayListState
+import com.vitorpamplona.amethyst.model.nip51Lists.proxyRelays.ProxyRelayListState
+import com.vitorpamplona.amethyst.model.topNavFeeds.OutboxRelayLoader
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+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 FollowListReusedOutboxOrProxyRelays(
+    kind3Follows: Kind3FollowListState,
+    blockedRelayList: BlockedRelayListState,
+    proxyRelayList: ProxyRelayListState,
+    val cache: LocalCache,
+    scope: CoroutineScope,
+) {
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val outboxRelayFlow: StateFlow<Set<NormalizedRelayUrl>> =
+        kind3Follows.flow
+            .transformLatest { follows ->
+                emitAll(
+                    OutboxRelayLoader(true).toAuthorsPerRelayFlow(follows.authors, cache) { authorsPerRelay ->
+                        authorsPerRelay
+                            .mapNotNull {
+                                if (it.value.size > 1) {
+                                    it.key
+                                } else {
+                                    null
+                                }
+                            }.toSet()
+                    },
+                )
+            }.onStart {
+                emit(
+                    OutboxRelayLoader(true).authorsPerRelaySnapshot(kind3Follows.flow.value.authors, cache) { authorsPerRelay ->
+                        authorsPerRelay
+                            .mapNotNull {
+                                if (it.value.size > 1) {
+                                    it.key
+                                } else {
+                                    null
+                                }
+                            }.toSet()
+                    },
+                )
+            }.distinctUntilChanged()
+            .flowOn(Dispatchers.IO)
+            .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.IO)
+            .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.IO)
+            .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.IO)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+}

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

@@ -0,0 +1,105 @@
+/**
+ * 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.LocalCache
+import com.vitorpamplona.amethyst.model.nip51Lists.blockedRelays.BlockedRelayListState
+import com.vitorpamplona.amethyst.model.nip51Lists.proxyRelays.ProxyRelayListState
+import com.vitorpamplona.amethyst.model.topNavFeeds.OutboxRelayLoader
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+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.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: Kind3FollowListState,
+    blockedRelayList: BlockedRelayListState,
+    proxyRelayList: ProxyRelayListState,
+    val cache: LocalCache,
+    scope: CoroutineScope,
+) {
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val outboxPerRelayFlow: StateFlow<Map<NormalizedRelayUrl, Set<HexKey>>> =
+        kind3Follows.flow
+            .transformLatest {
+                emitAll(
+                    OutboxRelayLoader().toAuthorsPerRelayFlow(it.authors, cache) { it },
+                )
+            }.onStart {
+                emit(
+                    OutboxRelayLoader().authorsPerRelaySnapshot(kind3Follows.flow.value.authors, cache) { it },
+                )
+            }.distinctUntilChanged()
+            .flowOn(Dispatchers.IO)
+            .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.IO)
+            .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.IO)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyMap(),
+            )
+}

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

@@ -0,0 +1,156 @@
+/**
+ * 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 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.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
+import com.vitorpamplona.quartz.nip02FollowList.tags.ContactTag
+import com.vitorpamplona.quartz.utils.Log
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+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.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+import kotlinx.coroutines.launch
+
+class Kind3FollowListState(
+    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.IO)
+            .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 { kind3Follows ->
+                kind3Follows.authors.mapNotNull {
+                    cache.checkGetOrCreateUser(it)
+                }
+            }.flowOn(Dispatchers.IO)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                // this has priority.
+                flow.value.authors.mapNotNull {
+                    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<HexKey> = emptySet(),
+        val authorsPlusMe: Set<HexKey>,
+    )
+
+    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,
+        )
+    }
+
+    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 ${it.tags.size} contacts")
+
+            @OptIn(DelicateCoroutinesApi::class)
+            scope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
+        }
+
+        // saves contact list for the next time.
+        scope.launch(Dispatchers.IO) {
+            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/nip03Timestamp/IncomingOtsEventVerifier.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.nip03Timestamp
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.quartz.nip03Timestamp.OtsEvent
+import com.vitorpamplona.quartz.nip03Timestamp.VerificationStateCache
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.stateIn
+
+class IncomingOtsEventVerifier(
+    private val otsVerifCache: VerificationStateCache,
+    private val cache: LocalCache,
+    private val scope: CoroutineScope,
+) {
+    val verifying =
+        cache.live.newEventBundles
+            .onEach { newNotes ->
+                newNotes.forEach {
+                    consume(it)
+                }
+            }.flowOn(Dispatchers.IO)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                null,
+            )
+
+    suspend fun consume(note: Note) {
+        note.event?.let { event ->
+            if (event is OtsEvent) {
+                otsVerifCache.cacheVerify(event)
+            }
+        }
+    }
+}

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

@@ -0,0 +1,104 @@
+/**
+ * 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 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.OtsResolverBuilder
+import com.vitorpamplona.quartz.utils.Log
+import com.vitorpamplona.quartz.utils.TimeUtils
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import java.util.Base64
+
+class OtsState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val otsResolver: OtsResolverBuilder,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    var lastTimeItTriedToUpdateAttestations: Long = 0
+
+    fun upgradeAttestationsIfNeeded(onReady: (List<OtsEvent>) -> Unit) {
+        // only tries to upgrade every hour
+        val now = TimeUtils.now()
+        if (now - lastTimeItTriedToUpdateAttestations > TimeUtils.ONE_HOUR) {
+            lastTimeItTriedToUpdateAttestations = now
+            scope.launch {
+                onReady(updateAttestations())
+            }
+        }
+    }
+
+    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
+    }
+
+    suspend 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/nip03Timestamp/TorAwareOkHttpOtsResolverBuilder.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.nip03Timestamp
+
+import com.vitorpamplona.quartz.nip03Timestamp.OtsResolver
+import com.vitorpamplona.quartz.nip03Timestamp.OtsResolverBuilder
+import com.vitorpamplona.quartz.nip03Timestamp.okhttp.OkHttpBitcoinExplorer
+import com.vitorpamplona.quartz.nip03Timestamp.okhttp.OkHttpCalendar
+import com.vitorpamplona.quartz.nip03Timestamp.ots.OtsBlockHeightCache
+import okhttp3.OkHttpClient
+
+class TorAwareOkHttpOtsResolverBuilder(
+    val okHttpClient: (url: String) -> OkHttpClient,
+    val isTorActive: (url: String) -> Boolean,
+    val cache: OtsBlockHeightCache,
+) : OtsResolverBuilder {
+    fun getAPI(usingTor: Boolean) =
+        if (usingTor) {
+            OkHttpBitcoinExplorer.Companion.MEMPOOL_API_URL
+        } else {
+            OkHttpBitcoinExplorer.Companion.BLOCKSTREAM_API_URL
+        }
+
+    override fun build(): OtsResolver =
+        OtsResolver(
+            explorer =
+                OkHttpBitcoinExplorer(
+                    baseUrl = {
+                        getAPI(usingTor = isTorActive(OkHttpBitcoinExplorer.Companion.MEMPOOL_API_URL))
+                    },
+                    client = okHttpClient(OkHttpBitcoinExplorer.Companion.MEMPOOL_API_URL),
+                    cache = cache,
+                ),
+            calendar = OkHttpCalendar(okHttpClient),
+        )
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip11RelayInfo/LoadRelayInfo.kt

@@ -0,0 +1,52 @@
+/**
+ * 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.nip11RelayInfo
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.produceState
+import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation
+import com.vitorpamplona.quartz.utils.Log
+
+@Composable
+fun loadRelayInfo(relay: NormalizedRelayUrl): State<Nip11RelayInformation> = loadRelayInfo(relay, Amethyst.instance.nip11Cache)
+
+@Composable
+fun loadRelayInfo(
+    relay: NormalizedRelayUrl,
+    nip11Cache: Nip11CachedRetriever,
+): State<Nip11RelayInformation> =
+    produceState(
+        nip11Cache.getFromCache(relay),
+        relay,
+    ) {
+        nip11Cache.loadRelayInfo(
+            relay = relay,
+            onInfo = {
+                value = it
+            },
+            onError = { url, errorCode, exceptionMessage ->
+                Log.e("RelayInfo", "Error loading relay info for ${relay.url}: $errorCode - $exceptionMessage")
+            },
+        )
+    }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip11RelayInfo/Nip11CachedRetriever.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.nip11RelayInfo
+
+import android.util.LruCache
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.displayUrl
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.toHttp
+import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation
+import okhttp3.OkHttpClient
+
+class Nip11CachedRetriever(
+    val okHttpClient: (NormalizedRelayUrl) -> OkHttpClient,
+) {
+    private val relayInformationEmptyCache = LruCache<NormalizedRelayUrl, Nip11RelayInformation>(1000)
+    private val relayInformationDocumentCache = LruCache<NormalizedRelayUrl, RetrieveResult?>(1000)
+    private val retriever = Nip11Retriever(okHttpClient)
+
+    fun getEmpty(relay: NormalizedRelayUrl): Nip11RelayInformation {
+        relayInformationEmptyCache.get(relay)?.let { return it }
+
+        val info =
+            Nip11RelayInformation(
+                name = relay.displayUrl(),
+                icon = relay.toHttp() + "favicon.ico",
+            )
+
+        relayInformationEmptyCache.put(relay, info)
+
+        return info
+    }
+
+    fun getFromCache(relay: NormalizedRelayUrl): Nip11RelayInformation {
+        val result = relayInformationDocumentCache.get(relay)
+
+        if (result == null) {
+            // resets the clock
+            val empty = getEmpty(relay)
+            relayInformationDocumentCache.put(relay, RetrieveResult.Empty(empty))
+            return empty
+        }
+
+        return when (result) {
+            is RetrieveResult.Success -> result.data
+            is RetrieveResult.Error -> result.data
+            is RetrieveResult.Empty -> result.data
+            is RetrieveResult.Loading -> result.data
+        }
+    }
+
+    suspend fun loadRelayInfo(
+        relay: NormalizedRelayUrl,
+        onInfo: (Nip11RelayInformation) -> Unit,
+        onError: (NormalizedRelayUrl, Nip11Retriever.ErrorCode, String?) -> Unit,
+    ) {
+        val doc = relayInformationDocumentCache.get(relay)
+        if (doc != null) {
+            when (doc) {
+                is RetrieveResult.Success -> onInfo(doc.data)
+                is RetrieveResult.Loading -> {
+                    if (doc.isValid()) {
+                        // just wait.
+                    } else {
+                        retrieve(relay, onInfo, onError)
+                    }
+                }
+                is RetrieveResult.Error -> {
+                    if (doc.isValid()) {
+                        onError(relay, doc.error, null)
+                    } else {
+                        retrieve(relay, onInfo, onError)
+                    }
+                }
+                is RetrieveResult.Empty -> retrieve(relay, onInfo, onError)
+            }
+        } else {
+            retrieve(relay, onInfo, onError)
+        }
+    }
+
+    private suspend fun retrieve(
+        relay: NormalizedRelayUrl,
+        onInfo: (Nip11RelayInformation) -> Unit,
+        onError: (NormalizedRelayUrl, Nip11Retriever.ErrorCode, String?) -> Unit,
+    ) {
+        relayInformationDocumentCache.put(relay, RetrieveResult.Loading(getEmpty(relay)))
+        retriever.loadRelayInfo(
+            relay = relay,
+            onInfo = {
+                relayInformationDocumentCache.put(relay, RetrieveResult.Success(it))
+                relayInformationEmptyCache.remove(relay)
+                onInfo(it)
+            },
+            onError = { relay, code, errorMsg ->
+                relayInformationDocumentCache.put(relay, RetrieveResult.Error(getEmpty(relay), code, errorMsg))
+                relayInformationEmptyCache.remove(relay)
+                onError(relay, code, errorMsg)
+            },
+        )
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip11RelayInfo/Nip11Retriever.kt

@@ -0,0 +1,90 @@
+/**
+ * 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.nip11RelayInfo
+
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.toHttp
+import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation
+import com.vitorpamplona.quartz.utils.Log
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.coroutines.executeAsync
+
+class Nip11Retriever(
+    val okHttpClient: (NormalizedRelayUrl) -> OkHttpClient,
+) {
+    enum class ErrorCode {
+        FAIL_TO_ASSEMBLE_URL,
+        FAIL_TO_REACH_SERVER,
+        FAIL_TO_PARSE_RESULT,
+        FAIL_WITH_HTTP_STATUS,
+    }
+
+    suspend fun loadRelayInfo(
+        relay: NormalizedRelayUrl,
+        onInfo: (Nip11RelayInformation) -> Unit,
+        onError: (NormalizedRelayUrl, ErrorCode, String?) -> Unit,
+    ) {
+        val url = relay.toHttp()
+        try {
+            val request: Request =
+                Request
+                    .Builder()
+                    .header("Accept", "application/nostr+json")
+                    .url(url)
+                    .build()
+
+            val client = okHttpClient(relay)
+
+            client.newCall(request).executeAsync().use { response ->
+                withContext(Dispatchers.IO) {
+                    val body = response.body.string()
+                    try {
+                        if (response.isSuccessful) {
+                            if (body.startsWith("{")) {
+                                onInfo(Nip11RelayInformation.fromJson(body))
+                            } else {
+                                onError(relay, ErrorCode.FAIL_TO_PARSE_RESULT, body)
+                            }
+                        } else {
+                            onError(relay, ErrorCode.FAIL_WITH_HTTP_STATUS, response.code.toString())
+                        }
+                    } catch (e: Exception) {
+                        if (e is CancellationException) throw e
+                        Log.e(
+                            "RelayInfoFail",
+                            "Resulting Message from Relay ${relay.url} in not parseable: $body",
+                            e,
+                        )
+                        onError(relay, ErrorCode.FAIL_TO_PARSE_RESULT, e.message)
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            if (e is CancellationException) throw e
+            Log.e("RelayInfoFail", "Invalid URL ${relay.url}", e)
+            onError(relay, ErrorCode.FAIL_TO_ASSEMBLE_URL, e.message)
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip11RelayInfo/RetrieveResult.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.nip11RelayInfo
+
+import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation
+import com.vitorpamplona.quartz.utils.TimeUtils
+
+sealed class RetrieveResult(
+    val data: Nip11RelayInformation,
+    val time: Long,
+) {
+    class Error(
+        data: Nip11RelayInformation,
+        val error: Nip11Retriever.ErrorCode,
+        val msg: String? = null,
+    ) : RetrieveResult(data, TimeUtils.now())
+
+    class Success(
+        data: Nip11RelayInformation,
+    ) : RetrieveResult(data, TimeUtils.now())
+
+    class Loading(
+        data: Nip11RelayInformation,
+    ) : RetrieveResult(data, TimeUtils.now())
+
+    class Empty(
+        data: Nip11RelayInformation,
+    ) : RetrieveResult(data, TimeUtils.now())
+
+    fun isValid() = time > TimeUtils.oneHourAgo()
+}

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.IO)
+            .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 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 com.vitorpamplona.quartz.utils.Log
+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.IO)
+            .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.IO) {
+            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.core.EmptyTagList
+import com.vitorpamplona.quartz.nip01Core.core.toImmutableListOfLists
+import com.vitorpamplona.quartz.nip01Core.hints.EventHintBundle
+import com.vitorpamplona.quartz.nip01Core.hints.types.EventIdHintOptional
+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 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 com.vitorpamplona.quartz.utils.Log
+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.IO)
+            .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.IO)
+            .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.IO) {
+            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.aTag.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.IO)
+            .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.IO)
+            .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,180 @@
+/**
+ * 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.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.relayClient.reqCommand.nwc.NWCPaymentFilterAssembler
+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 nwcFilterAssembler: NWCPaymentFilterAssembler,
+    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.IO)
+            .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.IO)
+            .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.IO)
+            .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,
+            )
+
+        nwcFilterAssembler.subscribe(filter)
+
+        scope.launch(Dispatchers.IO) {
+            delay(60000) // waits 1 minute to complete payment.
+            nwcFilterAssembler.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.IO)
+            .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.IO)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    val publicBookmarkEventIdSet =
+        publicBookmarks
+            .map { bookmark ->
+                bookmark
+                    .mapNotNull {
+                        if (it is EventBookmark) it.eventId else null
+                    }.toSet()
+            }.flowOn(Dispatchers.IO)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    val publicBookmarkAddressIdSet =
+        publicBookmarks
+            .map { bookmark ->
+                bookmark
+                    .mapNotNull {
+                        if (it is AddressBookmark) it.address else null
+                    }.toSet()
+            }.flowOn(Dispatchers.IO)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    val privateBookmarkEventIdSet =
+        privateBookmarks
+            .map { bookmark ->
+                bookmark
+                    .mapNotNull {
+                        if (it is EventBookmark) it.eventId else null
+                    }.toSet()
+            }.flowOn(Dispatchers.IO)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    val privateBookmarkAddressIdSet =
+        privateBookmarks
+            .map { bookmark ->
+                bookmark
+                    .mapNotNull {
+                        if (it is AddressBookmark) it.address else null
+                    }.toSet()
+            }.flowOn(Dispatchers.IO)
+            .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.IO)
+            .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
+        }
+    }
+}