From 0de27687c5639dbf899718396c0ae5ba50f7ab29 Mon Sep 17 00:00:00 2001
From: ManojNB <manojnb95@gmail.com>
Date: Tue, 15 Mar 2022 18:36:35 -0700
Subject: [PATCH] fix(pushnotification/android): return just the error message
 rather than the whole exception (#9641)

Co-authored-by: Manoj NB <manojnb@amazon.com>
Co-authored-by: Caleb Pollman <cpollman@amazon.com>
---
 .../amplify/pushnotification/RNPushNotificationModule.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/pushnotification/android/src/main/java/com/amazonaws/amplify/pushnotification/RNPushNotificationModule.java b/packages/pushnotification/android/src/main/java/com/amazonaws/amplify/pushnotification/RNPushNotificationModule.java
index d1098d8a73d..da9a88c9e2b 100644
--- a/packages/pushnotification/android/src/main/java/com/amazonaws/amplify/pushnotification/RNPushNotificationModule.java
+++ b/packages/pushnotification/android/src/main/java/com/amazonaws/amplify/pushnotification/RNPushNotificationModule.java
@@ -77,8 +77,11 @@ public void onComplete(@NonNull Task<String> task) {
                         onSuccessCallback.invoke(token);
                     } else {
                         Exception exception = task.getException();
-                        Log.e(LOG_TAG, "Error getting token: " + exception);
-                        onErrorCallback.invoke(exception);
+                        if (exception != null) {
+                            String exceptionMessage = exception.getMessage();
+                            Log.e(LOG_TAG, "Error getting token: " + exceptionMessage);
+                            onErrorCallback.invoke(exceptionMessage);
+                        }
                     }
                 }
             });