🐛 Issue #1188: Strings.xml google_app_id conflict with google-service…

…s.json
phonegap · May 4, 2017 · 620af90 · 620af90
1 parent ee9ecc9
commit 620af90
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/android/com/adobe/phonegap/push/PushConstants.java b/src/android/com/adobe/phonegap/push/PushConstants.java
@@ -79,4 +79,5 @@ public interface PushConstants {
     public static final String IMAGE_TYPE_SQUARE = "square";
     public static final String IMAGE_TYPE_CIRCLE = "circle";
     public static final String GOOGLE_APP_ID = "google_app_id";
+    public static final String GCM_DEFAULT_SENDER_ID = "gcm_defaultSenderId";
 }
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() {
 
                         Log.v(LOG_TAG, "execute: jo=" + jo.toString());
 
-                        senderID = getStringResourceByName(GOOGLE_APP_ID);
+                        senderID = getStringResourceByName(GCM_DEFAULT_SENDER_ID);
 
                         Log.v(LOG_TAG, "execute: senderID=" + senderID);