ANDROID: update handling with permission denied errors

Author: chrisws

src/platform/android/app/build.gradle

@@ -9,7 +9,7 @@ android {
     applicationId 'net.sourceforge.smallbasic'
     minSdkVersion 16
     targetSdkVersion 33
-    versionCode 54
+    versionCode 55
     versionName '12.25'
     resConfigs 'en'
   }

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

@@ -72,6 +72,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Queue;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -103,7 +104,7 @@ public class MainActivity extends NativeActivity {
   private final ExecutorService _audioExecutor = Executors.newSingleThreadExecutor();
   private final Queue<Sound> _sounds = new ConcurrentLinkedQueue<>();
   private final Handler _keypadHandler = new Handler(Looper.getMainLooper());
-  private final Map<String, Boolean> permittedHost = new HashMap<>();
+  private final Map<String, Boolean> permittedHost = new ConcurrentHashMap<>();
   private String[] _options = null;
   private MediaPlayer _mediaPlayer = null;
   private LocationAdapter _locationAdapter = null;
@@ -776,7 +777,7 @@ private boolean isHostDenied(String remoteHost) {
     return (remoteHost != null && permittedHost.get(remoteHost) != null && Boolean.FALSE.equals(permittedHost.get(remoteHost)));
   }
 
-  private boolean isHostNonPermitted(String remoteHost) {
+  private boolean isHostNotPermitted(String remoteHost) {
     return (remoteHost == null || permittedHost.get(remoteHost) == null || !Boolean.TRUE.equals(permittedHost.get(remoteHost)));
   }
 
@@ -894,7 +895,7 @@ private void setupStorageEnvironment() {
   }
 
   private void validateAccess(String remoteHost) throws IOException {
-    if (isHostNonPermitted(remoteHost)) {
+    if (isHostNotPermitted(remoteHost)) {
       throw new IOException(getString(R.string.PORTAL_DENIED));
     }
   }
@@ -999,7 +1000,7 @@ protected void execStream(String remoteHost, InputStream inputStream) throws IOE
       if (isHostDenied(remoteHost)) {
         throw new IOException(getString(R.string.PORTAL_DENIED));
       }
-      if (isHostNonPermitted(remoteHost)) {
+      if (isHostNotPermitted(remoteHost)) {
         requestHostPermission(remoteHost);
       } else {
         MainActivity.this.execStream(inputStream);
@@ -1014,7 +1015,7 @@ protected Response getFile(String remoteHost, String path, boolean asset) throws
         long length = getFileLength(name);
         log("Opened " + name + " " + length + " bytes");
         result = new Response(getAssets().open(name), length);
-        if ("index.html".equals(path) && isHostNonPermitted(remoteHost)) {
+        if ("index.html".equals(path) && isHostNotPermitted(remoteHost)) {
           requestHostPermission(remoteHost);
         }
       } else {

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

@@ -447,19 +447,25 @@ private Response handleFileList() throws IOException {
       builder.append('[');
       long id = 0;
       char comma = 0;
-      for (FileData nextFile : getFileData(remoteHost)) {
-        builder.append(comma);
-        builder.append('{');
-        builder.append("id", id++, true);
-        builder.append("fileName", nextFile.fileName, true);
-        builder.append("size", nextFile.size, true);
-        builder.append("date", nextFile.date, false);
-        builder.append('}');
-        comma = ',';
+      Response result;
+      try {
+        for (FileData nextFile : getFileData(remoteHost)) {
+          builder.append(comma);
+          builder.append('{');
+          builder.append("id", id++, true);
+          builder.append("fileName", nextFile.fileName, true);
+          builder.append("size", nextFile.size, true);
+          builder.append("date", nextFile.date, false);
+          builder.append('}');
+          comma = ',';
+        }
+        builder.append(']');
+        byte[] json = builder.getBytes();
+        result = new Response(new ByteArrayInputStream(json), json.length);
+      } catch (Exception e) {
+        result = handleStatus(false, e.getMessage());
       }
-      builder.append(']');
-      byte[] json = builder.getBytes();
-      return new Response(new ByteArrayInputStream(json), json.length);
+      return result;
     }
 
     /**
@@ -522,7 +528,7 @@ private Response handleDelete(Map<String, FormField> data) throws IOException {
         deleteFile(remoteHost, fileName);
         log("Deleted " + fileName);
         result = handleFileList();
-      } catch (IOException e) {
+      } catch (Exception e) {
         result = handleStatus(false, e.getMessage());
       }
       return result;
@@ -538,7 +544,7 @@ private Response handleRename(Map<String, FormField> data) throws IOException {
       try {
         renameFile(remoteHost, from, to);
         result = handleStatus(true, "File renamed");
-      } catch (IOException e) {
+      } catch (Exception e) {
         result = handleStatus(false, e.getMessage());
       }
       return result;

src/platform/android/webui/package.json

@@ -6,10 +6,10 @@
   "dependencies": {
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
-    "@mui/icons-material": "^5.10.9",
-    "@mui/material": "^5.10.12",
-    "@mui/x-data-grid": "^5.17.10",
-    "npm-check-updates": "^16.3.16",
+    "@mui/icons-material": "^5.10.15",
+    "@mui/material": "^5.10.15",
+    "@mui/x-data-grid": "^5.17.12",
+    "npm-check-updates": "^16.4.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-scripts": "5.0.1"

src/platform/android/webui/src/App.js

@@ -1,3 +1,4 @@
+
 import {
   Fragment,
   useState
@@ -173,7 +174,6 @@ function GridToolbarDelete(props) {
       props.setSelections([]);
     }, (error) => {
       setError(error);
-      setError(true);
     });
   };
 
@@ -314,7 +314,7 @@ function FileList(props) {
 
   return (
     <Fragment>
-      <ErrorMessage error={error} setError={setError} />
+      <ErrorMessage error={error} setError={setError} severity="error"/>
       <DataGrid rows={props.rows}
                 initialState={sorting}
                 columns={columns}