ANDROID: remove hardcoded references to /sdcard path

Author: chrisws

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

@@ -232,7 +232,7 @@ end
 
 sub loadFileList(path, byref basList)
   erase basList
-  local emptyNode, storage
+  local emptyNode, ext_storage, int_storage
 
   func walker(node)
     if (node.depth==0) then
@@ -249,9 +249,17 @@ sub loadFileList(path, byref basList)
   dirwalk path, "", use walker(x)
 
   if (path = "/" && len(basList) == 0 && !is_sdl) then
-     storage = env("EXTERNAL_STORAGE")
-     if (len(storage) > 0) then
-       emptyNode.name = mid(storage, 2)
+     ext_storage = env("EXTERNAL_STORAGE")
+     if (len(ext_storage) > 0) then
+       emptyNode.name = mid(ext_storage, 2)
+       emptyNode.dir = true
+       emptyNode.size = ""
+       emptyNode.mtime = 0
+       basList << emptyNode
+     endif
+     int_storage = env("INTERNAL_STORAGE")
+     if (len(int_storage) > 0 && int_storage != ext_storage) then
+       emptyNode.name = mid(int_storage, 2)
        emptyNode.dir = true
        emptyNode.size = ""
        emptyNode.mtime = 0

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

@@ -257,12 +257,16 @@ public String getExternalStorage() {
         result = path;
       }
     } else {
-      result = getFilesDir().getAbsolutePath();
+      result = getInternalStorage();
     }
     return result;
   }
 
-  public String getIPAddress() {
+  public String getInternalStorage() {
+    return getFilesDir().getAbsolutePath();
+  }
+
+  public String getIpAddress() {
     String result = "";
     try {
       for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
@@ -385,16 +389,6 @@ public boolean onPrepareOptionsMenu(Menu menu) {
     return super.onPrepareOptionsMenu(menu);
   }
 
-  @Override
-  public void onRequestPermissionsResult(int requestCode,
-                                         @NonNull String[] permissions,
-                                         @NonNull int[] grantResults) {
-    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    if (requestCode == REQUEST_STORAGE_PERMISSION && grantResults[0] == PackageManager.PERMISSION_DENIED) {
-      exit();
-    }
-  }
-
   public void optionsBox(final String[] items) {
     this._options = items;
     runOnUiThread(new Runnable() {
@@ -702,12 +696,6 @@ private void execStream(final String line, DataInputStream inputStream) throws I
     runFile(outputFile.getAbsolutePath());
   }
 
-  private void exit() {
-    moveTaskToBack(true);
-    android.os.Process.killProcess(android.os.Process.myPid());
-    System.exit(1);
-  }
-
   private Map<String, String> getPostData(DataInputStream inputStream, final String line) throws IOException {
     int length = 0;
     final String lengthHeader = "content-length: ";

src/platform/android/jni/runtime.cpp

@@ -458,7 +458,7 @@ void Runtime::runShell() {
   _app->activity->callbacks->onContentRectChanged = onContentRectChanged;
   loadConfig();
 
-  String ipAddress = getString("getIPAddress");
+  String ipAddress = getString("getIpAddress");
   if (!ipAddress.empty()) {
     setenv("IP_ADDR", ipAddress.c_str(), 1);
   }
@@ -487,7 +487,11 @@ void Runtime::loadConfig() {
   _output->setFontSize(fontSize);
   _initialFontSize = _output->getFontSize();
 
-  String storage = getString("getExternalStorage");
+  String storage = getString("getInternalStorage");
+  if (!storage.empty()) {
+    setenv("INTERNAL_STORAGE", storage.c_str(), 1);
+  }
+  storage = getString("getExternalStorage");
   if (!storage.empty()) {
     setenv("EXTERNAL_STORAGE", storage.c_str(), 1);
     chdir(storage.c_str());