Merge pull request #34 from KoalaSat/better-auth

Better relay auth
KoalaSat · Nov 5, 2024 · 15b0864 · 15b0864
2 parents 4a586ac + 091be10
commit 15b0864
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/app/src/main/java/com/koalasat/pokey/models/ExternalSigner.kt b/app/src/main/java/com/koalasat/pokey/models/ExternalSigner.kt
@@ -50,7 +50,7 @@ object ExternalSigner {
         }
     }
 
-    fun auth(relayUrl: String, challenge: String, onReady: (String) -> Unit) {
+    fun auth(relayUrl: String, challenge: String, onReady: (Event) -> Unit) {
         val pubKey = Pokey.getInstance().getHexKey()
         val createdAt = TimeUtils.now()
         val kind = 22242
@@ -71,6 +71,24 @@ object ExternalSigner {
                 content = content,
                 sig = "",
             )
+        externalSignerLauncher.openSigner(
+            event,
+        ) {
+            onReady(
+                Event(
+                    id = id,
+                    pubKey = pubKey,
+                    createdAt = createdAt,
+                    kind = kind,
+                    tags = tags,
+                    content = content,
+                    sig = it,
+                ),
+            )
+        }
+    }
+
+    fun sign(event: Event, onReady: (String) -> Unit) {
         externalSignerLauncher.openSigner(
             event,
             onReady,

diff --git a/app/src/main/java/com/koalasat/pokey/service/NotificationsService.kt b/app/src/main/java/com/koalasat/pokey/service/NotificationsService.kt
@@ -64,7 +64,9 @@ class NotificationsService : Service() {
             override fun onAuth(relay: Relay, challenge: String) {
                 Log.d("Pokey", "Relay on Auth: ${relay.url} : $challenge")
                 ExternalSigner.auth(relay.url, challenge) { result ->
-                    Log.d("Pokey", "Relay on Auth response: ${relay.url} : $result")
+                    Log.d("Pokey", "Relay on Auth response: ${relay.url} : ${result.toJson()}")
+                    relay.send(result)
+                    relay.renewFilters()
                 }
             }
 

diff --git a/app/src/main/java/com/koalasat/pokey/ui/relays/RelaysFragment.kt b/app/src/main/java/com/koalasat/pokey/ui/relays/RelaysFragment.kt
@@ -118,6 +118,8 @@ class RelaysFragment : Fragment() {
                 binding.addPrivateRelayUrl.error = getString(R.string.invalid_uri)
             }
         }
+        binding.publishPrivateRelay.setOnClickListener {
+        }
         binding.reloadPrivateRelay.setOnClickListener {
             Pokey.updateLoadingPrivateRelays(true)
             reconnectRelays(privateRelaysKind)

diff --git a/app/src/main/res/drawable/ic_remove_red_24dp.xml b/app/src/main/res/drawable/ic_remove_red_24dp.xml
@@ -1,11 +1,2 @@
-<?xml version="1.1" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#FFDC143C"
-    android:pathData="M3,6h18c0.553,0 1,0.447 1,1v2h-20V7C2,6.447 2.447,6 3,6zM4,10h16v12c0,1.104 -0.896,2 -2,2H6c-1.104,0 -2,-0.896 -2,-2V10zM10,12v8h4v-8h-4z"/>
-</vector>
+<!-- drawable/minus_circle.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#FFDC143C" android:pathData="M17,13H7V11H17M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" /></vector>