Fixes error when trying to decrypt the PrivateOutboxRelayList event for an account that is not currently active.

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt

@@ -122,7 +122,6 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
                             ContactListEvent.KIND,
                             AdvertisedRelayListEvent.KIND,
                             ChatMessageRelayListEvent.KIND,
-                            PrivateOutboxRelayListEvent.KIND,
                             SearchRelayListEvent.KIND,
                             FileServersEvent.KIND,
                             MuteListEvent.KIND,

quartz/src/main/java/com/vitorpamplona/quartz/events/NIP90ContentDiscoveryResponseEvent.kt

@@ -57,7 +57,7 @@ class NIP90ContentDiscoveryResponseEvent(
                     }
                 }
         } catch (e: Throwable) {
-            Log.w("GeneralList", "Error parsing the JSON ${e.message}")
+            Log.w("NIP90ContentDiscoveryResponseEvent", "Error parsing the JSON ${e.message}")
         }
 
         return events ?: listOf()

quartz/src/main/java/com/vitorpamplona/quartz/events/PrivateOutboxRelayListEvent.kt

@@ -41,27 +41,25 @@ class PrivateOutboxRelayListEvent(
 
     override fun dTag() = FIXED_D_TAG
 
-    fun relays(): List<String>? {
+    fun relays(): List<String>? =
-        return tags.mapNotNull {
+        tags
-            if (it.size > 1 && it[0] == "relay") {
+            .mapNotNull {
-                it[1]
-            } else {
-                null
-            }
-        }.plus(
-            privateTagsCache?.mapNotNull {
                 if (it.size > 1 && it[0] == "relay") {
                     it[1]
                 } else {
                     null
                 }
-            } ?: emptyList(),
+            }.plus(
-        ).ifEmpty { null }
+                privateTagsCache?.mapNotNull {
-    }
+                    if (it.size > 1 && it[0] == "relay") {
+                        it[1]
+                    } else {
+                        null
+                    }
+                } ?: emptyList(),
+            ).ifEmpty { null }
 
-    fun cachedPrivateTags(): Array<Array<String>>? {
+    fun cachedPrivateTags(): Array<Array<String>>? = privateTagsCache
-        return privateTagsCache
-    }
 
     fun privateTags(
         signer: NostrSigner,
@@ -79,11 +77,15 @@ class PrivateOutboxRelayListEvent(
 
         try {
             signer.nip44Decrypt(content, pubKey) {
-                privateTagsCache = mapper.readValue<Array<Array<String>>>(it)
+                try {
-                privateTagsCache?.let { onReady(it) }
+                    privateTagsCache = mapper.readValue<Array<Array<String>>>(it)
+                    privateTagsCache?.let { onReady(it) }
+                } catch (e: Throwable) {
+                    Log.w("PrivateOutboxRelayListEvent", "Error parsing the JSON: ${e.message}. Json `$it` from event `${toNostrUri()}`")
+                }
             }
         } catch (e: Throwable) {
-            Log.w("GeneralList", "Error parsing the JSON ${e.message}")
+            Log.w("PrivateOutboxRelayListEvent", "Error decrypting content: ${e.message}. Event: `${toNostrUri()}`")
         }
     }
 
@@ -92,13 +94,9 @@ class PrivateOutboxRelayListEvent(
         const val FIXED_D_TAG = ""
         val TAGS = arrayOf(arrayOf("alt", "Relay list to store private content from this author"))
 
-        fun createAddressATag(pubKey: HexKey): ATag {
+        fun createAddressATag(pubKey: HexKey): ATag = ATag(KIND, pubKey, FIXED_D_TAG, null)
-            return ATag(KIND, pubKey, FIXED_D_TAG, null)
-        }
 
-        fun createAddressTag(pubKey: HexKey): String {
+        fun createAddressTag(pubKey: HexKey): String = ATag.assembleATag(KIND, pubKey, FIXED_D_TAG)
-            return ATag.assembleATag(KIND, pubKey, FIXED_D_TAG)
-        }
 
         fun encryptTags(
             privateTags: Array<Array<String>>? = null,
@@ -114,11 +112,11 @@ class PrivateOutboxRelayListEvent(
             )
         }
 
-        fun createTagArray(relays: List<String>): Array<Array<String>> {
+        fun createTagArray(relays: List<String>): Array<Array<String>> =
-            return relays.map {
+            relays
-                arrayOf("relay", it)
+                .map {
-            }.toTypedArray()
+                    arrayOf("relay", it)
-        }
+                }.toTypedArray()
 
         fun updateRelayList(
             earlierVersion: PrivateOutboxRelayListEvent,
@@ -128,11 +126,13 @@ class PrivateOutboxRelayListEvent(
             onReady: (PrivateOutboxRelayListEvent) -> Unit,
         ) {
             val tags =
-                earlierVersion.privateTagsCache?.filter { it[0] != "relay" }?.plus(
+                earlierVersion.privateTagsCache
-                    relays.map {
+                    ?.filter { it[0] != "relay" }
-                        arrayOf("relay", it)
+                    ?.plus(
-                    },
+                        relays.map {
-                )?.toTypedArray() ?: emptyArray()
+                            arrayOf("relay", it)
+                        },
+                    )?.toTypedArray() ?: emptyArray()
 
             encryptTags(tags, signer) {
                 signer.sign<PrivateOutboxRelayListEvent>(createdAt, KIND, TAGS, it) {

quartz/src/main/java/com/vitorpamplona/quartz/signers/ExternalSignerLauncher.kt

@@ -52,9 +52,7 @@ class Permission(
     val type: String,
     val kind: Int? = null,
 ) {
-    fun toJson(): String {
+    fun toJson(): String = "{\"type\":\"${type}\",\"kind\":$kind}"
-        return "{\"type\":\"${type}\",\"kind\":$kind}"
-    }
 }
 
 class Result(
@@ -89,9 +87,7 @@ class Result(
         /**
          * Parses the json with a string of events to an Array of Event objects.
          */
-        fun fromJsonArray(json: String): Array<Result> {
+        fun fromJsonArray(json: String): Array<Result> = mapper.readValue(json)
-            return mapper.readValue(json)
-        }
     }
 }
 
@@ -272,9 +268,7 @@ class ExternalSignerLauncher(
         signerType: SignerType,
         data: Array<out String>,
         columnName: String = "signature",
-    ): kotlin.Result<String?> {
+    ): kotlin.Result<String?> = getDataFromResolver(signerType, data, columnName, contentResolver)
-        return getDataFromResolver(signerType, data, columnName, contentResolver)
-    }
 
     private fun getDataFromResolver(
         signerType: SignerType,
@@ -298,8 +292,7 @@ class ExternalSignerLauncher(
                     "1",
                     null,
                     null,
-                )
+                ).use {
-                .use {
                     if (it == null) {
                         return kotlin.Result.success(null)
                     }