- ignore invalid phone numbers

Author: jpage4500

src/main/java/com/jpage4500/devicemanager/manager/DeviceManager.java

@@ -266,12 +266,15 @@ private void fetchDeviceDetails(Device device, boolean fullRefresh, DeviceListen
                 fetchNickname(device);
 
                 // -- phone number --
+                // NOTE: there's no consistent way to get a phone number via adb
+                // - the best I've found is a script from: https://github.com/micro5k/microg-unofficial-installer/blob/main/utils/device-info.sh
                 String phone = runShellServiceCall(device, COMMAND_SERVICE_PHONE1);
-                if (TextUtils.notEmpty(phone)) device.phone = phone;
-                if (TextUtils.isEmpty(device.phone)) {
+                if (TextUtils.length(phone) > 7) {
+                    device.phone = phone;
+                } else {
                     // alternative way of getting phone number
                     phone = runShellServiceCall(device, COMMAND_SERVICE_PHONE2);
-                    if (TextUtils.notEmpty(phone)) device.phone = phone;
+                    if (TextUtils.length(phone) > 7) device.phone = phone;
                 }
 
                 // -- IMEI --
@@ -579,9 +582,9 @@ public void mirrorDevice(Device device, TaskListener listener) {
                 int port = Utils.getRandomNumber(2000, 65000);
                 // NOTE: adb must be in PATH (or ADB env variable set)
                 appResult = runApp(app, true, "-s", device.serial,
-                        "-p", String.valueOf(port),
-                        "--window-title", device.getDisplayName(),
-                        "--show-touches", "--stay-awake", "--no-audio");
+                    "-p", String.valueOf(port),
+                    "--window-title", device.getDisplayName(),
+                    "--show-touches", "--stay-awake", "--no-audio");
             }
 
             // TODO: figure out how to determine if scrcpy was run successfully..
@@ -647,8 +650,8 @@ private String findApp(String app) {
         String[] arr = new String[]{};
         if (Utils.isMac()) {
             arr = new String[]{
-                    "/opt/homebrew/bin",
-                    "/usr/local/bin",
+                "/opt/homebrew/bin",
+                "/usr/local/bin",
             };
         }
         for (String s : arr) {

src/main/java/com/jpage4500/devicemanager/ui/views/CheckBoxList.java

@@ -7,8 +7,6 @@
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 
 public class CheckBoxList extends JList {

src/main/java/com/jpage4500/devicemanager/ui/views/CustomTable.java

@@ -10,7 +10,6 @@
 import java.awt.dnd.DropTarget;
 import java.awt.dnd.DropTargetDragEvent;
 import java.awt.dnd.DropTargetEvent;
-import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -24,10 +23,6 @@
 public class CustomTable extends JTable {
     private static final Logger log = LoggerFactory.getLogger(CustomTable.class);
 
-    private static final Color COLOR_BACKGROUND = new Color(222, 222, 222);
-    private static final Color COLOR_HEADER = new Color(197, 197, 197);
-    private static final Color COLOR_ALTERNATE_ROW = new Color(246, 246, 246);
-
     private String prefKey;
     private TooltipListener tooltipListener;
     private DoubleClickListener doubleClickListener;
@@ -79,7 +74,7 @@ public int getSelectedColumn() {
     public CustomTable(String prefKey) {
         this.prefKey = prefKey;
         setOpaque(false);
-        setBackground(COLOR_BACKGROUND);
+        setBackground(Colors.COLOR_BACKGROUND);
 
         showBackground = PreferenceUtils.getPreference(PreferenceUtils.PrefBoolean.PREF_SHOW_BACKGROUND, true);
 
@@ -263,7 +258,7 @@ public void setModel(TableModel dataModel) {
     public Component prepareRenderer(TableCellRenderer renderer, int row, int column) {
         Component c = super.prepareRenderer(renderer, row, column);
         if (c != null && !c.getBackground().equals(getSelectionBackground())) {
-            Color color = (row % 2 == 0 ? Color.WHITE : COLOR_ALTERNATE_ROW);
+            Color color = (row % 2 == 0 ? Color.WHITE : Colors.COLOR_ALTERNATE_ROW);
             c.setBackground(color);
         }
         return c;
@@ -471,7 +466,7 @@ public CustomTableHeader(JTable t) {
             arrowUpIcon = UiUtils.getImageIcon("arrow_down.png", UiUtils.IMG_SIZE_SMALL);
             arrowDownIcon = UiUtils.getImageIcon("arrow_up.png", UiUtils.IMG_SIZE_SMALL);
 
-            setBackground(COLOR_HEADER);
+            setBackground(Colors.COLOR_TABLE_HEADER);
 
             UiUtils.addRightClickListener(this, e -> {
                 if (popupMenuListener != null) {

src/main/java/com/jpage4500/devicemanager/utils/Colors.java

@@ -8,6 +8,11 @@ public class Colors {
     public static final Color COLOR_BUSY = new Color(251, 109, 8);
     public static final Color COLOR_NOT_READY = new Color(251, 247, 8);
 
+    public static final Color COLOR_BACKGROUND = new Color(222, 222, 222);
+    public static final Color COLOR_ALTERNATE_ROW = new Color(246, 246, 246);
+
+    public static final Color COLOR_TABLE_HEADER = new Color(197, 197, 197);
+
     public static final Color COLOR_LIGHT_GRAY = new Color(232, 232, 232);
     public static final Color COLOR_LIST_SELECTED_NO_FOCUS = new Color(0, 81, 255, 108);
 
@@ -17,5 +22,4 @@ public class Colors {
     // log recording state
     public static final Color COLOR_START_RECORDING = COLOR_ONLINE;
     public static final Color COLOR_STOP_RECORDING = COLOR_BUSY;
-
 }