ANDROID: cleanup file access handling

Author: chrisws

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

@@ -952,13 +952,7 @@ protected Response getFile(String path, boolean asset) throws IOException {
         log("Opened " + name + " " + length + " bytes");
         result = new Response(getAssets().open(name), length);
       } else {
-        File file = getFile(_storage.getExternal(), path);
-        if (file == null) {
-          file = getFile(_storage.getMedia(), path);
-        }
-        if (file == null) {
-          file = getFile(_storage.getInternal(), path);
-        }
+        File file = getFile(path);
         if (file != null) {
           result = new Response(new FileInputStream(file), file.length());
         } else {
@@ -992,20 +986,11 @@ protected void renameFile(String from, String to) throws IOException {
       if (to == null || !to.endsWith(".bas")) {
         throw new IOException("Invalid file name: " + to);
       }
-      File toFile = getFile(_storage.getInternal(), to);
-      if (toFile == null) {
-        toFile = getFile(_storage.getExternal(), to);
-      }
+      File toFile = getFile(to);
       if (toFile != null) {
         throw new IOException("File already exists");
       }
-      File fromFile = getFile(_storage.getInternal(), from);
-      if (fromFile == null) {
-        fromFile = getFile(_storage.getExternal(), from);
-      }
-      if (fromFile == null) {
-        fromFile = getFile(_storage.getInternal(), from);
-      }
+      File fromFile = getFile(from);
       if (fromFile == null) {
         throw new IOException("Previous file does not exist");
       }
@@ -1033,6 +1018,17 @@ private File getFile(String parent, String path) {
       return result;
     }
 
+    private File getFile(String path) {
+      File file = getFile(_storage.getExternal(), path);
+      if (file == null) {
+        file = getFile(_storage.getMedia(), path);
+      }
+      if (file == null) {
+        file = getFile(_storage.getInternal(), path);
+      }
+      return file;
+    }
+
     private long getFileLength(String name) throws IOException {
       Long length = fileLengths.get(name);
       if (length == null) {