Issue #315: Getting Error : Empty registration ID received from GCM

phonegap · Nov 18, 2015 · 9522193 · 9522193
1 parent e96d38d
commit 9522193
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/android/com/adobe/phonegap/push/PushPlugin.java b/src/android/com/adobe/phonegap/push/PushPlugin.java
@@ -68,7 +68,7 @@ public void run() {
                         String savedRegID = sharedPref.getString(REGISTRATION_ID, "");
 
                         // first time run get new token
-                        if ("".equals(savedSenderID) && "".equals(savedRegID)) {
+                        if ("".equals(savedRegID)) {
                             token = InstanceID.getInstance(getApplicationContext()).getToken(senderID, GCM);
                         }
                         // new sender ID, re-register
@@ -88,6 +88,7 @@ else if (!savedSenderID.equals(senderID)) {
                             PushPlugin.sendEvent( json );
                         } else {
                             callbackContext.error("Empty registration ID received from GCM");
+                            return;
                         }
                     } catch (JSONException e) {
                         Log.e(LOG_TAG, "execute: Got JSON Exception " + e.getMessage());