Add senderID from installation as Android default.

- Prefer explicitly defined SENDER_ID from the plugin's JS. - I believe this resolves phonegap#689 without breaking existing compatibility.
cmprescott · Mar 16, 2016 · fb62e1c · fb62e1c
1 parent b1b5e9d
commit fb62e1c
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
@@ -84,7 +84,8 @@ public void run() {
 
                         Log.v(LOG_TAG, "execute: jo=" + jo.toString());
 
-                        senderID = jo.getString(SENDER_ID);
+                        // Prefer explicitly defined SENDER_ID from the plugin's JS. Default to installation information.
+                        senderID = !jo.isNull(SENDER_ID) ? jo.getString(SENDER_ID) : getSenderIdFromApplicationManifest();
 
                         Log.v(LOG_TAG, "execute: senderID=" + senderID);