diff --git a/android/src/main/java/com/rnappauth/RNAppAuthModule.java b/android/src/main/java/com/rnappauth/RNAppAuthModule.java index 0ff0b9b2..04abbae0 100644 --- a/android/src/main/java/com/rnappauth/RNAppAuthModule.java +++ b/android/src/main/java/com/rnappauth/RNAppAuthModule.java @@ -300,14 +300,18 @@ public void onFetchConfigurationCompleted( public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) { if (requestCode == 0) { if (data == null) { - promise.reject("authentication_error", "Data intent is null" ); + if (promise != null) { + promise.reject("authentication_error", "Data intent is null" ); + } return; } final AuthorizationResponse response = AuthorizationResponse.fromIntent(data); AuthorizationException exception = AuthorizationException.fromIntent(data); if (exception != null) { - promise.reject("authentication_error", getErrorMessage(exception)); + if (promise != null) { + promise.reject("authentication_error", getErrorMessage(exception)); + } return; } @@ -327,9 +331,13 @@ public void onTokenRequestCompleted( TokenResponse resp, AuthorizationException ex) { if (resp != null) { WritableMap map = TokenResponseFactory.tokenResponseToMap(resp, response); - authorizePromise.resolve(map); + if (authorizePromise != null) { + authorizePromise.resolve(map); + } } else { - promise.reject("token_exchange_failed", getErrorMessage(ex)); + if (promise != null) { + promise.reject("token_exchange_failed", getErrorMessage(ex)); + } } } };