Merge pull request #387 from pschlang/fix-connect-nullptr

Prevent crash in connect() when both intent and savedIntent are null
chariotsolutions · Apr 7, 2020 · da3ae2f · da3ae2f
2 parents 3e5287f + 44bf984
commit da3ae2f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/android/src/com/chariotsolutions/nfc/plugin/NfcPlugin.java b/src/android/src/com/chariotsolutions/nfc/plugin/NfcPlugin.java
@@ -856,7 +856,7 @@ private void connect(final String tech, final int timeout, final CallbackContext
             try {
 
                 Tag tag = getIntent().getParcelableExtra(NfcAdapter.EXTRA_TAG);
-                if (tag == null) {
+                if (tag == null && savedIntent != null) {
                     tag = savedIntent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
                 }