react-native-acoustic-mobile-push-location-beta 3.9.10 → 3.9.11

package/package.json

@@ -24,7 +24,7 @@
     "main": "index.js",
     "name": "react-native-acoustic-mobile-push-location-beta",
     "peerDependencies": {
-        "react-native-acoustic-mobile-push-beta": "3.9.10"
+        "react-native-acoustic-mobile-push-beta": "3.9.11"
     },
     "repository": {
         "directory": "plugins/react-native-acoustic-mobile-push-location",
@@ -36,5 +36,5 @@
         "test": "echo \"Error: no test specified\" && exit 1"
     },
     "summary": "react-native ios android mobile push Campaign",
-    "version": "3.9.10"
+    "version": "3.9.11"
 }

package/postinstall.js

@@ -167,82 +167,105 @@ function modifyInfoPlist(mainAppPath) {
     fs.writeFileSync(infoPath, plist.build(infoPlist), "utf8");
 }
 
-function updateiOSConfigFile(mainAppPath) {
-	const configName = 'MceConfig.json';
-	const configPath = path.join(mainAppPath, configName);
-	var config = JSON.parse(fs.readFileSync(configPath));
-
-	console.log("Adding location preferences to iOS MceConfig.json file.");
-	config["Please note, the existince of the location key is not required, if it is not present though, iBeacon and Geofence support will be disabled."] = ""
-
-	if(typeof(config.location) == "undefined") {
-		config.location = {
-	        "The location autoInitialize flag can be set to false to delay turning on the location services until desired.": "",
-	        "autoInitialize": true,
-
-	        "The sync key is only used to customize the iBeacon and Geofence syncing sevice, it is not required for those features": "",
-	        "sync": {
-	            "Location Sync radius is in meters, default 100km": "",
-	            "syncRadius": 100000,
-
-	            "Specify how long to wait before syncing again on significant location change in seconds, default 5 minutes": "",
-	            "syncInterval": 300
-        	}
-    	};
-    }
+function updateiOSConfigFile(projectPath, mainAppPath) {
+	const campaignConfigName = 'CampaignConfig.json';
+	const appConfigName = 'MceConfig.json';
+	const campaignConfigPath = path.join(projectPath, campaignConfigName);
+	const appConfigPath = path.join(mainAppPath, appConfigName);
+
+	let configTemplate = {
+		"The location autoInitialize flag can be set to false to delay turning on the location services until desired.": "",
+		"autoInitialize": true,
+
+		"The sync key is only used to customize the iBeacon and Geofence syncing sevice, it is not required for those features": "",
+		"sync": {
+			"Location Sync radius is in meters, default 100km": "",
+			"syncRadius": 100000,
+
+			"Specify how long to wait before syncing again on significant location change in seconds, default 5 minutes": "",
+			"syncInterval": 300
+		}
+	};
+
+	var config = JSON.parse(fs.readFileSync(campaignConfigPath));
+
+	if(typeof(config.iOS.location) == "undefined") {
+		console.log("Adding location preferences to iOS CampaignConfig.json file.");
+    	config.iOS["Please note, the existince of the location key is not required, if it is not present though, iBeacon and Geofence support will be disabled."] = "";
 
-    fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+		config.iOS.location = configTemplate;
+
+		fs.writeFileSync(campaignConfigPath, JSON.stringify(config, null, 2));
+
+		console.log("Adding location preferences to Android MceConfig.json file.");
+		var appConfig = JSON.parse(fs.readFileSync(appConfigPath));
+
+		appConfig.location = configTemplate;
+		fs.writeFileSync(appConfigPath, JSON.stringify(appConfig, null, 2));
+    }
 }
 
-function updateAndroidConfigFile(installDirectory) {
-	const configName = 'MceConfig.json';
-	const configPath = path.join(installDirectory, "android", "app", "src", "main", "assets", configName);
-	var config = JSON.parse(fs.readFileSync(configPath));
+function updateAndroidConfigFile(projectPath, installDirectory) {
+	const campaignConfigName = 'CampaignConfig.json';
+	const appConfigName = 'MceConfig.json';
+	const campaignConfigPath = path.join(projectPath, campaignConfigName);
+	const appConfigPath = path.join(installDirectory, "android", "app", "src", "main", "assets", appConfigName);
 
-	console.log("Adding location preferences to Android MceConfig.json file.");
-	config["Please note, the existince of the location key is not required, if it is not present though, iBeacon and Geofence support will be disabled."] = "";
+	let configTemplate = {
+		"The location autoInitialize flag can be set to false to delay turning on the location services until desired.": "",
+		"autoInitialize": true,
 
-	if(typeof(config.location) == "undefined") {
-		config.location = {
-			"The location autoInitialize flag can be set to false to delay turning on the location services until desired.": "",
-			"autoInitialize": true,
+		"The sync key is only used to customize the iBeacon and Geofence syncing service, it is not required for those features": "",
+		"sync": {
+			"Specify how long to wait before syncing again on significant location change in seconds, default 5 minutes":"",
+			"syncInterval": 300,
 
-			"The sync key is only used to customize the iBeacon and Geofence syncing service, it is not required for those features": "",
-			"sync": {
-				"Specify how long to wait before syncing again on significant location change in seconds, default 5 minutes":"",
-				"syncInterval": 300,
+			"Location Sync radius is in meters, default 100km":"",
+			"syncRadius": 100000,
 
-				"Location Sync radius is in meters, default 100km":"",
-				"syncRadius": 100000,
+			"Specify how long to wait before retrieving a new location from the device, default 5 minutes":"",
+			"locationResponsiveness": 300,
 
-				"Specify how long to wait before retrieving a new location from the device, default 5 minutes":"",
-				"locationResponsiveness": 300,
+			"Specify the minimum results when looking for locations nearby, default is 1, minimum value is 1":"",
+			"minLocationsForSearch": 1,
 
-				"Specify the minimum results when looking for locations nearby, default is 1, minimum value is 1":"",
-				"minLocationsForSearch": 1,
+			"Specify the maximum results when looking for locations nearby, default is 20, minimum value is 1":"",
+			"maxLocationsForSearch": 20,
 
-				"Specify the maximum results when looking for locations nearby, default is 20, minimum value is 1":"",
-				"maxLocationsForSearch": 20,
+			"Specify the location providers that will be used to retrieve the device location. 'gps' - gps location. 'network' - wifi + cellular, default is gps + network":"",
+			"providerPreferences": ["gps", "network"]
+		}
+	};
 
-				"Specify the location providers that will be used to retrieve the device location. 'gps' - gps location. 'network' - wifi + cellular, default is gps + network":"",
-				"providerPreferences": ["gps", "network"]
-			}
-		};
+	var config = JSON.parse(fs.readFileSync(campaignConfigPath));
+
+	if(typeof(config.android.location) == "undefined") {
+		console.log("Adding location preferences to Android CampaignConfig.json file.");
+    	config.android["Please note, the existince of the location key is not required, if it is not present though, iBeacon and Geofence support will be disabled."] = "";
+
+		config.android.location = configTemplate;
+		fs.writeFileSync(campaignConfigPath, JSON.stringify(config, null, 2));
+
+		console.log("Adding location preferences to Android MceConfig.json file.");
+		var appConfig = JSON.parse(fs.readFileSync(appConfigPath));
+
+		appConfig.location = configTemplate;
+		fs.writeFileSync(appConfigPath, JSON.stringify(appConfig, null, 2));
 	}
-	fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
 }
 
 if(process.env.MCE_RN_NOCONFIG) {
-    console.log(chalk.yellow.bold("Acoustic Mobile Push Location Plugin installed, but will not be auto configured because MCE_RN_NOCONFIG environment flag detected."));
+    console.log(chalk.yellow.bold("Acoustic Campaign Location Plugin installed, but will not be auto configured because MCE_RN_NOCONFIG environment flag detected."));
     return;
 }
 
-console.log(chalk.green.bold("Setting up Acoustic Mobile Push Location Plugin"));
+console.log(chalk.green.bold("Setting up Acoustic Campaign Location Plugin"));
+const projectPath = process.cwd();
 const installDirectory = findInstallDirectory();
 const mainAppPath = findMainPath(installDirectory);
 modifyInfoPlist(mainAppPath);
-updateiOSConfigFile(mainAppPath);
-updateAndroidConfigFile(installDirectory);
+updateiOSConfigFile(projectPath, mainAppPath);
+updateAndroidConfigFile(projectPath, installDirectory);
 modifyManifest(installDirectory);
 
 console.log(chalk.green("Installation Complete!"));
@@ -252,7 +275,4 @@ console.log(chalk.blue('For react-native 0.59 and lower link the plugin with:'))
 console.log('react-native link react-native-acoustic-mobile-push-location\n');
 
 console.log(chalk.blue('iOS Support:'));
-console.log("Please replace the placeholder location usage descriptions in info.plist in the NSLocationWhenInUseUsageDescription, NSLocationAlwaysUsageDescription and NSLocationAlwaysAndWhenInUseUsageDescription keys.\n");
-
-console.log(chalk.blue('Android Support:'));
-console.log("Note, this version of the plugin only supports AndroidX on React Native 0.60 and higher");
+console.log("Please replace the placeholder location usage descriptions in info.plist in the NSLocationWhenInUseUsageDescription, NSLocationAlwaysUsageDescription and NSLocationAlwaysAndWhenInUseUsageDescription keys.\n");