ANDROID: file manager webui (wip)

Author: chrisws

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

@@ -865,9 +865,11 @@ private void processIntent() {
   }
 
   private void processSettings() {
+    FileInputStream is = null;
     try {
+      is = getApplication().openFileInput("settings.txt");
       Properties p = new Properties();
-      p.load(getApplication().openFileInput("settings.txt"));
+      p.load(is);
       int socket = Integer.parseInt(p.getProperty("serverSocket", "-1"));
       String token = p.getProperty("serverToken", new Date().toString());
       if (socket > 1023 && socket < 65536) {
@@ -878,6 +880,15 @@ private void processSettings() {
       }
     } catch (Exception e) {
       Log.i(TAG, "Failed to start web service: ", e);
+    } finally {
+      if (is != null) {
+        try {
+          is.close();
+        }
+        catch (IOException e) {
+          Log.i(TAG, "Failed to close settings.txt: ", e);
+        }
+      }
     }
   }
 

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

@@ -51,8 +51,8 @@ public void run(final int socketNum, final String token) {
       public void run() {
         try {
           runServer(socketNum, token);
-        } catch (IOException e) {
-          log("startServer failed: ", e);
+        } catch (Exception e) {
+          log("Server failed to start: ", e);
         }
       }
     });
@@ -87,6 +87,7 @@ private void runServer(final int socketNum, final String token) throws IOExcepti
         THREAD_POOL.submit(new Request(socket, token));
       } catch (Exception e) {
         log("Server failed", e);
+        break;
       }
     }
   }
@@ -321,15 +322,15 @@ public void run() {
           }
         }
       } catch (IOException e) {
-        log("request failed", e);
+        log("Request failed", e);
       }
       finally {
         afterRun();
       }
     }
 
     private void afterRun() {
-      log("socket cleanup");
+      log("Socket cleanup");
       try {
         if (socket != null) {
           socket.close();
@@ -338,7 +339,7 @@ private void afterRun() {
           inputStream.close();
         }
       } catch (IOException e) {
-        log("socket cleanup failed: ", e);
+        log("Socket cleanup failed: ", e);
       }
     }
 
@@ -389,7 +390,7 @@ private Response handleDownload(Map<String, Collection<String>> data) throws IOE
      * Handler for files API
      */
     private Response handleFileList() throws IOException {
-      log("sending file list");
+      log("Sending file list");
       JsonBuilder builder = new JsonBuilder();
       builder.append('[');
       long id = 0;
@@ -433,7 +434,7 @@ private void handlePost(Map<String, String> data) throws IOException {
       if (userToken == null) {
         userToken = requestToken;
       }
-      log("userToken=" + userToken);
+      log("UserToken=" + userToken);
       if (tokenKey.equals(userToken)) {
         if (url.startsWith("/api/login")) {
           handleFileList().send(socket, userToken);
@@ -532,7 +533,7 @@ private Response handleWebResponse(String asset) throws IOException {
       try {
         result = getFile(path, true);
       } catch (Exception e) {
-        log("error: " + e);
+        log("Error: " + e);
         result = null;
       }
       return result != null ? result : new Response(SC_NOT_FOUND);
@@ -570,7 +571,7 @@ public Response(int errorCode) throws IOException {
      * Sends the response to the given socket
      */
     void send(Socket socket, String cookie) throws IOException {
-      log("sendResponse() entered");
+      log("Sending response");
       String contentLength = "Content-length: " + length + "\r\n";
       BufferedOutputStream out = new BufferedOutputStream(socket.getOutputStream());
       String code = errorCode == SC_OKAY ? SC_OKAY + " OK" : String.valueOf(errorCode);
@@ -583,7 +584,7 @@ void send(Socket socket, String cookie) throws IOException {
       out.write("Server: SmallBASIC for Android\r\n\r\n".getBytes(UTF_8));
       socket.setSendBufferSize(SEND_SIZE);
       int sent = toStream(out);
-      log("sent " + sent + " bytes");
+      log("Sent " + sent + " bytes");
       out.close();
     }