Merge pull request #37 from jpage4500/feature/02-05

bugfixes; allow audio passthrough via scrcpy; logging changes

Author: jpage4500

src/main/java/com/jpage4500/devicemanager/data/LogEntry.java

@@ -35,10 +35,10 @@ public LogEntry(String line, SimpleDateFormat dateFormat, int year) {
         String timeStr = lineArr[1];
         // remove micro-seconds (could be useful to parse but not necessary to display today)
         if (timeStr.length() > 4) timeStr = timeStr.substring(0, timeStr.length() - 4);
-        // NOTE: appending year is necessary to parse to Date correctly
-        date = year + "-" + dayStr + " " + timeStr;
+        date = dayStr + " " + timeStr;
         try {
-            Date eventDate = dateFormat.parse(date);
+            // NOTE: appending year is necessary to parse to Date correctly
+            Date eventDate = dateFormat.parse(year + "-" + date);
             timestamp = eventDate.getTime();
         } catch (Exception e) {
             System.out.println("Exception: " + date);

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

@@ -584,7 +584,7 @@ public void mirrorDevice(Device device, TaskListener listener) {
                 appResult = runApp(app, true, "-s", device.serial,
                     "-p", String.valueOf(port),
                     "--window-title", device.getDisplayName(),
-                    "--show-touches", "--stay-awake", "--no-audio");
+                    "--show-touches", "--stay-awake");
             }
 
             // TODO: figure out how to determine if scrcpy was run successfully..
@@ -1090,7 +1090,13 @@ private Map<String, String> getProcessMap(Device device) {
         // 7617 com.android.traceur
         // 7677 [csf_sync_update]
         Map<String, String> pidMap = new HashMap<>();
-        for (String line : result.resultList) {
+        List<String> resultList = result.resultList;
+        for (int i = 0; i < resultList.size(); i++) {
+            String line = resultList.get(i);
+            if (i == 0 && TextUtils.startsWith(line, "bad pid")) {
+                // older devices may not support the ps args.. try another route
+                return getProcessMapAlternative(device);
+            }
             String[] lineArr = line.trim().split(" ");
             if (lineArr.length < 2) continue;
             String pid = lineArr[0];
@@ -1104,6 +1110,47 @@ private Map<String, String> getProcessMap(Device device) {
         return pidMap;
     }
 
+    private Map<String, String> getProcessMapAlternative(Device device) {
+        ShellResult result = runShell(device, "ps");
+        // USER      PID   PPID  VSIZE  RSS   WCHAN              PC  NAME
+        // root      1     0     21964  2880  SyS_epoll_ 00004d9054 S /init
+        // root      2     0     0      0       kthreadd 0000000000 S kthreadd
+        // root      3     2     0      0     smpboot_th 0000000000 S ksoftirqd/0
+        // bluetooth 30891 236   1061340 16884 SyS_epoll_ 00f5597304 S com.android.bluetooth
+        // u0_a74    30946 235   1468852 33996 SyS_epoll_ 7fa5ce1870 S com.ttxapps.wifiadb
+        // u0_a55    31235 235   1464020 32072 SyS_epoll_ 7fa5ce1870 S com.cyanogenmod.lockclock
+        Map<String, String> pidMap = new HashMap<>();
+        List<String> resultList = result.resultList;
+        int indexPid = -1;
+        int indexApp = -1;
+        for (String line : resultList) {
+            List<String> pidList = TextUtils.splitSafe(line);
+            if (pidList.size() < 2) continue;
+
+            if (indexApp == -1 || indexPid == -1) {
+                for (int i = 0; i < pidList.size(); i++) {
+                    String label = pidList.get(i);
+                    if (TextUtils.equals(label, "PID")) {
+                        indexPid = i;
+                    } else if (TextUtils.equals(label, "NAME")) {
+                        indexApp = i;
+                        // special case
+                        if (pidList.size() == 8) indexApp++;
+                    }
+                }
+            } else if (indexPid < pidList.size() && indexApp < pidList.size()) {
+                String pid = pidList.get(indexPid);
+                String app = pidList.get(indexApp);
+                int atPos = app.indexOf('@');
+                if (atPos > 0) {
+                    app = app.substring(0, atPos);
+                }
+                pidMap.put(pid, app);
+            }
+        }
+        return pidMap;
+    }
+
     public void stopLogging(Device device) {
         AtomicBoolean loggingState = getLoggingState(device.serial, false);
         if (loggingState != null && loggingState.get()) {

src/main/java/com/jpage4500/devicemanager/table/LogsTableModel.java

@@ -22,6 +22,7 @@ public class LogsTableModel extends AbstractTableModel {
     private String searchText;
 
     private Columns[] visibleColumns;
+    private int dateColumnWidth = 0;
 
     /**
      * get text value for a given LogEntry and column
@@ -31,7 +32,20 @@ public String getTextValue(int row, int column) {
         if (logEntry == null) return null;
         Columns col = visibleColumns[column]; //LogsTableModel.Columns.values()[column];
         return switch (col) {
-            case DATE -> logEntry.date;
+            case DATE -> {
+                // 05-13 15:20:12
+                if (logEntry.date != null) {
+                    // TODO: 150 will vary based on font size
+                    if (dateColumnWidth < 150) {
+                        // truncate
+                        int space = logEntry.date.indexOf(' ');
+                        if (space > 0) {
+                            yield logEntry.date.substring(space + 1);
+                        }
+                    }
+                }
+                yield logEntry.date;
+            }
             case APP -> {
                 // set app using app <-> pid list
                 logEntry.app = getAppForPid(logEntry.pid);
@@ -48,6 +62,11 @@ public String getTextValue(int row, int column) {
         };
     }
 
+    public void setDateColumnWidth(int width) {
+        dateColumnWidth = width;
+        fireTableDataChanged();
+    }
+
     public enum Columns {
         DATE("Date"),
         APP("App"),

src/main/java/com/jpage4500/devicemanager/ui/DeviceScreen.java

@@ -311,6 +311,7 @@ public void setupTable() {
         table.setRowSorter(sorter);
 
         table.setDoubleClickListener((row, column, e) -> {
+            log.trace("table.setDoubleClickListener: row: {}, column: {}", row, column);
             if (column == DeviceTableModel.Columns.CUSTOM1.ordinal()) {
                 // edit custom 1 field
                 handleSetProperty(Device.CUSTOM_PROP_X + 1, DeviceTableModel.Columns.CUSTOM1.toString());
@@ -321,12 +322,10 @@ public void setupTable() {
                 return;
             } else if (column == DeviceTableModel.Columns.PHONE.ordinal()) {
                 Device device = getFirstSelectedDevice();
-                if (device != null) {
-                    if (TextUtils.isEmpty(device.phone)) {
-                        // edit phone number field
-                        handleSetProperty(Device.CUST_PROP_PHONE, "Device Phone Number");
-                        return;
-                    }
+                if (device != null && TextUtils.isEmpty(device.phone)) {
+                    // edit phone number field
+                    handleSetProperty(Device.CUST_PROP_PHONE, "Device Phone Number");
+                    return;
                 }
             }
             // default double-click action
@@ -547,7 +546,7 @@ public void handleException(Exception e) {
         SwingUtilities.invokeLater(() -> {
             String[] choices = {"Retry", "Cancel"};
             if (!DialogHelper.showOptionDialog(DeviceScreen.this, "ADB Server",
-                    "Unable to connect to ADB server. Please check that it's running and re-try", choices)) return;
+                "Unable to connect to ADB server. Please check that it's running and re-try", choices)) return;
 
             connectAdbServer();
         });