ANDROID: tidyup

Author: chrisws

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

@@ -150,13 +150,13 @@ public int ask(final byte[] titleBytes, final byte[] promptBytes, final boolean
       public void run() {
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
         builder.setTitle(title).setMessage(prompt);
-        builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+        builder.setPositiveButton(R.string.YES, new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialog, int which) {
             result.setYes();
             mutex.release();
           }
         });
-        builder.setNegativeButton("No", new DialogInterface.OnClickListener() {
+        builder.setNegativeButton(R.string.NO, new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialog, int which) {
             result.setNo();
             mutex.release();
@@ -170,7 +170,7 @@ public void onCancel(DialogInterface dialog) {
           }
         });
         if (cancel) {
-          builder.setNeutralButton("Cancel", new DialogInterface.OnClickListener() {
+          builder.setNeutralButton(R.string.CANCEL, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int which) {
               result.setCancel();
               mutex.release();
@@ -502,8 +502,7 @@ public void setClipboardText(final byte[] textBytes) {
       final String text = new String(textBytes, CP1252);
       runOnUiThread(new Runnable() {
         public void run() {
-          ClipboardManager clipboard =
-            (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+          ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
           if (clipboard != null) {
             ClipData clip = ClipData.newPlainText("text", text);
             clipboard.setPrimaryClip(clip);
@@ -578,7 +577,8 @@ public void showAlert(final byte[] titleBytes, final byte[] messageBytes) {
     runOnUiThread(new Runnable() {
       public void run() {
         new AlertDialog.Builder(activity)
-          .setTitle(title).setMessage(message)
+          .setTitle(title)
+          .setMessage(message)
           .setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int which) {}
           }).show();
@@ -806,11 +806,11 @@ private void processSettings() {
       is = getApplication().openFileInput("settings.txt");
       Properties p = new Properties();
       p.load(is);
-      int socket = Integer.parseInt(p.getProperty("serverSocket", "-1"));
+      int port = Integer.parseInt(p.getProperty("serverSocket", "-1"));
       String token = p.getProperty("serverToken", new Date().toString());
-      if (socket > 1023 && socket < 65536) {
+      if (port > 1023 && port < 65536) {
         WebServer webServer = new WebServerImpl();
-        webServer.run(socket, token);
+        webServer.run(port, token);
       } else {
         Log.i(TAG, "Web service disabled");
       }
@@ -862,13 +862,14 @@ private void requestHostPermission(String remoteHost) {
     runOnUiThread(new Runnable() {
       public void run() {
         new AlertDialog.Builder(activity)
-            .setTitle(R.string.PORTAL_PROMPT).setMessage(getString(R.string.PORTAL_QUESTION, remoteHost))
+            .setTitle(R.string.PORTAL_PROMPT)
+            .setMessage(getString(R.string.PORTAL_QUESTION, remoteHost))
             .setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
               public void onClick(DialogInterface dialog, int which) {
                 permittedHost.put(remoteHost, Boolean.TRUE);
               }
             })
-            .setNegativeButton(R.string.Cancel, new DialogInterface.OnClickListener() {
+            .setNegativeButton(R.string.CANCEL, new DialogInterface.OnClickListener() {
               public void onClick(DialogInterface dialog, int which) {
                 permittedHost.put(remoteHost, Boolean.FALSE);
               }

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

@@ -50,11 +50,11 @@ public WebServer() {
   /**
    * Runs the WebServer in a new thread
    */
-  public void run(final int socketNum, final String token) {
+  public void run(final int portNum, final String token) {
     Thread socketThread = new Thread(new Runnable() {
       public void run() {
         try {
-          runServer(socketNum, token);
+          runServer(portNum, token);
         } catch (Exception e) {
           log("Server failed to start: ", e);
         }
@@ -76,12 +76,12 @@ public void run() {
   /**
    * WebServer main loop to be run in a separate thread
    */
-  private void runServer(final int socketNum, final String token) throws IOException {
-    log("Listening :" + socketNum);
+  private void runServer(final int portNum, final String token) throws IOException {
+    log("Listening :" + portNum);
     log("Token :" + token);
     ServerSocket serverSocket;
     try {
-      serverSocket = new ServerSocket(socketNum);
+      serverSocket = new ServerSocket(portNum);
     } catch (IllegalArgumentException e) {
       log("Failed to start server: ", e);
       throw new IOException(e);

src/platform/android/app/src/main/res/values/strings.xml

@@ -5,7 +5,9 @@
   <string name="PORTAL_PROMPT">Allow Web portal access?</string>
   <string name="PORTAL_QUESTION">Do you wish to allow anyone with IP address [%s] to gain access to the portal?</string>
   <string name="OK">OK</string>
-  <string name="Cancel">Cancel</string>
+  <string name="CANCEL">Cancel</string>
+  <string name="YES">Yes</string>
+  <string name="NO">No</string>
   <style name="SBTheme" parent="android:Theme.Holo.Light">
     <item name="android:windowActionBar">false</item>
     <item name="android:windowNoTitle">true</item>