From cc9d4c237a8b22d6025676e9434998f735ea33f0 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sun, 30 Apr 2023 21:31:37 -0400 Subject: [PATCH 1/3] Fixes Bug with the Nostr's Report use of double asterisk --- .../com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt index 2cdac42f4..f833be657 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt @@ -89,7 +89,6 @@ fun RichTextViewer( if (content.startsWith("> ") || content.startsWith("# ") || content.contains("##") || - content.contains("**") || content.contains("__") || content.contains("```") ) { From 63cc00976f114955f23e4e9de7b9b7167d090768 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sun, 30 Apr 2023 21:34:19 -0400 Subject: [PATCH 2/3] Fixes https://github.com/vitorpamplona/amethyst/issues/387 --- .../com/vitorpamplona/amethyst/service/FileHeader.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt index 4c21971e3..f5dd55142 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt @@ -19,9 +19,14 @@ class FileHeader( ) { companion object { fun prepare(fileUrl: String, mimeType: String?, description: String?, onReady: (FileHeader) -> Unit, onError: () -> Unit) { - val imageData = URL(fileUrl).readBytes() + try { + val imageData = URL(fileUrl).readBytes() - prepare(imageData, fileUrl, mimeType, description, onReady, onError) + prepare(imageData, fileUrl, mimeType, description, onReady, onError) + } catch (e: Exception) { + Log.e("ImageDownload", "Couldn't download image from server: ${e.message}") + onError() + } } fun prepare(data: ByteArray, fileUrl: String, mimeType: String?, description: String?, onReady: (FileHeader) -> Unit, onError: () -> Unit) { From 22ba150c4e86723d2c85a1fcea8b1fcb7a1d016c Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sun, 30 Apr 2023 21:35:53 -0400 Subject: [PATCH 3/3] v0.40.1 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9f1b014a1..7db74552e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.vitorpamplona.amethyst" minSdk 26 targetSdk 33 - versionCode 134 - versionName "0.40.0" + versionCode 135 + versionName "0.40.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables {