ANDROID: handle non-.bas file in UI

Author: chrisws

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

@@ -34,6 +34,7 @@ const aboutId = "_about"
 const backId = "_back"
 const scratchId = "_scratch"
 const scratch_file = HOME + "/scratch.bas"
+const sortEnd = chr(255)
 
 func mk_menu(value, lab, x)
   local bn
@@ -230,13 +231,17 @@ end
 func fileCmpFunc0(l, r)
   local f1 = lower(l.name)
   local f2 = lower(r.name)
+  if (right(f1, 4) != ".bas") then f1 = sortEnd + f1
+  if (right(f2, 4) != ".bas") then f2 = sortEnd + f2
   local n = iff(f1 == f2, 0, iff(f1 > f2, 1, -1))
   return iff(l.dir == r.dir, n, iff(l.dir, 1, -1))
 end
 
 func fileCmpFunc1(l, r)
   local f1 = lower(l.name)
   local f2 = lower(r.name)
+  if (right(f1, 4) != ".bas") then f1 = sortEnd + f1
+  if (right(f2, 4) != ".bas") then f2 = sortEnd + f2
   local n = iff(f1 == f2, 0, iff(f1 > f2, -1, 1))
   return iff(l.dir == r.dir, n, iff(l.dir, 1, -1))
 end
@@ -285,7 +290,7 @@ sub loadFileList(path, byref basList)
   end
 
   func androidWalker(node)
-    if (node.dir == 0 && lower(right(node.name, 4)) == ".bas") then
+    if (node.dir == 0) then
       basList << node
     endif
     return node.depth == 0
@@ -392,7 +397,8 @@ sub listFiles(byref frm, path, sortDir, byref basList)
     endif
     if (abbr) then
       bn = mk_bn(path + name, name, txtcol)
-      bn.type = "link"
+      bn.type = iff(lower(right(name, 4)) == ".bas", "link", "label")
+      if (bn.type == "label") then bn.color = colText
       if (!node.dir) then bn.isExit = true
     else
       if (len(name) > 27) then
@@ -401,7 +407,8 @@ sub listFiles(byref frm, path, sortDir, byref basList)
         lab = name
       endif
       bn = mk_bn(path + name, lab, txtcol)
-      bn.type = "link"
+      bn.type = iff(lower(right(name, 4)) == ".bas", "link", "label")
+      if (bn.type == "label") then bn.color = colText
       if (!node.dir) then bn.isExit = true
       frm.inputs << bn
       gap = 12 - len(str(node.size))

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

@@ -1,5 +1,7 @@
 package net.sourceforge.smallbasic;
 
+import android.util.Base64;
+
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -14,7 +16,6 @@
 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;
@@ -107,7 +108,6 @@ 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;
@@ -158,24 +158,16 @@ protected Map<String, Collection<String>> getParameters(String url) throws IOExc
     /**
      * Parses HTTP POST data from the given input stream
      */
-    protected Map<String, Object> getPostData(InputStream inputStream) throws IOException {
+    protected Map<String, FormField> getPostData(InputStream inputStream) throws IOException {
       String postData = getLine(inputStream);
       String[] fields = postData.split("&");
-      Map<String, Object> result = new HashMap<>();
+      Map<String, FormField> result = new HashMap<>();
       for (String nextField : fields) {
         int eq = nextField.indexOf("=");
         if (eq != -1) {
           String key = nextField.substring(0, eq);
           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));
-          }
+          result.put(key, new FormField(key, value));
         }
       }
       return result;
@@ -272,6 +264,37 @@ public FileData(File file) {
     }
   }
 
+  /**
+   * Holder for POST form data
+   */
+  public static class FormField {
+    private static final String BASE_64_PREFIX = ";base64,";
+    private final String string;
+    private final byte[] bytes;
+
+    public FormField(String key, String value) throws IOException {
+      int index = value.indexOf(BASE_64_PREFIX);
+      if (index != -1 && "data".equals(key)) {
+        ByteArrayOutputStream data = new ByteArrayOutputStream();
+        String base64Value = value.substring(index + BASE_64_PREFIX.length());
+        data.write(Base64.decode(base64Value, Base64.DEFAULT));
+        this.string = null;
+        this.bytes = data.toByteArray();
+      } else {
+        this.string = URLDecoder.decode(value, UTF_8);
+        this.bytes = null;
+      }
+    }
+
+    public String getString() {
+      return string;
+    }
+
+    public byte[] toByteArray() {
+      return bytes;
+    }
+  }
+
   /**
    * Build JSON string
    */
@@ -369,6 +392,16 @@ private Collection<String> getAllFileNames() throws IOException {
       return result;
     }
 
+    private byte[] getData(Map<String, FormField> data) {
+      FormField field = data.get("data");
+      return field == null ? null : field.toByteArray();
+    }
+
+    private String getString(Map<String, FormField> data, String key) {
+      FormField field = data.get(key);
+      return field == null ? null : field.toString();
+    }
+
     /**
      * Download files button handler
      */
@@ -444,8 +477,8 @@ private void handleGet(Map<String, Collection<String>> parameters) throws IOExce
     /**
      * Handler for POST requests
      */
-    private void handlePost(Map<String, Object> data) throws IOException {
-      String userToken = (String) data.get(TOKEN);
+    private void handlePost(Map<String, FormField> data) throws IOException {
+      String userToken = getString(data, TOKEN);
       if (userToken == null) {
         userToken = requestToken;
       }
@@ -476,9 +509,9 @@ private void handlePost(Map<String, Object> data) throws IOException {
     /**
      * Handler for File rename operations
      */
-    private Response handleRename(Map<String, Object> data) throws IOException {
-      String from = (String) data.get("from");
-      String to = (String) data.get("to");
+    private Response handleRename(Map<String, FormField> data) throws IOException {
+      String from = getString(data, "from");
+      String to = getString(data, "to");
       Response result;
       try {
         renameFile(from, to);
@@ -515,15 +548,15 @@ private Response handleStatus(boolean success, String message) throws IOExceptio
     /**
      * Handler for file uploads
      */
-    private Response handleUpload(Map<String, Object> data) throws IOException {
-      String fileName = (String) data.get("fileName");
-      ByteArrayOutputStream content = (ByteArrayOutputStream) data.get("data");
+    private Response handleUpload(Map<String, FormField> data) throws IOException {
+      String fileName = getString(data, "fileName");
+      byte[] content = getData(data);
       Response result;
       try {
         if (fileName == null || content == null) {
           result = handleStatus(false, "Invalid input");
         } else {
-          saveFile(fileName, content.toByteArray());
+          saveFile(fileName, content);
           result = handleStatus(true, "File saved");
         }
       } catch (Exception e) {