From 1a848c6c673242d363e674f5a1eafdbf67941f7f Mon Sep 17 00:00:00 2001 From: Wouter Florijn Date: Fri, 15 Apr 2022 15:54:34 +0200 Subject: [PATCH] Fix error when promise is null --- .../rn/useridentity/RNUserIdentityModule.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/android/src/main/java/com/github/juliandramirez/rn/useridentity/RNUserIdentityModule.java b/android/src/main/java/com/github/juliandramirez/rn/useridentity/RNUserIdentityModule.java index 83b5dffb..12e7694e 100644 --- a/android/src/main/java/com/github/juliandramirez/rn/useridentity/RNUserIdentityModule.java +++ b/android/src/main/java/com/github/juliandramirez/rn/useridentity/RNUserIdentityModule.java @@ -36,12 +36,14 @@ public RNUserIdentityModule(ReactApplicationContext reactContext) { this.reactContext = reactContext; this.reactContext.addActivityEventListener(new BaseActivityEventListener() { public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) { - if(requestCode == INTENT_REQUEST_CODE) { - if (resultCode == Activity.RESULT_OK) { - String accountName = data.getStringExtra(AccountManager.KEY_ACCOUNT_NAME); - promise.resolve(accountName); - } else { - promise.reject("USER_CANCELED_ACCOUNT_SELECTION", "User cancelled the account selection dialog"); + if (requestCode == INTENT_REQUEST_CODE) { + if (promise != null) { + if (resultCode == Activity.RESULT_OK) { + String accountName = data.getStringExtra(AccountManager.KEY_ACCOUNT_NAME); + promise.resolve(accountName); + } else { + promise.reject("USER_CANCELED_ACCOUNT_SELECTION", "User cancelled the account selection dialog"); + } } } } @@ -88,4 +90,4 @@ public void triggerAccountSelection(String message, String accountType, Promise public String getName() { return "RNUserIdentity"; } -} \ No newline at end of file +}