Merge pull request #54 from jpage4500/feature/12-13

Refactor device pairing logic; send custom commands via remote control

Author: jpage4500

CLIENT_SERVER.md

@@ -0,0 +1,35 @@
+# Running a server and connect to it from a client
+
+Android Device Manager can manage devices connected to another computer running device manager. 
+Both computers need to be running the latest version of Device Manager. 
+See [this](https://github.com/jpage4500/AndroidDeviceManager?tab=readme-ov-file#install-android-device-manager) page for installation instructions.
+
+# Network Setup
+
+If both computers are on different networks, you’ll need some way to make both computers talk to each other across the Internet. 
+
+I’ve tested with free [ngrok](https://ngrok.com/) and [TailScale](https://tailscale.com/) services
+
+# Tailscale
+- Install [Tailscale](https://tailscale.com/) on both computers and login with the same account.
+
+# Server Setup
+- The server can be started from within the app. Click on the SERVER toolbar button and select "Start Server".
+
+![img.png](resources/server_stopped.png)
+
+- Click on Start Server button to start the server
+- Click Copy Connection String button
+  - If you have a Tailscale network running, select the IP address or hostname of the Tailscale network. This is how the client will reach the server.
+
+![img_1.png](resources/server_select_ip.png)
+
+# Client Setup
+- Connect to a server using the Connect toolbar button -> "Connect to Server"
+
+![Connect to Server](resources/server_connect.png)
+
+- You can manually connect to a server using the IP/port/auth token. Or, if you were able to use the "Copy Connection
+String" button above, hit "Paste Connection" and the details will be filled in automatically.
+
+![img_2.png](resources/client_add.png)

README.md

@@ -7,6 +7,7 @@ Android Device Manager is a desktop app which can manage one or more Android dev
 ## Features ##
 
 - View all connected (and wireless) devices
+- View devices connected to another computer (see [SERVER.md](SERVER.md))
 - Populates device **phone number, free space, IMEI, carrier** (if available)
 - **Remote control** selected devices (requires [scrcpy](https://github.com/Genymobile/scrcpy))
 - Capture **screenshots** of selected devices
@@ -17,12 +18,15 @@ Android Device Manager is a desktop app which can manage one or more Android dev
     - delete folders/files
     - root mode supported
 - View **Device Logs**
-    - NOTE: this is a work in progress!
+    - filter by log level/tag
+    - add and combine filters to make searching logs easier
 - **Restart** selected devices
 - Run **user-defined adb commands**
+- Run **user-defined scripts**
 - Set and display custom properties on each device
 - Start an **adb shell** session with selected devices
 - **View version** of user-defined list of apps
+- Connect to devices wirelessly via **QR code**
 
 ## Manage devices connected to other computers ##
 

SERVER.md

@@ -45,11 +45,7 @@ java -jar $ADM --server --port 5555 --auth-token "HELLO WORLD"
 
 ## Connecting to the Server
 
-Connect to a server using the Connect toolbar button -> "Connect to Server"
-![Connect to Server](resources/server_connect.png)
-
-You can manually connect to a server using the IP/port/auth token. Or, if you were able to use the "Copy Connection
-String" button above, hit "Paste Connection".
+See the [this page](CLIENT_SERVER.md) for more details on running a server and connecting to it from a client.
 
 ## Viewing Remote Devices
 
@@ -64,3 +60,5 @@ Most actions such as screenshot, install, remote command, etc can be run on remo
 Instead of running scrcpy which is used locally, remote mirroring a device sends a series of compressed screenshots from the server to the client. 
 
 You can interact with the device by clicking on the screen to send a click. Long-presses and swipes are also supported. Typing on the keyboard will send key events to the remote device as well. 
+
+![Mirror Client](resources/client_mirror.png)

resources/client_add.png

@@ -1,20 +1,21 @@
 package com.jpage4500.devicemanager;
 
 import com.formdev.flatlaf.FlatLightLaf;
-import com.jpage4500.devicemanager.data.Icons;
 import com.jpage4500.devicemanager.logging.AppLoggerFactory;
 import com.jpage4500.devicemanager.logging.Log;
 import com.jpage4500.devicemanager.manager.DeviceManager;
 import com.jpage4500.devicemanager.manager.server.RemoteServerManager;
 import com.jpage4500.devicemanager.ui.DeviceScreen;
-import com.jpage4500.devicemanager.utils.*;
+import com.jpage4500.devicemanager.utils.PreferenceUtils;
+import com.jpage4500.devicemanager.utils.RemoteConnectionUtils;
+import com.jpage4500.devicemanager.utils.TextUtils;
+import com.jpage4500.devicemanager.utils.Utils;
 import org.slf4j.ILoggerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -150,18 +151,6 @@ private void initializeUI(String[] args) {
         defaults.put("defaultFont", new Font("Arial", Font.PLAIN, 16));
         defaults.put("Button.defaultButtonFollowsFocus", Boolean.TRUE);
 
-        if (Taskbar.isTaskbarSupported()) {
-            try {
-                Taskbar taskbar = Taskbar.getTaskbar();
-                if (taskbar.isSupported(Taskbar.Feature.ICON_IMAGE)) {
-                    BufferedImage image = UiUtils.getImage(Icons.LOGO, 256);
-                    taskbar.setIconImage(image);
-                }
-            } catch (final Exception e) {
-                log.error("initializeUI: Taskbar Exception: {}", e.getMessage());
-            }
-        }
-
         deviceScreen = new DeviceScreen();
 
         // handle command line args

resources/client_mirror.png

@@ -33,6 +33,7 @@ public enum Icons {
     EYE_CLOSED("eye_closed.png"),
     EYE_OPEN("eye_open.png"),
     FILE("file.png"),
+    FILE_ADB("file_adb.png"),
     FILE_APK("file_apk.png"),
     FILE_JSON("file_json.png"),
     FILE_LINK("file_link.png"),