From 6367e9ddc9658f07e0364dab2f75ad3ca79a5125 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Wed, 14 May 2025 19:19:58 -0400
Subject: [PATCH] Moving logs from SubscriptionController to the Manager to be
 able to distinguish between the multiple managers

---
 .../eoseManagers/BaseEoseManager.kt           | 30 +++++++++++++++++--
 .../datasources/SubscriptionController.kt     |  6 ----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/eoseManagers/BaseEoseManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/eoseManagers/BaseEoseManager.kt
index 8fec97b42..729864eee 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/eoseManagers/BaseEoseManager.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/eoseManagers/BaseEoseManager.kt
@@ -20,6 +20,8 @@
  */
 package com.vitorpamplona.amethyst.service.relayClient.eoseManagers
 
+import android.util.Log
+import com.vitorpamplona.amethyst.isDebug
 import com.vitorpamplona.ammolite.relays.NostrClient
 import com.vitorpamplona.ammolite.relays.datasources.SubscriptionController
 
@@ -29,6 +31,7 @@ abstract class BaseEoseManager<T>(
 ) {
     val orchestrator =
         SubscriptionController(client) {
+            if (isDebug) Log.d("${this.javaClass.simpleName}", "Updating Subscriptions")
             updateSubscriptions(allKeys())
         }
 
@@ -38,9 +41,30 @@ abstract class BaseEoseManager<T>(
 
     fun invalidateFilters() = orchestrator.invalidateFilters()
 
-    fun start() = orchestrator.start()
+    fun start() {
+        orchestrator.start()
+        if (isDebug) {
+            Log.d("${this.javaClass.simpleName}", "Start")
+        }
+    }
 
-    fun stop() = orchestrator.stop()
+    fun stop() {
+        orchestrator.stop()
+        if (isDebug) {
+            Log.d("${this.javaClass.simpleName}", "Stop")
+        }
+    }
 
-    fun destroy() = orchestrator.destroy()
+    fun destroy() {
+        orchestrator.destroy()
+        if (isDebug) {
+            Log.d("${this.javaClass.simpleName}", "Destroy, Unsubscribe")
+        }
+    }
+
+    fun init() {
+        if (isDebug) {
+            Log.d("${this.javaClass.simpleName}", "Init, Subscribe")
+        }
+    }
 }
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/datasources/SubscriptionController.kt b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/datasources/SubscriptionController.kt
index 75a9eba73..daf793917 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/datasources/SubscriptionController.kt
+++ b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/datasources/SubscriptionController.kt
@@ -20,7 +20,6 @@
  */
 package com.vitorpamplona.ammolite.relays.datasources
 
-import android.util.Log
 import com.vitorpamplona.ammolite.relays.BundledUpdate
 import com.vitorpamplona.ammolite.relays.NostrClient
 import com.vitorpamplona.ammolite.relays.Relay
@@ -81,20 +80,17 @@ class SubscriptionController(
     }
 
     init {
-        Log.d("${this.javaClass.simpleName}", "Init, Subscribe")
         client.subscribe(clientListener)
     }
 
     override fun destroy() {
         // makes sure to run
-        Log.d("${this.javaClass.simpleName}", "Destroy, Unsubscribe")
         stop()
         client.unsubscribe(clientListener)
         bundler.cancel()
     }
 
     override fun start() {
-        Log.d("${this.javaClass.simpleName}", "Start")
         active = true
         invalidateFilters()
     }
@@ -102,7 +98,6 @@ class SubscriptionController(
     @OptIn(DelicateCoroutinesApi::class)
     override fun stop() {
         active = false
-        Log.d("${this.javaClass.simpleName}", "Stop")
 
         subscriptions.forEach { subscription ->
             client.close(subscription.id)
@@ -142,7 +137,6 @@ class SubscriptionController(
     private fun resetFiltersSuspend() {
         // only runs one at a time. Ignores the others
         if (changingFilters.compareAndSet(false, true)) {
-            Log.d("${this.javaClass.simpleName}", "resetFiltersSuspend $active")
             try {
                 resetFiltersSuspendInner()
             } finally {