From e396d7df1d9788ecd0a53e64a875243414f376d1 Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Wed, 3 Apr 2013 00:24:35 +0200 Subject: [PATCH] replaced (String == String) with String.equals(String) --- mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java | 5 ++--- mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java index f7713036..90f089ec 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java @@ -42,7 +42,7 @@ public class IITC_Mobile extends Activity { listener = new OnSharedPreferenceChangeListener() { @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { - if (key == "pref_force_desktop") + if (key.equals("pref_force_desktop")) desktop = sharedPreferences.getBoolean("pref_force_desktop", false); // reload intel map iitc_view.loadUrl(addUrlParam("https://www.ingress.com/intel")); @@ -63,8 +63,7 @@ public class IITC_Mobile extends Activity { if (Intent.ACTION_VIEW.equals(action)) { Uri uri = intent.getData(); String url = uri.toString(); - // TODO Why does "if(intent.getScheme() == "http")" not work? - if (url.contains("http://")) + if (intent.getScheme().equals("http://")) url = url.replace("http://", "https://"); Log.d("Intent received", "url: " + url); if (url.contains("ingress.com")) { diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java index e215e4bb..b51fae9c 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java @@ -40,7 +40,7 @@ public class IITC_WebViewClient extends WebViewClient { String iitc_version = "not found"; for (int i = 0; i < attributes.length; i++) { // search vor version and use the value - if (attributes[i].contains("@version")) iitc_version = attributes[i+1]; + if (attributes[i].equals("@version")) iitc_version = attributes[i+1]; } return iitc_version; }