Add null check for "data" in the callback

Since the app settings screen does not have an output
e-mission · Jun 5, 2021 · a726584 · a726584
1 parent 0e47d50
commit a726584
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/android/DataCollectionPlugin.java b/src/android/DataCollectionPlugin.java
@@ -161,8 +161,13 @@ public void onRequestPermissionResult(int requestCode, String[] permissions,
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
+      if (data == null) {
+        Log.d(cordova.getActivity(), TAG, "received onActivityResult(" + requestCode + "," +
+          resultCode + "," + "null data" + ")");
+      } else {
         Log.d(cordova.getActivity(), TAG, "received onActivityResult("+requestCode+","+
                 resultCode+","+data.getDataString()+")");
+      }
         // This will be a NOP if we are not handling the correct activity intent
                 mControlDelegate.onActivityResult(requestCode, resultCode, data);
         /*