From 5a53e88a41c3e82ef3c0f76c6b2e6c79c30e2fda Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Wed, 19 Feb 2014 00:49:16 +0100 Subject: [PATCH] intent MIME types may be null...generate empty string in that case --- mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java index a3a488ef..a643e7f0 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java @@ -198,9 +198,12 @@ public class IITC_Mobile extends Activity handleIntent(intent, false); } + // handles ingress intel url intents, search intents, geo intents and javascript file intents private void handleIntent(final Intent intent, final boolean onCreate) { - // load new iitc web view with ingress intel page final String action = intent.getAction(); + // intent MIME type may be null + final String type = intent.getType() == null ? "" : intent.getType(); + if (Intent.ACTION_VIEW.equals(action) || NfcAdapter.ACTION_NDEF_DISCOVERED.equals(action)) { final Uri uri = intent.getData(); Log.d("intent received url: " + uri.toString()); @@ -234,7 +237,7 @@ public class IITC_Mobile extends Activity } } - if (uri.getPath().endsWith(".user.js") || intent.getType().contains("javascript")) { + if (uri.getPath().endsWith(".user.js") || type.contains("javascript")) { final Intent prefIntent = new Intent(this, IITC_PluginPreferenceActivity.class); prefIntent.setDataAndType(uri, intent.getType()); startActivity(prefIntent);