more code formatting

mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java

@@ -112,7 +112,7 @@ public class IITC_DeviceAccountLogin implements AccountManagerCallback<Bundle> {
 
     /**
      * called to start authenticating using AccountManager.
-     * 
+     * <p/>
      * After a token is created, AccountManager will call the run() method.
      */
     private void startAuthentication() {
@@ -164,7 +164,7 @@ public class IITC_DeviceAccountLogin implements AccountManagerCallback<Bundle> {
 
     /**
      * start authentication
-     * 
+     * <p/>
      * if we already have a username (e.g. because the existing login has timed out), we can directly start
      * authentication if an account with that username is found.
      */

mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java

@@ -1,10 +1,5 @@
 package com.cradle.iitc_mobile;
 
-import java.util.HashMap;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-
 import android.app.AlertDialog;
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -18,6 +13,11 @@ import android.util.Log;
 import android.webkit.JavascriptInterface;
 import android.widget.Toast;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import java.util.HashMap;
+
 // provide communication between IITC script and android app
 public class IITC_JSInterface {
 
@@ -74,28 +74,22 @@ public class IITC_JSInterface {
         if (id.equals("map")) {
             button_id = android.R.id.home;
             title = iitcm.getString(R.string.app_name);
-        }
+        } else if (id.equals("info")) {
-        else if (id.equals("info")) {
             button_id = R.id.menu_info;
             title = "Info";
-        }
+        } else if (id.equals("full")) {
-        else if (id.equals("full")) {
             button_id = R.id.menu_full;
             title = "Full";
-        }
+        } else if (id.equals("compact")) {
-        else if (id.equals("compact")) {
             button_id = R.id.menu_compact;
             title = "Compact";
-        }
+        } else if (id.equals("public")) {
-        else if (id.equals("public")) {
             button_id = R.id.menu_public;
             title = "Public";
-        }
+        } else if (id.equals("faction")) {
-        else if (id.equals("faction")) {
             button_id = R.id.menu_faction;
             title = "Faction";
-        }
+        } else if (id.equals("debug")) {
-        else if (id.equals("debug")) {
             button_id = R.id.menu_debug;
             title = "Debug";
         }
@@ -227,7 +221,7 @@ public class IITC_JSInterface {
             }
         };
 
-        d_m.setMultiChoiceItems(overlay_layers, overlay_is_active , m_listener);
+        d_m.setMultiChoiceItems(overlay_layers, overlay_is_active, m_listener);
         // switch to base layers
         d_m.setPositiveButton("Base Layers", new OnClickListener() {
             @Override

mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java

@@ -1,8 +1,5 @@
 package com.cradle.iitc_mobile;
 
-import java.io.IOException;
-import java.util.ArrayList;
-
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.SearchManager;
@@ -31,6 +28,9 @@ import android.webkit.WebView;
 import android.widget.SearchView;
 import android.widget.Toast;
 
+import java.io.IOException;
+import java.util.ArrayList;
+
 public class IITC_Mobile extends Activity {
 
     private static final int REQUEST_LOGIN = 1;
@@ -92,8 +92,7 @@ public class IITC_Mobile extends Activity {
                     if (desktop) {
                         setActionBarHomeEnabledWithUp(false);
                         actionBar.setTitle(getString(R.string.app_name));
-                    }
+                    } else actionBar.setHomeButtonEnabled(true);
-                    else actionBar.setHomeButtonEnabled(true);
                     invalidateOptionsMenu();
                 }
                 if (key.equals("pref_user_loc"))
@@ -301,7 +300,7 @@ public class IITC_Mobile extends Activity {
                 new Handler().postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        back_button_pressed=false;
+                        back_button_pressed = false;
                     }
                 }, 2000);
             }

mobile/src/com/cradle/iitc_mobile/IITC_Settings.java

@@ -29,7 +29,7 @@ public class IITC_Settings extends Activity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             // exit settings when home button (iitc icon) is pressed
-            case android.R.id.home :
+            case android.R.id.home:
                 onBackPressed();
                 return true;
             default:

mobile/src/com/cradle/iitc_mobile/IITC_SettingsFragment.java

@@ -6,7 +6,6 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.AssetManager;
 import android.os.Bundle;
 import android.os.Environment;
-import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;

mobile/src/com/cradle/iitc_mobile/IITC_WebView.java

@@ -11,10 +11,10 @@ import android.os.Build;
 import android.preference.PreferenceManager;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.webkit.GeolocationPermissions;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
-import android.webkit.GeolocationPermissions;
 
 @SuppressLint("SetJavaScriptEnabled")
 public class IITC_WebView extends WebView {
@@ -26,7 +26,7 @@ public class IITC_WebView extends WebView {
 
     // init web view
     private void iitc_init(Context c) {
-        if ( this.isInEditMode() ) return;
+        if (this.isInEditMode()) return;
         settings = this.getSettings();
         settings.setJavaScriptEnabled(true);
         settings.setDomStorageEnabled(true);
@@ -95,8 +95,7 @@ public class IITC_WebView extends WebView {
     public void loadUrl(String url) {
         // if in edit text mode, don't load javascript otherwise the keyboard closes.
         HitTestResult testResult = this.getHitTestResult();
-        if (url.startsWith("javascript:") && testResult != null && testResult.getType() == HitTestResult.EDIT_TEXT_TYPE)
+        if (url.startsWith("javascript:") && testResult != null && testResult.getType() == HitTestResult.EDIT_TEXT_TYPE) {
-        {
             // let window.show(...) interupt input
             // window.show(...) is called if one of the action bar buttons
             // is clicked

mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java

@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.Map;
 import java.util.Scanner;
-import java.util.Set;
 
 public class IITC_WebViewClient extends WebViewClient {
     private static final ByteArrayInputStream style = new ByteArrayInputStream(
@@ -77,7 +76,7 @@ public class IITC_WebViewClient extends WebViewClient {
             js = this.fileToString(iitc_path
                     + "dev/total-conversion-build.user.js", false);
             if (js.equals("false")) {
-                Toast.makeText( context, "File " + iitc_path +
+                Toast.makeText(context, "File " + iitc_path +
                         "dev/total-conversion-build.user.js not found. " +
                         "Disable developer mode or add iitc files to the dev folder.",
                         Toast.LENGTH_LONG).show();
@@ -167,7 +166,7 @@ public class IITC_WebViewClient extends WebViewClient {
         Map<String, ?> all_prefs = sharedPref.getAll();
 
         // iterate through all plugins
-        for(Map.Entry<String, ?> entry : all_prefs.entrySet()){
+        for (Map.Entry<String, ?> entry : all_prefs.entrySet()) {
             String plugin = entry.getKey();
             if (plugin.endsWith("user.js") && entry.getValue().toString().equals("true")) {
                 // load default iitc plugins
@@ -278,6 +277,7 @@ public class IITC_WebViewClient extends WebViewClient {
         }
         return js;
     }
+
     // Check every external resource if it’s okay to load it and maybe replace
     // it
     // with our own content. This is used to block loading Niantic resources