From da5e464249c0963d8f3302ca9fa7e1619dcce3c7 Mon Sep 17 00:00:00 2001
From: Doug McLain <doug@nostar.net>
Date: Mon, 15 Nov 2021 16:23:38 -0500
Subject: [PATCH] Add scrollbars to settings/log tabs and fix android USB
 discovery for multiple serial devices (when using otg hubs for example)

---
 LogTab.qml                                  |  1 +
 SettingsTab.qml                             |  3 ++-
 android/AndroidManifest.xml                 |  2 +-
 android/src/main/java/USBSerialWrapper.java | 19 +++++++++++++++++--
 androidserialport.cpp                       |  4 +++-
 droidstar.cpp                               |  4 ++--
 serialambe.cpp                              |  4 ++--
 7 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/LogTab.qml b/LogTab.qml
index e6462ee..60dcb5c 100644
--- a/LogTab.qml
+++ b/LogTab.qml
@@ -47,6 +47,7 @@ Item {
 						   logTxt.height
 			flickableDirection: Flickable.VerticalFlick
 			clip: true
+			ScrollBar.vertical: ScrollBar {}
 			TextArea {
 				id: logTxt
 				width: logTextBox.width
diff --git a/SettingsTab.qml b/SettingsTab.qml
index 22ccb49..244a4dd 100644
--- a/SettingsTab.qml
+++ b/SettingsTab.qml
@@ -71,13 +71,14 @@ Item {
 	property alias modemNXDNTXLevelEdit: _modemNXDNTXLevelEdit
 
 	Flickable {
+		id: flickable
 		anchors.fill: parent
 		contentWidth: parent.width
 		contentHeight: vocoderButton.y +
 					   vocoderButton.height + 10
 		flickableDirection: Flickable.VerticalFlick
 		clip: true
-
+		ScrollBar.vertical: ScrollBar {}
 		Text {
 			id: csLabel
 			x: 10
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e17979d..fd8b2a2 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.dudetronics.droidstar" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="57" android:installLocation="auto">
+<manifest package="org.dudetronics.droidstar" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="60" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
 
 	<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
diff --git a/android/src/main/java/USBSerialWrapper.java b/android/src/main/java/USBSerialWrapper.java
index 0f6eaeb..1bd74c1 100644
--- a/android/src/main/java/USBSerialWrapper.java
+++ b/android/src/main/java/USBSerialWrapper.java
@@ -36,6 +36,7 @@ public class USBSerialWrapper implements SerialInputOutputManagerTest.Listener {
 	public int m_parity = 0;
 	public int m_flowcontrol = 0;
 	public int m_rts = 0;
+	public String m_devicename;
 	
     UsbSerialPort m_port;
     SerialInputOutputManagerTest usbIoManager;
@@ -46,6 +47,12 @@ public class USBSerialWrapper implements SerialInputOutputManagerTest.Listener {
         counter++;
     }
     
+    public void set_port_name(String d)
+    {
+		m_devicename = d;
+		System.out.println("Java Devicename: " + m_devicename);
+	}
+    
     public void set_baud_rate(int br)
     {
 		m_baudrate = br;
@@ -96,7 +103,7 @@ public class USBSerialWrapper implements SerialInputOutputManagerTest.Listener {
 			System.out.println(availableDrivers.size() + " found");
 
 			for(int i = 0; i < availableDrivers.size(); ++i){
-				devices[i] = availableDrivers.get(i).getDevice().getProductName();
+				devices[i] = availableDrivers.get(i).getDevice().getProductName() + ":" + availableDrivers.get(i).getDevice().getDeviceName();
 				System.out.println("USB device getDeviceName() == " + availableDrivers.get(i).getDevice().getDeviceName());
 				System.out.println("USB device getProductName() == " + availableDrivers.get(i).getDevice().getProductName());
 				System.out.println("USB device getProductId() == " + availableDrivers.get(i).getDevice().getProductId());
@@ -109,6 +116,7 @@ public class USBSerialWrapper implements SerialInputOutputManagerTest.Listener {
     public String setup_serial(Context c)
     {
 		m_context = c;
+		int devicenum = 0;
 		UsbManager manager = (UsbManager) m_context.getSystemService(Context.USB_SERVICE);
 		List<UsbSerialDriver> availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager);
 		
@@ -123,10 +131,17 @@ public class USBSerialWrapper implements SerialInputOutputManagerTest.Listener {
 				System.out.println("USB device getProductName() == " + availableDrivers.get(i).getDevice().getProductName());
 				System.out.println("USB device getProductId() == " + availableDrivers.get(i).getDevice().getProductId());
 				System.out.println("USB device getVendorId() == " + availableDrivers.get(i).getDevice().getVendorId());
+				
+				//if((availableDrivers.get(i).getDevice().getDeviceName()) == m_devicename){
+				if(m_devicename.equals(availableDrivers.get(i).getDevice().getDeviceName())){
+					devicenum = i;
+					System.out.println("Found device == " + devicenum);
+					
+				}
 			}
 		}
 		
-		UsbSerialDriver driver = availableDrivers.get(0);
+		UsbSerialDriver driver = availableDrivers.get(devicenum);
 		UsbDeviceConnection connection = manager.openDevice(driver.getDevice());
 		
 		if (connection == null) {
diff --git a/androidserialport.cpp b/androidserialport.cpp
index 2cedc77..2a3d627 100644
--- a/androidserialport.cpp
+++ b/androidserialport.cpp
@@ -80,7 +80,9 @@ int AndroidSerialPort::write(QByteArray data)
 
 void AndroidSerialPort::setPortName(QString s)
 {
-	qDebug() << "setPortName() == " << s;
+	QAndroidJniObject p = QAndroidJniObject::fromString(s);
+	jstring j = p.object<jstring>();
+	serialJavaObject.callMethod<void>("set_port_name", "(Ljava/lang/String;)V", j);
 }
 
 void AndroidSerialPort::setBaudRate(int br)
diff --git a/droidstar.cpp b/droidstar.cpp
index ec4e70d..1c08ff8 100644
--- a/droidstar.cpp
+++ b/droidstar.cpp
@@ -290,12 +290,12 @@ void DroidStar::process_connect()
 		QString vocoder = "";
 		if( (m_vocoder != "Software vocoder") && (m_vocoder.contains(':')) ){
 			QStringList vl = m_vocoder.split(':');
-			vocoder = vl.at(0);
+			vocoder = vl.at(1);
 		}
 		QString modem = "";
 		if( (m_modem != "None") && (m_modem.contains(':')) ){
 			QStringList ml = m_modem.split(':');
-			modem = ml.at(0);
+			modem = ml.at(1);
 		}
 
 		const bool rxInvert = true;
diff --git a/serialambe.cpp b/serialambe.cpp
index f8c3e85..e6ad06c 100755
--- a/serialambe.cpp
+++ b/serialambe.cpp
@@ -74,14 +74,14 @@ QMap<QString, QString> SerialAMBE::discover_devices()
 			fprintf(stderr, "%s", out.toStdString().c_str());fflush(stderr);
 			if(!serialPortInfo.isBusy()){
 				//devlist[serialPortInfo.systemLocation()] = serialPortInfo.portName() + " - " + serialPortInfo.manufacturer() + " " + serialPortInfo.description() + " - " + serialPortInfo.serialNumber();
-				devlist[serialPortInfo.systemLocation()] = serialPortInfo.systemLocation() + ":" + serialPortInfo.description();
+				devlist[serialPortInfo.systemLocation()] = serialPortInfo.description() + ":" + serialPortInfo.systemLocation();
 			}
 		}
 	}
 #else
 	QStringList list = AndroidSerialPort::GetInstance().discover_devices();
 	for ( const auto& i : list  ){
-		devlist[i] = i + ":" + i;
+		devlist[i] = i;
 	}
 #endif
 return devlist;