Use client sets to manage clients

A better habit makes it easier to understand the codes
JingMatrix · Aug 17, 2023 · 0a5dbbb · 0a5dbbb
1 parent e32fc2c
commit 0a5dbbb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/app/src/main/java/org/matrix/chromext/Chrome.kt b/app/src/main/java/org/matrix/chromext/Chrome.kt
@@ -92,6 +92,7 @@ object Chrome {
     val lastClient = cspBypassed.find { it.tabId == tabId }
     var client = lastClient ?: DevToolClient(tabId)
     if (client.isClosed()) {
+      cspBypassed.remove(client)
       hitDevTools().close()
       client = DevToolClient(tabId)
     }
@@ -103,6 +104,8 @@ object Chrome {
       client.command(null, "Page.setBypassCSP", JSONObject().put("enabled", bypassCSP))
       if (bypassCSP) {
         cspBypassed.add(client)
+      } else {
+        cspBypassed.remove(client)
       }
     }
     if (!bypassCSP) client.close()

diff --git a/app/src/main/java/org/matrix/chromext/Listener.kt b/app/src/main/java/org/matrix/chromext/Listener.kt
@@ -259,6 +259,7 @@ object Listener {
           }
           thread {
             target?.close()
+            devSessions.remove(target)
             hitDevTools().close()
             target = DevToolClient(targetTabId)
             if (!target!!.isClosed()) {

diff --git a/app/src/main/java/org/matrix/chromext/devtools/WebSocketClient.kt b/app/src/main/java/org/matrix/chromext/devtools/WebSocketClient.kt
@@ -9,7 +9,6 @@ import java.security.SecureRandom
 import kotlin.experimental.xor
 import org.json.JSONObject
 import org.matrix.chromext.Chrome
-import org.matrix.chromext.Listener
 import org.matrix.chromext.hook.UserScriptHook
 import org.matrix.chromext.hook.WebViewHook
 import org.matrix.chromext.utils.Log
@@ -43,10 +42,6 @@ class DevToolClient(tabId: String) : LocalSocket() {
 
   override fun close() {
     super.close()
-    if (!mClosed) {
-      Chrome.cspBypassed.remove(this)
-      Listener.devSessions.remove(this)
-    }
     mClosed = true
   }