Merge pull request #33 from dengzii/dev

Dev
dengzii · Mar 10, 2021 · 73f6cc2 · 73f6cc2
2 parents 4cd799f + b1e3775
commit 73f6cc2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -3,7 +3,7 @@
     <id>com.dengzii.plugin.adb</id>
     <name>Android WiFiADB</name>
 
-    <version>3.4</version>
+    <version>3.5</version>
     <vendor email="dengzii@foxmail.com" url="https://github.com/dengzii">dengzi</vendor>
     <description><![CDATA[
 <h3>An AndroidStudio plugin use for connecting Android device over WiFi.</h3>
@@ -30,6 +30,9 @@
     ]]></description>
 
     <change-notes><![CDATA[
+      <b>3.5 (2021-03-10)</b><br>
+      1. fix: cannot remember configured adb path.<br>
+
       <b>3.4 (2021-03-08)</b><br>
       1. fix: the about dialog cannot be displayed.<br>
       2. fix: `connect manual` dialog size problem.<br>

diff --git a/src/com/dengzii/plugin/adb/Config.kt b/src/com/dengzii/plugin/adb/Config.kt
@@ -21,10 +21,6 @@ object Config {
 
     var jvm_test = false
 
-    fun init() {
-        AdbUtils.setAdbCommand(loadAdbPath())
-    }
-
     fun clearDeviceList() {
         PropertiesComponent.getInstance().unsetValue(KEY_DEVICES_LIST)
     }

diff --git a/src/com/dengzii/plugin/adb/MainAction.kt b/src/com/dengzii/plugin/adb/MainAction.kt
@@ -2,6 +2,7 @@ package com.dengzii.plugin.adb
 
 import com.dengzii.plugin.adb.tools.NotificationUtils
 import com.dengzii.plugin.adb.ui.MainDialog
+import com.dengzii.plugin.adb.utils.AdbUtils
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 
@@ -22,6 +23,7 @@ class MainAction : AnAction() {
 //        adb?.devices?.forEach {
 //            println(it.name)
 //        }
+        AdbUtils.setAdbCommand(Config.loadAdbPath())
         try {
             val dialog = MainDialog()
             dialog.show()