Skip to content

Fix for new cordova paths #213 #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix for new cordova paths #213 #439

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ee6347
Fix for new cordova paths #213
Grohden Jan 8, 2018
1786c9c
path typo
Grohden Jan 8, 2018
d63e2f3
Fix fro wrong condition order :u
Grohden Jan 8, 2018
961a7ea
Merge branch 'master' into patch-1
Grohden Mar 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions scripts/fcm_config_files_process.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
'use strict';

var fs = require('fs');
var execSync = require('child_process').execSync;

var getValue = function(config, name) {
var value = config.match(new RegExp('<' + name + '>(.*?)</' + name + '>', "i"))
Expand Down Expand Up @@ -55,10 +56,17 @@ if (directoryExists("platforms/android")) {
if (fileExists( path )) {
try {
var contents = fs.readFileSync(path).toString();
fs.writeFileSync("platforms/android/google-services.json", contents);

var cordovaVersion = execSync('cordova -v', {encoding: 'utf-8'});
var isNewFolderStructures = cordovaVersion.split('.')[0] >= 7;

var gServicesWritePath = isNewFolderStructures ? "platforms/android/app/" : "platforms/android/";
var stringsPath = (isNewFolderStructures ? "platforms/android/app/src/main" : "platforms/android") + "/res/values/strings.xml";

fs.writeFileSync(gServicesWritePath + "google-services.json", contents);

var json = JSON.parse(contents);
var strings = fs.readFileSync("platforms/android/res/values/strings.xml").toString();
var strings = fs.readFileSync(stringsPath).toString();

// strip non-default value
strings = strings.replace(new RegExp('<string name="google_app_id">([^\@<]+?)</string>', "i"), '')
Expand All @@ -75,12 +83,12 @@ if (directoryExists("platforms/android")) {
// replace the default value
strings = strings.replace(new RegExp('<string name="google_api_key">([^<]+?)</string>', "i"), '<string name="google_api_key">' + json.client[0].api_key[0].current_key + '</string>')

fs.writeFileSync("platforms/android/res/values/strings.xml", strings);
fs.writeFileSync(stringsPath, strings);
} catch(err) {
process.stdout.write(err);
}

} else {
throw new Error("cordova-plugin-fcm: You have installed platform android but file 'google-services.json' was not found in your Cordova project root folder.")
}
}
}