IOIO: android integration

Author: chrisws

ioio/Makefile.am

@@ -35,3 +35,7 @@ android:
    (cd ioio/build/libs && zip ../outputs/aar/ioio-debug.aar classes.jar) && \
    (cd ioio/build/libs && zip ../outputs/aar/ioio-release.aar classes.jar) && \
    cp ioio/build/outputs/aar/ioio-* ~/src/SmallBASIC/src/platform/android/app/libs/
+
+desktop:
+	@(cd ioio && mvn clean package && cp target/ioio-1.0-jar-with-dependencies.jar ..)
+

…essory/AccessoryConnectionBootstrap.java …ndroid/AccessoryConnectionBootstrap.javaioio/ioio/src/main/java/ioio/lib/android/accessory/AccessoryConnectionBootstrap.java renamed to ioio/ioio/src/main/java/ioio/lib/android/AccessoryConnectionBootstrap.java ioio/ioio/src/main/java/ioio/lib/android/accessory/AccessoryConnectionBootstrap.java renamed to ioio/ioio/src/main/java/ioio/lib/android/AccessoryConnectionBootstrap.java

@@ -27,15 +27,19 @@
  * or implied.
  */
 
-package ioio.lib.android.accessory;
+package ioio.lib.android;
 
-import ioio.lib.android.accessory.Adapter.UsbAccessoryInterface;
-import ioio.lib.api.IOIOConnection;
-import ioio.lib.api.exception.ConnectionLostException;
-import ioio.lib.impl.FixedReadBufferedInputStream;
-import ioio.lib.spi.IOIOConnectionBootstrap;
-import ioio.lib.spi.IOIOConnectionFactory;
-import ioio.lib.spi.NoRuntimeSupportException;
+import android.annotation.TargetApi;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Build;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+import net.sourceforge.smallbasic.ioio.IOIOLoader;
 
 import java.io.BufferedOutputStream;
 import java.io.FileDescriptor;
@@ -46,42 +50,37 @@
 import java.io.OutputStream;
 import java.util.Collection;
 
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.ParcelFileDescriptor;
-import android.util.Log;
+import ioio.lib.android.UsbManagerAdapter.UsbAccessoryInterface;
+import ioio.lib.api.IOIOConnection;
+import ioio.lib.api.exception.ConnectionLostException;
+import ioio.lib.impl.FixedReadBufferedInputStream;
+import ioio.lib.spi.IOIOConnectionBootstrap;
+import ioio.lib.spi.IOIOConnectionFactory;
+import ioio.lib.spi.NoRuntimeSupportException;
 
 public class AccessoryConnectionBootstrap extends BroadcastReceiver implements IOIOConnectionBootstrap, IOIOConnectionFactory {
   private static final String TAG = AccessoryConnectionBootstrap.class.getSimpleName();
   private static final String ACTION_USB_PERMISSION = "ioio.lib.accessory.action.USB_PERMISSION";
 
-  private ContextWrapper activity;
-  private final Adapter adapter;
-  private Adapter.AbstractUsbManager usbManager;
+  private final Context activity;
+  private final UsbManagerAdapter.AbstractUsbManager usbManager;
   private boolean shouldTryOpen = false;
   private PendingIntent pendingIntent;
   private ParcelFileDescriptor fileDescriptor;
   private InputStream inputStream;
   private OutputStream outputStream;
 
   public AccessoryConnectionBootstrap() throws NoRuntimeSupportException {
-    adapter = new Adapter();
-  }
-
-  //@Override
-  public void onCreate(ContextWrapper wrapper) {
-    activity = wrapper;
-    usbManager = adapter.getManager(wrapper);
+    Log.d(TAG, "creating AccessoryConnectionBootstrap");
+    UsbManagerAdapter usbManagerAdapter = new UsbManagerAdapter();
+    activity = IOIOLoader.getContext();
+    usbManager = usbManagerAdapter.getManager(activity);
     registerReceiver();
   }
 
   //@Override
   public void onDestroy() {
-    unregisterReceiver();
+    activity.unregisterReceiver(this);
   }
 
   @Override
@@ -107,12 +106,9 @@ public synchronized void reopen() {
     notifyAll();
   }
 
-  //@Override
-  public synchronized void close() {
-  }
-
   private synchronized void disconnect() {
     // This should abort any current open attempt.
+    Log.d(TAG, "private disconnect");
     shouldTryOpen = false;
     notifyAll();
 
@@ -130,6 +126,7 @@ private synchronized void disconnect() {
       pendingIntent.cancel();
       pendingIntent = null;
     }
+    Log.d(TAG, "leaving private disconnect");
   }
 
   @Override
@@ -257,38 +254,38 @@ private boolean tryOpen() {
     }
   }
 
+  @TargetApi(Build.VERSION_CODES.TIRAMISU)
   private void registerReceiver() {
     IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION);
-    activity.registerReceiver(this, filter);
-  }
-
-  private void unregisterReceiver() {
-    activity.unregisterReceiver(this);
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      activity.registerReceiver(this, filter, Context.RECEIVER_NOT_EXPORTED);
+    }
   }
 
   private void trySleep(long time) {
     synchronized (AccessoryConnectionBootstrap.this) {
       try {
         AccessoryConnectionBootstrap.this.wait(time);
       } catch (InterruptedException e) {
+        Log.e(TAG, e.toString());
       }
     }
   }
 
-  private static enum InstanceState {
+  private enum InstanceState {
     INIT, CONNECTED, DEAD
-  };
+  }
 
   private class Connection implements IOIOConnection {
     private InstanceState instanceState_ = InstanceState.INIT;
 
     @Override
-    public InputStream getInputStream() throws ConnectionLostException {
+    public InputStream getInputStream() {
       return inputStream;
     }
 
     @Override
-    public OutputStream getOutputStream() throws ConnectionLostException {
+    public OutputStream getOutputStream() {
       return outputStream;
     }
 
@@ -316,6 +313,7 @@ public void waitForConnect() throws ConnectionLostException {
 
     @Override
     public void disconnect() {
+      Log.d(TAG, "disconnect");
       synchronized(AccessoryConnectionBootstrap.this) {
         if (instanceState_ != InstanceState.DEAD) {
           AccessoryConnectionBootstrap.this.disconnect();

…/ioio/lib/android/accessory/Adapter.java …/ioio/lib/android/UsbManagerAdapter.javaioio/ioio/src/main/java/ioio/lib/android/accessory/Adapter.java renamed to ioio/ioio/src/main/java/ioio/lib/android/UsbManagerAdapter.java ioio/ioio/src/main/java/ioio/lib/android/accessory/Adapter.java renamed to ioio/ioio/src/main/java/ioio/lib/android/UsbManagerAdapter.java

@@ -27,50 +27,44 @@
  * or implied.
  */
 
-package ioio.lib.android.accessory;
+package ioio.lib.android;
 
-import ioio.lib.spi.NoRuntimeSupportException;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.content.ContextWrapper;
-
 import android.hardware.usb.UsbAccessory;
 import android.hardware.usb.UsbManager;
 import android.os.ParcelFileDescriptor;
 
+import ioio.lib.spi.Log;
+import ioio.lib.spi.NoRuntimeSupportException;
+
 /**
- * This class serves as a common interface for USB accessory for either com.android.future.usb or
- *
- * When this class is instantiated, it will throw a {@link NoRuntimeSupportException} if none of the
- * underlying implementations exist. Otherwise, the client may call
- * {@link #getManager(ContextWrapper)}, which returns an interface that is equivalent to UsbManager
- * on either API. Likewise, the {@link UsbAccessoryInterface} interface is a wrapper around
- * UsbAccessory.
+ * This class serves as a common interface for USB accessory for android.hardware.usb.UsbManager
  *
+ * When this class is instantiated, it will throw a {@link NoRuntimeSupportException} if the
+ * underlying implementation does not exist.
  */
-class Adapter {
-  Adapter() throws NoRuntimeSupportException {
+class UsbManagerAdapter {
+  private static final String TAG = UsbManagerAdapter.class.getSimpleName();
+
+  UsbManagerAdapter() throws NoRuntimeSupportException {
     try {
-      Class.forName("UsbManager");
+      Class.forName("android.hardware.usb.UsbManager");
     } catch (ClassNotFoundException e) {
-      throw new NoRuntimeSupportException("No support for USB accesory mode.");
+      Log.d(TAG, e.toString());
+      throw new NoRuntimeSupportException("No support for USB accessory mode.");
     }
   }
 
-  AbstractUsbManager getManager(ContextWrapper wrapper) {
-    return getManagerNew(wrapper);
-  }
-
-  private AbstractUsbManager getManagerNew(ContextWrapper wrapper) {
+  AbstractUsbManager getManager(Context wrapper) {
     final UsbManager manager = (UsbManager) wrapper.getSystemService(Context.USB_SERVICE);
-    return new NewUsbManager(manager);
+    return new UsbManagerImpl(manager);
   }
 
   static abstract class AbstractUsbManager {
     final String EXTRA_PERMISSION_GRANTED;
-    protected AbstractUsbManager(String action_usb_accessory_detached,
-                                 String extra_permission_granted) {
-      EXTRA_PERMISSION_GRANTED = extra_permission_granted;
+    protected AbstractUsbManager() {
+      EXTRA_PERMISSION_GRANTED = UsbManager.EXTRA_PERMISSION_GRANTED;
     }
 
     abstract UsbAccessoryInterface[] getAccessoryList();
@@ -79,12 +73,11 @@ protected AbstractUsbManager(String action_usb_accessory_detached,
     abstract void requestPermission(UsbAccessoryInterface accessory, PendingIntent pendingIntent);
   }
 
-  private static final class NewUsbManager extends AbstractUsbManager {
+  private static final class UsbManagerImpl extends AbstractUsbManager {
     private final UsbManager manager;
 
-    private NewUsbManager(UsbManager manager) {
-      super(UsbManager.ACTION_USB_ACCESSORY_DETACHED,
-            UsbManager.EXTRA_PERMISSION_GRANTED);
+    private UsbManagerImpl(UsbManager manager) {
+      super();
       this.manager = manager;
     }
 
@@ -127,6 +120,6 @@ private static class UsbAccessoryAdapter<T> implements UsbAccessoryInterface {
     }
   }
 
-  static interface UsbAccessoryInterface {
+  interface UsbAccessoryInterface {
   }
 }

ioio/ioio/src/main/java/net/sourceforge/smallbasic/ioio/ConnectionController.java

@@ -11,12 +11,9 @@ public class ConnectionController extends IOIOBaseApplicationHelper {
 
   static {
     if (AndroidUtil.isAndroid()) {
-      IOIOConnectionRegistry.addBootstraps(new String[]{
-          "ioio.lib.android.accessory.AccessoryConnectionBootstrap"});
+      IOIOConnectionRegistry.addBootstraps(new String[]{"ioio.lib.android.AccessoryConnectionBootstrap"});
     } else {
-      IOIOConnectionRegistry.addBootstraps(new String[]{
-          "ioio.lib.pc.SerialPortIOIOConnectionBootstrap"
-      });
+      IOIOConnectionRegistry.addBootstraps(new String[]{"ioio.lib.pc.SerialPortIOIOConnectionBootstrap"});
     }
   }
 

ioio/ioio/src/main/java/net/sourceforge/smallbasic/ioio/IOIOLoader.java

@@ -1,14 +1,25 @@
 package net.sourceforge.smallbasic.ioio;
 
+import android.content.Context;
+
+import java.lang.ref.WeakReference;
+
 import ioio.lib.spi.Log;
 
 public class IOIOLoader {
   private static final String TAG = "IOIOLoader";
   public static native void init(Long app);
 
-  public IOIOLoader(Long activity) {
+  private static WeakReference<Context> context;
+
+  public IOIOLoader(Long activity, Context context) {
     super();
     Log.d(TAG, "IOIOLoader: " + activity);
+    IOIOLoader.context = new WeakReference<>(context);
     init(activity);
   }
+
+  public static Context getContext() {
+    return context.get();
+  }
 }

ioio/ioio/src/main/java/net/sourceforge/smallbasic/ioio/IOLock.java

@@ -1,6 +1,7 @@
 package net.sourceforge.smallbasic.ioio;
 
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
@@ -10,6 +11,7 @@
 
 public class IOLock<I> {
   private final Object mutex = new Object();
+  private static final int TIMEOUT_SECS = 5;
   private Consumer<I> consumer;
 
   public void invoke(Consumer<I> consumer) {
@@ -87,7 +89,9 @@ private CountDownLatch beginLatch() {
    */
   private void endLatch(CountDownLatch latch) {
     try {
-      latch.await();
+      if (!latch.await(TIMEOUT_SECS, TimeUnit.SECONDS)) {
+        throw new RuntimeException("Timeout waiting for latch");
+      }
     } catch (InterruptedException e) {
       throw new RuntimeException(e);
     }

ioio/main.cpp

@@ -134,12 +134,18 @@ struct IOTask {
     auto exc = g_env->ExceptionOccurred();
     if (exc) {
       if (retval) {
+#if defined(ANDROID_MODULE)
+        // avoid: JNI DETECTED ERROR IN APPLICATION: JNI FindClass called with pending exception
+        error(retval, "Java exception - see adb logcat");
+        g_env->ExceptionClear();
+#else
         jclass clazz = g_env->FindClass("java/lang/Object");
         jmethodID methodId = g_env->GetMethodID(clazz, "toString", "()Ljava/lang/String;");
         jstring jstr = (jstring) g_env->CallObjectMethod(exc, methodId);
         const char *message = g_env->GetStringUTFChars(jstr, JNI_FALSE);
         error(retval, message);
         g_env->ReleaseStringUTFChars(jstr, message);
+#endif
       } else {
         g_env->ExceptionDescribe();
         g_env->ExceptionClear();
@@ -513,20 +519,23 @@ int sblib_init(const char *sourceFile) {
 #else
   int result = 1;
 #endif
-
-  g_ioioTask = new IOTask();
-  var_t retval;
-  if (!g_ioioTask || !g_ioioTask->create(CLASS_IOIO, &retval)) {
-    fprintf(stderr, "Failed to IOIOTask: %s\n", v_getstr(&retval));
+  if (g_jvm == nullptr) {
     result = 0;
+  } else {
+    g_ioioTask = new IOTask();
+    var_t retval;
+    if (!g_ioioTask || !g_ioioTask->create(CLASS_IOIO, &retval)) {
+      fprintf(stderr, "Failed to IOIOTask: %s\n", v_getstr(&retval));
+      result = 0;
+    }
   }
   return result;
 }
 
 #if defined(ANDROID_MODULE)
 //
 // Stores the Android JavaVM reference
-// 
+//
 extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void* reserved) {
   logEntered();
   g_jvm = vm;
@@ -583,13 +592,13 @@ void sblib_close(void) {
     fprintf(stderr, "IOTask leak detected\n");
     g_ioTaskMap.clear();
   }
-#if defined(DESKTOP_MODULE)  
+#if defined(DESKTOP_MODULE)
   if (g_jvm) {
     g_jvm->DetachCurrentThread();
   }
   // calling this hangs
   //jvm->DestroyJavaVM();
   g_env = nullptr;
   g_jvm = nullptr;
-#endif  
+#endif
 }