Update v2.5.1 fix bug

change log:
- fix bug when only one device connected, scrcpy will open automaticaly
- new way to looking for adb and scrcpy in folder and in environment
- won't open when there is no adb and scrcpy found in both environment nor in folder
- merge showDeviceInfo and showInfo

Author: opelooo

src/com/opelooo/scrcpyGUI/GUI_functions.java

@@ -2,6 +2,7 @@
 
 //<editor-fold defaultstate="collapsed" desc=" imports ">
 import java.io.*;
+import java.nio.file.Paths;
 import java.util.*;
 import javax.swing.*;
 import java.util.regex.*;
@@ -20,10 +21,11 @@ public class GUI_functions {
 
     private static String adb = "adb";
     private static String scrcpy = "scrcpy";
-    
+
     /**
      * Method to check if there is adb and scrcpy in folder where .jar at.
-     * Execute FileInputStream and catch error if there is no adb/scrcpy exe file.
+     * Execute FileInputStream and catch error if there is no adb/scrcpy exe
+     * file.
      *
      * @param errorHandler interface PopupHandler
      * @return {@code List<String> output}
@@ -35,20 +37,20 @@ public static int checkAdb_Scrcpy_InFolder(PopupHandler errorHandler) {
             return 1;
         }
 
+        // Check for adb and scrcpy executables in the folder
+        String[] programs = {"adb.exe", "scrcpy.exe"};
         StringBuilder error = new StringBuilder();
-        // check adb exe in folder
-        try {
-            new FileInputStream("/adb.exe");
-        } catch (FileNotFoundException ex) {
-            error.append("\n").append(ex.getMessage());
+
+        for (String program : programs) {
+            File programFile = Paths.get(program).toFile();
+            if (!programFile.exists()) {
+                error.append("\n").append(program).append(" not found in folder.");
+            }
         }
 
-        // check scrcpy exe in folder
-        try {
-            new FileInputStream("/scrcpy.exe");
-        } catch (FileNotFoundException ex) {
-            error.append("\n").append(ex.getMessage());
-            errorHandler.showError("Program not found in folder, can not run program: " + error);
+        // If error occurred, show the error and return -1
+        if (error.length() > 0) {
+            errorHandler.showError("Programs not found in folder, cannot run program: " + error);
             return -1;
         }
 
@@ -59,52 +61,49 @@ public static int checkAdb_Scrcpy_InFolder(PopupHandler errorHandler) {
 
     /**
      * Method to check if there is adb and scrcpy in environment variable.
-     * Execute {@code adb} and {@code scrcpy} command using ProcessBuilder.
      *
      * @param errorHandler interface PopupHandler
      * @return {@code List<String> output}
      * @author opelooo
      */
     private static int checkAdb_Scrcpy_InEnvironment(PopupHandler errorHandler) {
         StringBuilder error = new StringBuilder();
-        AtomicInteger status = new AtomicInteger(1);
-
-        // Create a new thread to check for adb and scrcpy
-        Thread checkThread = new Thread(() -> {
-            try {
-                ProcessBuilder pb = new ProcessBuilder(adb);
-                pb.start();
-            } catch (Exception e) {
-                status.set(-1);
-                error.append(e.getMessage());
-            }
 
-            try {
-                ProcessBuilder pb = new ProcessBuilder(scrcpy);
-                pb.start();
-            } catch (Exception e) {
-                status.set(-1);
-                error.append("\n").append(e.getMessage());
-            }
-        });
-        // Start the thread
-        checkThread.start();
-        // wait to finish
-        try {
-            checkThread.join();  // This will wait for the thread to finish
-        } catch (InterruptedException e) {
-            // Handle interruption
-            errorHandler.showError("Thread was interrupted.");
-            checkThread.interrupt();
-            return -1;
-        }
-        if (status.get() == -1) {
-            errorHandler.showError("Can not found adb and scrcpy in environment!\n" + error);
+        // Check adb and scrcpy in the environment
+        if (!checkProgramInEnvironment(adb, error) || !checkProgramInEnvironment(scrcpy, error)) {
+            errorHandler.showError("Cannot find adb or scrcpy in environment!\n" + error);
             return -1;
         }
+
         return 1;
     }
 
+    /**
+     * Helper method to check if a program is available in the environment.
+     * Execute {@code adb --version} and {@code scrcpy --version} command using ProcessBuilder.
+     *
+     * @param errorHandler interface PopupHandler
+     * @return {@code List<String> output}
+     * @author opelooo
+     */ 
+    private static boolean checkProgramInEnvironment(String program, StringBuilder error) {
+        try {
+            ProcessBuilder pb = new ProcessBuilder(program, "--version"); // Run the version command to check
+            Process process = pb.start();
+            int exitCode = process.waitFor(); // Wait for the process to finish and get the exit code
+
+            if (exitCode != 0) {
+                error.append(program).append(" returned non-zero exit code: ").append(exitCode).append("\n");
+                return false;
+            }
+
+        } catch (IOException | InterruptedException e) {
+            error.append("Error checking ").append(program).append(": ").append(e.getMessage()).append("\n");
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Method to list devices connected to the computer, this method execute
      * {@code adb devices} command using ProcessBuilder.
@@ -202,8 +201,7 @@ public static String adb_device_info(PopupHandler errorHandler, String device_co
         String output = new String();
         try {
             // Create a process
-            ProcessBuilder pb
-                    = new ProcessBuilder(
+            ProcessBuilder pb = new ProcessBuilder(
                             adb, "-s", device_code, "shell",
                             "getprop", "ro.product.manufacturer"
                     );
@@ -241,8 +239,7 @@ public static String adb_get_device_ip(PopupHandler errorHandler, String device_
         String device_ip_addr = new String();
         try {
             // Create a process to execute 'adb devices'
-            ProcessBuilder pb
-                    = new ProcessBuilder(
+            ProcessBuilder pb = new ProcessBuilder(
                             adb, "-s", device_code, "shell",
                             "ip", "route"
                     );
@@ -267,7 +264,7 @@ public static String adb_get_device_ip(PopupHandler errorHandler, String device_
             // Wait for the process to complete
             process.waitFor();
         } catch (IOException | InterruptedException | NullPointerException e) {
-
+            errorHandler.showError("Exception occurred: " + e.getMessage());
         }
         return device_ip_addr;
     }

src/com/opelooo/scrcpyGUI/PopupHandler.java

@@ -19,15 +19,9 @@ public interface PopupHandler {
      * Method to show popup message containing error happening
      *
      * @param infoMessage String containing information message
+     * @param typeOfInfo contain title showing type of information
      */
-    void showInfo(String infoMessage);
-    
-    /**
-     * Method to show popup message containing device info
-     *
-     * @param message String containing device info message
-     */
-    void showDeviceInfo(String message);
+    void showInfo(String infoMessage, String typeOfInfo);
 
     /**
      * Method to create new JDialog for progress bar

src/com/opelooo/scrcpyGUI/scrcpy_main_panel.java

@@ -18,6 +18,7 @@
 public class scrcpy_main_panel extends javax.swing.JFrame implements PopupHandler {
 
     private final DefaultListModel<String> listModel_JD;  // Declare the list model
+    private final int ADB_SCRCPY_STATUS = GUI_functions.checkAdb_Scrcpy_InFolder(this);
     private JPopupMenu popupMenu;  // The popup menu
 
     /**
@@ -29,11 +30,13 @@ public scrcpy_main_panel() {
 
         listModel_JD = new DefaultListModel<>();  // Initialize the list model
         list_devices.setModel(listModel_JD);     // Set the list model to JList
-        if (GUI_functions.checkAdb_Scrcpy_InFolder(this) == 1) {
-            updateDeviceList();
-        }
+
         poupMenuDeviceInfo();
 
+        if (ADB_SCRCPY_STATUS != 1) {
+            return;
+        }
+        updateDeviceList();
     }
 
     /**
@@ -305,8 +308,9 @@ private void refreshButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN
     private void selectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectButtonActionPerformed
         // TODO add your handling code here:
         String selectedDevice = list_devices.getSelectedValue();
-        showDeviceInfo("Device Info for: " + selectedDevice
-                + "\nDevice Manufacturer: " + GUI_functions.adb_device_info(this, selectedDevice));
+        showInfo("Device Info for: " + selectedDevice
+                + "\nDevice Manufacturer: "
+                + GUI_functions.adb_device_info(this, selectedDevice), "Device Info");
     }//GEN-LAST:event_selectButtonActionPerformed
 
     private void bitRateSliderMouseDragged(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_bitRateSliderMouseDragged
@@ -331,7 +335,12 @@ public static void main(String args[]) {
         Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
         /* Create and display the form */
         java.awt.EventQueue.invokeLater(() -> {
-            javax.swing.JFrame mainFrame = new scrcpy_main_panel();
+            scrcpy_main_panel mainFrame = new scrcpy_main_panel();
+            // Check the adb status using the instance method
+            if (getAdbStatus(mainFrame) != 1) {
+                mainFrame.dispose();
+                return;
+            }
             // Calculate the frame location
             int x1 = (screenSize.width - mainFrame.getWidth()) / 2;
             int y1 = (screenSize.height - mainFrame.getHeight()) / 2;
@@ -341,6 +350,11 @@ public static void main(String args[]) {
         });
     }
 
+    // Access the instance variable using the passed scrcpyPanel
+    public static int getAdbStatus(scrcpy_main_panel scrcpyPanel) {
+        return scrcpyPanel.ADB_SCRCPY_STATUS;
+    }
+
     //<editor-fold defaultstate="collapsed" desc=" Variables declaration - do not modify ">
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JComboBox<String> audioFormats;
@@ -429,11 +443,13 @@ private void showPopupMenu(MouseEvent e) {
                 return;
             }
             if (e.getSource() == infoMenuItem) {
-                showDeviceInfo("Device Info for: " + selectedDevice
-                        + "\nDevice Manufacturer: " + GUI_functions.adb_device_info(this, selectedDevice));
+                showInfo("Device Info for: " + selectedDevice
+                        + "\nDevice Manufacturer: "
+                        + GUI_functions.adb_device_info(this, selectedDevice), "Device Info");
             } else if (e.getSource() == ipInfo) {
-                showDeviceInfo("Device Info for: " + selectedDevice
-                        + "\nDevice IP Address: " + GUI_functions.adb_get_device_ip(this, selectedDevice));
+                showInfo("Device Info for: " + selectedDevice
+                        + "\nDevice IP Address: "
+                        + GUI_functions.adb_get_device_ip(this, selectedDevice), "Device Info");
             }
         };
 
@@ -456,14 +472,6 @@ private void setIcon(String iconURL) {
         }
     }
 
-    @Override
-    public void showDeviceInfo(String message) {
-        if (message.contains("null")) {
-            return;
-        }
-        JOptionPane.showMessageDialog(this, message, "Device Info", JOptionPane.INFORMATION_MESSAGE);
-    }
-
     @Override
     public void showError(String errorMessage) {
         errorMessage = (errorMessage.contains("null")) ? "Please select device" : errorMessage;
@@ -491,7 +499,10 @@ public JDialog progressBarDialog() {
     }
 
     @Override
-    public void showInfo(String infoMessage) {
-        JOptionPane.showMessageDialog(this, infoMessage, "Info", JOptionPane.INFORMATION_MESSAGE);
+    public void showInfo(String infoMessage, String title) {
+        if (infoMessage.contains("null")) {
+            return;
+        }
+        JOptionPane.showMessageDialog(this, infoMessage, title, JOptionPane.INFORMATION_MESSAGE);
     }
 }