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

some code formatting

Browse Source
This commit is contained in:
Philipp Schaefer 2013-10-04 16:15:58 +02:00
parent 26754ac8c0
commit 709af1a9d9
11 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ import java.util.Locale;
// provide communication between IITC script and android app // provide communication between IITC script and android app
public class IITC_JSInterface { public class IITC_JSInterface {
// context of main activity // context of main activity
private IITC_Mobile mIitc; private final IITC_Mobile mIitc;
IITC_JSInterface(IITC_Mobile iitc) { IITC_JSInterface(IITC_Mobile iitc) {
mIitc = iitc; mIitc = iitc;
@ -111,7 +111,7 @@ public class IITC_JSInterface {
@Override @Override
public void run() { public void run() {
mIitc.setLoadingState(false); mIitc.setLoadingState(false);
mIitc.getMapSettings().onBootFinished(); mIitc.getMapSettings().onBootFinished();
} }
}); });

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

@ -22,7 +22,7 @@ import java.util.Comparator;
public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickListener, OnItemLongClickListener { public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickListener, OnItemLongClickListener {
private class HighlighterAdapter extends ArrayAdapter<String> { private class HighlighterAdapter extends ArrayAdapter<String> {
private HighlighterComparator mComparator = new HighlighterComparator(); private final HighlighterComparator mComparator = new HighlighterComparator();
private HighlighterAdapter(int resource) { private HighlighterAdapter(int resource) {
super(mIitc, resource); super(mIitc, resource);
@ -67,8 +67,7 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
} }
} }
private class LayerAdapter extends ArrayAdapter<Layer> private class LayerAdapter extends ArrayAdapter<Layer> {
{
public LayerAdapter(int resource) { public LayerAdapter(int resource) {
super(mIitc, resource); super(mIitc, resource);
} }
@ -84,15 +83,15 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
} }
} }
private IITC_Mobile mIitc; private final IITC_Mobile mIitc;
private ArrayAdapter<String> mHighlighters; private final ArrayAdapter<String> mHighlighters;
private ArrayAdapter<Layer> mBaseLayers; private final ArrayAdapter<Layer> mBaseLayers;
private ArrayAdapter<Layer> mOverlayLayers; private final ArrayAdapter<Layer> mOverlayLayers;
private Spinner mSpinnerBaseMap; private final Spinner mSpinnerBaseMap;
private Spinner mSpinnerHighlighter; private final Spinner mSpinnerHighlighter;
private ListView mListViewOverlayLayers; private final ListView mListViewOverlayLayers;
private String mActiveHighlighter; private String mActiveHighlighter;
private int mActiveLayer; private int mActiveLayer;
@ -181,8 +180,7 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
if (parent.equals(mSpinnerHighlighter)) { if (parent.equals(mSpinnerHighlighter)) {
String name = mHighlighters.getItem(position); String name = mHighlighters.getItem(position);
mIitc.getWebView().loadUrl("javascript: window.changePortalHighlights('" + name + "')"); mIitc.getWebView().loadUrl("javascript: window.changePortalHighlights('" + name + "')");
} } else if (parent.equals(mSpinnerBaseMap)) {
else if (parent.equals(mSpinnerBaseMap)) {
mBaseLayers.getItem(mActiveLayer).active = false; // set old layer to hidden, but no need to really hide mBaseLayers.getItem(mActiveLayer).active = false; // set old layer to hidden, but no need to really hide
Layer layer = mBaseLayers.getItem(position); Layer layer = mBaseLayers.getItem(position);
@ -253,7 +251,6 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
mBaseLayers.add(layer); mBaseLayers.add(layer);
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
continue;
} }
} }
mBaseLayers.notifyDataSetChanged(); mBaseLayers.notifyDataSetChanged();
@ -273,7 +270,6 @@ public class IITC_MapSettings implements OnItemSelectedListener, OnItemClickList
mOverlayLayers.add(layer); mOverlayLayers.add(layer);
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
continue;
} }
} }
mOverlayLayers.notifyDataSetChanged(); mOverlayLayers.notifyDataSetChanged();

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

@ -283,8 +283,7 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
if (mReloadNeeded) { if (mReloadNeeded) {
Log.d("iitcm", "preference had changed...reload needed"); Log.d("iitcm", "preference had changed...reload needed");
reloadIITC(); reloadIITC();
} } else {
else {
// iitc is not fully booted...timer will be reset by the script itself // iitc is not fully booted...timer will be reset by the script itself
if (findViewById(R.id.imageLoading).getVisibility() == View.GONE) { if (findViewById(R.id.imageLoading).getVisibility() == View.GONE) {
mIitcWebView.loadUrl("javascript: window.idleReset();"); mIitcWebView.loadUrl("javascript: window.idleReset();");
@ -353,7 +352,6 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
if (mBackButtonPressed || !mSharedPrefs.getBoolean("pref_press_twice_to_exit", false)) { if (mBackButtonPressed || !mSharedPrefs.getBoolean("pref_press_twice_to_exit", false)) {
super.onBackPressed(); super.onBackPressed();
return;
} else { } else {
mBackButtonPressed = true; mBackButtonPressed = true;
Toast.makeText(this, "Press twice to exit", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "Press twice to exit", Toast.LENGTH_SHORT).show();
@ -574,7 +572,7 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
* called by IITC_WebViewClient when the Google login form is opened. * called by IITC_WebViewClient when the Google login form is opened.
*/ */
public void onReceivedLoginRequest(IITC_WebViewClient client, WebView view, public void onReceivedLoginRequest(IITC_WebViewClient client, WebView view,
String realm, String account, String args) { String realm, String account, String args) {
mLogin = new IITC_DeviceAccountLogin(this, view, client); mLogin = new IITC_DeviceAccountLogin(this, view, client);
mLogin.startLogin(realm, account, args); mLogin.startLogin(realm, account, args);
} }
@ -621,8 +619,8 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
} }
/** /**
* @deprecated ActionBar related stuff should be handled by IITC_NavigationHelper
* @see getNavigationHelper() * @see getNavigationHelper()
* @deprecated ActionBar related stuff should be handled by IITC_NavigationHelper
*/ */
@Deprecated @Deprecated
@Override @Override

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

@ -60,8 +60,7 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
view.setText(getPaneTitle(item)); view.setText(getPaneTitle(item));
int icon = 0; int icon = 0;
switch (item) switch (item) {
{
case MAP: case MAP:
icon = R.drawable.location_map; icon = R.drawable.location_map;
break; break;
@ -100,13 +99,13 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
public static final int NOTICE_INFO = 1 << 1; public static final int NOTICE_INFO = 1 << 1;
// next one would be 1<<2; (this results in 1,2,4,8,...) // next one would be 1<<2; (this results in 1,2,4,8,...)
private IITC_Mobile mIitc; private final IITC_Mobile mIitc;
private ActionBar mActionBar; private final ActionBar mActionBar;
private SharedPreferences mPrefs; private final SharedPreferences mPrefs;
private NavigationAdapter mNavigationAdapter; private final NavigationAdapter mNavigationAdapter;
private DrawerLayout mDrawerLayout; private final DrawerLayout mDrawerLayout;
private ListView mDrawerLeft; private final ListView mDrawerLeft;
private View mDrawerRight; private final View mDrawerRight;
private boolean mDesktopMode = false; private boolean mDesktopMode = false;
private boolean mFullscreen = false; private boolean mFullscreen = false;
@ -236,8 +235,7 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
mDrawerLayout.closeDrawers(); mDrawerLayout.closeDrawers();
} }
public String getPaneTitle(Pane pane) public String getPaneTitle(Pane pane) {
{
switch (pane) { switch (pane) {
case INFO: case INFO:
return "Info"; return "Info";

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

@ -62,7 +62,7 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
if(onIsMultiPane()) getIntent() if (onIsMultiPane()) getIntent()
.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT, PluginsFragment.class.getName()); .putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT, PluginsFragment.class.getName());
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
} }
@ -76,7 +76,7 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
// Select the displayed fragment in the headers (when using a tablet) : // Select the displayed fragment in the headers (when using a tablet) :
// This should be done by Android, it is a bug fix // This should be done by Android, it is a bug fix
// thx to http://stackoverflow.com/a/16793839 // thx to http://stackoverflow.com/a/16793839
if(mHeaders != null) { if (mHeaders != null) {
final String displayedFragment = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT); final String displayedFragment = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT);
if (displayedFragment != null) { if (displayedFragment != null) {
@ -227,7 +227,7 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
// now we have all stuff together and can build the preference // now we have all stuff together and can build the preference
// first check if we need a new category // first check if we need a new category
if (sPlugins.containsKey(plugin_cat) == false) { if (!sPlugins.containsKey(plugin_cat)) {
sPlugins.put(plugin_cat, new ArrayList<IITC_PluginPreference>()); sPlugins.put(plugin_cat, new ArrayList<IITC_PluginPreference>());
Log.d("iitcm", "create " + plugin_cat + " and add " + plugin_name); Log.d("iitcm", "create " + plugin_cat + " and add " + plugin_name);
} }
@ -288,7 +288,7 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
TextView summary; TextView summary;
} }
private LayoutInflater mInflater; private final LayoutInflater mInflater;
static int getHeaderType(Header header) { static int getHeaderType(Header header) {
if (header.fragment == null && header.intent == null) { if (header.fragment == null && header.intent == null) {

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

@ -53,7 +53,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);
} }

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

@ -148,7 +148,7 @@ public class IITC_WebViewClient extends WebViewClient {
@Override @Override
public void onPageFinished(WebView view, String url) { public void onPageFinished(WebView view, String url) {
if (url.startsWith("http://www.ingress.com/intel") if (url.startsWith("http://www.ingress.com/intel")
|| url.startsWith("https://www.ingress.com/intel")) { || url.startsWith("https://www.ingress.com/intel")) {
Log.d("iitcm", "injecting iitc.."); Log.d("iitcm", "injecting iitc..");
view.loadUrl("javascript: " + this.mIitcScript); view.loadUrl("javascript: " + this.mIitcScript);
} }

6
mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java
View File

@ -24,13 +24,13 @@ import java.io.IOException;
*/ */
public class CheckHttpResponse extends AsyncTask<String, Void, Boolean> { public class CheckHttpResponse extends AsyncTask<String, Void, Boolean> {
private IITC_JSInterface mJsInterface; private final IITC_JSInterface mJsInterface;
private Context mContext; private final Context mContext;
public CheckHttpResponse(IITC_JSInterface jsInterface, Context c) { public CheckHttpResponse(IITC_JSInterface jsInterface, Context c) {
mContext = c; mContext = c;
mJsInterface = jsInterface; mJsInterface = jsInterface;
}; }
@Override @Override
protected Boolean doInBackground(String... urls) { protected Boolean doInBackground(String... urls) {

2
mobile/src/com/cradle/iitc_mobile/share/IntentFragmentAdapter.java
View File

@ -8,7 +8,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class IntentFragmentAdapter extends FragmentPagerAdapter { public class IntentFragmentAdapter extends FragmentPagerAdapter {
private List<IntentFragment> mTabs; private final List<IntentFragment> mTabs;
public IntentFragmentAdapter(FragmentManager fm) { public IntentFragmentAdapter(FragmentManager fm) {
super(fm); super(fm);

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

@ -74,7 +74,7 @@ public class IntentListView extends ListView {
private IntentAdapter mAdapter; private IntentAdapter mAdapter;
private PackageManager mPackageManager; private PackageManager mPackageManager;
HashMap<ComponentName, Intent> mActivities = new HashMap<ComponentName, Intent>(); private final HashMap<ComponentName, Intent> mActivities = new HashMap<ComponentName, Intent>();
public IntentListView(Context context) { public IntentListView(Context context) {
super(context); super(context);
@ -155,7 +155,6 @@ public class IntentListView extends ListView {
if (hasCopyIntent || !activity.name.equals(SendToClipboard.class.getCanonicalName())) { if (hasCopyIntent || !activity.name.equals(SendToClipboard.class.getCanonicalName())) {
activityList.remove(i); activityList.remove(i);
i--; i--;
continue;
} }
} }
} }
@ -172,8 +171,7 @@ public class IntentListView extends ListView {
if (resolveInfo.activityInfo.packageName.equals(defaultTarget.activityInfo.packageName) if (resolveInfo.activityInfo.packageName.equals(defaultTarget.activityInfo.packageName)
&& resolveInfo.activityInfo.name.equals(defaultTarget.activityInfo.name)) { && resolveInfo.activityInfo.name.equals(defaultTarget.activityInfo.name)) {
allActivities.add(0, resolveInfo); allActivities.add(0, resolveInfo);
} } else {
else {
allActivities.add(resolveInfo); allActivities.add(resolveInfo);
} }
} }

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

@ -108,7 +108,7 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
Intent intent = getIntent(); Intent intent = getIntent();
// from portallinks/permalinks we build 3 intents (share / geo / vanilla-intel-link) // from portallinks/permalinks we build 3 intents (share / geo / vanilla-intel-link)
if (intent.getBooleanExtra("onlyShare", false) == false) { if (!intent.getBooleanExtra("onlyShare", false)) {
mTitle = intent.getStringExtra("title"); mTitle = intent.getStringExtra("title");
mLl = intent.getDoubleExtra("lat", 0) + "," + intent.getDoubleExtra("lng", 0); mLl = intent.getDoubleExtra("lat", 0) + "," + intent.getDoubleExtra("lng", 0);
mZoom = intent.getIntExtra("zoom", 0); mZoom = intent.getIntExtra("zoom", 0);