guard against NPEs

tvbarthel · Oct 12, 2016 · 6e25bd7 · 6e25bd7
1 parent 247c53b
commit 6e25bd7
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...app/src/main/java/fr/tvbarthel/apps/cameracolorpicker/activities/ColorPickerActivity.java b/...app/src/main/java/fr/tvbarthel/apps/cameracolorpicker/activities/ColorPickerActivity.java
@@ -203,7 +203,7 @@ private static Camera getCameraInstance() {
     protected boolean mIsFlashOn;
 
     /** the intent {@link android.content.Intent#getAction action} that led to this activity. */
-    protected String action;
+    protected String action = null;
 
     /** <a href="http://www.openintents.org/action/org-openintents-action-pick-color/">
      * see openintents.org</a> */
@@ -220,7 +220,9 @@ protected void onCreate(Bundle savedInstanceState) {
         initViews();
         initTranslationDeltas();
 
-        action = getIntent().getAction();
+        Intent intent = getIntent();
+        if (intent != null)
+            action = intent.getAction();
     }
 
     @Override