From 27348e3e410ff5757ec542f8f3020087860f70e2 Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Mon, 9 Oct 2023 08:57:31 -0300
Subject: [PATCH] fix decrypt

---
 app/build.gradle                                       |  2 +-
 .../com/greenart7c3/nostrsigner/service/AmberUtils.kt  | 10 +++++++++-
 build.gradle                                           |  6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9ff899e2..caae54e5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -75,7 +75,7 @@ dependencies {
     implementation "androidx.core:core-splashscreen:1.0.1"
 
     implementation 'androidx.core:core-ktx:1.12.0'
-    implementation 'androidx.activity:activity-compose:1.7.2'
+    implementation 'androidx.activity:activity-compose:1.8.0'
     implementation "androidx.compose.ui:ui:$compose_ui_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
 
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/AmberUtils.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/AmberUtils.kt
index 2c76fc2d..712074fb 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/service/AmberUtils.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/AmberUtils.kt
@@ -71,11 +71,19 @@ object AmberUtils {
                 decryptZapEvent(data, account)
             }
             SignerType.NIP04_DECRYPT -> {
-                CryptoUtils.decryptNIP04(
+                var decryptedContent = CryptoUtils.decryptNIP04(
                     data,
                     account.keyPair.privKey,
                     Hex.decode(pubKey)
                 )
+                if (decryptedContent.contains("?iv=")) {
+                    decryptedContent = CryptoUtils.decryptNIP04(
+                        decryptedContent,
+                        account.keyPair.privKey,
+                        Hex.decode(pubKey)
+                    )
+                }
+                decryptedContent
             }
             SignerType.NIP04_ENCRYPT -> {
                 CryptoUtils.encryptNIP04(
diff --git a/build.gradle b/build.gradle
index 7ea14cfa..ba5f0719 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 buildscript {
     ext {
         lifecycle_version = '2.6.1'
-        compose_ui_version = '1.5.1'
-        compose_ui_test_version = '1.5.2'
-        nav_version = "2.7.3"
+        compose_ui_version = '1.5.3'
+        compose_ui_test_version = '1.5.3'
+        nav_version = "2.7.4"
     }
 }