phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more code formatting

Browse Source
This commit is contained in:
Philipp Schaefer 2013-06-16 13:28:41 +02:00
parent e85a6a98ac
commit dc22aaf4dd
7 changed files with 46 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java
View File

@ -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.
*/

28
mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java
View File

@ -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";
}

9
mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
View File

@ -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"))

1
mobile/src/com/cradle/iitc_mobile/IITC_SettingsFragment.java
View File

@ -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;

5
mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
View File

@ -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 {
@ -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

2
mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java
View File

@ -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(
@ -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