ANDROID: update handling for external modules

Author: chrisws

src/platform/android/app/src/main/assets/main.bas

@@ -162,6 +162,8 @@ end
 
 sub do_setup()
   local frm
+  local fontId = int(env("fontId"))
+  local loadModules = int(env("loadModules"))
 
   color colText, colBkGnd
   cls
@@ -185,7 +187,7 @@ sub do_setup()
   frm.inputs(0).x = char_w
   frm.inputs(1).type = "list"
   frm.inputs(1).value = "Inconsolata|Envy Code R|UbuntuMono"
-  frm.inputs(1).selectedIndex = env("fontId")
+  frm.inputs(1).selectedIndex = iff(fontId in [0,1,2], fontId, 0)
   frm.inputs(1).x = char_w * 1.5
   frm.inputs(1).y = char_h * 2.2
   frm.inputs(1).height = char_h * 3 + 4
@@ -213,14 +215,14 @@ sub do_setup()
       goto exitFunc
     endif
   wend
-  local fontId = frm.inputs(1).selectedIndex
+  fontId = frm.inputs(1).selectedIndex
 
   cls
   at 0, char_h * 1
   rect x, y, w * 2, h + y * 2.5
   frm.inputs(0).label = "Extension modules:"
   frm.inputs(1).value = "Ignore|Load"
-  frm.inputs(1).selectedIndex = env("loadModules")
+  frm.inputs(1).selectedIndex = iff(loadModules == 1, 1, 0)
   frm = form(frm)
   while 1
     frm.doEvents()
@@ -230,7 +232,7 @@ sub do_setup()
       goto exitFunc
     endif
   wend
-  local loadModules = frm.inputs(1).selectedIndex
+  loadModules = frm.inputs(1).selectedIndex
 
   color colText, colBkGnd
   cls
@@ -270,22 +272,17 @@ end
 sub server_info()
   local serverSocket = env("serverSocket")
   local ipAddr = env("IP_ADDR")
-  local loadModules = env("loadModules")
-  local hasText = false
+  local loadModules = int(env("loadModules"))
 
   if (len(serverSocket) > 0 && int(serverSocket) > 1023 && int(serverSocket) < 65536 && len(ipAddr)) then
     serverSocket = ipAddr + ":" + serverSocket
     print boldOff + "Web Service: " + boldOn + serverSocket
     print boldOff + "Access token: " + boldOn + env("serverToken")
     print boldOff;
-    hasText = true
   fi
-  if (int(loadModules) == 1) then
-    print "Extension modules: " + boldOn + "Enabled"
-    print boldOff;
-    hasText = true
-  endif
-  if (hasText) then print
+
+  print "Extension modules: " + boldOn + iff(loadModules == 2, "Active", iff(loadModules == 1, "Enabled", "Disabled"))
+  print boldOff
 end
 
 func fileCmpFunc0(l, r)

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java

@@ -115,6 +115,7 @@ public class MainActivity extends NativeActivity {
     System.loadLibrary("smallbasic");
   }
 
+  public native long getActivity();
   public static native boolean libraryMode();
   public static native void onActivityPaused(boolean paused);
   public static native void onResize(int width, int height);
@@ -222,6 +223,16 @@ public boolean closeLibHandlers() {
     return removeLocationUpdates();
   }
 
+  public Class<?> findClass(String className) {
+    try {
+      Log.d(TAG, "findClass " + className);
+      return Class.forName(className.replace("/", "."));
+    }
+    catch (ClassNotFoundException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   public byte[] getClipboardText() {
     final StringBuilder text = new StringBuilder();
     final Context context = this;
@@ -358,15 +369,16 @@ public int getWindowHeight() {
   }
 
   public boolean loadModules() {
-    Log.i(TAG, "loadModules");
+    Log.i(TAG, "loadModules: " + getActivity() );
     boolean result;
     try {
       System.loadLibrary("ioio");
-      Class.forName("net.sourceforge.smallbasic.ioio.IOIOLoader").newInstance();
-      Log.i(TAG, "loadModules - success");
+      Class<?> clazz = Class.forName("net.sourceforge.smallbasic.ioio.IOIOLoader");
+      clazz.getDeclaredConstructor(Long.class).newInstance(getActivity());
+      Log.d(TAG, "loadModules - success");
       result = true;
     } catch (Exception | UnsatisfiedLinkError e) {
-      Log.i(TAG, "loadModules", e);
+      Log.d(TAG, "loadModules", e);
       result = false;
     }
     return result;

src/platform/android/jni/runtime.cpp

@@ -190,6 +190,11 @@ extern "C" JNIEXPORT jboolean JNICALL Java_net_sourceforge_smallbasic_MainActivi
 #endif
 }
 
+extern "C" JNIEXPORT jlong JNICALL Java_net_sourceforge_smallbasic_MainActivity_getActivity
+  (JNIEnv *env, jobject instance) {
+  return runtime->getActivity();
+}
+
 void onContentRectChanged(ANativeActivity *activity, const ARect *rect) {
   logEntered();
   runtime->onResize(rect->right, rect->bottom);
@@ -555,14 +560,20 @@ void Runtime::loadConfig() {
         g_themeId = id;
       }
     }
+    s = settings.get(LOAD_MODULES_KEY);
+    if (s && s->toInteger() == 1) {
+      if (getBoolean("loadModules")) {
+        systemLog("Extension modules loaded\n");
+        settings.put(LOAD_MODULES_KEY, "2");
+      } else {
+        systemLog("Loading extension modules failed\n");
+        settings.put(LOAD_MODULES_KEY, "0");
+      }
+    }
     loadEnvConfig(settings, SERVER_SOCKET_KEY);
     loadEnvConfig(settings, SERVER_TOKEN_KEY);
     loadEnvConfig(settings, LOAD_MODULES_KEY);
     loadEnvConfig(settings, FONT_ID_KEY);
-    s = settings.get(LOAD_MODULES_KEY);
-    if (s && s->toInteger() == 1 && !getBoolean("loadModules")) {
-      systemLog("loadModules failed");
-    }
   }
 }
 

src/platform/android/jni/runtime.h

@@ -36,6 +36,7 @@ struct Runtime : public System {
   void disableSensor();
   void enableCursor(bool enabled) {}
   bool enableSensor(int sensorType);
+  jlong getActivity() { return (jlong)_app->activity->clazz; }
   bool getBoolean(const char *methodName);
   String getString(const char *methodName);
   String getStringBytes(const char *methodName);

src/ui/utils.h

@@ -26,8 +26,11 @@
 
 #if defined(_ANDROID)
  #include <android/log.h>
- #define deviceLog(...) __android_log_print(ANDROID_LOG_INFO, \
-                        "smallbasic", __VA_ARGS__)
+ #if defined(_DEBUG)
+   #define deviceLog(...) __android_log_print(ANDROID_LOG_ERROR, "smallbasic", __VA_ARGS__)
+ #else
+   #define deviceLog(...) __android_log_print(ANDROID_LOG_INFO, "smallbasic", __VA_ARGS__)
+ #endif
 #elif defined(_SDL) || defined(_FLTK) || defined(_EMCC)
  void appLog(const char *format, ...);
  #define deviceLog(...) appLog(__VA_ARGS__)
@@ -39,10 +42,8 @@
  #define trace(...)
 #endif
 
-#define logEntered() trace("%s entered (%s %d)", \
-                           __FUNCTION__, __FILE__, __LINE__);
-#define logLeaving() trace("%s leaving (%s %d)", \
-                           __FUNCTION__, __FILE__, __LINE__);
+#define logEntered() trace("%s entered (%s %d)", __FUNCTION__, __FILE__, __LINE__);
+#define logLeaving() trace("%s leaving (%s %d)", __FUNCTION__, __FILE__, __LINE__);
 
 #define C_LINKAGE_BEGIN extern "C" {
 #define C_LINKAGE_END }