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

…s.json
phonegap · Apr 29, 2017 · f3b01f1 · f3b01f1
1 parent 453561c
commit f3b01f1
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 12 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -26,21 +26,16 @@
         <engine name="cordova-ios" version=">=4.3.0"/>
     </engines>
 
-    <preference name="SENDER_ID" default="85075801930"/>
-
 	<!-- android -->
 	<platform name="android">
+        <hook type="before_plugin_install" src="scripts/copyAndroidFile.js" />
 
 		<config-file target="res/xml/config.xml" parent="/*">
 			<feature name="PushNotification" >
 				<param name="android-package" value="com.adobe.phonegap.push.PushPlugin"/>
 			</feature>
 		</config-file>
 
-        <config-file target="res/values/strings.xml" parent="/resources">
-            <string name="google_app_id">$SENDER_ID</string>
-        </config-file>
-
         <config-file target="AndroidManifest.xml" parent="/manifest">
             <uses-permission android:name="android.permission.INTERNET"/>
             <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -65,10 +60,11 @@
             </service>
 		</config-file>
 
-        <framework src="push.gradle" custom="true" type="gradleReference" />
         <framework src="com.android.support:support-v13:23+" />
         <framework src="me.leolin:ShortcutBadger:1.1.11@aar"/>
+        <!-- framework src="com.google.gms:google-services:3.0.0" /-->
         <framework src="com.google.firebase:firebase-messaging:9+" />
+        <framework src="push.gradle" custom="true" type="gradleReference" />
 
 		<source-file src="src/android/com/adobe/phonegap/push/FCMService.java" target-dir="src/com/adobe/phonegap/push/" />
 		<source-file src="src/android/com/adobe/phonegap/push/PushConstants.java" target-dir="src/com/adobe/phonegap/push/" />
@@ -104,7 +100,8 @@
         <!--  Start FCM Related Files -->
         <framework src="FirebaseMessaging" type="podspec" spec="~> 1.2.1"/>
 
-        <resource-file src="src/ios/GoogleService-Info.plist" target="Resources/GoogleService-Info.plist" />
+        <!-- resource-file src="src/ios/GoogleService-Info.plist" target="Resources/GoogleService-Info.plist" / -->
+        <hook src="scripts/copy_file.js" type="after_prepare" />
         <!--  End FCM Related Files -->
 	</platform>
 
@@ -117,6 +114,4 @@
     		<preference name="WindowsToastCapable" value="true" />
     	</config-file>
 	</platform>
-
-    <hook src="scripts/copy_file.js" type="after_prepare" />
 </plugin>
diff --git a/push.gradle b/push.gradle
@@ -8,6 +8,10 @@ def doExtractStringFromManifest(name) {
     return matcher.group(1)
 }
 
+cdvPluginPostBuildExtras << {
+    apply plugin: 'com.google.gms.google-services'
+}
+
 android {
     sourceSets {
         main {

diff --git a/scripts/copyAndroidFile.js b/scripts/copyAndroidFile.js
@@ -0,0 +1,34 @@
+module.exports = function(ctx) {
+    var fs = ctx.requireCordovaModule('fs'),
+        path = ctx.requireCordovaModule('path'),
+        os = require("os"),
+        readline = require("readline"),
+        deferral = ctx.requireCordovaModule('q').defer();
+
+    var settingsFile = path.join(ctx.opts.projectRoot, 'google-services.json');
+
+    fs.stat(settingsFile, function(err,stats) {
+        if (err) {
+            deferral.reject("To use this plugin on android you'll need to add a google-services.json file with the FCM project_info and place that into your www folder");
+        } else {
+
+            fs.createReadStream(settingsFile).pipe(fs.createWriteStream('platforms/android/google-services.json'));
+
+            var lineReader = readline.createInterface({
+                terminal: false,
+                input : fs.createReadStream('platforms/android/build.gradle')
+            });
+            lineReader.on("line", function(line) {
+                fs.appendFileSync('./build.gradle', line.toString() + os.EOL);
+                if (/.*\ dependencies \{.*/.test(line)) {
+                    fs.appendFileSync('./build.gradle', '\t\tclasspath "com.google.gms:google-services:3.0.0"' + os.EOL);
+                }
+            }).on("close", function () {
+                fs.rename('./build.gradle', 'platforms/android/build.gradle', deferral.resolve);
+            });
+
+        }
+    });
+
+    return deferral.promise;
+};
diff --git a/scripts/copy_file.js b/scripts/copy_file.js
@@ -40,4 +40,13 @@ if(fileExists("GoogleService-Info.plist") && directoryExists("platforms/ios/")){
   } catch(err) {
     process.stdout.write(err);
   }
-}
+}
+
+if(fileExists("google-services.json") && directoryExists("platforms/android/")){
+  try {
+  	var contents = fs.readFileSync("google-services.json").toString();
+    fs.writeFileSync("platforms/android/google-services.json", contents);
+  } catch(err) {
+    process.stdout.write(err);
+  }
+}
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);