downgrade kotlin version to 1.3.72.

Author: bytebeats

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'org.jetbrains.intellij' version '1.3.0'
-    id 'org.jetbrains.kotlin.jvm' version '1.6.10'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.72'
 }
 
 group 'io.github.bytebeats'
@@ -33,28 +33,24 @@ dependencies {
 intellij {
     pluginName = 'OkHttpAnalyzer'
     updateSinceUntilBuild = false
-//    version = '2021.3'
-//    version = '211.7628.21'
-//    type = 'IC'
-//    plugins = ['android']
+    version = '211.7628.21'
+    plugins = ['android']
     localPath = project.hasProperty("StudioRunPath") ? StudioRunPath : StudioCompilePath
     instrumentCode {
-        compilerVersion = "213.6461.79"
-//        compilerVersion = "211.7628.21"
+        compilerVersion = "211.7628.21"
     }
 //
     instrumentTestCode {
-        compilerVersion = "213.6461.79"
-//        compilerVersion = "211.7628.21"
+        compilerVersion = "211.7628.21"
     }
 }
 
-//runIde {
-//    // Absolute path to installed target 3.5 Android Studio to use as IDE Development Instance
-//    // The "Contents" directory is macOS specific.
-//    def dir = project.hasProperty("StudioRunPath") ? StudioRunPath : StudioCompilePath
-//    ideDir = file(dir)
-//}
+runIde {
+    // Absolute path to installed target 3.5 Android Studio to use as IDE Development Instance
+    // The "Contents" directory is macOS specific.
+    def dir = project.hasProperty("StudioRunPath") ? StudioRunPath : StudioCompilePath
+    ideDir = file(dir)
+}
 
 compileKotlin {
     kotlinOptions.jvmTarget = "1.8"

gradle.copy.properties

@@ -0,0 +1,17 @@
+# Copy this file as gradle.properties
+# It will be used for both compiling and running the adb-idea plugin.
+
+
+# Path to a downloaded instance of Android Studio
+# This is used to add the android plugin dependencies to the project.
+# must point to the latest version of Android Studio.
+# You'll know it's right if you can find "$StudioCompilePath/lib/idea.jar"
+#StudioCompilePath=/Applications/Android Studio.app/Contents
+StudioCompilePath=/Users/tiger/Library/Application Support/JetBrains/Toolbox/apps/AndroidStudio/ch-0/211.7628.21.2111.8193401/Android Studio.app/Contents
+
+
+# Determines which IDE to run when using the "./gradlew runIdea" command.
+# This is useful to test the plugin on older versions of Android Studio or Intellij
+# Default value: $StudioCompilePath
+#StudioRunPath=/Applications/Android Studio.app/Contents
+StudioRunPath=/Users/tiger/Library/Application Support/JetBrains/Toolbox/apps/AndroidStudio/ch-0/211.7628.21.2111.8193401/Android Studio.app/Contents

src/main/java/me/bytebeats/asp/analyzer/MainForm.java

@@ -29,10 +29,10 @@ public class MainForm {
     private JPanel panel;
     private JComboBox<DebugDevice> deviceList;
     private JComboBox<DebugProcess> appList;
+    private JComboBox<String> methodList;
     private JPanel mainContainer;
     private JEditorPane initialHtml;
     private JPanel buttonContainer;
-    private JComboBox<String> methodList;
     private JTextField keywordFilter;
     private final JButton scrollToBottomButton;
     private final JButton clearButton;
@@ -47,20 +47,23 @@ public MainForm() {
         donateButton = new JButton();
         donateButton.setPreferredSize(new Dimension(30, 30));
         donateButton.setIcon(ResourcesKt.getIcon("donate.png"));
+        donateButton.setToolTipText(ResourcesKt.getString("donate"));
         GridBagConstraints donateButtonConstraints = new GridBagConstraints();
         donateButtonConstraints.gridx = 1;
         donateButtonConstraints.gridy = 0;
 
         scrollToBottomButton = new JButton();
         scrollToBottomButton.setIcon(ResourcesKt.getIcon("scroll.png"));
         scrollToBottomButton.setPreferredSize(new Dimension(30, 30));
+        scrollToBottomButton.setToolTipText(ResourcesKt.getString("scroll_to_bottom"));
         GridBagConstraints scrollConstraints = new GridBagConstraints();
         scrollConstraints.gridx = 2;
         scrollConstraints.gridy = 0;
 
         clearButton = new JButton();
         clearButton.setPreferredSize(new Dimension(30, 30));
         clearButton.setIcon(ResourcesKt.getIcon("delete.png"));
+        clearButton.setToolTipText(ResourcesKt.getString("clear"));
         GridBagConstraints clearConstraints = new GridBagConstraints();
         clearConstraints.gridx = 3;
         clearConstraints.gridy = 0;
@@ -160,7 +163,6 @@ public void updateMethodList(String method) {
         if (!methods.contains(method)) {
             methods.add(method);
             methodList.setModel(new DefaultComboBoxModel<>(new Vector<>(methods)));
-            methodList.addItemListener(methodItemListener);
         }
     }
 }

src/main/kotlin/me/bytebeats/asp/analyzer/AdbManager.kt

@@ -12,6 +12,7 @@ import me.bytebeats.asp.analyzer.data.RequestDataSource
 import me.bytebeats.asp.analyzer.enums.MessageType
 import me.bytebeats.asp.analyzer.util.TAG_DELIMITER
 import me.bytebeats.asp.analyzer.util.TAG_KEY
+import me.bytebeats.asp.analyzer.util.info
 import me.bytebeats.asp.analyzer.view.FormViewManager
 import org.jetbrains.android.sdk.AndroidSdkUtils
 import java.awt.event.ActionEvent
@@ -57,8 +58,8 @@ class AdbManager(
                         val debugRequest = RequestDataSource.getRequestFromMessage(id, messageType, line.message)
                         if (debugRequest != null) {
                             try {
-                                mainForm.updateMethodList(debugRequest.method)
                                 SwingUtilities.invokeLater {
+                                    mainForm.updateMethodList(debugRequest.method)
                                     requestTableManager.insertOrUpdate(debugRequest)
                                 }
                             } catch (e: Exception) {
@@ -73,6 +74,10 @@ class AdbManager(
 
     init {
         initDeviceList(project)
+        initMethodList()
+    }
+
+    private fun initMethodList() {
         mainForm.setMethodItemListener {
             if (it.stateChange == ItemEvent.SELECTED) {
                 requestTableManager.methodFilter = mainForm.methodList.selectedItem as String
@@ -88,36 +93,36 @@ class AdbManager(
     private fun initDeviceList(project: Project) {
         AndroidDebugBridge.addDeviceChangeListener(object : AndroidDebugBridge.IDeviceChangeListener {
             override fun deviceChanged(device: IDevice?, p1: Int) {
-                log("deviceChanged $device")
+                info("deviceChanged $device")
                 device?.let {
                     attachToDevice(it)
                 }
             }
 
             override fun deviceConnected(device: IDevice?) {
-                log("deviceConnected $device")
+                info("deviceConnected $device")
                 updateDeviceList(AndroidDebugBridge.getBridge()?.devices)
             }
 
             override fun deviceDisconnected(device: IDevice?) {
-                log("deviceDisconnected $device")
+                info("deviceDisconnected $device")
                 updateDeviceList(AndroidDebugBridge.getBridge()?.devices)
             }
         })
         AndroidDebugBridge.addDebugBridgeChangeListener {
             val devices = it?.devices
             if (devices?.isNotEmpty() == true) {
-                log("addDebugBridgeChangeListener $it")
+                info("addDebugBridgeChangeListener $it")
                 updateDeviceList(devices)
             } else {
-                log("addDebugBridgeChangeListener EMPTY $it and connected ${it?.isConnected}")
+                info("addDebugBridgeChangeListener EMPTY $it and connected ${it?.isConnected}")
             }
         }
         AndroidDebugBridge.addClientChangeListener { client: Client?, _: Int ->
             updateClient(client)
         }
         val bridge0: AndroidDebugBridge? = AndroidSdkUtils.getDebugBridge(project)
-        log("initDeviceList bridge0 ${bridge0?.isConnected}")
+        info("initDeviceList bridge0 ${bridge0?.isConnected}")
     }
 
     private fun updateClient(client: Client?) {
@@ -128,7 +133,7 @@ class AdbManager(
             for (i in 0 until clientModel.size) {
                 val model = clientModel.getElementAt(i)
                 if (model.pid == clientData.pid) {
-                    log("updateClient ${clientData.pid}")
+                    info("updateClient ${clientData.pid}")
                     model.process = clientData.packageName
                     model.clientDescription = clientData.clientDescription
                     if (model.getClientKey() == prefSelectedPackage) {
@@ -144,7 +149,7 @@ class AdbManager(
     }
 
     private fun updateDeviceList(devices: Array<IDevice>?) {
-        log("updateDeviceList ${devices?.size}")
+        info("updateDeviceList ${devices?.size}")
         val selectedDeviceName = preferences.selectedDevice
         var selectedDevice: IDevice? = null
         if (devices != null) {
@@ -161,7 +166,7 @@ class AdbManager(
             list.model = model
             list.addItemListener {
                 if (it.stateChange == ItemEvent.SELECTED) {
-                    log("Selected ${list.selectedItem}")
+                    info("Selected ${list.selectedItem}")
                     val device = list.selectedItem as DebugDevice
                     attachToDevice(device.device)
                     preferences.selectedDevice = device.device.name
@@ -186,21 +191,21 @@ class AdbManager(
     }
 
     private fun createProcessList(device: IDevice) {
-        val prefSelectedPackage = preferences.selectedProcess
+        val prefSelectedProcess = preferences.selectedProcess
         var defaultSelection: DebugProcess? = null
         val debugProcessList = ArrayList<DebugProcess>()
-        log("createProcessList ${device.clients.size}")
+        info("createProcessList ${device.clients.size}")
         for (client in device.clients) {
             val clientData = client.clientData
             val process = DebugProcess(
                 clientData.pid,
                 clientData.packageName,
                 clientData.clientDescription
             )
-            if (prefSelectedPackage == process.getClientKey()) {
+            if (prefSelectedProcess == process.getClientKey()) {
                 defaultSelection = process
             }
-            log("addClient $process")
+            info("addClient $process")
             debugProcessList.add(process)
         }
         val model = DefaultComboBoxModel(debugProcessList.toTypedArray())
@@ -211,7 +216,7 @@ class AdbManager(
                 preferences.selectedProcess = client.getClientKey()
                 defaultSelection = client
                 selectedProcess = client
-                log("selectedProcess $defaultSelection")
+                info("selectedProcess $defaultSelection")
                 requestTableManager.clear()
 //                requestTableManager.addAll(RequestDataSource.r(client.getClientKey()))
                 mainForm.resetMethodList()
@@ -226,12 +231,8 @@ class AdbManager(
     }
 
 
-    private fun log(text: String) {
-        println(text)
-    }
-
     private fun setListener(device: IDevice) {
-        log(device.toString())
+        info(device.toString())
         val prevDevice = selectedDevice
         if (prevDevice != null) {
             logcatService.removeListener(prevDevice, logcatListener)

src/main/kotlin/me/bytebeats/asp/analyzer/Preferences.kt

@@ -2,6 +2,7 @@ package me.bytebeats.asp.analyzer
 
 import com.intellij.ide.util.PropertiesComponent
 import me.bytebeats.asp.analyzer.util.SELECTED_DEVICE
+import me.bytebeats.asp.analyzer.util.SELECTED_METHOD
 import me.bytebeats.asp.analyzer.util.SELECTED_PID
 import me.bytebeats.asp.analyzer.util.SELECTED_TAB
 
@@ -32,4 +33,10 @@ class Preferences(private val properties: PropertiesComponent) {
         set(value) {
             properties.setValue(SELECTED_TAB, value)
         }
+
+    var selectedMethod: String?
+        get() = properties.getValue(SELECTED_METHOD)
+        set(value) {
+            properties.setValue(SELECTED_METHOD, value)
+        }
 }

src/main/kotlin/me/bytebeats/asp/analyzer/util/Consts.kt

@@ -16,6 +16,7 @@ const val BUNDLE_STRINGS = "strings"
 const val SELECTED_DEVICE = "selected_device"
 const val SELECTED_PID = "selected_pid"
 const val SELECTED_TAB = "selected_tab"
+const val SELECTED_METHOD = "selected_method"
 const val NEW_LINE = "\r\n"
 const val SPACE = " "
 

src/main/kotlin/me/bytebeats/asp/analyzer/util/Notifications.kt

@@ -0,0 +1,50 @@
+package me.bytebeats.asp.analyzer.util
+
+import com.intellij.notification.NotificationGroup
+import com.intellij.notification.NotificationType
+import com.intellij.openapi.project.ex.ProjectManagerEx
+
+
+/**
+ * @Author bytebeats
+ * @Email <[email protected]>
+ * @Github https://github.com/bytebeats
+ * @Created at 2022/3/4 14:50
+ * @Version 1.0
+ * @Description TO-DO
+ */
+private const val NOTIFICATION_TITLE = "OkHttp Analyzer"
+private val LOG_NOTIFICATION_GROUP = NotificationGroup.logOnlyGroup("$NOTIFICATION_TITLE Log")
+private val BALLOON_NOTIFICATION_GROUP = NotificationGroup.balloonGroup("$NOTIFICATION_TITLE Balloon")
+private val TOOL_WINDOW_NOTIFICATION_GROUP =
+    NotificationGroup.toolWindowGroup("$NOTIFICATION_TITLE Tool Window", "$NOTIFICATION_TITLE Tool Window")
+
+/**
+ * messages on Event Log Window
+ *
+ * @param message
+ */
+fun info(message: String) {
+    LOG_NOTIFICATION_GROUP.createNotification(NOTIFICATION_TITLE, message, NotificationType.INFORMATION, null)
+        .notify(ProjectManagerEx.getInstance().defaultProject)
+}
+
+/**
+ * messages on Event Log Window in balloon style
+ *
+ * @param message
+ */
+fun infoBalloon(message: String) {
+    BALLOON_NOTIFICATION_GROUP.createNotification(NOTIFICATION_TITLE, message, NotificationType.WARNING, null)
+        .notify(ProjectManagerEx.getInstance().defaultProject)
+}
+
+/**
+ * messages on Tool Window
+ *
+ * @param message
+ */
+fun infoToolWindow(message: String) {
+    TOOL_WINDOW_NOTIFICATION_GROUP.createNotification(NOTIFICATION_TITLE, message, NotificationType.ERROR, null)
+        .notify(ProjectManagerEx.getInstance().defaultProject)
+}