Merge pull request #57 from Grigory-Rylov/fix/dialog-processes-refresh

Fix: Auto-refresh device list in Select Layout recording dialog

Author: Grigory-Rylov

.github/workflows/release.yml

@@ -4,12 +4,16 @@ on:
   push:
     branches:
       - '**'
+  pull_request:
+    branches:
+      - '**'
 
 jobs:
   build-artifact:
     runs-on: ubuntu-latest
     outputs:
       plugin_version: ${{ steps.get_version.outputs.plugin_version }}
+      is_master: ${{ steps.check_branch.outputs.is_master }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -21,7 +25,10 @@ jobs:
           java-version: '21'
 
       - name: Set up Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: '8.13'
+          cache-disabled: true
 
       - name: Extract plugin version
         id: get_version
@@ -30,6 +37,15 @@ jobs:
           echo "$version" > plugin-version.txt
           echo "plugin_version=$version" >> $GITHUB_OUTPUT
 
+      - name: Check if master branch
+        id: check_branch
+        run: |
+          if [ "${{ github.ref }}" == "refs/heads/master" ]; then
+            echo "is_master=true" >> $GITHUB_OUTPUT
+          else
+            echo "is_master=false" >> $GITHUB_OUTPUT
+          fi
+
       - name: Build plugin
         run: ./gradlew buildPlugin
 
@@ -50,7 +66,7 @@ jobs:
           path: plugin-version.txt
 
   release:
-    if: github.ref == 'refs/heads/master'
+    if: needs.build-artifact.outputs.is_master == 'true'
     needs: build-artifact
     runs-on: ubuntu-latest
     steps:

build.gradle.kts

@@ -4,9 +4,9 @@ plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "2.1.0"
+    id("org.jetbrains.kotlin.jvm") version "2.2.20"
     // https://github.com/JetBrains/intellij-platform-gradle-plugin
-    id("org.jetbrains.intellij.platform") version "2.6.0"
+    id("org.jetbrains.intellij.platform") version "2.10.5"
     // https://github.com/JetBrains/gradle-changelog-plugin
     id("org.jetbrains.changelog") version "2.2.1"
 }

gradle.properties

@@ -1,6 +1,7 @@
 # Gradle JVM settings
-org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx4096m
 kotlin.code.style=official
+org.gradle.parallel=true
 # Opt-out flag for bundling Kotlin standard library.
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
 # suppress inspection "UnusedProperty"
@@ -10,16 +11,14 @@ kotlin.stdlib.default.dependency=false
 platformPlugins=android
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType=AI
-#TODO: set to 2025.1.1.2
-platformVersion=2024.3.1.7
+platformVersion=2025.3.1.1
 pluginGroup=com.github.grishberg.android
 pluginName=YALI
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-#TODO: set to 252.*
-sinceBuild=243.22562.145
-pluginVersion=25.08.05.0
+sinceBuild=253.28294.334
+pluginVersion=26.04.12.0
 # Use the latest of Android plugin versionAdd commentMore actions
 # see https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
-androidPluginVersion=243.22562.218
+# androidPluginVersion=251.25410.109
 #localASVersion=/Applications/Android Studio.app/Contents

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/com/android/layoutinspector/model/TreePathUtils.kt

@@ -22,7 +22,7 @@ object TreePathUtils {
         var node: AbstractViewNode? = node
         val nodes = Lists.newArrayList<Any>()
         do {
-            nodes.add(0, node)
+            nodes.add(0, node!!)
             node = node?.parent as AbstractViewNode?
         } while (node != null && node !== root)
         if (root != null && node === root) {

src/main/kotlin/com/github/grishberg/android/layoutinspector/ui/dialogs/NewLayoutDialog.kt

@@ -45,6 +45,7 @@ class NewLayoutDialog(
     private val resetConnectionButton: JButton
     private val clientsList: JBList<ClientWrapper>
     private val deviceChangedAction = DeviceChangedActions()
+    private var processesRefreshJob: Job? = null
     var result: LayoutRecordOptions? = null
         private set
 
@@ -73,6 +74,7 @@ class NewLayoutDialog(
         }
 
         showAllProcesses = JCheckBox("any processes")
+        showAllProcesses.isSelected = true
         showAllProcesses.addActionListener {
             val deviceWrapper = devicesComboBox.selectedItem as DeviceWrapper?
 
@@ -81,6 +83,27 @@ class NewLayoutDialog(
             }
         }
 
+        // Start processes refresh timer when dialog is shown
+        addWindowListener(object : java.awt.event.WindowAdapter() {
+            override fun windowOpened(e: java.awt.event.WindowEvent?) {
+                logger.d("$TAG: windowOpened() - Starting process auto-refresh")
+                // Immediately populate clients for the selected device
+                val deviceWrapper = devicesComboBox.selectedItem as DeviceWrapper?
+                if (deviceWrapper != null) {
+                    logger.d("$TAG: windowOpened() - Populating clients for device: ${deviceWrapper.device}")
+                    populateWithClients(deviceWrapper.device)
+                } else {
+                    logger.w("$TAG: windowOpened() - No device selected")
+                }
+                startProcessesRefreshTimer()
+            }
+
+            override fun windowClosed(e: java.awt.event.WindowEvent?) {
+                logger.d("$TAG: windowClosed() - Stopping process auto-refresh")
+                stopProcessesRefreshTimer()
+            }
+        })
+
         clientsList = JBList(clientListModel)
         val listScroll = JBScrollPane(clientsList)
         setupClientsList(clientsList)
@@ -237,24 +260,31 @@ class NewLayoutDialog(
     }
 
     fun showDialog() {
+        logger.d("$TAG: showDialog() - Opening dialog")
         deviceProvider.deviceChangedActions.add(deviceChangedAction)
         setLocationRelativeTo(owner)
         result = null
         populateWithDevices()
         isVisible = true
+        logger.d("$TAG: showDialog() - Dialog closed, result: ${result != null}")
     }
 
     private fun populateWithDevices() {
+        logger.d("$TAG: populateWithDevices() - Requesting devices from provider")
         GlobalScope.launch(Dispatchers.EDT) {
             val devices = deviceProvider.requestDevices()
-            logger.d("$TAG: received ${devices.size} devices")
+            logger.d("$TAG: populateWithDevices() - received ${devices.size} devices")
             devicesComboBox.removeAllItems()
             for (device in devices) {
                 devicesComboBox.addItem(RealDeviceWrapper(device))
+                logger.d("$TAG: populateWithDevices() - added device: ${device}")
             }
 
             if (devicesComboBox.itemCount > 0) {
                 devicesComboBox.selectedIndex = 0
+                // Immediately populate clients for the first device
+                logger.d("$TAG: populateWithDevices() - selecting first device and populating clients")
+                populateWithClients((devicesComboBox.selectedItem as DeviceWrapper).device)
             }
             if (devicesComboBox.itemCount == 1) {
                 clientsList.requestFocus()
@@ -263,6 +293,7 @@ class NewLayoutDialog(
     }
 
     private fun populateWithClients(device: IDevice) {
+        logger.d("$TAG: populateWithClients() called for device: ${device}")
         GlobalScope.launch(Dispatchers.EDT) {
             val clients = getClientsWithWindow(device, showAllProcesses.isSelected)
             clientListModel.clear()
@@ -280,6 +311,7 @@ class NewLayoutDialog(
             }
             pack()
             repaint()
+            logger.d("$TAG: populateWithClients() completed, clients count: ${clients.size}")
         }
     }
 
@@ -340,6 +372,32 @@ class NewLayoutDialog(
         }
     }
 
+    private fun startProcessesRefreshTimer() {
+        logger.d("$TAG: startProcessesRefreshTimer() - Starting 3-second refresh timer")
+        processesRefreshJob = GlobalScope.launch(Dispatchers.Default) {
+            while (isActive) {
+                delay(3000) // 3 seconds
+                withContext(Dispatchers.EDT) {
+                    val deviceWrapper = devicesComboBox.selectedItem as DeviceWrapper?
+                    if (deviceWrapper != null) {
+                        logger.d("$TAG: timer tick - populating clients for device: ${deviceWrapper.device}")
+                        populateWithClients(deviceWrapper.device)
+                    } else {
+                        logger.w("$TAG: timer tick - no device selected, skipping refresh")
+                    }
+                }
+            }
+        }
+        logger.d("$TAG: startProcessesRefreshTimer() - Timer job started: ${processesRefreshJob?.hashCode()}")
+    }
+
+    private fun stopProcessesRefreshTimer() {
+        logger.d("$TAG: stopProcessesRefreshTimer() - Cancelling timer job: ${processesRefreshJob?.hashCode()}")
+        processesRefreshJob?.cancel()
+        processesRefreshJob = null
+        logger.d("$TAG: stopProcessesRefreshTimer() - Timer stopped")
+    }
+
     private inner class FocusPolicy : FocusTraversalPolicy() {
         override fun getComponentAfter(aContainer: Container, aComponent: Component): Component {
             return when (aComponent) {