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

reformat code

Browse Source
This commit is contained in:
Philipp Schaefer
2013-10-22 20:05:58 +02:00
parent 7fae77099f
commit 3d7192ecd6
12 changed files with 120 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.py
View File

@ -263,7 +263,7 @@ if buildMobile:
if buildMobile != 'copyonly':
# now launch 'ant' to build the mobile project
retcode = os.system("ant %s -buildfile mobile/build.xml %s" % (antOptions, buildMobile))
retcode = os.system("ant clean %s -buildfile mobile/build.xml %s" % (antOptions, buildMobile))
if retcode != 0:
print ("Error: mobile app failed to build. ant returned %d" % retcode)

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

@ -129,10 +129,12 @@ public class IITC_DeviceAccountLogin implements AccountManagerCallback<Bundle> {
public void onActivityResult(int resultCode, Intent data) {
if (resultCode == Activity.RESULT_OK)
// authentication activity succeeded, request token again
{
startAuthentication();
else
} else {
onLoginFailed();
}
}
/**
* called by AccountManager

21
mobile/src/com/cradle/iitc_mobile/IITC_MapSettings.java
View File

@ -47,14 +47,15 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
@Override
public int compare(String lhs, String rhs) {
// Move "No Highlights" on top. Sort the rest alphabetically
if (lhs.equals("No Highlights"))
if (lhs.equals("No Highlights")) {
return -1000;
else if (rhs.equals("No Highlights"))
} else if (rhs.equals("No Highlights")) {
return 1000;
else
} else {
return lhs.compareTo(rhs);
}
}
}
private class Layer {
boolean active;
@ -77,8 +78,9 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
Layer item = getItem(position);
View view = (TextView) super.getView(position, convertView, parent);
if (view instanceof CheckedTextView)
if (view instanceof CheckedTextView) {
((CheckedTextView) view).setChecked(item.active);
}
return view;
}
}
@ -128,10 +130,11 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
}
private void setLayer(Layer layer) {
if (!mLoading)
if (!mLoading) {
mIitc.getWebView().loadUrl(
"javascript: window.layerChooser.showLayer(" + layer.id + "," + layer.active + ");");
}
}
public void addPortalHighlighter(String name) {
mHighlighters.add(name);
@ -208,8 +211,9 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
mActiveHighlighter = name;
int position = mHighlighters.getPosition(mActiveHighlighter);
if (position >= 0 && position < mHighlighters.getCount())
if (position >= 0 && position < mHighlighters.getCount()) {
mSpinnerHighlighter.setSelection(position);
}
mIitc.getNavigationHelper().setHighlighter(name);
}
@ -246,7 +250,9 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
if (layer.active)
// getCount() will be the index of the layer we are about to add
{
mActiveLayer = mBaseLayers.getCount();
}
mBaseLayers.add(layer);
} catch (JSONException e) {
@ -276,7 +282,8 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
}
public void updateLayers() {
if (!mLoading)
if (!mLoading) {
mIitc.getWebView().loadUrl("javascript: window.layerChooser.getLayers()");
}
}
}

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

@ -134,7 +134,9 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
|| key.equals("pref_messages")
|| key.equals("pref_external_storage"))
// no reload needed
{
return;
}
mReloadNeeded = true;
}
@ -233,8 +235,9 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
// parts[0] may contain an 'uncertainty' parameter, delimited by a semicolon
String[] pos = parts[0].split(";", 2)[0].split(",", 2);
if (pos.length != 2)
if (pos.length != 2) {
throw new URISyntaxException(uri.toString(), "URI does not contain a valid position");
}
try {
lat = Double.valueOf(pos[0]);
@ -262,8 +265,9 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
}
String url = "http://www.ingress.com/intel?ll=" + lat + "," + lon;
if (z != null)
if (z != null) {
url += "&z=" + z;
}
this.loadUrl(url);
}
@ -298,8 +302,9 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
Log.d("iitcm", "stopping iitcm");
mIitcWebView.loadUrl("javascript: window.idleSet();");
if (mIsLocEnabled)
if (mIsLocEnabled) {
mLocMngr.removeUpdates(this);
}
super.onStop();
}
@ -383,10 +388,11 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
// ensure no double adds
if (pane == mCurrentPane) return;
if (mBackStackPush)
if (mBackStackPush) {
mBackStack.push(mCurrentPane);
else
} else {
mBackStackPush = true;
}
mCurrentPane = pane;
mNavigationHelper.switchTo(pane);
@ -433,8 +439,9 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (mNavigationHelper.onOptionsItemSelected(item))
if (mNavigationHelper.onOptionsItemSelected(item)) {
return true;
}
// Handle item selection
final int itemId = item.getItemId();
@ -462,11 +469,12 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
"window.map.locate({setView : true, maxZoom: 15});");
// if gps location is displayed we can use a better location without any costs
} else {
if (mLastLocation != null)
if (mLastLocation != null) {
mIitcWebView.loadUrl("javascript: window.map.setView(new L.LatLng(" +
mLastLocation.getLatitude() + "," +
mLastLocation.getLongitude() + "), 15);");
}
}
return true;
case R.id.action_settings: // start settings activity
Intent intent = new Intent(this, IITC_PreferenceActivity.class);
@ -511,11 +519,12 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
// vp=f enables mDesktopMode mode...vp=m is the defaul mobile view
private String addUrlParam(String url) {
if (mDesktopMode)
if (mDesktopMode) {
return (url + "?vp=f");
else
} else {
return (url + "?vp=m");
}
}
// inject the iitc-script and load the intel url
// plugins are injected onPageFinished

49
mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
View File

@ -46,18 +46,20 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
add(Pane.PUBLIC);
add(Pane.FACTION);
if (mPrefs.getBoolean("pref_advanced_menu", false))
if (mPrefs.getBoolean("pref_advanced_menu", false)) {
add(Pane.DEBUG);
}
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
TextView view = (TextView) super.getView(position, convertView, parent);
Pane item = getItem(position);
if (item == Pane.MAP)
if (item == Pane.MAP) {
view.setText("Map");
else
} else {
view.setText(getPaneTitle(item));
}
int icon = 0;
switch (item) {
@ -84,8 +86,9 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
break;
}
if (icon != 0)
if (icon != 0) {
view.setCompoundDrawablesWithIntrinsicBounds(icon, 0, 0, 0);
}
return view;
}
@ -140,8 +143,9 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
}
private void showNotice(final int which) {
if ((mPrefs.getInt("pref_messages", 0) & which) != 0)
if ((mPrefs.getInt("pref_messages", 0) & which) != 0) {
return;
}
String text;
switch (which) {
@ -186,8 +190,9 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
private void updateActionBar() {
int position = mNavigationAdapter.getPosition(mPane);
if (position >= 0 && position < mNavigationAdapter.getCount())
if (position >= 0 && position < mNavigationAdapter.getCount()) {
mDrawerLeft.setItemChecked(position, true);
}
if (mDesktopMode) {
mActionBar.setDisplayHomeAsUpEnabled(false); // Hide "up" indicator
@ -207,29 +212,33 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
mActionBar.setHomeButtonEnabled(true);// Make icon clickable
mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
if (mPane == Pane.MAP || mDrawerLayout.isDrawerOpen(mDrawerLeft))
if (mPane == Pane.MAP || mDrawerLayout.isDrawerOpen(mDrawerLeft)) {
setDrawerIndicatorEnabled(true);
else
} else {
setDrawerIndicatorEnabled(false);
}
}
if (mDrawerLayout.isDrawerOpen(mDrawerLeft))
if (mDrawerLayout.isDrawerOpen(mDrawerLeft)) {
mActionBar.setTitle(mIitc.getString(R.string.app_name));
else
} else {
mActionBar.setTitle(getPaneTitle(mPane));
}
}
boolean mapVisible = mDesktopMode || mPane == Pane.MAP;
if ("No Highlights".equals(mHighlighter) || isDrawerOpened() || mIsLoading || !mapVisible)
if ("No Highlights".equals(mHighlighter) || isDrawerOpened() || mIsLoading || !mapVisible) {
mActionBar.setSubtitle(null);
else
} else {
mActionBar.setSubtitle(mHighlighter);
}
if (mFullscreen && mHideInFullscreen)
if (mFullscreen && mHideInFullscreen) {
mActionBar.hide();
else
} else {
mActionBar.show();
}
}
public void closeDrawers() {
mDrawerLayout.closeDrawers();
@ -289,16 +298,18 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
Pane item = mNavigationAdapter.getItem(position);
mIitc.switchToPane(item);
if (item == Pane.INFO)
if (item == Pane.INFO) {
showNotice(NOTICE_INFO);
}
mDrawerLayout.closeDrawer(mDrawerLeft);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home)
if (item.getItemId() == android.R.id.home) {
mDrawerLayout.closeDrawer(mDrawerRight);
}
return super.onOptionsItemSelected(item);
}
@ -315,9 +326,10 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
}
public void openRightDrawer() {
if (mDrawerLayout.getDrawerLockMode(mDrawerRight) == DrawerLayout.LOCK_MODE_UNLOCKED)
if (mDrawerLayout.getDrawerLockMode(mDrawerRight) == DrawerLayout.LOCK_MODE_UNLOCKED) {
mDrawerLayout.openDrawer(mDrawerRight);
}
}
public void reset() {
mPane = Pane.MAP;
@ -326,9 +338,10 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
public void setDebugMode(boolean enabled) {
mNavigationAdapter.remove(Pane.DEBUG); // avoid duplicates
if (enabled)
if (enabled) {
mNavigationAdapter.add(Pane.DEBUG);
}
}
public void setFullscreen(boolean fullscreen) {
mFullscreen = fullscreen;

19
mobile/src/com/cradle/iitc_mobile/IITC_PluginPreferenceActivity.java
View File

@ -62,8 +62,10 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
if (onIsMultiPane()) getIntent()
if (onIsMultiPane()) {
getIntent()
.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT, PluginsFragment.class.getName());
}
super.onCreate(savedInstanceState);
}
@ -162,8 +164,9 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
// TODO Auto-generated catch block
e2.printStackTrace();
}
if (s != null)
if (s != null) {
src = s.hasNext() ? s.next() : "";
}
// now we have all stuff together and can build the pref screen
addPluginPreference(src, anAsset_array, false);
}
@ -179,8 +182,9 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
e.printStackTrace();
Log.d("iitcm", "failed to parse file " + file);
}
if (s != null)
if (s != null) {
src = s.hasNext() ? s.next() : "";
}
// now we have all stuff together and can build the pref screen
addPluginPreference(src, file.toString(), true);
@ -202,13 +206,16 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
String plugin_cat = "Misc";
for (int j = 0; j < attributes.length; j++) {
// search for name and use the value
if (attributes[j].equals("@name"))
if (attributes[j].equals("@name")) {
plugin_name = attributes[j + 1];
if (attributes[j].equals("@description"))
}
if (attributes[j].equals("@description")) {
plugin_desc = attributes[j + 1];
if (attributes[j].equals("@category"))
}
if (attributes[j].equals("@category")) {
plugin_cat = attributes[j + 1];
}
}
// remove IITC plugin prefix from plugin_name
plugin_name = plugin_name.replace("IITC Plugin: ", "");

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

@ -33,7 +33,6 @@ public class IITC_WebView extends WebView {
" Gecko/20130810 Firefox/17.0 Iceweasel/17.0.8";
// init web view
private void iitc_init(Context c) {
if (isInEditMode()) return;
@ -136,10 +135,11 @@ public class IITC_WebView extends WebView {
// force https if enabled in settings
SharedPreferences sharedPref = PreferenceManager
.getDefaultSharedPreferences(getContext());
if (sharedPref.getBoolean("pref_force_https", true))
if (sharedPref.getBoolean("pref_force_https", true)) {
url = url.replace("http://", "https://");
else
} else {
url = url.replace("https://", "http://");
}
// disable splash screen if a http error code is responded
new CheckHttpResponse(mJsInterface, mContext).execute(url);
@ -173,8 +173,11 @@ public class IITC_WebView extends WebView {
Log.d("iitcm", "not connected to wifi...load tiles from cache");
mSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
} else {
if (login) Log.d("iitcm", "login...load tiles from network");
else Log.d("iitcm", "connected to wifi...load tiles from network");
if (login) {
Log.d("iitcm", "login...load tiles from network");
} else {
Log.d("iitcm", "connected to wifi...load tiles from network");
}
mSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
}
break;

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

@ -50,9 +50,10 @@ public class IITC_WebViewClient extends WebViewClient {
public String getIITCVersion() {
String header = "";
if (mIitcScript != null)
if (mIitcScript != null) {
header = mIitcScript.substring(mIitcScript.indexOf("==UserScript=="),
mIitcScript.indexOf("==/UserScript=="));
}
// remove new line comments
header = header.replace("\n//", "");
// get a list of key-value
@ -60,9 +61,10 @@ public class IITC_WebViewClient extends WebViewClient {
String iitc_version = "not found";
for (int i = 0; i < attributes.length; i++) {
// search for version and use the value
if (attributes[i].equals("@version"))
if (attributes[i].equals("@version")) {
iitc_version = attributes[i + 1];
}
}
return iitc_version;
}
@ -201,10 +203,11 @@ public class IITC_WebViewClient extends WebViewClient {
// load it as javascript
public boolean loadJS(String file, boolean asset, WebView view) {
String js = fileToString(file, asset);
if (js.equals("false"))
if (js.equals("false")) {
return false;
else
} else {
view.loadUrl("javascript:" + js);
}
return true;
}
@ -235,8 +238,9 @@ public class IITC_WebViewClient extends WebViewClient {
}
}
if (s != null)
if (s != null) {
src = s.hasNext() ? s.next() : "";
}
return src;
}

3
mobile/src/com/cradle/iitc_mobile/fragments/MainSettings.java
View File

@ -75,8 +75,9 @@ public class MainSettings extends PreferenceFragment {
// thx to http://stackoverflow.com/a/16800527/2638486 !!
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
if (preference.getTitle().toString().equals(getString(R.string.pref_advanced_options)))
if (preference.getTitle().toString().equals(getString(R.string.pref_advanced_options))) {
initializeActionBar((PreferenceScreen) preference);
}
return super.onPreferenceTreeClick(preferenceScreen, preference);
}

3
mobile/src/com/cradle/iitc_mobile/share/IntentFragment.java
View File

@ -33,8 +33,9 @@ public class IntentFragment extends Fragment implements OnScrollListener, OnItem
mIntents = args.getParcelableArrayList("intents");
mListView = new IntentListView(getActivity());
mListView.setIntents(mIntents);
if (mScrollIndex != -1 && mScrollTop != -1)
if (mScrollIndex != -1 && mScrollTop != -1) {
mListView.setSelectionFromTop(mScrollIndex, mScrollTop);
}
mListView.setOnScrollListener(this);
mListView.setOnItemClickListener(this);

6
mobile/src/com/cradle/iitc_mobile/share/IntentListView.java
View File

@ -60,8 +60,9 @@ public class IntentListView extends ListView {
private static final HashSet<CopyHandler> KNOWN_COPY_HANDLERS = new HashSet<CopyHandler>();
private static void setupKnownCopyHandlers() {
if (!KNOWN_COPY_HANDLERS.isEmpty())
if (!KNOWN_COPY_HANDLERS.isEmpty()) {
return;
}
KNOWN_COPY_HANDLERS.add(new CopyHandler(
"com.google.android.apps.docs",
@ -141,9 +142,10 @@ public class IntentListView extends ListView {
for (ResolveInfo resolveInfo : activityList) { // search for "Copy to clipboard" handler
CopyHandler handler = new CopyHandler(resolveInfo);
if (KNOWN_COPY_HANDLERS.contains(handler))
if (KNOWN_COPY_HANDLERS.contains(handler)) {
hasCopyIntent = true;
}
}
// use traditional loop since list may change during iteration
for (int i = 0; i < activityList.size(); i++) {

15
mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
View File

@ -45,15 +45,17 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
private String getUrl() {
String url = "http://www.ingress.com/intel?ll=" + mLl + "&z=" + mZoom;
if (mIsPortal)
if (mIsPortal) {
url += "&pll=" + mLl;
}
return url;
}
private void setSelected(int position) {
// Activity not fully loaded yet (may occur during tab creation)
if (mSharedPrefs == null)
if (mSharedPrefs == null) {
return;
}
mSharedPrefs
.edit()
@ -125,8 +127,9 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
mViewPager.setOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
@Override
public void onPageSelected(int position) {
if (actionBar.getNavigationMode() != ActionBar.NAVIGATION_MODE_STANDARD)
if (actionBar.getNavigationMode() != ActionBar.NAVIGATION_MODE_STANDARD) {
actionBar.setSelectedNavigationItem(position);
}
setSelected(position);
}
});
@ -141,17 +144,19 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
.setTabListener(this));
}
if (mFragmentAdapter.getCount() > 1)
if (mFragmentAdapter.getCount() > 1) {
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
}
mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
int selected = mSharedPrefs.getInt("pref_share_selected_tab", 0);
if (selected < mFragmentAdapter.getCount()) {
mViewPager.setCurrentItem(selected);
if (actionBar.getNavigationMode() != ActionBar.NAVIGATION_MODE_STANDARD)
if (actionBar.getNavigationMode() != ActionBar.NAVIGATION_MODE_STANDARD) {
actionBar.setSelectedNavigationItem(selected);
}
}
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {