Issue #295: data.registrationId is empty string "" on register event …

…callback
phonegap · Nov 2, 2015 · 1ab47d8 · 1ab47d8
1 parent 5846757
commit 1ab47d8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/android/com/adobe/phonegap/push/PushPlugin.java b/src/android/com/adobe/phonegap/push/PushPlugin.java
@@ -80,11 +80,15 @@ else if (!savedSenderID.equals(senderID)) {
  token = sharedPref.getString(REGISTRATION_ID, "");
  }
 
- JSONObject json = new JSONObject().put(REGISTRATION_ID, token);
+ if (!"".equals(token)) {
+ JSONObject json = new JSONObject().put(REGISTRATION_ID, token);
 
- Log.v(LOG_TAG, "onRegistered: " + json.toString());
+  Log.v(LOG_TAG, "onRegistered: " + json.toString());
 
- PushPlugin.sendEvent( json );
+ PushPlugin.sendEvent( json );
+ } else {
+ callbackContext.error("Empty registration ID received from GCM");
+ }
  } catch (JSONException e) {
  Log.e(LOG_TAG, "execute: Got JSON Exception " + e.getMessage());
  callbackContext.error(e.getMessage());