Fix crashed on 'up' caused by not checking intent.getAction()

rubenwardy · Feb 8, 2017 · 54226b6 · 54226b6
1 parent 81aa3c6
commit 54226b6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/src/main/java/com/rubenwardy/minetestmodmanager/ModListActivity.java b/app/src/main/java/com/rubenwardy/minetestmodmanager/ModListActivity.java
@@ -83,8 +83,9 @@ protected void onCreate(Bundle savedInstanceState) {
         // Read opening intent
         //
         Intent intent = getIntent();
-        if (intent.getAction().equals("com.google.android.gms.actions.SEARCH_ACTION") ||
-                intent.getAction().equals(ACTION_SEARCH)) {
+        String action = intent.getAction();
+        if (action != null && (action.equals("com.google.android.gms.actions.SEARCH_ACTION") ||
+                intent.getAction().equals(ACTION_SEARCH))) {
             search_filter = intent.getExtras().getString(PARAM_QUERY);
         } else {
             Log.e("MAct", "Intent was " + intent.getAction());