From 7468352795eb9ac59ee042360f3d9b94479b43e7 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 1 Mar 2024 10:40:12 -0500
Subject: [PATCH] Removes warnings from the quartz library.

---
 .../vitorpamplona/quartz/encoders/Lud06.kt    |  2 +-
 .../quartz/encoders/Nip19Bech32.kt            |  4 ++-
 .../quartz/events/BaseTextNoteEvent.kt        | 32 +++++++++++--------
 .../quartz/events/EventInterface.kt           |  2 +-
 .../quartz/events/GitPatchEvent.kt            |  2 +-
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/encoders/Lud06.kt b/quartz/src/main/java/com/vitorpamplona/quartz/encoders/Lud06.kt
index d4d2bb178..775a7c85f 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/encoders/Lud06.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/encoders/Lud06.kt
@@ -30,7 +30,7 @@ class Lud06 {
 
     fun toLud16(str: String): String? {
         return try {
-            val url = toLnUrlp(str)
+            val url = toLnUrlp(str) ?: return null
 
             val matcher = LNURLP_PATTERN.matcher(url)
             if (matcher.find()) {
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/encoders/Nip19Bech32.kt b/quartz/src/main/java/com/vitorpamplona/quartz/encoders/Nip19Bech32.kt
index de2e719b3..31267b345 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/encoders/Nip19Bech32.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/encoders/Nip19Bech32.kt
@@ -94,7 +94,9 @@ object Nip19Bech32 {
             val key = matcher.group(3) // bech32
             val additionalChars = matcher.group(4) // additional chars
 
-            return parseComponents(type!!, key, additionalChars)
+            if (type == null) return null
+
+            return parseComponents(type, key, additionalChars)
         } catch (e: Throwable) {
             Log.e("NIP19 Parser", "Issue trying to Decode NIP19 $uri: ${e.message}", e)
         }
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/BaseTextNoteEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/BaseTextNoteEvent.kt
index 26a522e49..a6d202298 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/BaseTextNoteEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/BaseTextNoteEvent.kt
@@ -105,14 +105,16 @@ open class BaseTextNoteEvent(
             val additionalChars = matcher2.group(4) // additional chars
 
             try {
-                val parsed = Nip19Bech32.parseComponents(type, key, additionalChars)?.entity
+                if (type != null) {
+                    val parsed = Nip19Bech32.parseComponents(type, key, additionalChars)?.entity
 
-                if (parsed != null) {
-                    if (parsed is Nip19Bech32.NProfile) {
-                        returningList.add(parsed.hex)
-                    }
-                    if (parsed is Nip19Bech32.NPub) {
-                        returningList.add(parsed.hex)
+                    if (parsed != null) {
+                        if (parsed is Nip19Bech32.NProfile) {
+                            returningList.add(parsed.hex)
+                        }
+                        if (parsed is Nip19Bech32.NPub) {
+                            returningList.add(parsed.hex)
+                        }
                     }
                 }
             } catch (e: Exception) {
@@ -151,14 +153,16 @@ open class BaseTextNoteEvent(
             val key = matcher2.group(3) // bech32
             val additionalChars = matcher2.group(4) // additional chars
 
-            val parsed = Nip19Bech32.parseComponents(type, key, additionalChars)?.entity
+            if (type != null) {
+                val parsed = Nip19Bech32.parseComponents(type, key, additionalChars)?.entity
 
-            if (parsed != null) {
-                when (parsed) {
-                    is Nip19Bech32.NEvent -> citations.add(parsed.hex)
-                    is Nip19Bech32.NAddress -> citations.add(parsed.atag)
-                    is Nip19Bech32.Note -> citations.add(parsed.hex)
-                    is Nip19Bech32.NEmbed -> citations.add(parsed.event.id)
+                if (parsed != null) {
+                    when (parsed) {
+                        is Nip19Bech32.NEvent -> citations.add(parsed.hex)
+                        is Nip19Bech32.NAddress -> citations.add(parsed.atag)
+                        is Nip19Bech32.Note -> citations.add(parsed.hex)
+                        is Nip19Bech32.NEmbed -> citations.add(parsed.event.id)
+                    }
                 }
             }
         }
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/EventInterface.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/EventInterface.kt
index 55f0b4b2b..ae2d56396 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/EventInterface.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/EventInterface.kt
@@ -63,7 +63,7 @@ interface EventInterface {
 
     fun isTaggedUser(idHex: String): Boolean
 
-    fun isTaggedUsers(idHex: Set<String>): Boolean
+    fun isTaggedUsers(idHexes: Set<String>): Boolean
 
     fun isTaggedEvent(idHex: String): Boolean
 
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/GitPatchEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/GitPatchEvent.kt
index d9a6670e1..4c5a04ce8 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/GitPatchEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/GitPatchEvent.kt
@@ -60,7 +60,7 @@ class GitPatchEvent(
     fun commitPGPSig() = tags.firstOrNull { it.size > 1 && it[0] == "commit-pgp-sig" }?.get(1)
 
     fun committer() =
-        tags.filter { it.size > 1 && it[0] == "committer" }?.mapNotNull {
+        tags.filter { it.size > 1 && it[0] == "committer" }.mapNotNull {
             Committer(it.getOrNull(1), it.getOrNull(2), it.getOrNull(3), it.getOrNull(4))
         }