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

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

@ -1,10 +1,5 @@
package com.cradle.iitc_mobile; package com.cradle.iitc_mobile;
import java.util.HashMap;
import org.json.JSONArray;
import org.json.JSONException;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.ClipData; import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
@ -18,6 +13,11 @@ import android.util.Log;
import android.webkit.JavascriptInterface; import android.webkit.JavascriptInterface;
import android.widget.Toast; import android.widget.Toast;
import org.json.JSONArray;
import org.json.JSONException;
import java.util.HashMap;
// provide communication between IITC script and android app // provide communication between IITC script and android app
public class IITC_JSInterface { public class IITC_JSInterface {
@ -74,28 +74,22 @@ public class IITC_JSInterface {
if (id.equals("map")) { if (id.equals("map")) {
button_id = android.R.id.home; button_id = android.R.id.home;
title = iitcm.getString(R.string.app_name); title = iitcm.getString(R.string.app_name);
} } else if (id.equals("info")) {
else if (id.equals("info")) {
button_id = R.id.menu_info; button_id = R.id.menu_info;
title = "Info"; title = "Info";
} } else if (id.equals("full")) {
else if (id.equals("full")) {
button_id = R.id.menu_full; button_id = R.id.menu_full;
title = "Full"; title = "Full";
} } else if (id.equals("compact")) {
else if (id.equals("compact")) {
button_id = R.id.menu_compact; button_id = R.id.menu_compact;
title = "Compact"; title = "Compact";
} } else if (id.equals("public")) {
else if (id.equals("public")) {
button_id = R.id.menu_public; button_id = R.id.menu_public;
title = "Public"; title = "Public";
} } else if (id.equals("faction")) {
else if (id.equals("faction")) {
button_id = R.id.menu_faction; button_id = R.id.menu_faction;
title = "Faction"; title = "Faction";
} } else if (id.equals("debug")) {
else if (id.equals("debug")) {
button_id = R.id.menu_debug; button_id = R.id.menu_debug;
title = "Debug"; title = "Debug";
} }
@ -215,7 +209,7 @@ public class IITC_JSInterface {
// show all overlay layers in a multi selection list dialog // show all overlay layers in a multi selection list dialog
private void show_multi_selection() { private void show_multi_selection() {
// build the layer chooser dialog // build the layer chooser dialog
AlertDialog.Builder d_m = new AlertDialog.Builder(context); AlertDialog.Builder d_m = new AlertDialog.Builder(context);
OnMultiChoiceClickListener m_listener = new OnMultiChoiceClickListener() { OnMultiChoiceClickListener m_listener = new OnMultiChoiceClickListener() {
@Override @Override
@ -227,20 +221,20 @@ 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 // switch to base layers
d_m.setPositiveButton("Base Layers", new OnClickListener() { d_m.setPositiveButton("Base Layers", new OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
show_single_selection(); show_single_selection();
dialog.cancel(); dialog.cancel();
} }
}); });
d_m.setNegativeButton("Close", new OnClickListener() { d_m.setNegativeButton("Close", new OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
dialog.cancel(); dialog.cancel();
} }
}); });
d_m.setTitle("Overlay Layers"); d_m.setTitle("Overlay Layers");
d_m.show(); d_m.show();
@ -256,7 +250,7 @@ public class IITC_JSInterface {
+ layer_ids.get(base_layers[which]) + "," + layer_ids.get(base_layers[which]) + ","
+ true + ");"); + true + ");");
active_base_layer = which; active_base_layer = which;
} }
}; };
AlertDialog.Builder d_s = new AlertDialog.Builder(context); AlertDialog.Builder d_s = new AlertDialog.Builder(context);
d_s.setSingleChoiceItems(base_layers, active_base_layer, s_listener); d_s.setSingleChoiceItems(base_layers, active_base_layer, s_listener);

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

@ -1,8 +1,5 @@
package com.cradle.iitc_mobile; package com.cradle.iitc_mobile;
import java.io.IOException;
import java.util.ArrayList;
import android.app.ActionBar; import android.app.ActionBar;
import android.app.Activity; import android.app.Activity;
import android.app.SearchManager; import android.app.SearchManager;
@ -31,6 +28,9 @@ import android.webkit.WebView;
import android.widget.SearchView; import android.widget.SearchView;
import android.widget.Toast; import android.widget.Toast;
import java.io.IOException;
import java.util.ArrayList;
public class IITC_Mobile extends Activity { public class IITC_Mobile extends Activity {
private static final int REQUEST_LOGIN = 1; private static final int REQUEST_LOGIN = 1;
@ -92,8 +92,7 @@ public class IITC_Mobile extends Activity {
if (desktop) { if (desktop) {
setActionBarHomeEnabledWithUp(false); setActionBarHomeEnabledWithUp(false);
actionBar.setTitle(getString(R.string.app_name)); actionBar.setTitle(getString(R.string.app_name));
} } else actionBar.setHomeButtonEnabled(true);
else actionBar.setHomeButtonEnabled(true);
invalidateOptionsMenu(); invalidateOptionsMenu();
} }
if (key.equals("pref_user_loc")) if (key.equals("pref_user_loc"))
@ -301,7 +300,7 @@ public class IITC_Mobile extends Activity {
new Handler().postDelayed(new Runnable() { new Handler().postDelayed(new Runnable() {
@Override @Override
public void run() { public void run() {
back_button_pressed=false; back_button_pressed = false;
} }
}, 2000); }, 2000);
} }
@ -407,7 +406,7 @@ public class IITC_Mobile extends Activity {
// get location from network by default // get location from network by default
if (!is_loc_enabled) { if (!is_loc_enabled) {
iitc_view.loadUrl("javascript: window.map.locate({setView : true, maxZoom: 15});"); iitc_view.loadUrl("javascript: window.map.locate({setView : true, maxZoom: 15});");
// if gps location is displayed we can use a better location without any costs // if gps location is displayed we can use a better location without any costs
} else { } else {
if (last_location != null) if (last_location != null)
iitc_view.loadUrl("javascript: window.map.setView(new L.LatLng(" + iitc_view.loadUrl("javascript: window.map.setView(new L.LatLng(" +

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

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

3
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.content.res.AssetManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.preference.CheckBoxPreference;
import android.preference.EditTextPreference; import android.preference.EditTextPreference;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
@ -58,7 +57,7 @@ public class IITC_SettingsFragment extends PreferenceFragment {
.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { .setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override @Override
public boolean onPreferenceChange(Preference preference, public boolean onPreferenceChange(Preference preference,
Object newValue) { Object newValue) {
preference.setSummary(getString(R.string.pref_select_iitc_sum) + preference.setSummary(getString(R.string.pref_select_iitc_sum) +
" " + newValue); " " + newValue);
// TODO: update iitc_version when iitc source has // TODO: update iitc_version when iitc source has

9
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.preference.PreferenceManager;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.webkit.GeolocationPermissions;
import android.webkit.WebChromeClient; import android.webkit.WebChromeClient;
import android.webkit.WebSettings; import android.webkit.WebSettings;
import android.webkit.WebView; import android.webkit.WebView;
import android.webkit.GeolocationPermissions;
@SuppressLint("SetJavaScriptEnabled") @SuppressLint("SetJavaScriptEnabled")
public class IITC_WebView extends WebView { public class IITC_WebView extends WebView {
@ -26,7 +26,7 @@ public class IITC_WebView extends WebView {
// init web view // init web view
private void iitc_init(Context c) { private void iitc_init(Context c) {
if ( this.isInEditMode() ) return; if (this.isInEditMode()) return;
settings = this.getSettings(); settings = this.getSettings();
settings.setJavaScriptEnabled(true); settings.setJavaScriptEnabled(true);
settings.setDomStorageEnabled(true); settings.setDomStorageEnabled(true);
@ -49,7 +49,7 @@ public class IITC_WebView extends WebView {
*/ */
@Override @Override
public void onGeolocationPermissionsShowPrompt(String origin, public void onGeolocationPermissionsShowPrompt(String origin,
GeolocationPermissions.Callback callback) { GeolocationPermissions.Callback callback) {
callback.invoke(origin, true, false); callback.invoke(origin, true, false);
} }
@ -95,8 +95,7 @@ public class IITC_WebView extends WebView {
public void loadUrl(String url) { public void loadUrl(String url) {
// if in edit text mode, don't load javascript otherwise the keyboard closes. // if in edit text mode, don't load javascript otherwise the keyboard closes.
HitTestResult testResult = this.getHitTestResult(); 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 // let window.show(...) interupt input
// window.show(...) is called if one of the action bar buttons // window.show(...) is called if one of the action bar buttons
// is clicked // is clicked

16
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.net.URL;
import java.util.Map; import java.util.Map;
import java.util.Scanner; import java.util.Scanner;
import java.util.Set;
public class IITC_WebViewClient extends WebViewClient { public class IITC_WebViewClient extends WebViewClient {
private static final ByteArrayInputStream style = new ByteArrayInputStream( private static final ByteArrayInputStream style = new ByteArrayInputStream(
@ -77,7 +76,7 @@ public class IITC_WebViewClient extends WebViewClient {
js = this.fileToString(iitc_path js = this.fileToString(iitc_path
+ "dev/total-conversion-build.user.js", false); + "dev/total-conversion-build.user.js", false);
if (js.equals("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. " + "dev/total-conversion-build.user.js not found. " +
"Disable developer mode or add iitc files to the dev folder.", "Disable developer mode or add iitc files to the dev folder.",
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
@ -131,7 +130,7 @@ public class IITC_WebViewClient extends WebViewClient {
// enable https // enable https
@Override @Override
public void onReceivedSslError(WebView view, SslErrorHandler handler, public void onReceivedSslError(WebView view, SslErrorHandler handler,
SslError error) { SslError error) {
handler.proceed(); handler.proceed();
} }
@ -167,7 +166,7 @@ public class IITC_WebViewClient extends WebViewClient {
Map<String, ?> all_prefs = sharedPref.getAll(); Map<String, ?> all_prefs = sharedPref.getAll();
// iterate through all plugins // iterate through all plugins
for(Map.Entry<String, ?> entry : all_prefs.entrySet()){ for (Map.Entry<String, ?> entry : all_prefs.entrySet()) {
String plugin = entry.getKey(); String plugin = entry.getKey();
if (plugin.endsWith("user.js") && entry.getValue().toString().equals("true")) { if (plugin.endsWith("user.js") && entry.getValue().toString().equals("true")) {
// load default iitc plugins // load default iitc plugins
@ -263,9 +262,9 @@ public class IITC_WebViewClient extends WebViewClient {
String wrapper_start = "function wrapper() {"; String wrapper_start = "function wrapper() {";
String wrapper_end = "} // wrapper end"; String wrapper_end = "} // wrapper end";
String injection_code = "// inject code into site context\n" + String injection_code = "// inject code into site context\n" +
"var script = document.createElement('script');\n" + "var script = document.createElement('script');\n" +
"script.appendChild(document.createTextNode('('+ wrapper +')();'));\n" + "script.appendChild(document.createTextNode('('+ wrapper +')();'));\n" +
"(document.body || document.head || document.documentElement).appendChild(script);"; "(document.body || document.head || document.documentElement).appendChild(script);";
if (js.contains(wrapper_start) && js.contains(wrapper_end) && js.contains(injection_code)) { if (js.contains(wrapper_start) && js.contains(wrapper_end) && js.contains(injection_code)) {
js = js.replace(wrapper_start, ""); js = js.replace(wrapper_start, "");
// remove the wrapper function // remove the wrapper function
@ -278,6 +277,7 @@ public class IITC_WebViewClient extends WebViewClient {
} }
return js; return js;
} }
// Check every external resource if it’s okay to load it and maybe replace // Check every external resource if it’s okay to load it and maybe replace
// it // it
// with our own content. This is used to block loading Niantic resources // with our own content. This is used to block loading Niantic resources
@ -285,7 +285,7 @@ public class IITC_WebViewClient extends WebViewClient {
// via http://stackoverflow.com/a/8274881/1684530 // via http://stackoverflow.com/a/8274881/1684530
@Override @Override
public WebResourceResponse shouldInterceptRequest(final WebView view, public WebResourceResponse shouldInterceptRequest(final WebView view,
String url) { String url) {
if (url.contains("/css/common.css")) { if (url.contains("/css/common.css")) {
return new WebResourceResponse("text/css", "UTF-8", style); return new WebResourceResponse("text/css", "UTF-8", style);
} else if (url.contains("gen_dashboard.js")) { } else if (url.contains("gen_dashboard.js")) {