Merge branch 'main' into main

.github/workflows/create-release.yml

@@ -227,4 +227,9 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: app/build/outputs/bundle/fdroidRelease/app-fdroid-release.aab
           asset_name: amethyst-fdroid-${{ github.ref_name }}.aab
-          asset_content_type: application/zip
+          asset_content_type: application/zip
+
+      - name: Drafts a description for the release
+        uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,22 +1,42 @@
-# Amethyst: Nostr client for Android
+<div align="center">
+     
+<a href="https://amethyst.social">
+    <img src="./docs/design/3rd%20Logo%20-%20Zitron/amethyst.svg" alt="Amethyst Logo" title="Amethyst logo" width="80"/>
+</a>
+
+# Amethyst
+
+## Nostr Client for Android
 
-<img align="right" src="./docs/screenshots/home.png" data-canonical-src="./docs/screenshots/home.png" width="350px"/>
+Join the social network you control.
 
-Amethyst brings the best social network to your Android phone. Just insert your Nostr private key and start posting. 
+[![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)
+
+## Download and Install
 
 [<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)
+height="70">](https://github.com/vitorpamplona/amethyst/releases)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
      alt="Get it on F-Droid"
-     height="80">](https://f-droid.org/packages/com.vitorpamplona.amethyst/)
+     height="70">](https://f-droid.org/packages/com.vitorpamplona.amethyst/)
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
      alt="Get it on Google Play"
-     height="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)
+
+</div>
 
-# Current Features
+## 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)
@@ -27,7 +47,7 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [ ] WebBrowser Signer (NIP-07, Not applicable)
 - [x] Old-style mentions (NIP-08)
 - [x] Event Deletion (NIP-09)
-- [x] Replies, mentions, Threads and Notifications (NIP-10)
+- [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)
@@ -59,6 +79,7 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [ ] Nostr Connect (NIP-46)
 - [x] Wallet Connect API (NIP-47)
 - [ ] 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)
@@ -69,6 +90,7 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] Zaps (NIP-57)
 - [x] Private Zaps
 - [x] Zap Splits (NIP-57)
+- [x] Gift Wraps & Seals (NIP-59)
 - [x] Zapraiser (NIP-TBD)
 - [x] Badges (NIP-58)
 - [ ] Relay List Metadata (NIP-65)
@@ -79,13 +101,13 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] Highlights (NIP-84)
 - [x] Recommended Application Handlers (NIP-89)
 - [ ] Data Vending Machine (NIP-90)
+- [x] Inline Metadata (NIP-92)
 - [x] Verifiable file URLs (NIP-94)
 - [x] Binary Blobs (NIP-95)
 - [x] HTTP File Storage Integration (NIP-96 Draft)
 - [x] HTTP Auth (NIP-98)
 - [x] Classifieds (NIP-99)
 - [x] Private Messages and Small Groups (NIP-24/Draft)
-- [x] Gift Wraps & Seals (NIP-59/Draft)
 - [x] Versioned Encrypted Payloads (NIP-44/Draft)
 - [x] Audio Tracks (zapstr.live) (Kind:31337)
 - [x] Push Notifications (Google and Unified Push)
@@ -101,40 +123,50 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [ ] Workspaces
 - [ ] Infinity Scroll
 
+## 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 of 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 17+
 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:
@@ -166,7 +198,7 @@ For the Play build:
 ./gradlew installPlayDebug
 ```
 
-## How to Deploy
+## Deploying
 
 1. Generate a new signing key
 ```
@@ -183,44 +215,53 @@ openssl base64 < <my-release-key.keystore> | tr -d '\n' | tee some_signing_key.j
 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.
+Setup [JitPack.io](https://jitpack.io/#vitorpamplona/amethyst/v0.84.3) to your build file
 
-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 `maven { url 'https://jitpack.io' }` to settings.gradle at the end of repositories:
 
-# DM Privacy #
-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.
+```gradle
+dependencyResolutionManagement {
+  repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+  repositories {
+    mavenCentral()
+    maven { url 'https://jitpack.io' }
+  }
+}
+```
+
+Add the dependency
 
-# Visibility & Permanence of Your Content on nostr
-## Information Visibility ##
-Content that you share can be shared to other relays. 
-Information that you share publicly is 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.
+```gradle
+implementation('com.github.vitorpamplona.amethyst:quartz:v0.84.3')
+```
 
-## Information Permanence ##
-Information shared on nostr should be assumed permanent for privacy purposes. There is no way to guarantee edit or deletion of any content once posted. 
+## Contributing
+
+[Issues](https://github.com/vitorpamplona/amethyst/issues) and [pull requests](https://github.com/vitorpamplona/amethyst/pulls) here are very 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
 
 | 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" />
 </a>
 
 # MIT License
 
+<pre>
 Copyright (c) 2023 Vitor Pamplona
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -240,3 +281,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>

app/build.gradle

@@ -12,8 +12,9 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 34
-        versionCode 348
-        versionName "0.83.7"
+        versionCode 358
+        versionName "0.84.3"
+        buildConfigField "String", "RELEASE_NOTES_ID", "\"4d5a05aec61d8798f30f76b2efab81b98d75a03f935fb82823a1080bd56473cd\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -26,7 +27,7 @@ android {
             'cy-rGB',
             'da-rDK',
             'de',
-            'el-rGB',
+            'el-rGR',
             'en-rGB',
             'eo',
             'es',
@@ -141,13 +142,15 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.5.3"
+        // Should match compose version : https://developer.android.com/jetpack/androidx/releases/compose-kotlin
+        kotlinCompilerExtensionVersion "1.5.8"
     }
 
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
+        exclude '**/libscrypt.dylib'
     }
 
     lint {
@@ -161,6 +164,7 @@ android {
 
 dependencies {
     implementation project(path: ':quartz')
+    implementation project(path: ':commons')
     implementation "androidx.core:core-ktx:$core_ktx_version"
     implementation 'androidx.activity:activity-compose:1.8.2'
     implementation "androidx.compose.ui:ui:$compose_ui_version"
@@ -181,7 +185,7 @@ dependencies {
 
     // Adaptive Layout / Two Pane
     implementation "androidx.compose.material3:material3-window-size-class:${material3_version}"
-    implementation "com.google.accompanist:accompanist-adaptive:0.32.0"
+    implementation 'com.google.accompanist:accompanist-adaptive:0.34.0'
 
 
     // Lifecycle
@@ -191,7 +195,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     // Zoomable images
-    implementation 'net.engawapg.lib:zoomable:1.5.3'
+    implementation 'net.engawapg.lib:zoomable:1.6.0'
 
     // Biometrics
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
@@ -228,7 +232,7 @@ dependencies {
     implementation "com.google.accompanist:accompanist-permissions:$accompanist_version"
 
     // For QR generation
-    implementation 'com.google.zxing:core:3.5.2'
+    implementation 'com.google.zxing:core:3.5.3'
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 
     // Markdown
@@ -251,7 +255,7 @@ dependencies {
     playImplementation 'com.google.mlkit:translate:17.0.2'
 
     // PushNotifications
-    playImplementation platform('com.google.firebase:firebase-bom:32.7.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.7.2')
     playImplementation 'com.google.firebase:firebase-messaging-ktx'
 
     //PushNotifications(FDroid)
@@ -276,8 +280,8 @@ dependencies {
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'io.mockk:mockk:1.13.9'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.0-alpha02'
-    androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.0-alpha02'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.0-alpha03'
+    androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.0-alpha03'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"

app/proguard-rules.pro

@@ -33,6 +33,11 @@
 # JNA For Libsodium
 -keep class com.goterl.lazysodium.** { *; }
 
+# libscrypt
+-keep class com.lambdaworks.codec.** { *; }
+-keep class com.lambdaworks.crypto.** { *; }
+-keep class com.lambdaworks.jni.** { *; }
+
 # 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 { *; }

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

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