ANDROID: added android.request

Author: chrisws

src/platform/android/app/proguard-rules.pro

@@ -3,7 +3,7 @@
 #
 
 -keep public class net.sourceforge.smallbasic.** { public *; }
--keep public class ioio.lib.** { *; }
+-keep public class ioio.** { *; }
 -keepclasseswithmembernames class * { native <methods>; }
 -printmapping build/outputs/mapping/release/mapping.txt
 -keepattributes LineNumberTable,SourceFile

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

@@ -58,11 +58,14 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
+import java.net.URL;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -115,7 +118,6 @@ 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);
@@ -233,6 +235,8 @@ public Class<?> findClass(String className) {
     }
   }
 
+  public native long getActivity();
+
   public byte[] getClipboardText() {
     final StringBuilder text = new StringBuilder();
     final Context context = this;
@@ -372,9 +376,10 @@ public boolean loadModules() {
     Log.i(TAG, "loadModules: " + getActivity());
     boolean result;
     try {
+      // this would ideally be done with some kind of dependency injection
       System.loadLibrary("ioio");
-      Class<?> clazz = Class.forName("ioio.smallbasic.android.IOIOLoader");
-      clazz.getDeclaredConstructor(Long.class, Context.class).newInstance(getActivity(), this);
+      Class.forName("ioio.smallbasic.android.ModuleLoader")
+           .getDeclaredConstructor(Long.class, Context.class).newInstance(getActivity(), this);
       Log.e(TAG, "loadModules - success");
       result = true;
     } catch (Exception | UnsatisfiedLinkError e) {
@@ -502,6 +507,39 @@ public boolean removeLocationUpdates() {
     return result;
   }
 
+  public String request(String endPoint, String method, String data, String apiKey) throws IOException {
+    String result = null;
+    try {
+      URL url = new URL(endPoint);
+      HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+      conn.setRequestMethod(method == null || method.isEmpty() ? "POST" : method);
+      if (apiKey != null && !apiKey.isEmpty()) {
+        conn.setRequestProperty("Content-Type", "application/json");
+        conn.setRequestProperty("Authorization", "Bearer " + apiKey);
+      }
+      conn.setDoOutput(true);
+      if (data != null && !data.isEmpty()) {
+        OutputStream os = conn.getOutputStream();
+        os.write(data.getBytes(StandardCharsets.UTF_8));
+        os.flush();
+        os.close();
+      }
+      if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
+        BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+        String inputLine;
+        StringBuilder response = new StringBuilder();
+        while ((inputLine = in.readLine()) != null) {
+          response.append(inputLine);
+        }
+        in.close();
+        result = response.toString();
+      }
+    } catch (Exception e) {
+      Log.d(TAG, e.toString());
+    }
+    return result;
+  }
+
   public boolean requestLocationUpdates() {
     final LocationManager locationService = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
     boolean result = false;

src/platform/android/jni/runtime.cpp

@@ -964,6 +964,46 @@ int Runtime::getFontId() {
   return result;
 }
 
+int Runtime::invokeRequest(int argc, slib_par_t *params, var_t *retval) {
+  int result = 0;
+  if (argc >= 1 && argc < 5 &&
+      v_is_type(params[0].var_p, V_STR) &&
+      v_is_type(params[1].var_p, V_STR) &&
+      v_is_type(params[2].var_p, V_STR) &&
+      v_is_type(params[3].var_p, V_STR)) {
+    JNIEnv *env;
+    _app->activity->vm->AttachCurrentThread(&env, nullptr);
+
+    auto endPoint = env->NewStringUTF(v_getstr(params[0].var_p));
+    auto method = env->NewStringUTF(v_getstr(params[1].var_p));
+    auto data = env->NewStringUTF(v_getstr(params[2].var_p));
+    auto apiKey = env->NewStringUTF(v_getstr(params[3].var_p));
+
+    jclass clazz = env->GetObjectClass(_app->activity->clazz);
+    const char *signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;";
+    jmethodID methodId = env->GetMethodID(clazz, "request", signature);
+    jstring resultStr = (jstring)env->CallObjectMethod(_app->activity->clazz, methodId, endPoint, method, data, apiKey);
+    const char *str = env->GetStringUTFChars(resultStr, JNI_FALSE);
+    v_init(retval);
+    v_setstr(retval, str);
+    result = 1;
+
+    env->ReleaseStringUTFChars(resultStr, str);
+    env->DeleteLocalRef(resultStr);
+    env->DeleteLocalRef(clazz);
+    env->DeleteLocalRef(endPoint);
+    env->DeleteLocalRef(method);
+    env->DeleteLocalRef(data);
+    env->DeleteLocalRef(apiKey);
+
+    _app->activity->vm->DetachCurrentThread();
+  }
+  if (!result) {
+    v_setstr(retval, "invalid arguments");
+  }
+  return result;
+}
+
 //
 // System platform methods
 //
@@ -1409,7 +1449,8 @@ int sblib_proc_exec(int index, int param_count, slib_par_t *params, var_t *retva
 
 const char *lib_funcs[] = {
   "LOCATION",
-  "SENSOR"
+  "SENSOR",
+  "REQUEST"
 };
 
 int sblib_func_count(void) {
@@ -1438,6 +1479,9 @@ int sblib_func_exec(int index, int param_count, slib_par_t *params, var_t *retva
     runtime->setSensorData(retval);
     result = 1;
     break;
+  case 2:
+    result = runtime->invokeRequest(param_count, params, retval);
+    break;
   default:
     result = 0;
     break;

src/platform/android/jni/runtime.h

@@ -81,6 +81,7 @@ struct Runtime : public System {
   char *getClipboardText();
   void setFocus(bool focus) { _hasFocus = focus; }
   int  getFontId();
+  int  invokeRequest(int param_count, slib_par_t *params, var_t *retval);
 
 private:
   bool _keypadActive;