USB: UsbSerial 6.1.0 with @mobilinkd CDC fix

Compilation, in UsbSerial directory: cd usbserial && \ ../gradlew build && \ unzip build/outputs/aar/usbserial-debug.aar classes.jar && \ mv classes.jar ../../aprsdroid/libs/usbserial-6.1.0.jar Details: #264 (comment)
ge0rg · Aug 15, 2020 · 1dd06c6 · 1dd06c6
1 parent 6db2eca
commit 1dd06c6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -127,4 +127,6 @@ dependencies {
 	implementation fileTree(include: ['*.jar'], dir: 'libs')
 	implementation 'com.google.android.gms:play-services-maps:17.0.0'
 	implementation 'com.google.maps.android:android-maps-utils:0.5'
+
+	implementation 'com.squareup.okio:okio:2.1.0'
 }
diff --git a/libs/usbserial-4.5.1.jar b/libs/usbserial-4.5.1.jar
diff --git a/libs/usbserial-6.1.0-cdc.jar b/libs/usbserial-6.1.0-cdc.jar
diff --git a/src/backend/UsbTnc.scala b/src/backend/UsbTnc.scala
@@ -146,7 +146,7 @@ class UsbTnc(service : AprsService, prefs : PrefsWrapper) extends AprsBackend(pr
 		override def run() {
 			val con = usbManager.openDevice(dev)
 			ser = UsbSerialDevice.createUsbSerialDevice(dev, con)
-			if (ser == null || !ser.open()) {
+			if (ser == null || !ser.syncOpen()) {
 				con.close()
 				service.postAbort(service.getString(R.string.p_serial_unsupported))
 				return