Merge pull request #2 from believethehype/gallery2

Gallery2
vitorpamplona · Jun 28, 2024 · 5cbea69 · 5cbea69
2 parents e073e58 + 0d18a89
commit 5cbea69
Show file tree

Hide file tree

Showing 29 changed files with 850 additions and 169 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -99,7 +99,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: amethyst/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
 
@@ -110,7 +110,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: amethyst/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
 
@@ -121,7 +121,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: amethyst/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
 
@@ -132,7 +132,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: amethyst/build/outputs/apk/play/release/app-play-arm64-v8a-release-unsigned-signed.apk
+          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
 
@@ -143,7 +143,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: amethyst/build/outputs/apk/play/release/app-play-armeabi-v7a-release-unsigned-signed.apk
+          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
 
@@ -155,7 +155,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: amethyst/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
 
@@ -166,7 +166,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: amethyst/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
 
@@ -177,7 +177,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: amethyst/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
 
@@ -188,7 +188,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: amethyst/build/outputs/apk/fdroid/release/app-fdroid-arm64-v8a-release-unsigned-signed.apk
+          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
 
@@ -199,7 +199,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: amethyst/build/outputs/apk/fdroid/release/app-fdroid-armeabi-v7a-release-unsigned-signed.apk
+          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
 
@@ -213,7 +213,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: amethyst/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
 
@@ -225,6 +225,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: amethyst/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
diff --git a/amethyst/build.gradle b/amethyst/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 34
-        versionCode 381
-        versionName "0.88.4"
+        versionCode 382
+        versionName "0.88.5"
         buildConfigField "String", "RELEASE_NOTES_ID", "\"2a34cbadd03212c8162e1ff896ba12641821088a2ec8d5e40d54aa80c0510800\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -2203,6 +2203,7 @@ class Account(
         url: String,
     ) {
         if (!isWriteable()) return
+
         GalleryListEvent.addEvent(
             userProfile().latestGalleryList,
             idHex,
@@ -2226,7 +2227,7 @@ class Account(
             GalleryListEvent.removeReplaceable(
                 galleryentries,
                 note.address,
-                false,
+                url,
                 signer,
             ) {
                 Client.send(it)
@@ -2236,7 +2237,7 @@ class Account(
             GalleryListEvent.removeEvent(
                 galleryentries,
                 note.idHex,
-                false,
+                url,
                 signer,
             ) {
                 Client.send(it)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/HttpStatusMessages.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/HttpStatusMessages.kt
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.R
+
+class HttpStatusMessages {
+    companion object {
+        fun resourceIdFor(statusCode: Int = 0): Int? =
+            when (statusCode) {
+                400 -> R.string.http_status_400
+                401 -> R.string.http_status_401
+                402 -> R.string.http_status_402
+                403 -> R.string.http_status_403
+                404 -> R.string.http_status_404
+                405 -> R.string.http_status_405
+                406 -> R.string.http_status_406
+                407 -> R.string.http_status_407
+                408 -> R.string.http_status_408
+                409 -> R.string.http_status_409
+                410 -> R.string.http_status_410
+                411 -> R.string.http_status_411
+                412 -> R.string.http_status_412
+                413 -> R.string.http_status_413
+                414 -> R.string.http_status_414
+                415 -> R.string.http_status_415
+                416 -> R.string.http_status_416
+                417 -> R.string.http_status_417
+                426 -> R.string.http_status_426
+
+                500 -> R.string.http_status_500
+                501 -> R.string.http_status_501
+                502 -> R.string.http_status_502
+                503 -> R.string.http_status_503
+                504 -> R.string.http_status_504
+                505 -> R.string.http_status_505
+                506 -> R.string.http_status_506
+                507 -> R.string.http_status_507
+                508 -> R.string.http_status_508
+                511 -> R.string.http_status_511
+
+                else -> null
+            }
+    }
+}
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip96Uploader.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip96Uploader.kt
@@ -21,6 +21,7 @@
 package com.vitorpamplona.amethyst.service
 
 import android.content.ContentResolver
+import android.content.Context
 import android.net.Uri
 import android.provider.OpenableColumns
 import android.webkit.MimeTypeMap
@@ -29,7 +30,9 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.ammolite.service.HttpClientManager
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -48,7 +51,9 @@ val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
 
 fun randomChars() = List(16) { charPool.random() }.joinToString("")
 
-class Nip96Uploader(val account: Account?) {
+class Nip96Uploader(
+    val account: Account?,
+) {
     suspend fun uploadImage(
         uri: Uri,
         contentType: String?,
@@ -58,6 +63,7 @@ class Nip96Uploader(val account: Account?) {
         server: Nip96MediaServers.ServerName,
         contentResolver: ContentResolver,
         onProgress: (percentage: Float) -> Unit,
+        context: Context,
     ): PartialEvent {
         val serverInfo =
             Nip96Retriever()
@@ -74,6 +80,7 @@ class Nip96Uploader(val account: Account?) {
             serverInfo,
             contentResolver,
             onProgress,
+            context,
         )
     }
 
@@ -86,6 +93,7 @@ class Nip96Uploader(val account: Account?) {
         server: Nip96Retriever.ServerInfo,
         contentResolver: ContentResolver,
         onProgress: (percentage: Float) -> Unit,
+        context: Context,
     ): PartialEvent {
         checkNotInMainThread()
 
@@ -111,6 +119,7 @@ class Nip96Uploader(val account: Account?) {
             sensitiveContent,
             server,
             onProgress,
+            context,
         )
     }
 
@@ -122,6 +131,7 @@ class Nip96Uploader(val account: Account?) {
         sensitiveContent: String?,
         server: Nip96Retriever.ServerInfo,
         onProgress: (percentage: Float) -> Unit,
+        context: Context,
     ): PartialEvent {
         checkNotInMainThread()
 
@@ -130,20 +140,19 @@ class Nip96Uploader(val account: Account?) {
             contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
 
         val client = HttpClientManager.getHttpClient()
-        val requestBody: RequestBody
         val requestBuilder = Request.Builder()
 
-        requestBody =
-            MultipartBody.Builder()
+        val requestBody: RequestBody =
+            MultipartBody
+                .Builder()
                 .setType(MultipartBody.FORM)
                 .addFormDataPart("expiration", "")
                 .addFormDataPart("size", length.toString())
                 .also { body ->
                     alt?.let { body.addFormDataPart("alt", it) }
                     sensitiveContent?.let { body.addFormDataPart("content-warning", it) }
                     contentType?.let { body.addFormDataPart("content_type", it) }
-                }
-                .addFormDataPart(
+                }.addFormDataPart(
                     "file",
                     "$fileName.$extension",
                     object : RequestBody() {
@@ -155,8 +164,7 @@ class Nip96Uploader(val account: Account?) {
                             inputStream.source().use(sink::writeAll)
                         }
                     },
-                )
-                .build()
+                ).build()
 
         nip98Header(server.apiUrl)?.let { requestBuilder.addHeader("Authorization", it) }
 
@@ -178,11 +186,16 @@ class Nip96Uploader(val account: Account?) {
                     } else if (result.status == "success" && result.nip94Event != null) {
                         return result.nip94Event
                     } else {
-                        throw RuntimeException("Failed to upload with message: ${result.message}")
+                        throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, result.message))
                     }
                 }
             } else {
-                throw RuntimeException("Error Uploading image: ${response.code}")
+                val explanation = HttpStatusMessages.resourceIdFor(response.code)
+                if (explanation != null) {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, stringRes(context, explanation)))
+                } else {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, response.code))
+                }
             }
         }
     }
@@ -191,6 +204,7 @@ class Nip96Uploader(val account: Account?) {
         hash: String,
         contentType: String?,
         server: Nip96Retriever.ServerInfo,
+        context: Context,
     ): Boolean {
         val extension =
             contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
@@ -216,7 +230,12 @@ class Nip96Uploader(val account: Account?) {
                     return result.status == "success"
                 }
             } else {
-                throw RuntimeException("Error Uploading image: ${response.code}")
+                val explanation = HttpStatusMessages.resourceIdFor(response.code)
+                if (explanation != null) {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_delete_with_message, stringRes(context, explanation)))
+                } else {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_delete_with_message, response.code))
+                }
             }
         }
     }
@@ -233,7 +252,8 @@ class Nip96Uploader(val account: Account?) {
             onProgress((currentResult.percentage ?: 100) / 100f)
 
             val request: Request =
-                Request.Builder()
+                Request
+                    .Builder()
                     .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                     .url(result.processingUrl)
                     .build()
@@ -257,13 +277,12 @@ class Nip96Uploader(val account: Account?) {
         }
     }
 
-    suspend fun nip98Header(url: String): String? {
-        return withTimeoutOrNull(5000) {
+    suspend fun nip98Header(url: String): String? =
+        withTimeoutOrNull(5000) {
             suspendCancellableCoroutine { continuation ->
                 nip98Header(url, "POST") { authorizationToken -> continuation.resume(authorizationToken) }
             }
         }
-    }
 
     fun nip98Header(
         url: String,

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt
@@ -118,7 +118,8 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
         )
 
     fun createOtherAccountsBaseFilter(): TypedFilter? {
-        if (otherAccounts.isEmpty()) return null
+        val otherAuthors = otherAccounts.filter { it != account.userProfile().pubkeyHex }
+        if (otherAuthors.isEmpty()) return null
         return TypedFilter(
             types = EVENT_FINDER_TYPES,
             filter =
@@ -134,7 +135,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
                             MuteListEvent.KIND,
                             PeopleListEvent.KIND,
                         ),
-                    authors = otherAccounts.filter { it != account.userProfile().pubkeyHex },
+                    authors = otherAuthors,
                     limit = 100,
                 ),
         )