Merge pull request #139 from VismaLietuva/master

prevents crash if onActivityResult receives intent as null
lampaa · Mar 21, 2020 · 47ff3d4 · 47ff3d4
2 parents 2fa54b4 + 762f905
commit 47ff3d4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/android/startApp.java b/src/android/startApp.java
@@ -389,7 +389,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
 				result.put("_ACTION_requestCode_", requestCode);
 				result.put("_ACTION_resultCode_", resultCode);
 
-				Bundle bundle = intent.getExtras();
+				Bundle bundle = intent == null ? null : intent.getExtras();
 				if (bundle != null) {
 					for (String key : bundle.keySet()) {
 						result.put(key, bundle.get(key));
@@ -405,4 +405,4 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
 			callbackContext.sendPluginResult(pluginResult);
 		}
 	}
-}
+}