android usb serial: Prepare device / driver select

This commit contains the serial_android_usb part of the changes proposed
in issue #2657.

What's implemented:
- A data structure that contains all the data that can be used to
  describe an usb device (including user-facing string).
- A function to get a list of all attached usb devices (optionally with
  selectable driver class).
- Changes in the serial_android_usb_open-function and in the Java part
  to use the information about the usb device and optionally selected
  driver when connecting.

This commit keeps compatibility with the current UI-Code in the case
that only one USB-Device is connected. If two devices are connected,
only the first one is tried.

There are still some small things to do:
- Change the user-facing string to something more descriptive.
- Parts which aren't uesd anymore when the UI-Part is implemented are
  simply marked as obsolete (to keep compatibility for now).

But generally it seems to work.

[Dirk Hohndel: some white space / coding style adjustments]

Signed-off-by: Christof Arnosti <charno@charno.ch>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 49 insertions, 17 deletions

diff --git a/android-mobile/src/org/subsurfacedivelog/mobile/AndroidSerial.java b/android-mobile/src/org/subsurfacedivelog/mobile/AndroidSerial.java
index 1193b0ceb..fa26f065e 100644
--- a/android-mobile/src/org/subsurfacedivelog/mobile/AndroidSerial.java
+++ b/android-mobile/src/org/subsurfacedivelog/mobile/AndroidSerial.java
@@ -14,6 +14,8 @@ import android.content.Intent;
 import org.subsurfacedivelog.mobile.SubsurfaceMobileActivity;
 
 import java.lang.System;
+import java.lang.Class;
+import java.lang.reflect.Constructor;
 import java.lang.Thread;
 import java.util.Queue;
 import java.util.List;
@@ -83,38 +85,68 @@ public class AndroidSerial {
 		this.usbSerialPort = usbSerialPort;
 	}
 
-	public static AndroidSerial open_android_serial()
+	public static AndroidSerial open_android_serial(UsbDevice usbDevice, String driverClassName)
 	{
 		try {
 			Log.d(TAG, "in " + Thread.currentThread().getStackTrace()[2].getMethodName());
 			// Find all available drivers from attached devices.
 			Context context = SubsurfaceMobileActivity.getAppContext();
 			UsbManager manager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
-			ProbeTable usbSerialProbetable = UsbSerialProber.getDefaultProbeTable();
 
-			usbSerialProbetable.addProduct(0x0403, 0xf460, FtdiSerialDriver.class); // Oceanic Custom PID
-			usbSerialProbetable.addProduct(0x0403, 0xf680, FtdiSerialDriver.class); // Suunto Custom PID
-			usbSerialProbetable.addProduct(0x0403, 0x87d0, FtdiSerialDriver.class); // Cressi (Leonardo) Custom PID
+			if (usbDevice == null) {
+					Log.e(TAG, "usbDevice == null");
+					return null;
+			}
 
-			usbSerialProbetable.addProduct(0x04B8, 0x0521, ProlificSerialDriver.class); // Mares (Nemo Sport) / Cressi Custom PID
-			usbSerialProbetable.addProduct(0x04B8, 0x0521, ProlificSerialDriver.class); // Zeagle Custom PID
-			usbSerialProbetable.addProduct(0xFFFF, 0x0005, CdcAcmSerialDriver.class); // Mares Icon HD Custom PID
+			UsbSerialDriver driver = null;
 
-			UsbSerialProber usbSerialProber = new UsbSerialProber(usbSerialProbetable);
+			if (driverClassName.length() == 0) {
+				ProbeTable usbSerialProbetable = UsbSerialProber.getDefaultProbeTable();
 
-			List<UsbSerialDriver> availableDrivers = usbSerialProber.findAllDrivers(manager);
-			if (availableDrivers.isEmpty()) {
-				Log.w(TAG, "no usb-to-serial devices found!");
-				return null;
+				usbSerialProbetable.addProduct(0x0403, 0xf460, FtdiSerialDriver.class); // Oceanic Custom PID
+				usbSerialProbetable.addProduct(0x0403, 0xf680, FtdiSerialDriver.class); // Suunto Custom PID
+				usbSerialProbetable.addProduct(0x0403, 0x87d0, FtdiSerialDriver.class); // Cressi (Leonardo) Custom PID
+
+				usbSerialProbetable.addProduct(0x04B8, 0x0521, ProlificSerialDriver.class); // Mares (Nemo Sport) / Cressi Custom PID
+				usbSerialProbetable.addProduct(0x04B8, 0x0521, ProlificSerialDriver.class); // Zeagle Custom PID
+				usbSerialProbetable.addProduct(0xFFFF, 0x0005, CdcAcmSerialDriver.class); // Mares Icon HD Custom PID
+
+				UsbSerialProber usbSerialProber = new UsbSerialProber(usbSerialProbetable);
+
+				driver = usbSerialProber.probeDevice(usbDevice);
+
+				if (driver == null) {
+					Log.w(TAG, "Could not find a driver for the usb device " + usbDevice);
+					return null;
+				}
+
+				Log.i(TAG, "Using autodetected driver class " + driver.getClass().getSimpleName());
+
+			} else {
+				final Class<? extends UsbSerialDriver> driverClass = Class.forName("com.hoho.android.usbserial.driver." + driverClassName).asSubclass(UsbSerialDriver.class);
+
+				if (driverClass == null) {
+					Log.w(TAG, "Could not find driver class " + driverClassName);
+					return null;
+				}
+
+				try {
+					final Constructor<? extends UsbSerialDriver> ctor =
+							driverClass.getConstructor(UsbDevice.class);
+					driver = ctor.newInstance(usbDevice);
+				} catch (Exception e) {
+					Log.w(TAG, "Could not load user-specified driver class " + driverClassName, e);
+					return null;
+				}
+				Log.i(TAG, "Using user-specified driver class " + driver.getClass().getSimpleName());
 			}
 
 			// Open a connection to the first available driver.
-			UsbSerialDriver driver = availableDrivers.get(0);
-			UsbDeviceConnection connection = manager.openDevice(driver.getDevice());
+			UsbDeviceConnection connection = manager.openDevice(usbDevice);
 
 			if (connection == null) {
-				manager.requestPermission(driver.getDevice(), PendingIntent.getBroadcast(context, 0, new Intent("org.subsurfacedivelog.mobile.USB_PERMISSION"), 0));
-				Log.w(TAG, "Could not open device!");
+				manager.requestPermission(usbDevice, PendingIntent.getBroadcast(context, 0, new Intent("org.subsurfacedivelog.mobile.USB_PERMISSION"), 0));
+				Log.w(TAG, "Could not open device. Requesting permission.");
 				return null;
 			}