ANDROID: fix binary data upload in webui

Author: chrisws

src/lib/lodepng

@@ -9,7 +9,7 @@ android {
     applicationId 'net.sourceforge.smallbasic'
     minSdkVersion 16
     targetSdkVersion 33
-    versionCode 53
+    versionCode 54
     versionName '12.25'
     resConfigs 'en'
   }
@@ -47,6 +47,7 @@ android {
       path '../jni/Android.mk'
     }
   }
+  namespace 'net.sourceforge.smallbasic'
 }
 
 dependencies {

src/lib/miniaudio

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="net.sourceforge.smallbasic">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <!-- support large + xlarge screens to avoid compatibility mode -->
   <supports-screens android:largeScreens="true" />
   <supports-screens android:xlargeScreens="true" />

src/lib/stb

@@ -1047,7 +1047,7 @@ private long getFileLength(String name) throws IOException {
     private Collection<FileData> getFiles(File path) {
       Collection<FileData> result = new ArrayList<>();
       if (path.isDirectory() && path.canRead()) {
-        File[] files = path.listFiles(new BasFileFilter());
+        File[] files = path.listFiles((FilenameFilter)null);
         if (files != null) {
           for (File file : files) {
             result.add(new FileData(file));

src/platform/android/app/build.gradle

@@ -11,15 +11,16 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.URLDecoder;
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.TimeZone;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.zip.ZipEntry;
@@ -32,7 +33,7 @@
  * @author chrisws
  */
 public abstract class WebServer {
-  private static final int BUFFER_SIZE = 32768;
+  private static final int BUFFER_SIZE = 32768 / 2;
   private static final int SEND_SIZE = BUFFER_SIZE / 4;
   private static final int LINE_SIZE = 128;
   private static final String UTF_8 = "utf-8";
@@ -106,6 +107,7 @@ public abstract static class AbstractRequest {
     final String tokenKey;
     final List<String> headers;
     final InputStream inputStream;
+    private static final String BASE_64_PREFIX = ";base64,";
 
     public AbstractRequest(Socket socket, String tokenKey) throws IOException {
       this.socket = socket;
@@ -156,16 +158,24 @@ protected Map<String, Collection<String>> getParameters(String url) throws IOExc
     /**
      * Parses HTTP POST data from the given input stream
      */
-    protected Map<String, String> getPostData(InputStream inputStream) throws IOException {
+    protected Map<String, Object> getPostData(InputStream inputStream) throws IOException {
       String postData = getLine(inputStream);
       String[] fields = postData.split("&");
-      Map<String, String> result = new HashMap<>();
+      Map<String, Object> result = new HashMap<>();
       for (String nextField : fields) {
         int eq = nextField.indexOf("=");
         if (eq != -1) {
           String key = nextField.substring(0, eq);
-          String value = URLDecoder.decode(nextField.substring(eq + 1), UTF_8);
-          result.put(key, value);
+          String value = nextField.substring(eq + 1);
+          int index = value.indexOf(BASE_64_PREFIX);
+          if (index != -1) {
+            ByteArrayOutputStream data = new ByteArrayOutputStream();
+            value = value.substring(index + BASE_64_PREFIX.length());
+            data.write(Base64.getDecoder().decode(value));
+            result.put(key, data);
+          } else {
+            result.put(key, URLDecoder.decode(nextField.substring(eq + 1), UTF_8));
+          }
         }
       }
       return result;
@@ -253,9 +263,11 @@ public FileData(String fileName, String date, long size) {
     }
 
     public FileData(File file) {
-      ZonedDateTime zonedDateTime = Instant.ofEpochMilli(file.lastModified()).atZone(ZoneId.of("UTC"));
+      final DateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.ENGLISH);
+      format.setLenient(false);
+      format.setTimeZone(TimeZone.getTimeZone("UTC"));
       this.fileName = file.getName();
-      this.date = DateTimeFormatter.RFC_1123_DATE_TIME.format(zonedDateTime);
+      this.date = format.format(file.lastModified());
       this.size = file.length();
     }
   }
@@ -432,8 +444,8 @@ private void handleGet(Map<String, Collection<String>> parameters) throws IOExce
     /**
      * Handler for POST requests
      */
-    private void handlePost(Map<String, String> data) throws IOException {
-      String userToken = data.get(TOKEN);
+    private void handlePost(Map<String, Object> data) throws IOException {
+      String userToken = (String) data.get(TOKEN);
       if (userToken == null) {
         userToken = requestToken;
       }
@@ -464,9 +476,9 @@ private void handlePost(Map<String, String> data) throws IOException {
     /**
      * Handler for File rename operations
      */
-    private Response handleRename(Map<String, String> data) throws IOException {
-      String from = data.get("from");
-      String to = data.get("to");
+    private Response handleRename(Map<String, Object> data) throws IOException {
+      String from = (String) data.get("from");
+      String to = (String) data.get("to");
       Response result;
       try {
         renameFile(from, to);
@@ -503,15 +515,15 @@ private Response handleStatus(boolean success, String message) throws IOExceptio
     /**
      * Handler for file uploads
      */
-    private Response handleUpload(Map<String, String> data) throws IOException {
-      String fileName = data.get("fileName");
-      String content = data.get("data");
+    private Response handleUpload(Map<String, Object> data) throws IOException {
+      String fileName = (String) data.get("fileName");
+      ByteArrayOutputStream content = (ByteArrayOutputStream) data.get("data");
       Response result;
       try {
         if (fileName == null || content == null) {
           result = handleStatus(false, "Invalid input");
         } else {
-          saveFile(fileName, content.getBytes(UTF_8));
+          saveFile(fileName, content.toByteArray());
           result = handleStatus(true, "File saved");
         }
       } catch (Exception e) {

src/platform/android/app/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.3.0'
+    classpath 'com.android.tools.build:gradle:7.3.1'
   }
 }
 

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

@@ -572,7 +572,7 @@ bool Runtime::loadSettings(Properties<String *> &settings) {
     String buffer;
     struct stat st{};
     if (stat(path.c_str(), &st) == 0) {
-      int len = st.st_size;
+      long len = st.st_size;
       buffer.append(fp, len);
       settings.load(buffer.c_str(), buffer.length());
       result = true;
@@ -959,7 +959,7 @@ bool System::getPen3() {
   return result;
 }
 
-void System::completeKeyword(int index) {
+void System::completeKeyword(int index) const {
   if (get_focus_edit() && isEditing()) {
     const char *help = get_focus_edit()->completeKeyword(index);
     if (help) {

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

@@ -54,7 +54,7 @@ struct Runtime : public System {
   void pushEvent(MAEvent *event);
   void readSensorEvents();
   void setFloat(const char *methodName, float value);
-  void setLocationData(var_t *retval);
+  static void setLocationData(var_t *retval);
   void setSensorData(var_t *retval);
   void setString(const char *methodName, const char *value);
   void speak(const char *text) { setString("speak", text); }
@@ -72,7 +72,7 @@ struct Runtime : public System {
   void onRunCompleted();
   void onUnicodeChar(int ch);
   void loadConfig();
-  void loadEnvConfig(Properties<String *> &settings, const char *key);
+  static void loadEnvConfig(Properties<String *> &settings, const char *key);
   bool loadSettings(Properties<String *> &settings);
   void saveConfig();
   void runPath(const char *path);