@josuelmm/cordova-background-geolocation 3.2.0 → 4.2.2

package/ios/common/BackgroundGeolocation/MAURUrlTemplateResolver.m

@@ -0,0 +1,107 @@
+//
+//  MAURUrlTemplateResolver.m
+//  BackgroundGeolocation
+//
+
+#import "MAURUrlTemplateResolver.h"
+#import "MAURLocation.h"
+
+@implementation MAURUrlTemplateResolver
+
++ (NSString *)resolve:(NSString *)urlTemplate
+             location:(MAURLocation *)location
+          queryParams:(NSDictionary *)queryParams
+{
+    if (urlTemplate == nil || urlTemplate.length == 0) return urlTemplate;
+
+    NSDictionary *ctx = [self buildContext:location queryParams:queryParams];
+
+    NSError *error = nil;
+    NSRegularExpression *regex = [NSRegularExpression
+        regularExpressionWithPattern:@"\\{([a-zA-Z0-9_]+)\\}"
+        options:0
+        error:&error];
+    if (regex == nil) return urlTemplate;
+
+    NSMutableString *result = [NSMutableString stringWithString:urlTemplate];
+    NSArray *matches = [regex matchesInString:urlTemplate
+                                      options:0
+                                        range:NSMakeRange(0, urlTemplate.length)];
+
+    // Iterate in reverse so ranges don't shift.
+    for (NSTextCheckingResult *match in [matches reverseObjectEnumerator]) {
+        NSString *key = [urlTemplate substringWithRange:[match rangeAtIndex:1]];
+        NSString *value = ctx[key];
+        if (value != nil) {
+            NSString *encoded = [self urlEncode:value];
+            [result replaceCharactersInRange:[match range] withString:encoded];
+        }
+        // else: leave the placeholder as-is.
+    }
+    return result;
+}
+
++ (NSDictionary *)buildContext:(MAURLocation *)loc queryParams:(NSDictionary *)queryParams
+{
+    NSMutableDictionary *ctx = [NSMutableDictionary dictionary];
+
+    // queryParams first; location-derived values can override below.
+    if (queryParams != nil) {
+        for (id key in queryParams) {
+            id value = queryParams[key];
+            if (value != nil && value != [NSNull null]) {
+                ctx[key] = [NSString stringWithFormat:@"%@", value];
+            }
+        }
+    }
+
+    if (loc != nil) {
+        if (loc.latitude != nil) {
+            ctx[@"latitude"] = [loc.latitude stringValue];
+            ctx[@"lat"] = [loc.latitude stringValue];
+        }
+        if (loc.longitude != nil) {
+            ctx[@"longitude"] = [loc.longitude stringValue];
+            ctx[@"lon"] = [loc.longitude stringValue];
+        }
+        if (loc.time != nil) {
+            long long ms = (long long)([loc.time timeIntervalSince1970] * 1000.0);
+            ctx[@"time"] = [NSString stringWithFormat:@"%lld", ms];
+            ctx[@"timestamp"] = [NSString stringWithFormat:@"%lld", ms];
+            ctx[@"timestamp_iso"] = [self isoUtc:loc.time];
+        }
+        if (loc.speed != nil) ctx[@"speed"] = [loc.speed stringValue];
+        if (loc.altitude != nil) ctx[@"altitude"] = [loc.altitude stringValue];
+        if (loc.heading != nil) ctx[@"bearing"] = [loc.heading stringValue];
+        if (loc.accuracy != nil) ctx[@"accuracy"] = [loc.accuracy stringValue];
+        if (loc.provider != nil) ctx[@"provider"] = loc.provider;
+    }
+
+    return ctx;
+}
+
++ (NSString *)urlEncode:(NSString *)s
+{
+    if (s == nil) return @"";
+    NSCharacterSet *allowed = [NSCharacterSet URLQueryAllowedCharacterSet];
+    NSString *enc = [s stringByAddingPercentEncodingWithAllowedCharacters:allowed];
+    // URLQueryAllowedCharacterSet leaves "+" and "&" unescaped which is unsafe in values.
+    enc = [enc stringByReplacingOccurrencesOfString:@"&" withString:@"%26"];
+    enc = [enc stringByReplacingOccurrencesOfString:@"+" withString:@"%2B"];
+    return enc != nil ? enc : s;
+}
+
++ (NSString *)isoUtc:(NSDate *)date
+{
+    static NSDateFormatter *fmt = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        fmt = [[NSDateFormatter alloc] init];
+        fmt.dateFormat = @"yyyy-MM-dd'T'HH:mm:ss'Z'";
+        fmt.timeZone = [NSTimeZone timeZoneWithAbbreviation:@"UTC"];
+        fmt.locale = [NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"];
+    });
+    return [fmt stringFromDate:date];
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@josuelmm/cordova-background-geolocation",
-  "version": "3.2.0",
+  "version": "4.2.2",
   "description": "Cordova Background Geolocation (fork actualizado)",
   "main": "./www/BackgroundGeolocation.js",
   "types": "./www/BackgroundGeolocation.d.ts",
@@ -64,6 +64,46 @@
         "cordova": ">=8.0.0",
         "cordova-android": ">=8.0.0",
         "cordova-ios": ">=6.0.0"
+      },
+      "3.3.0": {
+        "cordova": ">=10.0.0",
+        "cordova-android": ">=12.0.0",
+        "cordova-ios": ">=6.0.0"
+      },
+      "3.4.0": {
+        "cordova": ">=10.0.0",
+        "cordova-android": ">=12.0.0",
+        "cordova-ios": ">=6.2.0"
+      },
+      "3.5.0": {
+        "cordova": ">=10.0.0",
+        "cordova-android": ">=12.0.0",
+        "cordova-ios": ">=6.2.0"
+      },
+      "3.6.0": {
+        "cordova": ">=10.0.0",
+        "cordova-android": ">=12.0.0",
+        "cordova-ios": ">=6.2.0"
+      },
+      "4.0.0": {
+        "cordova": ">=10.0.0",
+        "cordova-android": ">=12.0.0",
+        "cordova-ios": ">=6.2.0"
+      },
+      "4.1.0": {
+        "cordova": ">=10.0.0",
+        "cordova-android": ">=12.0.0",
+        "cordova-ios": ">=6.2.0"
+      },
+      "4.2.0": {
+        "cordova": ">=10.0.0",
+        "cordova-android": ">=12.0.0",
+        "cordova-ios": ">=6.2.0"
+      },
+      "4.2.2": {
+        "cordova": ">=10.0.0",
+        "cordova-android": ">=12.0.0",
+        "cordova-ios": ">=6.2.0"
       }
     }
   },

package/plugin.xml

@@ -2,16 +2,16 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-background-geolocation"
-    version="3.2.0">
+    version="4.2.2">
     <name>cordova-background-geolocation</name>
     <description>Cordova Background Geolocation Plugin</description>
     <license>Apache-2.0</license>
     <keywords>cordova,phonegap,background,geolocation,gps,location</keywords>
 
     <engines>
-        <engine name="cordova" version=">=8.0.0"/>
-        <engine name="cordova-android" version=">=8.0.0"/>
-        <engine name="cordova-ios" version=">=6.0.0"/>
+        <engine name="cordova" version=">=10.0.0"/>
+        <engine name="cordova-android" version=">=12.0.0"/>
+        <engine name="cordova-ios" version=">=6.2.0"/>
     </engines>
 
     <js-module src="www/BackgroundGeolocation.js" name="BackgroundGeolocation">
@@ -23,7 +23,7 @@
 
     <!-- android -->
     <platform name="android">
-        <preference name="GOOGLE_PLAY_SERVICES_VERSION" default="17+"/>
+        <preference name="GOOGLE_PLAY_SERVICES_VERSION" default="21.0.1"/>
         <preference name="ICON" default="@mipmap/ic_launcher" />
         <preference name="SMALL_ICON" default="@mipmap/ic_launcher" />
         <preference name="ACCOUNT_NAME" default="@string/app_name" />
@@ -84,6 +84,10 @@
         <source-file src="android/common/src/main/java/com/marianhello/bgloc/headless/TaskRunnerFactory.java" target-dir="src/com/marianhello/bgloc/headless" />
         <source-file src="android/common/src/main/java/com/marianhello/bgloc/headless/TaskRunner.java" target-dir="src/com/marianhello/bgloc/headless" />
         <source-file src="android/common/src/main/java/com/marianhello/bgloc/HttpPostService.java" target-dir="src/com/marianhello/bgloc" />
+        <source-file src="android/common/src/main/java/com/marianhello/bgloc/http/UrlTemplateResolver.java" target-dir="src/com/marianhello/bgloc/http" />
+        <source-file src="android/common/src/main/java/com/marianhello/bgloc/oem/BatteryOemHelper.java" target-dir="src/com/marianhello/bgloc/oem" />
+        <source-file src="android/common/src/main/java/com/marianhello/bgloc/driving/DrivingEventsDetector.java" target-dir="src/com/marianhello/bgloc/driving" />
+        <source-file src="android/common/src/main/java/com/marianhello/bgloc/sensor/SensorFusionDetector.java" target-dir="src/com/marianhello/bgloc/sensor" />
         <source-file src="android/common/src/main/java/com/marianhello/bgloc/LocationManager.java" target-dir="src/com/marianhello/bgloc" />
         <source-file src="android/common/src/main/java/com/marianhello/bgloc/PluginDelegate.java" target-dir="src/com/marianhello/bgloc" />
         <source-file src="android/common/src/main/java/com/marianhello/bgloc/PluginException.java" target-dir="src/com/marianhello/bgloc" />
@@ -160,7 +164,7 @@
                 android:enabled="true"
                 android:exported="false"
                 android:name="com.marianhello.bgloc.service.LocationServiceImpl"
-                android:foregroundServiceType="location|dataSync"
+                android:foregroundServiceType="location"
                 />
             <receiver
                   android:name="com.marianhello.bgloc.BootCompletedReceiver"
@@ -168,9 +172,11 @@
                   android:exported="true">
                <intent-filter>
                   <action android:name="android.intent.action.BOOT_COMPLETED" />
+                  <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+                  <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
+                  <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
                </intent-filter>
             </receiver>
-            <uses-library android:name="org.apache.http.legacy" android:required="true" />
         </config-file>
 
         <config-file target="AndroidManifest.xml" parent="/manifest">
@@ -183,11 +189,11 @@
             <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
             <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
             <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+            <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
             <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
             <uses-permission android:name="android.permission.INTERNET" />
             <uses-permission android:name="android.permission.WAKE_LOCK" />
             <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-            <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
             <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
             <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
             <uses-permission android:name="android.hardware.location" />
@@ -269,6 +275,7 @@
             </feature>
         </config-file>
         <framework src="CoreLocation.framework" />
+        <framework src="CoreMotion.framework" />
         <framework src="SystemConfiguration.framework" />
         <framework src="AudioToolbox.framework" weak="true" />
         <framework src="AVFoundation.framework" weak="true" />
@@ -325,6 +332,10 @@
         <header-file src="ios/common/BackgroundGeolocation/MAURLogging.h" />
         <header-file src="ios/common/BackgroundGeolocation/MAURPostLocationTask.h" />
         <source-file src="ios/common/BackgroundGeolocation/MAURPostLocationTask.m" />
+        <header-file src="ios/common/BackgroundGeolocation/MAURUrlTemplateResolver.h" />
+        <source-file src="ios/common/BackgroundGeolocation/MAURUrlTemplateResolver.m" />
+        <header-file src="ios/common/BackgroundGeolocation/MAURSensorFusionDetector.h" />
+        <source-file src="ios/common/BackgroundGeolocation/MAURSensorFusionDetector.m" />
         <header-file src="ios/common/BackgroundGeolocation/MAURProviderDelegate.h" />
         <header-file src="ios/common/BackgroundGeolocation/MAURRawLocationProvider.h" />
         <source-file src="ios/common/BackgroundGeolocation/MAURRawLocationProvider.m" />