Merge branch 'expo-plugin-licensing'

transistorsoft · Sep 5, 2024 · 9b11cf3 · 9b11cf3
2 parents 8f29620 + 5c0da4a
commit 9b11cf3
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## 4.17.1 &mdash; 2024-09-05
+* [Expo] Fix bug in Expo plugin adding unused license keys for "polygon geofencing" with a value of `UNDEFINED`, causing license-validation error.  Add logic to automatically remove license keys from `AndroidManifest` when corresponding keys are not found in your `app.json` (eg: `polygonLicense`).
+
 ## 4.17.0 &mdash; 2024-09-04
 * [iOS] Fix bug in iOS *Polygon Geofencing* when running in geofences-only mode (`.startGeofences`).  iOS would mistakenly turn off location updates exactly 3 samples into the containing circular geofence of a polygon.
 * Implement `notifyOnDwell` for polygon-geofences.

diff --git a/expo/plugin/src/androidPlugin.ts b/expo/plugin/src/androidPlugin.ts
@@ -53,7 +53,12 @@ if (!MODULE_NAME) {
   process.exit(1);
 }
 
-const { addMetaDataItemToMainApplication, getMainApplicationOrThrow } = AndroidConfig.Manifest;
+const { 
+  addMetaDataItemToMainApplication, 
+  removeMetaDataItemFromMainApplication,
+  getMainApplicationOrThrow 
+} = AndroidConfig.Manifest;
+
 
 const androidPlugin: ConfigPlugin<Props> = (config, props={}) => {
   config = withProjectBuildGradle(config, ({ modResults, ...subConfig }) => {
@@ -86,24 +91,38 @@ const androidPlugin: ConfigPlugin<Props> = (config, props={}) => {
 
   config = withAndroidManifest(config, async (config) => {
 
+    console.log("[react-native-background-geolocation] Adding license-keys to AndroidManifest:", props);
+
     const mainApplication = getMainApplicationOrThrow(config.modResults);
 
     addMetaDataItemToMainApplication(
       mainApplication,
       META_LICENSE_KEY,
       props.license || "UNDEFINED"
     );
-    addMetaDataItemToMainApplication(
-      mainApplication,
-      META_HMS_LICENSE_KEY,
-      props.hmsLicense || "UNDEFINED"
-    );
+    if (props.hmsLicense) {
+      addMetaDataItemToMainApplication(
+        mainApplication,
+        META_HMS_LICENSE_KEY,
+        props.hmsLicense
+      );
+    } else {
+      removeMetaDataItemFromMainApplication(
+        mainApplication,
+        META_HMS_LICENSE_KEY
+      );
+    }
     if (props.polygonLicense) {
       addMetaDataItemToMainApplication(
         mainApplication,
         META_POLYGON_LICENSE_KEY,
         props.polygonLicense
       );
+    } else {
+      removeMetaDataItemFromMainApplication(
+        mainApplication,
+        META_POLYGON_LICENSE_KEY
+      );
     }
     return config;
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-background-geolocation",
-  "version": "4.17.0",
+  "version": "4.17.1",
   "description": "The most sophisticated cross-platform background location-tracking & geofencing module with battery-conscious motion-detection intelligence",
   "scripts": {
     "build": "yarn run build:expo",