Merge pull request #214 from chrisws/master

Android fixes

Author: chrisws

src/lib/lodepng

@@ -723,9 +723,9 @@ sub main
     frm.inputs << bn_files
     frm.inputs << bn_online
     frm.inputs << bn_scratch
-'    if (!is_sdl) then
+    if (!is_sdl) then
       frm.inputs << bn_setup
-'    endif
+    endif
     frm.inputs << bn_about
     listFiles frm, path, sortDir, basList
     frm = form(frm)

src/lib/miniaudio

@@ -514,6 +514,7 @@ public String request(String endPoint, String data, String apiKey) throws IOExce
     try {
       HttpURLConnection conn = getHttpURLConnection(endPoint, (data == null || data.isEmpty()) ? "GET" : "POST", apiKey);
       if (data != null && !data.isEmpty()) {
+        conn.setRequestProperty("Content-Length", "" + data.getBytes().length);
         OutputStream os = conn.getOutputStream();
         os.write(data.getBytes(StandardCharsets.UTF_8));
         os.flush();
@@ -530,10 +531,10 @@ public String request(String endPoint, String data, String apiKey) throws IOExce
         in.close();
         result = response.toString();
       } else {
-        result = "error:[" + responseCode + "]";
+        result = "error: [" + responseCode + "]";
       }
     } catch (Exception e) {
-      result = "error:[" + e + "]";
+      result = "error: [" + e + "]";
     }
     return result;
   }
@@ -806,6 +807,7 @@ private HttpURLConnection getHttpURLConnection(String endPoint, String method, S
     result.setRequestMethod(method);
     result.setInstanceFollowRedirects(true);
     if (apiKey != null && !apiKey.isEmpty()) {
+      result.setRequestProperty("Accept", "application/json");
       result.setRequestProperty("Content-Type", "application/json");
       result.setRequestProperty("Authorization", "Bearer " + apiKey);
     }
@@ -921,7 +923,7 @@ private String readBuffer(File inputFile) {
       }
       input.close();
     } catch (FileNotFoundException e) {
-      Log.i(TAG, "readBuffer failed: ", e);
+      Log.i(TAG, "file not found: ", e);
     } catch (IOException e) {
       Log.i(TAG, "readBuffer failed: ", e);
     }

src/lib/stb

@@ -978,22 +978,22 @@ int Runtime::getFontId() {
 int Runtime::invokeRequest(int argc, slib_par_t *params, var_t *retval) {
   int result = 0;
   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))) {
+    _output->redraw();
+
     JNIEnv *env;
     _app->activity->vm->AttachCurrentThread(&env, nullptr);
-
     auto endPoint = env->NewStringUTF(v_getstr(params[0].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));
+    auto data = env->NewStringUTF(argc < 2 ? "" : v_getstr(params[1].var_p));
+    auto apiKey = env->NewStringUTF(argc < 3 ? "" : v_getstr(params[2].var_p));
 
     jclass clazz = env->GetObjectClass(_app->activity->clazz);
     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, 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: [", 8) == 0 ? 0 : 1;
     env->ReleaseStringUTFChars(jstr, str);
     env->DeleteLocalRef(jstr);
     env->DeleteLocalRef(clazz);
@@ -1003,7 +1003,7 @@ int Runtime::invokeRequest(int argc, slib_par_t *params, var_t *retval) {
 
     _app->activity->vm->DetachCurrentThread();
   } else {
-    v_setstr(retval, "invalid arguments");
+    v_setstr(retval, "Invalid request arguments");
   }
   return result;
 }