ANDROID: remove hardcoded references to /sdcard path

Author: chrisws

src/common/brun.c

@@ -269,8 +269,8 @@ void exec_setup_predefined_variables() {
   setsysvar_num(SYSVAR_MAXINT, VAR_MAX_INT);
 
 #if defined(_ANDROID)
-  if (getenv("EXTERNAL_STORAGE")) {
-    strlcpy(homedir, getenv("EXTERNAL_STORAGE"), sizeof(homedir));
+  if (getenv("HOME_DIR")) {
+    strlcpy(homedir, getenv("HOME_DIR"), sizeof(homedir));
   }
 #else
 #if defined(_Win32)

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

@@ -249,15 +249,15 @@ sub loadFileList(path, byref basList)
   dirwalk path, "", use walker(x)
 
   if (path = "/" && len(basList) == 0 && !is_sdl) then
-     ext_storage = env("EXTERNAL_STORAGE")
+     ext_storage = env("EXTERNAL_DIR")
      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")
+     int_storage = env("INTERNAL_DIR")
      if (len(int_storage) > 0 && int_storage != ext_storage) then
        emptyNode.name = mid(int_storage, 2)
        emptyNode.dir = true

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

@@ -23,6 +23,7 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
+import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.util.Base64;
@@ -104,6 +105,7 @@ public class MainActivity extends NativeActivity {
   public static native void onUnicodeChar(int ch);
   public static native boolean optionSelected(int index);
   public static native void runFile(String fileName);
+  public static native void setenv(String name, String value);
 
   public void addShortcut(final byte[] pathBytes) {
     final String path = getString(pathBytes);
@@ -168,7 +170,6 @@ public void onClick(DialogInterface dialog, int which) {
       mutex.acquire();
     } catch (InterruptedException e) {
       Log.i(TAG, "ask failed: ", e);
-      e.printStackTrace();
     }
     Log.i(TAG, "ask result=" + result);
     return result.value;
@@ -229,7 +230,6 @@ public void run() {
       mutex.acquire();
     } catch (InterruptedException e) {
       Log.i(TAG, "getClipboardText failed: ", e);
-      e.printStackTrace();
     }
     byte[] result;
     try {
@@ -241,26 +241,6 @@ public void run() {
     return result;
   }
 
-  public String getExternalStorage() {
-    String result;
-    String path = Environment.getExternalStorageDirectory().getAbsolutePath();
-    if (isPublicStorage(path)) {
-      File sb = new File(path, FOLDER_NAME);
-      if ((sb.isDirectory() && sb.canWrite()) || sb.mkdirs()) {
-        result = path + "/" + FOLDER_NAME;
-      } else {
-        result = path;
-      }
-    } else {
-      result = getInternalStorage();
-    }
-    return result;
-  }
-
-  public String getInternalStorage() {
-    return getFilesDir().getAbsolutePath();
-  }
-
   public String getIpAddress() {
     String result = "";
     try {
@@ -384,6 +364,16 @@ 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) {
+      setupStorageEnvironment(true);
+    }
+  }
+
   public void optionsBox(final String[] items) {
     this._options = items;
     runOnUiThread(new Runnable() {
@@ -628,13 +618,16 @@ private String buildTokenForm() {
 
   private void checkFilePermission() {
     if (!permitted(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+      setupStorageEnvironment(false);
       Runnable handler = new Runnable() {
         @Override
         public void run() {
           checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, REQUEST_STORAGE_PERMISSION);
         }
       };
       new Handler().postDelayed(handler, 250);
+    } else {
+      setupStorageEnvironment(true);
     }
   }
 
@@ -700,6 +693,27 @@ private void execStream(final String line, DataInputStream inputStream) throws I
     runFile(outputFile.getAbsolutePath());
   }
 
+  private String getExternalStorage() {
+    String result;
+    String path = Environment.getExternalStorageDirectory().getAbsolutePath();
+    if (isPublicStorage(path)) {
+      File sb = new File(path, FOLDER_NAME);
+      if ((sb.isDirectory() && sb.canWrite()) || sb.mkdirs()) {
+        result = path + "/" + FOLDER_NAME;
+      } else {
+        result = path;
+      }
+    } else {
+      result = getInternalStorage();
+    }
+    return result;
+  }
+
+  private String getInternalStorage() {
+    Log.d(TAG, "internal = " + getFilesDir().getAbsolutePath());
+    return getFilesDir().getAbsolutePath();
+  }
+
   private Map<String, String> getPostData(DataInputStream inputStream, final String line) throws IOException {
     int length = 0;
     final String lengthHeader = "content-length: ";
@@ -737,7 +751,6 @@ private String getString(final byte[] promptBytes) {
       return new String(promptBytes, CP1252);
     } catch (UnsupportedEncodingException e) {
       Log.i(TAG, "getString failed: ", e);
-      e.printStackTrace();
       return "";
     }
   }
@@ -748,7 +761,7 @@ private boolean isPublicStorage(String dir) {
       result = false;
     } else {
       File file = new File(dir);
-      result = file.isDirectory() && file.canWrite();
+      result = file.isDirectory() && file.canRead() && file.canWrite();
     }
     return result;
   }
@@ -887,6 +900,13 @@ private void sendResponse(Socket socket, String content) throws IOException {
     out.close();
   }
 
+  private void setupStorageEnvironment(boolean external) {
+    if (external) {
+      setenv("EXTERNAL_DIR", getExternalStorage());
+    }
+    setenv("INTERNAL_DIR", getInternalStorage());
+  }
+
   private void startServer(final int socketNum, final String token) {
     Thread socketThread = new Thread(new Runnable() {
       public void run() {

src/platform/android/jni/runtime.cpp

@@ -147,6 +147,15 @@ extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_r
   env->ReleaseStringUTFChars(path, fileName);
 }
 
+extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_setenv
+  (JNIEnv *env, jclass jclazz, jstring nameString, jstring valueString) {
+  const char *name = env->GetStringUTFChars(nameString, JNI_FALSE);
+  const char *value = env->GetStringUTFChars(valueString, JNI_FALSE);
+  setenv(name, value, 1);
+  env->ReleaseStringUTFChars(nameString, name);
+  env->ReleaseStringUTFChars(valueString, value);
+}
+
 extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_onResize
   (JNIEnv *env, jclass jclazz, jint width, jint height) {
   if (runtime != NULL && !runtime->isClosing() && runtime->isActive() && os_graphics) {
@@ -487,14 +496,13 @@ void Runtime::loadConfig() {
   _output->setFontSize(fontSize);
   _initialFontSize = _output->getFontSize();
 
-  String storage = getString("getInternalStorage");
-  if (!storage.empty()) {
-    setenv("INTERNAL_STORAGE", storage.c_str(), 1);
+  const char *storage = getenv("EXTERNAL_DIR");
+  if (!storage) {
+    storage = getenv("INTERNAL_DIR");
   }
-  storage = getString("getExternalStorage");
-  if (!storage.empty()) {
-    setenv("EXTERNAL_STORAGE", storage.c_str(), 1);
-    chdir(storage.c_str());
+  if (storage) {
+    setenv("HOME_DIR", storage, 1);
+    chdir(storage);
   }
   if (loadSettings(settings)) {
     String *s = settings.get(FONT_SCALE_KEY);