From 50ec6bc9e8350e52926023561be6fd0ef42ae05a Mon Sep 17 00:00:00 2001
From: Shiina_Xi_yu <dolphinht.pwp@gmail.com>
Date: Wed, 21 Aug 2024 00:30:05 +0800
Subject: [PATCH] Fix can not select the device correctly

---
 src/main/kotlin/moe/sekiu/minilpa/lpa/LPABackend.kt        | 7 -------
 src/main/kotlin/moe/sekiu/minilpa/lpa/LPACExecutor.kt      | 4 +---
 .../kotlin/moe/sekiu/minilpa/lpa/LocalProfileAssistant.kt  | 1 -
 src/main/kotlin/moe/sekiu/minilpa/lpa/MiniRemoteLPA.kt     | 2 --
 src/main/kotlin/moe/sekiu/minilpa/ui/MainFrame.kt          | 3 ++-
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/main/kotlin/moe/sekiu/minilpa/lpa/LPABackend.kt b/src/main/kotlin/moe/sekiu/minilpa/lpa/LPABackend.kt
index 1e90c118..74abed72 100644
--- a/src/main/kotlin/moe/sekiu/minilpa/lpa/LPABackend.kt
+++ b/src/main/kotlin/moe/sekiu/minilpa/lpa/LPABackend.kt
@@ -8,13 +8,6 @@ import moe.sekiu.minilpa.model.Profile
 
 interface LPABackend<D : Device>
 {
-    var selectedDevice : D?
-
-    fun set(d : D?)
-    {
-        selectedDevice = d
-    }
-
     suspend fun getChipInfo() : ChipInfo
 
     suspend fun getProfileList() : List<Profile>
diff --git a/src/main/kotlin/moe/sekiu/minilpa/lpa/LPACExecutor.kt b/src/main/kotlin/moe/sekiu/minilpa/lpa/LPACExecutor.kt
index 3d95f661..dd976c2c 100644
--- a/src/main/kotlin/moe/sekiu/minilpa/lpa/LPACExecutor.kt
+++ b/src/main/kotlin/moe/sekiu/minilpa/lpa/LPACExecutor.kt
@@ -27,8 +27,6 @@ class LPACExecutor() : LPABackend<Driver>
 {
     private val log = logger()
 
-    override var selectedDevice : Driver? = null
-
     suspend fun getDeviceList() : List<Driver> = decode(execute("driver", "apdu", "list").data)
 
     override suspend fun getChipInfo() : ChipInfo = decode(execute("chip", "info").data)
@@ -79,7 +77,7 @@ class LPACExecutor() : LPABackend<Driver>
         val env = mutableMapOf<String, String>()
         if (setting.debug.libeuicc.apdu) env["LIBEUICC_DEBUG_APDU"] = "true"
         if (setting.debug.libeuicc.http) env["LIBEUICC_DEBUG_HTTP"] = "true"
-        selectedDevice?.run { env["DRIVER_IFID"] = cast<Driver>().env }
+        LocalProfileAssistant.devices.selectedItem?.run { env["DRIVER_IFID"] = cast<Driver>().env }
         var lpacout : LPACIO? = null
         process(
             *(arrayOf(lpacFile.canonicalPath) + commands),
diff --git a/src/main/kotlin/moe/sekiu/minilpa/lpa/LocalProfileAssistant.kt b/src/main/kotlin/moe/sekiu/minilpa/lpa/LocalProfileAssistant.kt
index e4019916..91d19fc0 100644
--- a/src/main/kotlin/moe/sekiu/minilpa/lpa/LocalProfileAssistant.kt
+++ b/src/main/kotlin/moe/sekiu/minilpa/lpa/LocalProfileAssistant.kt
@@ -44,7 +44,6 @@ object LocalProfileAssistant
                 devices.addAll(backend.cast<LPACExecutor>().getDeviceList())
                 val device = devices.getElementAt(0)
                 devices.selectedItem = device
-                backend.cast<LPABackend<Device>>().selectedDevice = device
             }
         }
     }
diff --git a/src/main/kotlin/moe/sekiu/minilpa/lpa/MiniRemoteLPA.kt b/src/main/kotlin/moe/sekiu/minilpa/lpa/MiniRemoteLPA.kt
index 2609c89e..1540154f 100644
--- a/src/main/kotlin/moe/sekiu/minilpa/lpa/MiniRemoteLPA.kt
+++ b/src/main/kotlin/moe/sekiu/minilpa/lpa/MiniRemoteLPA.kt
@@ -35,8 +35,6 @@ suspend fun main()
 
 class MiniRemoteLPA : LPABackend<RemoteCard>
 {
-    override var selectedDevice : RemoteCard? = null
-
     lateinit var wsSession : WebSocketSession
     val waiting = mutableMapOf<UUID, CompletableDeferred<LPACIO>>()
 
diff --git a/src/main/kotlin/moe/sekiu/minilpa/ui/MainFrame.kt b/src/main/kotlin/moe/sekiu/minilpa/ui/MainFrame.kt
index 3ba803e5..387a03e9 100644
--- a/src/main/kotlin/moe/sekiu/minilpa/ui/MainFrame.kt
+++ b/src/main/kotlin/moe/sekiu/minilpa/ui/MainFrame.kt
@@ -27,6 +27,7 @@ import moe.sekiu.minilpa.exception.OperationFailureException
 import moe.sekiu.minilpa.freeze
 import moe.sekiu.minilpa.language
 import moe.sekiu.minilpa.logger
+import moe.sekiu.minilpa.lpa.LocalProfileAssistant
 import moe.sekiu.minilpa.setup
 import moe.sekiu.minilpa.setupFontSize
 import moe.sekiu.minilpa.ui.component.MiniProgressDialog
@@ -148,7 +149,7 @@ class MainFrame : JFrame()
         block : suspend () -> T
     ) : T?
     {
-        if (requireDevice && backend.selectedDevice == null)
+        if (requireDevice && LocalProfileAssistant.devices.selectedItem == null)
         {
             JOptionPane.showMessageDialog(
                 this@MainFrame,