ANDROID: Implemented "android.request"

Author: chrisws

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

@@ -103,6 +103,7 @@ public class MainActivity extends NativeActivity {
   private static final String FOLDER_NAME = "SmallBASIC";
   private static final int COPY_BUFFER_SIZE = 1024;
   private static final String[] SAMPLES = {"welcome.bas"};
+  private static final int TIMEOUT_MILLIS = 5000;
   private String _startupBas = null;
   private boolean _untrusted = false;
   private final ExecutorService _audioExecutor = Executors.newSingleThreadExecutor();
@@ -382,7 +383,6 @@ public boolean loadModules() {
       System.loadLibrary("ioio");
       Class.forName("ioio.smallbasic.android.ModuleLoader")
            .getDeclaredConstructor(Long.class, Context.class).newInstance(getActivity(), this);
-      consoleLog("loadModules - success");
       result = true;
     } catch (Exception | UnsatisfiedLinkError e) {
       consoleLog(e.toString());
@@ -509,10 +509,10 @@ public boolean removeLocationUpdates() {
     return result;
   }
 
-  public String request(String endPoint, String method, String data, String apiKey) throws IOException {
+  public String request(String endPoint, String data, String apiKey) throws IOException {
     String result;
     try {
-      HttpURLConnection conn = getHttpURLConnection(endPoint, method, apiKey);
+      HttpURLConnection conn = getHttpURLConnection(endPoint, (data == null || data.isEmpty()) ? "GET" : "POST", apiKey);
       if (data != null && !data.isEmpty()) {
         OutputStream os = conn.getOutputStream();
         os.write(data.getBytes(StandardCharsets.UTF_8));
@@ -530,10 +530,10 @@ public String request(String endPoint, String method, String data, String apiKey
         in.close();
         result = response.toString();
       } else {
-        result = "[error:" + responseCode + "]";
+        result = "error:[" + responseCode + "]";
       }
     } catch (Exception e) {
-      result = "[error:" + e + "]";
+      result = "error:[" + e + "]";
     }
     return result;
   }
@@ -798,21 +798,19 @@ private void execStream(InputStream inputStream) throws IOException {
   }
 
   @NonNull
-  private static HttpURLConnection getHttpURLConnection(String endPoint,
-                                                        String method,
-                                                        String apiKey) throws IOException {
+  private HttpURLConnection getHttpURLConnection(String endPoint, String method, String apiKey) throws IOException {
     URL url = new URL(endPoint);
-    HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-    conn.setConnectTimeout(10000);
-    conn.setRequestProperty("User-Agent", "SmallBASIC");
-    conn.setRequestMethod(method == null || method.isEmpty() ? "POST" : method);
-    conn.setInstanceFollowRedirects(true);
+    HttpURLConnection result = (HttpURLConnection) url.openConnection();
+    result.setConnectTimeout(TIMEOUT_MILLIS);
+    result.setRequestProperty("User-Agent", "SmallBASIC");
+    result.setRequestMethod(method);
+    result.setInstanceFollowRedirects(true);
     if (apiKey != null && !apiKey.isEmpty()) {
-      conn.setRequestProperty("Content-Type", "application/json");
-      conn.setRequestProperty("Authorization", "Bearer " + apiKey);
+      result.setRequestProperty("Content-Type", "application/json");
+      result.setRequestProperty("Authorization", "Bearer " + apiKey);
     }
-    conn.setDoOutput(true);
-    return conn;
+    result.setDoOutput(true);
+    return result;
   }
 
   private Uri getSharedFile(File file) {

src/platform/android/jni/runtime.cpp

@@ -200,6 +200,7 @@ extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_c
   if (jstr != nullptr) {
     const char *str = env->GetStringUTFChars(jstr, 0);
     runtime->systemLog(str);
+    runtime->systemLog("\n");
     env->ReleaseStringUTFChars(jstr, str);
   }
 }
@@ -976,30 +977,27 @@ int Runtime::getFontId() {
 
 int Runtime::invokeRequest(int argc, slib_par_t *params, var_t *retval) {
   int result = 0;
-  if ((argc >= 1 && argc <= 4 && v_is_type(params[0].var_p, V_STR)) &&
+  if ((argc >= 1 && argc <= 3 && v_is_type(params[0].var_p, V_STR)) &&
       (argc < 2 || v_is_type(params[1].var_p, V_STR)) &&
-      (argc < 3 || v_is_type(params[2].var_p, V_STR)) &&
-      (argc < 4 || v_is_type(params[3].var_p, V_STR))) {
+      (argc < 3 || v_is_type(params[2].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(argc < 2 ? "POST" : v_getstr(params[1].var_p));
     auto data = env->NewStringUTF(argc < 3 ? "" : v_getstr(params[2].var_p));
     auto apiKey = env->NewStringUTF(argc < 4 ? "" : 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;";
+    const char *signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;";
     jmethodID methodId = env->GetMethodID(clazz, "request", signature);
-    jstring jstr = (jstring)env->CallObjectMethod(_app->activity->clazz, methodId, endPoint, method, data, apiKey);
+    jstring jstr = (jstring)env->CallObjectMethod(_app->activity->clazz, methodId, endPoint, data, apiKey);
     const char *str = env->GetStringUTFChars(jstr, JNI_FALSE);
     v_setstr(retval, str);
-    result = strncmp(str, "[error:", 7) == 0 ? 0 : 1;
+    result = strncmp(str, "error:[", 7) == 0 ? 0 : 1;
     env->ReleaseStringUTFChars(jstr, str);
     env->DeleteLocalRef(jstr);
     env->DeleteLocalRef(clazz);
     env->DeleteLocalRef(endPoint);
-    env->DeleteLocalRef(method);
     env->DeleteLocalRef(data);
     env->DeleteLocalRef(apiKey);