revert usb receiver try catch and convert anonymous function to lambda

isl-org · Dec 14, 2020 · d0c1e9f · d0c1e9f
1 parent 9a5af01
commit d0c1e9f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/android/app/src/main/java/org/openbot/NetworkActivity.java b/android/app/src/main/java/org/openbot/NetworkActivity.java
@@ -257,13 +257,10 @@ protected void processImage() {
             updateVehicleState();
 
             runOnUiThread(
-                new Runnable() {
-                  @Override
-                  public void run() {
-                    // showFrameInfo(previewWidth + "x" + previewHeight);
-                    // showCropInfo(croppedBitmap.getWidth() + "x" + croppedBitmap.getHeight());
-                    showInference(lastProcessingTimeMs + "ms");
-                  }
+                () -> {
+                  // showFrameInfo(previewWidth + "x" + previewHeight);
+                  // showCropInfo(croppedBitmap.getWidth() + "x" + croppedBitmap.getHeight());
+                  showInference(lastProcessingTimeMs + "ms");
                 });
           });
     }

diff --git a/android/app/src/main/java/org/openbot/env/UsbConnection.java b/android/app/src/main/java/org/openbot/env/UsbConnection.java
@@ -17,6 +17,7 @@
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import com.felhr.usbserial.UsbSerialDevice;
 import com.felhr.usbserial.UsbSerialInterface;
+import java.io.UnsupportedEncodingException;
 import java.util.Map;
 import org.openbot.SensorService;
 
@@ -54,20 +55,18 @@ public UsbConnection(Context context, int baudRate) {
 
   private final UsbSerialInterface.UsbReadCallback callback =
       data -> {
-        String dataUtf8 = new String(data, UTF_8);
-        buffer += dataUtf8;
-        int index;
-        while ((index = buffer.indexOf('\n')) != -1) {
-          final String dataStr = buffer.substring(0, index).trim();
-          buffer = buffer.length() == index ? "" : buffer.substring(index + 1);
-
-          AsyncTask.execute(
-              new Runnable() {
-                @Override
-                public void run() {
-                  onSerialDataReceived(dataStr);
-                }
-              });
+        try {
+          String dataUtf8 = new String(data, "UTF-8");
+          buffer += dataUtf8;
+          int index;
+          while ((index = buffer.indexOf('\n')) != -1) {
+            final String dataStr = buffer.substring(0, index).trim();
+            buffer = buffer.length() == index ? "" : buffer.substring(index + 1);
+
+            AsyncTask.execute(() -> onSerialDataReceived(dataStr));
+          }
+        } catch (UnsupportedEncodingException e) {
+          LOGGER.e("Error receiving USB data");
         }
       };