V2.6.14

Workaround #283 - Initialize USB serial AFTER port open
fr3ts0n · Jan 6, 2025 · 8750c9b · 8750c9b
1 parent 7bf7133
commit 8750c9b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -21,6 +21,8 @@
 
             // Launch behaviour if source files have been saved after the APK was built. One of: [ ignore warn stop ]. Default: warn
             "staleBuild": "warn",
+
+            "launchActivity": ".MainActivity"
         }
     ]
 }

diff --git a/androbd/build.gradle b/androbd/build.gradle
@@ -9,8 +9,8 @@ android {
         // SDK 25 to allow background service mechanism for plugins
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 25
-        versionCode 20613
-        versionName 'V2.6.13'
+        versionCode 20614
+        versionName 'V2.6.14'
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -43,7 +43,7 @@ dependencies {
     implementation project(':plugin')
     implementation project(':library')
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.github.mik3y:usb-serial-for-android:3.8.0'
+    implementation 'com.github.mik3y:usb-serial-for-android:3.8.1'
     implementation 'com.github.anastr:speedviewlib:1.6.1'
     implementation 'androidx.core:core-ktx:1.12.0'
 }
diff --git a/androbd/src/main/java/com/fr3ts0n/ecu/gui/androbd/UsbCommService.java b/androbd/src/main/java/com/fr3ts0n/ecu/gui/androbd/UsbCommService.java
@@ -117,7 +117,6 @@ public UsbCommService(Context context, Handler handler)
 	private void setDevice(UsbSerialPort port)
 	{
 		sPort = port;
-		mSerialIoManager = new SerialInputOutputManager(sPort, mListener);
 	}
 
 	@Override
@@ -204,6 +203,9 @@ public void start()
 
 				// start communication thread
 				log.info("Starting io manager ..");
+				// Initialize SerialIoManager AFTER opening sPort
+				// workaround for AndrOBD#285 / https://github.com/mik3y/usb-serial-for-android/issues/611
+				mSerialIoManager = new SerialInputOutputManager(sPort, mListener);
 				Executors.newSingleThreadExecutor().submit(mSerialIoManager);
 
 				// we are connected -> signal connectionEstablished

diff --git a/library/build.gradle b/library/build.gradle
@@ -27,8 +27,8 @@ test {
 }
 
 dependencies {
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
 }
 
 

diff --git a/plugin b/plugin
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,8 @@ @@
                 // Launch behaviour if source files have been saved after the APK was built. One of: [ ignore warn stop ]. Default: warn
                 "staleBuild": "warn",
+                "launchActivity": ".MainActivity"
             }
         ]
     }
@@ Expand Down @@