From 6d498fc548bb1b1048b9c43c52a62d1d31dbff34 Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Fri, 20 Sep 2024 07:35:57 -0300
Subject: [PATCH] Use signerSync inside signerprovider

---
 .../greenart7c3/nostrsigner/SignerProvider.kt | 55 +++++++++++--------
 .../greenart7c3/nostrsigner/models/Account.kt |  3 +-
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt
index 6d5ea90a..c1158b08 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt
@@ -5,6 +5,7 @@ import android.content.ContentValues
 import android.database.Cursor
 import android.database.MatrixCursor
 import android.net.Uri
+import android.util.Log
 import com.greenart7c3.nostrsigner.database.HistoryEntity
 import com.greenart7c3.nostrsigner.models.SignerType
 import com.greenart7c3.nostrsigner.models.TimeUtils
@@ -166,9 +167,10 @@ class SignerProvider : ContentProvider() {
                     }
                 }
 
-                var cursor: MatrixCursor? = null
+                val signedEvent = account.signer.signerSync.sign<Event>(event.createdAt, event.kind, event.tags, event.content)
 
-                account.signer.sign<Event>(event.createdAt, event.kind, event.tags, event.content) { signedEvent ->
+                if (signedEvent == null) {
+                    Log.d("SignerProvider", "Failed to sign event from $packageName")
                     database.applicationDao().addHistory(
                         HistoryEntity(
                             0,
@@ -176,31 +178,38 @@ class SignerProvider : ContentProvider() {
                             "SIGN_EVENT",
                             event.kind,
                             TimeUtils.now(),
-                            true,
+                            false,
                         ),
                     )
+                    return null
+                }
 
-                    val localCursor =
-                        MatrixCursor(arrayOf("signature", "event")).also {
-                            val signature =
-                                if (event is LnZapRequestEvent &&
-                                    event.tags.any {
-                                            tag ->
-                                        tag.any { t -> t == "anon" }
-                                    }
-                                ) {
-                                    signedEvent.toJson()
-                                } else {
-                                    signedEvent.sig
+                database.applicationDao().addHistory(
+                    HistoryEntity(
+                        0,
+                        sortOrder ?: packageName,
+                        "SIGN_EVENT",
+                        event.kind,
+                        TimeUtils.now(),
+                        true,
+                    ),
+                )
+
+                val cursor =
+                    MatrixCursor(arrayOf("signature", "event")).also {
+                        val signature =
+                            if (event is LnZapRequestEvent &&
+                                event.tags.any {
+                                        tag ->
+                                    tag.any { t -> t == "anon" }
                                 }
-                            it.addRow(arrayOf(signature, signedEvent.toJson()))
-                        }
-                    cursor = localCursor
-                }
-
-                while (cursor == null) {
-                    // do nothing
-                }
+                            ) {
+                                signedEvent.toJson()
+                            } else {
+                                signedEvent.sig
+                            }
+                        it.addRow(arrayOf(signature, signedEvent.toJson()))
+                    }
 
                 return cursor
             }
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/models/Account.kt b/app/src/main/java/com/greenart7c3/nostrsigner/models/Account.kt
index c47c46bb..352b6880 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/models/Account.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/models/Account.kt
@@ -5,13 +5,12 @@ import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.events.RelayAuthEvent
-import com.vitorpamplona.quartz.signers.NostrSigner
 import com.vitorpamplona.quartz.signers.NostrSignerInternal
 
 @Stable
 class Account(
     val keyPair: KeyPair,
-    val signer: NostrSigner = NostrSignerInternal(keyPair),
+    val signer: NostrSignerInternal = NostrSignerInternal(keyPair),
     var name: String,
     var useProxy: Boolean,
     var proxyPort: Int,