react-native-background-geolocation 5.0.0-beta.1 → 5.0.0-beta.3

package/README.md

@@ -47,18 +47,18 @@ Also available for [Flutter](https://github.com/transistorsoft/flutter_backgroun
 ### With *Expo*
 
 ```shell
-npx expo install react-native-background-geolocation
+npx expo install react-native-background-geolocation@beta
 ```
 
 ### With `yarn`
 
 ```bash
-yarn add react-native-background-geolocation
+yarn add react-native-background-geolocation@beta
 ```
 
 ### With `npm`
 ```
-$ npm install react-native-background-geolocation --save
+$ npm install react-native-background-geolocation@beta --save
 ```
 
 ## :large_blue_diamond: Setup Guides

package/RNBackgroundGeolocation.podspec

@@ -14,15 +14,32 @@ Pod::Spec.new do |s|
   s.homepage            = package['homepage']
   s.license             = package['license']
   s.author              = package['author']
-  s.source              = { :git => 'https://github.com/transistorsoft/react-native-background-geolocation.git', :tag => s.version }
+  s.source              = {
+    :git => 'https://github.com/transistorsoft/react-native-background-geolocation.git',
+    :tag => s.version
+  }
+
   s.platform            = :ios, '12.0'
+  s.requires_arc        = true
+  s.static_framework    = true
 
-  s.dependency 'React-Core'
-  s.static_framework = true
+  s.source_files        = 'ios/RNBackgroundGeolocation/*.{h,m,mm}'
   s.preserve_paths      = 'docs', 'CHANGELOG.md', 'LICENSE', 'package.json', 'RNBackgroundGeolocation.ios.js'
+
   s.dependency 'CocoaLumberjack', '~> 3.8.5'
   s.dependency 'TSLocationManager', '~> 4.0.0-beta.5'
-  s.source_files        = 'ios/RNBackgroundGeolocation/*.{h,m}'
-  s.libraries           = 'sqlite3', 'z', 'stdc++'  
-  s.resource_bundles = {'TSLocationManagerPrivacy' => ['ios/Resources/PrivacyInfo.xcprivacy']}
-end
+
+  s.libraries           = 'sqlite3', 'z', 'stdc++'
+  s.resource_bundles    = {
+    'TSLocationManagerPrivacy' => ['ios/Resources/PrivacyInfo.xcprivacy']
+  }
+
+  # React Native dependencies:
+  # - For RN >= 0.71, use the helper which wires up React-Core, ReactCodegen, etc.
+  # - For older RN, fall back to React-Core manually.
+  if defined?(install_modules_dependencies)
+    install_modules_dependencies(s)
+  else
+    s.dependency 'React-Core'
+  end
+end

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -2,7 +2,7 @@ arguments=--init-script /var/folders/qk/r2r49k7527b6r81484vtk0g40000gn/T/db3b08f
 auto.sync=false
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.9))
-connection.project.dir=../../../android
+connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
 java.home=/opt/homebrew/Cellar/openjdk@17/17.0.15/libexec/openjdk.jdk/Contents/Home

package/android/build.gradle

@@ -26,6 +26,7 @@ def safeExtGet(prop, fallback) {
 
 react {
     libraryName = "react-native-background-geolocation"
+    codegenJavaPackageName = "com.transistorsoft.rnbackgroundgeolocation"
 }
 android {
     namespace("com.transistorsoft.rnbackgroundgeolocation")

package/android/src/main/java/com/transistorsoft/rnbackgroundgeolocation/RNBackgroundGeolocation.java

@@ -8,25 +8,24 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.bridge.JavaScriptModule;
+
 
 /**
+ * React Native package for RNBackgroundGeolocation.
+ * This is used by the old architecture and by autolinking.
+ * The new architecture / TurboModule path is driven by codegen + RNBackgroundGeolocationModule.
+ * 
  * Created by chris on 2015-10-30.
  */
 public class RNBackgroundGeolocation implements ReactPackage {
 
-    @Override public List<NativeModule> createNativeModules (ReactApplicationContext reactContext) {
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
         modules.add(new RNBackgroundGeolocationModule(reactContext));
         return modules;
     }
 
-    // Depreciated RN 0.47
-    //@Override
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
-    }
-    
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
         return Collections.emptyList();

package/android/src/main/java/com/transistorsoft/rnbackgroundgeolocation/RNBackgroundGeolocationModule.java

@@ -1,5 +1,7 @@
 package com.transistorsoft.rnbackgroundgeolocation;
 
+import com.transistorsoft.rnbackgroundgeolocation.NativeRNBackgroundGeolocationSpec;
+
 import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
@@ -78,7 +80,7 @@ import java.util.Map;
  */
 @ReactModule(name = "RNBackgroundGeolocation")
 public class RNBackgroundGeolocationModule
-        extends ReactContextBaseJavaModule
+        extends NativeRNBackgroundGeolocationSpec
         implements ActivityEventListener, LifecycleEventListener {
 
     private static final String TAG = "TSLocationManager";
@@ -467,7 +469,7 @@ public class RNBackgroundGeolocationModule
     }
 
     @ReactMethod
-    public void changePace(final Boolean moving, final Promise response) {
+    public void changePace(final boolean moving, final Promise response) {
         getAdapter().changePace(moving, new TSCallback() {
             @Override public void onSuccess() { response.resolve(moving); }
             @Override public void onFailure(String error) { response.reject(error); }
@@ -616,10 +618,12 @@ public class RNBackgroundGeolocationModule
         if (options.hasKey("desiredAccuracy")) { builder.setDesiredAccuracy(options.getInt("desiredAccuracy")); }
 
         getAdapter().watchPosition(builder.build());
-        response.resolve(true);
+        // TODO Implement watchId for android.
+        response.resolve(-1);
     }
     @ReactMethod
-    public void stopWatchPosition(final Promise response) {
+    public void stopWatchPosition(double watchId, final Promise response) {
+        // TODO Implement watchId for android.
         getAdapter().stopWatchPosition(new TSCallback() {
             @Override public void onSuccess() {
                 response.resolve(true);
@@ -634,7 +638,7 @@ public class RNBackgroundGeolocationModule
         response.resolve(getAdapter().getOdometer());
     }
     @ReactMethod
-    public void setOdometer(Double value, final Promise response) {
+    public void setOdometer(double value, final Promise response) {
         getAdapter().setOdometer(value, new TSLocationCallback() {
             @Override public void onLocation(LocationEvent event) {
                 response.resolve(mapToWritableMap(event.toMap()));
@@ -783,8 +787,8 @@ public class RNBackgroundGeolocationModule
 
     // TODO Rename #finish -> #stopBackgroundTask
     @ReactMethod
-    public void finish(int taskId, Promise response) {
-        getAdapter().stopBackgroundTask(taskId);
+    public void finish(double taskId, Promise response) {
+        getAdapter().stopBackgroundTask((int) taskId);
         response.resolve(taskId);
     }
 
@@ -793,7 +797,7 @@ public class RNBackgroundGeolocationModule
      * @param taskId*
      */
     @ReactMethod
-    public void finishHeadlessTask(int taskId, Promise response) {
+    public void finishHeadlessTask(double taskId, Promise response) {
         EventBus eventBus = EventBus.getDefault();
         if (!eventBus.hasSubscriberForEvent(HeadlessEvent.class)) {
             // This shouldn't happen.  In order for this method to even be called, it MUST have been executed from within the consumer's
@@ -803,7 +807,7 @@ public class RNBackgroundGeolocationModule
             response.reject(message);
             return;
         }
-        FinishHeadlessTaskEvent event = new FinishHeadlessTaskEvent(getReactApplicationContext(), taskId);
+        FinishHeadlessTaskEvent event = new FinishHeadlessTaskEvent(getReactApplicationContext(), (int) taskId);
         eventBus.post(event);
         response.resolve(true);
     }
@@ -885,7 +889,7 @@ public class RNBackgroundGeolocationModule
     }
 
     @ReactMethod
-    public void log(String level, String message, Promise response) throws JSONException {
+    public void log(String level, String message, Promise response) {
         TSLog.log(level, message);
         response.resolve(true); 
     }
@@ -946,13 +950,17 @@ public class RNBackgroundGeolocationModule
     }
 
     @ReactMethod
-    public void requestSettings(ReadableMap args, Promise response) throws JSONException {
-        String action = args.getString("action");
-        DeviceSettingsRequest request = getAdapter().requestSettings(action);
-        if (request != null) {
-            response.resolve(mapToWritableMap(request.toMap()));
-        } else {
-            response.reject("Failed to find " + action + " screen for device " + Build.MANUFACTURER + " " + Build.MODEL + "@" + Build.VERSION.RELEASE);
+    public void requestSettings(ReadableMap args, Promise response) {
+        try {
+            String action = args.getString("action");
+            DeviceSettingsRequest request = getAdapter().requestSettings(action);
+            if (request != null) {
+                response.resolve(mapToWritableMap(request.toMap()));
+            } else {
+                response.reject("Failed to find " + action + " screen for device " + Build.MANUFACTURER + " " + Build.MODEL + "@" + Build.VERSION.RELEASE);
+            }
+        } catch (Exception e) {
+            response.reject(e.getMessage(), e);
         }
     }
 
@@ -1002,7 +1010,7 @@ public class RNBackgroundGeolocationModule
     }
 
     @ReactMethod
-    public void removeListeners(Integer count) {
+    public void removeListeners(double count) {
         // Keep:  Required for RN built-in NativeEventEmitter calls.
     }
 

package/expo/plugin/build/androidPlugin.js

@@ -34,14 +34,6 @@ if (!MODULE_NAME) {
 }
 const { addMetaDataItemToMainApplication, removeMetaDataItemFromMainApplication, getMainApplicationOrThrow } = config_plugins_1.AndroidConfig.Manifest;
 const androidPlugin = (config, props = {}) => {
-    config = (0, config_plugins_1.withProjectBuildGradle)(config, ({ modResults, ...subConfig }) => {
-        if (modResults.language !== 'groovy') {
-            config_plugins_1.WarningAggregator.addWarningAndroid('withBackgroundGeolocation', `Cannot automatically configure project build.gradle if it's not groovy`);
-            return { modResults, ...subConfig };
-        }
-        modResults.contents = applyMavenUrl(modResults.contents);
-        return { modResults, ...subConfig };
-    });
     config = (0, config_plugins_1.withAppBuildGradle)(config, ({ modResults, ...subConfig }) => {
         if (modResults.language !== 'groovy') {
             config_plugins_1.WarningAggregator.addWarningAndroid('withBackgroundGeolocation', `Cannot automatically configure project build.gradle if it's not groovy`);
@@ -51,17 +43,19 @@ const androidPlugin = (config, props = {}) => {
         return { modResults, ...subConfig };
     });
     config = (0, config_plugins_1.withAndroidManifest)(config, async (config) => {
-        console.log("[react-native-background-geolocation] Adding license-keys to AndroidManifest:", props);
+        console.log("[react-native-background-geolocation] Adding license-key to AndroidManifest:", props);
         const mainApplication = getMainApplicationOrThrow(config.modResults);
         addMetaDataItemToMainApplication(mainApplication, META_LICENSE_KEY, props.license || "UNDEFINED");
         if (props.hmsLicense) {
-            addMetaDataItemToMainApplication(mainApplication, META_HMS_LICENSE_KEY, props.hmsLicense);
+            console.log("[react-native-background-geolocation] ℹ️ hmsLicense is no longer required. The new TSLocationManager v4 license format applies HMS functionality as an entitlement within the BackgroundGeolocation license key.  You can remove the 'hmsLicense' from your app.json.  Removing from AndroidManifest.");
+            removeMetaDataItemFromMainApplication(mainApplication, META_HMS_LICENSE_KEY);
         }
         else {
             removeMetaDataItemFromMainApplication(mainApplication, META_HMS_LICENSE_KEY);
         }
         if (props.polygonLicense) {
-            addMetaDataItemToMainApplication(mainApplication, META_POLYGON_LICENSE_KEY, props.polygonLicense);
+            console.log("[react-native-background-geolocation] ℹ️ polygonLicense is no longer required. The new TSLocationManager v4 license format applies Polygon functionality as an entitlement within the BackgroundGeolocation license key.  You can remove the 'polygonLicense' from your app.json.  Removing from AndroidManifest.");
+            removeMetaDataItemFromMainApplication(mainApplication, META_POLYGON_LICENSE_KEY);
         }
         else {
             removeMetaDataItemFromMainApplication(mainApplication, META_POLYGON_LICENSE_KEY);

package/expo/plugin/build/androidPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"androidPlugin.js","sourceRoot":"","sources":["../src/androidPlugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"androidPlugin.js","sourceRoot":"","sources":["../src/androidPlugin.ts"],"names":[],"mappings":";;;;;AAAA,yDAQ8B;AAE9B,gFAGuD;AASvD,gDAAwB;AACxB,4CAAoB;AAEpB,MAAM,aAAa,GAAG,qCAAqC,CAAC;AAC5D,MAAM,cAAc,GAAG,aAAa,GAAG,UAAU,CAAC;AAElD,MAAM,gBAAgB,GAAG,4CAA4C,CAAC;AACtE,MAAM,oBAAoB,GAAG,gDAAgD,CAAC;AAC9E,MAAM,wBAAwB,GAAG,oDAAoD,CAAC;AAEtF,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAiB,EAAE;IAC3D,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IACtD,IAAI,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC;QACzD,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,IAAI,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;QAC1D,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,MAAM,MAAM,GAAG,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACvC,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;QACnB,2DAA2D;QAC3D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC;AACvC,CAAC,CAAC;AACF,MAAM,WAAW,GAAG,qBAAqB,CAAC,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;AAC7D,IAAI,CAAC,WAAW,EAAE,CAAC;IACjB,OAAO,CAAC,KAAK,CAAC,2BAA2B,aAAa,SAAS,cAAc,mBAAmB,CAAC,CAAC;IAClG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,MAAM,EACJ,gCAAgC,EAChC,qCAAqC,EACrC,yBAAyB,EAC1B,GAAG,8BAAa,CAAC,QAAQ,CAAC;AAG3B,MAAM,aAAa,GAAwB,CAAC,MAAM,EAAE,KAAK,GAAC,EAAE,EAAE,EAAE;IAE9D,MAAM,GAAG,IAAA,mCAAkB,EAAC,MAAM,EAAE,CAAC,EAAE,UAAU,EAAE,GAAG,SAAS,EAAE,EAAE,EAAE;QACnE,IAAI,UAAU,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACrC,kCAAiB,CAAC,iBAAiB,CACjC,2BAA2B,EAC3B,wEAAwE,CACzE,CAAC;YACF,OAAO,EAAE,UAAU,EAAE,GAAG,SAAS,EAAE,CAAC;QACtC,CAAC;QAED,UAAU,CAAC,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAE1D,OAAO,EAAE,UAAU,EAAE,GAAG,SAAS,EAAE,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,IAAA,oCAAmB,EAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAEpD,OAAO,CAAC,GAAG,CAAC,8EAA8E,EAAE,KAAK,CAAC,CAAC;QAEnG,MAAM,eAAe,GAAG,yBAAyB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAErE,gCAAgC,CAC9B,eAAe,EACf,gBAAgB,EAChB,KAAK,CAAC,OAAO,IAAI,WAAW,CAC7B,CAAC;QACF,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,uSAAuS,CAAC,CAAC;YACrT,qCAAqC,CACnC,eAAe,EACf,oBAAoB,CACrB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,qCAAqC,CACnC,eAAe,EACf,oBAAoB,CACrB,CAAC;QACJ,CAAC;QACD,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,mTAAmT,CAAC,CAAC;YACjU,qCAAqC,CACnC,eAAe,EACf,wBAAwB,CACzB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,qCAAqC,CACnC,eAAe,EACf,wBAAwB,CACzB,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAEhB,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,WAAkB,EAAE,EAAE;IAC5C,sCAAsC;IACtC,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,MAAM,CAAC,IAAI,CAAC,8CAA8C,WAAW,IAAI,CAAC,CAAA;IAC1E,MAAM,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAA;IAE7E,WAAW,GAAG,IAAA,4BAAa,EAAC;QAC1B,GAAG,EAAE,GAAG,WAAW,UAAU;QAC7B,GAAG,EAAE,WAAW;QAChB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;QACzB,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,CAAC,CAAC;QACV,OAAO,EAAE,IAAI;KACd,CAAC,CAAC,QAAQ,CAAC;IAEZ,OAAO,WAAW,CAAC;AAErB,CAAC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BE;AAEF,MAAM,aAAa,GAAG,CAAC,WAAmB,EAAS,EAAE;IACnD,OAAO,IAAA,4BAAa,EAAC;QACnB,GAAG,EAAE,GAAG,WAAW,QAAQ;QAC3B,GAAG,EAAE,WAAW;QAChB,MAAM,EAAE,+BAA+B,WAAW,8EAA8E;QAChI,MAAM,EAAE,WAAW;QACnB,MAAM,EAAE,CAAC;QACT,OAAO,EAAE,IAAI;KACd,CAAC,CAAC,QAAQ,CAAC;AACd,CAAC,CAAA;AAED,kBAAe,aAAa,CAAC"}

package/ios/RNBackgroundGeolocation/RNBackgroundGeolocation.h

@@ -20,3 +20,9 @@
 
 @end
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <ReactCodegen/RNBackgroundGeolocation/RNBackgroundGeolocation.h>
+
+@interface RNBackgroundGeolocation () <NativeRNBackgroundGeolocationSpec>
+@end
+#endif

package/ios/RNBackgroundGeolocation/{RNBackgroundGeolocation.m → RNBackgroundGeolocation.mm}

@@ -6,6 +6,18 @@
 //  Copyright (c) 2015 Transistor Software. All rights reserved.
 //
 #import "RNBackgroundGeolocation.h"
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <ReactCodegen/RNBackgroundGeolocation/RNBackgroundGeolocation.h>
+
+#import <React/RCTBridge+Private.h>
+#import <React/RCTUtils.h>
+
+using namespace facebook;
+using namespace facebook::react;
+#endif
+
+
 #import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
@@ -140,8 +152,8 @@ RCT_EXPORT_METHOD(registerPlugin:(NSString*)pluginName)
 }
 
 RCT_EXPORT_METHOD(reset:(NSDictionary*)params
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 {
     TSConfig *config = [TSConfig sharedInstance];
     @try {
@@ -163,8 +175,8 @@ RCT_EXPORT_METHOD(reset:(NSDictionary*)params
  * configure plugin
  */
 RCT_EXPORT_METHOD(ready:(NSDictionary*)params
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 {
     BOOL resetFlag = (params[@"reset"]) ? [params[@"reset"] boolValue] : YES;
 
@@ -210,14 +222,14 @@ RCT_EXPORT_METHOD(ready:(NSDictionary*)params
 
 
 
-RCT_EXPORT_METHOD(removeAllListeners:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(removeAllListeners:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager removeListeners];
     resolve(@(YES));
 }
 
 
-RCT_EXPORT_METHOD(setConfig:(NSDictionary*)params resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(setConfig:(NSDictionary*)params resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     TSConfig *config = [TSConfig sharedInstance];
     [config updateWithDictionary:params];
@@ -229,7 +241,7 @@ RCT_EXPORT_METHOD(setConfig:(NSDictionary*)params resolver:(RCTPromiseResolveBlo
     return [locationManager getState];
 }
 
-RCT_EXPORT_METHOD(getState:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getState:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     NSDictionary *state = [locationManager getState];
     resolve(state);
@@ -238,7 +250,7 @@ RCT_EXPORT_METHOD(getState:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseR
 /**
  * Turn on background geolocation
  */
-RCT_EXPORT_METHOD(start:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(start:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         [self.locationManager start];
@@ -248,7 +260,7 @@ RCT_EXPORT_METHOD(start:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseReje
 /**
  * Turn it off
  */
-RCT_EXPORT_METHOD(stop:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(stop:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager stop];
     resolve([locationManager getState]);
@@ -257,7 +269,7 @@ RCT_EXPORT_METHOD(stop:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejec
 /**
  * Start schedule
  */
-RCT_EXPORT_METHOD(startSchedule:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(startSchedule:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         [self.locationManager startSchedule];
@@ -268,7 +280,7 @@ RCT_EXPORT_METHOD(startSchedule:(RCTPromiseResolveBlock)resolve rejecter:(RCTPro
 /**
  * Stop schedule
  */
-RCT_EXPORT_METHOD(stopSchedule:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(stopSchedule:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         [self.locationManager stopSchedule];
@@ -279,7 +291,7 @@ RCT_EXPORT_METHOD(stopSchedule:(RCTPromiseResolveBlock)resolve rejecter:(RCTProm
 /**
  * Start schedule
  */
-RCT_EXPORT_METHOD(startGeofences:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(startGeofences:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         TSConfig *config = [TSConfig sharedInstance];
@@ -292,26 +304,34 @@ RCT_EXPORT_METHOD(startGeofences:(RCTPromiseResolveBlock)resolve rejecter:(RCTPr
  * Change pace to moving/stopped
  * @param {Boolean} isMoving
  */
-RCT_EXPORT_METHOD(changePace:(BOOL)moving resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(changePace:(BOOL)moving resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager changePace:moving];
     resolve(@(YES));
 }
 
-RCT_EXPORT_METHOD(beginBackgroundTask:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(beginBackgroundTask:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     resolve(@([locationManager createBackgroundTask]));
 }
 /**
  * Called by js to signify the end of a background-geolocation event
  */
-RCT_EXPORT_METHOD(finish:(int)taskId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(finish:(NSInteger)taskId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager stopBackgroundTask:taskId];
     resolve(@(taskId));
 }
 
-RCT_EXPORT_METHOD(getCurrentPosition:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(finishHeadlessTask:(double)taskId
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+{
+    // iOS doesn't use RN Headless JS.
+    resolve(@(YES));
+}
+
+RCT_EXPORT_METHOD(getCurrentPosition:(NSDictionary*)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     TSCurrentPositionRequest *request = [TSCurrentPositionRequest requestWithSuccess:^(TSLocationEvent *event) {
         resolve([event toDictionary]);
@@ -340,7 +360,7 @@ RCT_EXPORT_METHOD(getCurrentPosition:(NSDictionary*)options resolver:(RCTPromise
     [locationManager getCurrentPosition:request];
 }
 
-RCT_EXPORT_METHOD(watchPosition:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(watchPosition:(NSDictionary*)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     TSWatchPositionRequest *request = [TSWatchPositionRequest requestWithSuccess:^(TSLocationStreamEvent *event) {
         [self sendEvent:EVENT_WATCHPOSITION body:[event toDictionary]];
@@ -354,17 +374,17 @@ RCT_EXPORT_METHOD(watchPosition:(NSDictionary*)options resolver:(RCTPromiseResol
     if (options[@"extras"])             { request.extras = options[@"extras"]; }
     if (options[@"timeout"])            { request.timeout = [options[@"timeout"] doubleValue]; }
 
-    long watchId = [locationManager watchPosition:request];
+    NSInteger watchId = [locationManager watchPosition:request];
     resolve(@(watchId));
 }
 
-RCT_EXPORT_METHOD(stopWatchPosition:(long)watchId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(stopWatchPosition:(NSInteger)watchId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager stopWatchPosition:watchId];
     resolve(@(YES));
 }
 
-RCT_EXPORT_METHOD(getLocations:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getLocations:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager getLocations:^(NSArray* records) {
         resolve(records);
@@ -373,7 +393,7 @@ RCT_EXPORT_METHOD(getLocations:(RCTPromiseResolveBlock)resolve rejecter:(RCTProm
     }];
 }
 
-RCT_EXPORT_METHOD(sync:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(sync:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager sync:^(NSArray* records) {
         resolve(records);
@@ -382,7 +402,7 @@ RCT_EXPORT_METHOD(sync:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejec
     }];
 }
 
-RCT_EXPORT_METHOD(getGeofences:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getGeofences:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager getGeofences:^(NSArray* geofences) {
         NSMutableArray *result = [NSMutableArray new];
@@ -393,7 +413,7 @@ RCT_EXPORT_METHOD(getGeofences:(RCTPromiseResolveBlock)resolve rejecter:(RCTProm
     }];
 }
 
-RCT_EXPORT_METHOD(getGeofence:(NSString*)identifier resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getGeofence:(NSString*)identifier resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager getGeofence:identifier success:^(TSGeofence* geofence) {
         resolve([geofence toDictionary]);
@@ -402,14 +422,14 @@ RCT_EXPORT_METHOD(getGeofence:(NSString*)identifier resolver:(RCTPromiseResolveB
     }];
 }
 
-RCT_EXPORT_METHOD(geofenceExists:(NSString*)identifier resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(geofenceExists:(NSString*)identifier resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager geofenceExists:identifier callback:^(BOOL exists) {
         resolve(@(exists));
     }];
 }
 
-RCT_EXPORT_METHOD(addGeofence:(NSDictionary*)params resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(addGeofence:(NSDictionary*)params resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     TSGeofence *geofence = [self buildGeofence:params];
     if (!geofence) {
@@ -424,7 +444,7 @@ RCT_EXPORT_METHOD(addGeofence:(NSDictionary*)params resolver:(RCTPromiseResolveB
     }];
 }
 
-RCT_EXPORT_METHOD(addGeofences:(NSArray*) data resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(addGeofences:(NSArray*) data resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     NSMutableArray *geofences = [NSMutableArray new];
     for (NSDictionary *params in data) {
@@ -462,7 +482,7 @@ RCT_EXPORT_METHOD(addGeofences:(NSArray*) data resolver:(RCTPromiseResolveBlock)
                                          vertices: params[@"vertices"]];
 }
 
-RCT_EXPORT_METHOD(removeGeofence:(NSString*)identifier resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(removeGeofence:(NSString*)identifier resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager removeGeofence:identifier success:^{
         resolve(@(YES));
@@ -471,7 +491,7 @@ RCT_EXPORT_METHOD(removeGeofence:(NSString*)identifier resolver:(RCTPromiseResol
     }];
 }
 
-RCT_EXPORT_METHOD(removeGeofences:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(removeGeofences:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     NSArray *geofences = @[];
     [locationManager removeGeofences:geofences success:^{
@@ -481,13 +501,13 @@ RCT_EXPORT_METHOD(removeGeofences:(RCTPromiseResolveBlock)resolve rejecter:(RCTP
     }];
 }
 
-RCT_EXPORT_METHOD(getOdometer:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getOdometer:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     NSNumber *distance = @([locationManager getOdometer]);
     resolve(distance);
 }
 
-RCT_EXPORT_METHOD(setOdometer:(double)value resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(setOdometer:(double)value resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     TSCurrentPositionRequest *request = [TSCurrentPositionRequest requestWithSuccess:^(TSLocationEvent *event) {
         resolve([event toDictionary]);
@@ -497,7 +517,7 @@ RCT_EXPORT_METHOD(setOdometer:(double)value resolver:(RCTPromiseResolveBlock)res
     [locationManager setOdometer:value request:request];
 }
 
-RCT_EXPORT_METHOD(destroyLocations:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(destroyLocations:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     BOOL result = [locationManager destroyLocations];
     if (result) {
@@ -507,7 +527,7 @@ RCT_EXPORT_METHOD(destroyLocations:(RCTPromiseResolveBlock)resolve rejecter:(RCT
     }
 }
 
-RCT_EXPORT_METHOD(destroyLocation:(NSString*)uuid resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(destroyLocation:(NSString*)uuid resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager destroyLocation:uuid success:^{
         resolve(@(YES));
@@ -516,7 +536,7 @@ RCT_EXPORT_METHOD(destroyLocation:(NSString*)uuid resolver:(RCTPromiseResolveBlo
     }];
 }
 
-RCT_EXPORT_METHOD(getCount:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getCount:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     int count = [locationManager getCount];
     if (count >= 0) {
@@ -526,7 +546,7 @@ RCT_EXPORT_METHOD(getCount:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseR
     }
 }
 
-RCT_EXPORT_METHOD(insertLocation:(NSDictionary*)params resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(insertLocation:(NSDictionary*)params resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager insertLocation: params success:^(NSString* uuid) {
         resolve(uuid);
@@ -535,7 +555,7 @@ RCT_EXPORT_METHOD(insertLocation:(NSDictionary*)params resolver:(RCTPromiseResol
     }];
 }
 
-RCT_EXPORT_METHOD(getLog:(NSDictionary*)params resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getLog:(NSDictionary*)params resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     LogQuery *query = [[LogQuery alloc] initWithDictionary:params];
     [locationManager getLog:query success:^(NSString* log) {
@@ -545,7 +565,7 @@ RCT_EXPORT_METHOD(getLog:(NSDictionary*)params resolver:(RCTPromiseResolveBlock)
     }];
 }
 
-RCT_EXPORT_METHOD(destroyLog:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(destroyLog:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     BOOL result = [locationManager destroyLog];
     if (result) {
@@ -555,7 +575,7 @@ RCT_EXPORT_METHOD(destroyLog:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromis
     }
 }
 
-RCT_EXPORT_METHOD(emailLog:(NSString*)email query:(NSDictionary*)params resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(emailLog:(NSString*)email query:(NSDictionary*)params resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     LogQuery *query = [[LogQuery alloc] initWithDictionary:params];
     [locationManager emailLog:email query:query success:^{
@@ -565,7 +585,7 @@ RCT_EXPORT_METHOD(emailLog:(NSString*)email query:(NSDictionary*)params resolver
     }];
 }
 
-RCT_EXPORT_METHOD(uploadLog:(NSString*)url query:(NSDictionary*)params resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(uploadLog:(NSString*)url query:(NSDictionary*)params resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
 
     
@@ -578,12 +598,16 @@ RCT_EXPORT_METHOD(uploadLog:(NSString*)url query:(NSDictionary*)params resolver:
 }
 
 
-RCT_EXPORT_METHOD(log:(NSString*)level message:(NSString*)message)
+RCT_EXPORT_METHOD(log:(NSString*)level
+                  message:(NSString*)message
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager log:level message:message];
+    resolve(@(YES));
 }
 
-RCT_EXPORT_METHOD(getSensors:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getSensors:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     NSDictionary *sensors = @{
         @"platform": @"ios",
@@ -595,40 +619,40 @@ RCT_EXPORT_METHOD(getSensors:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromis
     resolve(sensors);
 }
 
-RCT_EXPORT_METHOD(getDeviceInfo:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getDeviceInfo:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     TSDeviceInfo *deviceInfo = [TSDeviceInfo sharedInstance];
     resolve([deviceInfo toDictionary:@"react-native"]);
 }
 
-RCT_EXPORT_METHOD(isPowerSaveMode:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(isPowerSaveMode:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     BOOL isPowerSaveMode = [locationManager isPowerSaveMode];
     resolve(@(isPowerSaveMode));
 }
 
-RCT_EXPORT_METHOD(isIgnoringBatteryOptimizations:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(isIgnoringBatteryOptimizations:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     resolve(@(NO));
 }
 
-RCT_EXPORT_METHOD(requestSettings:(NSDictionary*)args resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(requestSettings:(NSDictionary*)args resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     reject(@"request_settings_error", @"No iOS Implementation", nil);
 }
 
-RCT_EXPORT_METHOD(showSettings:(NSDictionary*)args resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(showSettings:(NSDictionary*)args resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     reject(@"show_settings_error", @"No iOS Implementation", nil);
 }
 
-RCT_EXPORT_METHOD(getProviderState:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getProviderState:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     TSProviderChangeEvent *event = [locationManager getProviderState];
     resolve([event toDictionary]);
 }
 
-RCT_EXPORT_METHOD(requestPermission:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(requestPermission:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager requestPermission:^(NSNumber *status) {
         resolve(status);
@@ -637,7 +661,7 @@ RCT_EXPORT_METHOD(requestPermission:(RCTPromiseResolveBlock)resolve rejecter:(RC
     }];
 }
 
-RCT_EXPORT_METHOD(requestTemporaryFullAccuracy:(NSString*)purpose resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(requestTemporaryFullAccuracy:(NSString*)purpose resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [locationManager requestTemporaryFullAccuracy:purpose success:^(NSInteger accuracyAuthorization) {
         resolve(@(accuracyAuthorization));
@@ -646,7 +670,11 @@ RCT_EXPORT_METHOD(requestTemporaryFullAccuracy:(NSString*)purpose resolver:(RCTP
     }];
 }
 
-RCT_EXPORT_METHOD(getTransistorToken:(NSString*)orgname username:(NSString*)username url:(NSString*)url resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getTransistorToken:(NSString*)orgname
+                            username:(NSString*)username
+                                 url:(NSString*)url
+                             resolve:(RCTPromiseResolveBlock)resolve
+                              reject:(RCTPromiseRejectBlock)reject)
 {
     [TransistorAuthorizationToken findOrCreateWithOrg:orgname
                                              username:username
@@ -659,15 +687,18 @@ RCT_EXPORT_METHOD(getTransistorToken:(NSString*)orgname username:(NSString*)user
     }];
 }
 
-RCT_EXPORT_METHOD(destroyTransistorToken:(NSString*)url resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(destroyTransistorToken:(NSString*)url
+                                 resolve:(RCTPromiseResolveBlock)resolve
+                                  reject:(RCTPromiseRejectBlock)reject)
 {
     [TransistorAuthorizationToken destroyWithUrl:url];
     resolve(@(YES));
 }
 
-RCT_EXPORT_METHOD(playSound:(int)soundId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(playSound:(NSString*)soundId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
-    [locationManager playSound: soundId];
+    NSInteger soundIdInt = [soundId integerValue];
+    [locationManager playSound: soundIdInt];
     resolve(@(YES));
 }
 
@@ -691,6 +722,12 @@ RCT_EXPORT_METHOD(playSound:(int)soundId resolver:(RCTPromiseResolveBlock)resolv
     locationManager = nil;
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (std::shared_ptr<TurboModule>)getTurboModule:(const ObjCTurboModule::InitParams &)params
+{
+  return std::make_shared<NativeRNBackgroundGeolocationSpecJSI>(params);
+}
+#endif
 
 @end
 

package/package.json

@@ -1,13 +1,24 @@
 {
   "name": "react-native-background-geolocation",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.3",
   "description": "The most sophisticated cross-platform background location-tracking & geofencing module with battery-conscious motion-detection intelligence",
+  "scripts": {
+    "build": "yarn run build:expo",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build:expo": "rimraf expo/plugin/build && tsc --build ./expo/plugin",
+    "docs": "node ./scripts/generate-docs.mjs",
+    "docs:publish": "./scripts/publish-docs.sh"
+  },
   "codegenConfig": {
     "name": "RNBackgroundGeolocation",
-    "type": "all",
-    "jsSrcsDir": "./src",
+    "type": "modules",
+    "jsSrcsDir": "./src/specs",
     "android": {
       "javaPackageName": "com.transistorsoft.rnbackgroundgeolocation"
+    },
+    "ios": {
+      "swiftModuleName": "RNBackgroundGeolocation",
+      "packageName": "RNBackgroundGeolocation"
     }
   },
   "main": "src/index.js",
@@ -28,7 +39,7 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.26.0",
-    "@transistorsoft/background-geolocation-types": "^5.0.0",
+    "@transistorsoft/background-geolocation-types": "^5.0.1",
     "tslib": "^2.6.3"
   },
   "author": "Chris Scott <chris@transistorsoft.com>",
@@ -46,12 +57,5 @@
     "rimraf": "^5.0.0",
     "typedoc": "^0.28.14",
     "typescript": "^5.6.0"
-  },
-  "scripts": {
-    "build": "yarn run build:expo",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build:expo": "rimraf expo/plugin/build && tsc --build ./expo/plugin",
-    "docs": "node ./scripts/generate-docs.mjs",
-    "docs:publish": "./scripts/publish-docs.sh"
   }
-}
+}

package/src/Logger.js

@@ -1,8 +1,9 @@
+// Logger.js
 'use strict';
 
-import { NativeModules } from "react-native"
+import NativeModule from "./NativeModule";
 
-const { RNBackgroundGeolocation } = NativeModules;
+const RNBackgroundGeolocation = NativeModule; // uses the same getNativeBGGeo() under the hood
 
 const LOG_LEVEL_DEBUG = "debug";
 const LOG_LEVEL_NOTICE = "notice";
@@ -14,12 +15,16 @@ const ORDER_ASC = 1;
 const ORDER_DESC = -1;
 
 function log(level, msg) {
+  // You can either:
+  // 1) call the native logger via NativeModule.logger
+  //    NativeModule.logger[level](msg);
+  // or
+  // 2) just use the native `log` directly if exposed:
   RNBackgroundGeolocation.log(level, msg);
 }
 
 function validateQuery(query) {
   if (typeof(query) !== 'object') return {};
-
   if (query.hasOwnProperty('start') && isNaN(query.start)) {
     throw new Error('Invalid SQLQuery.start.  Expected unix timestamp but received: ' + query.start);
   }
@@ -33,31 +38,17 @@ export default class Logger {
   static get ORDER_ASC() { return ORDER_ASC; }
   static get ORDER_DESC() { return ORDER_DESC; }
 
-  static debug(msg) {
-    log(LOG_LEVEL_DEBUG, msg);
-  }
-
-  static error(msg) {
-    log(LOG_LEVEL_ERROR, msg);
-  }
-
-  static warn(msg) {
-    log(LOG_LEVEL_WARN, msg);
-  }
-
-  static info(msg) {
-    log(LOG_LEVEL_INFO, msg);
-  }
-
-  static notice(msg) {
-    log(LOG_LEVEL_NOTICE, msg);
-  }
+  static debug(msg)  { log(LOG_LEVEL_DEBUG, msg);  }
+  static error(msg)  { log(LOG_LEVEL_ERROR, msg);  }
+  static warn(msg)   { log(LOG_LEVEL_WARN, msg);   }
+  static info(msg)   { log(LOG_LEVEL_INFO, msg);   }
+  static notice(msg) { log(LOG_LEVEL_NOTICE, msg); }
 
   static getLog(query) {
-    return RNBackgroundGeolocation.getLog(validateQuery(query));    
+    return RNBackgroundGeolocation.getLog(validateQuery(query));
   }
 
-  static emailLog(email, query) {
+  static emailLog(email, query) {    
     return RNBackgroundGeolocation.emailLog(email, validateQuery(query));
   }
 
@@ -66,6 +57,6 @@ export default class Logger {
   }
 
   static destroyLog() {
-    return RNBackgroundGeolocation.destroyLog();      
+    return RNBackgroundGeolocation.destroyLog();
   }
 }

package/src/NativeModule.js

@@ -1,18 +1,45 @@
 'use strict';
 
-// foo
 import {
   NativeEventEmitter,
   NativeModules,
-  DeviceEventEmitter,
+  TurboModuleRegistry,
   Platform,
   AppRegistry,
-} from "react-native"
+} from "react-native";
 
-const { RNBackgroundGeolocation } = NativeModules;
+function getNativeBGGeo() {
+  // Prefer TurboModule when the new architecture is enabled.
+  
+  if (TurboModuleRegistry && typeof TurboModuleRegistry.get === 'function') {
+    try {
+      const turbo = TurboModuleRegistry.get('RNBackgroundGeolocation');
+      if (turbo) {        
+        return turbo;
+      }
+    } catch (e) {
+      // If Turbo lookup fails for any reason, fall through to classic bridge.
+    }
+  }
+
+  // Fallback to classic bridge (old architecture).
+  const legacy = NativeModules && NativeModules.RNBackgroundGeolocation;
+  if (legacy) {    
+    return legacy;
+  }
+
+  // If we reach here, the native module is not installed or not linked.
+  throw new Error(
+    '[react-native-background-geolocation] Native module "RNBackgroundGeolocation" not found. ' +
+      'Make sure the library is properly installed and linked for your platform.'
+  );
+}
+
+const RNBackgroundGeolocation = getNativeBGGeo();
 
 const EventEmitter = new NativeEventEmitter(RNBackgroundGeolocation);
 
+
 import TransistorAuthorizationService from "./TransistorAuthorizationService";
 
 const TAG               = "TSLocationManager";
@@ -260,21 +287,37 @@ export default class NativeModule {
     return RNBackgroundGeolocation.getCurrentPosition(options);    
   }
 
-  static watchPosition(options, success, failure) {
-    let callback = ()  => {
-      EventEmitter.addListener("watchposition", success);
-    };
-    RNBackgroundGeolocation.watchPosition(options).then(() => {
-      callback();
-    }).failure((error) => {
-      if (typeof(failure) === 'function') {
-        failure(error);
+  static async watchPosition(options, success, failure) {
+
+    if (typeof success !== 'function') {
+      throw `${TAG}#watchPosition requires a success callback`;
+    }
+    return new Promise(async (resolve, reject) => {
+      options = options || {};
+      failure = failure || (() => {});
+      // Register listener immediately.
+      const subscription = EventEmitter.addListener('watchposition', success);
+      let watchId;
+      try {
+        watchId = await RNBackgroundGeolocation.watchPosition(options);
+        console.log("********** watchPositonId: ", watchId)
+        // Resolve with our wrapped Subscription instance.
+        resolve({
+          id: watchId,
+          remove: () => {
+            subscription.remove();
+            RNBackgroundGeolocation.stopWatchPosition(watchId);
+          }
+        });
+      } catch (error) {
+        subscription.remove();
+        reject(error);
       }
-    });
+    });    
   }
 
-  static stopWatchPosition() {
-    return RNBackgroundGeolocation.stopWatchPosition();    
+  static stopWatchPosition(watchId) {
+    return RNBackgroundGeolocation.stopWatchPosition(watchId);
   }
 
   static getOdometer() {
@@ -360,8 +403,8 @@ export default class NativeModule {
     return RNBackgroundGeolocation.destroyLog();    
   }
 
-  static emailLog(email) {
-    return RNBackgroundGeolocation.emailLog(email);  
+  static emailLog(email, query) {
+    return RNBackgroundGeolocation.emailLog(email, query);  
   }
 
   static isPowerSaveMode() {

package/src/index.js

@@ -563,21 +563,20 @@ export default class BackgroundGeolocation {
   /**
   * Begin watching a stream of locations
   */
-  static watchPosition(success, failure, options) {
-    if (typeof(success) === 'undefined') {
-      throw TAG + '#watchPosition cannot use Promises since a Promise can only evaluate once while the supplied callback must be executed for each location';
+  static watchPosition(options, success, failure) {
+    if (typeof success !== 'function') {
+      throw TAG + '#watchPosition requires a success callback';
     }
-    failure = failure || emptyFn;
     options = options || {};
-
-    NativeModule.watchPosition(options, success, failure);
+    failure = failure || emptyFn;
+    return NativeModule.watchPosition(options, success, failure);
   }
 
   /**
   * Stop watching location
   */
-  static stopWatchPosition() {  
-    return NativeModule.stopWatchPosition();
+  static stopWatchPosition(watchId) {
+    return NativeModule.stopWatchPosition(watchId);
   }
 
   /**
@@ -604,8 +603,9 @@ export default class BackgroundGeolocation {
   /**
   * Open deafult email client on device to email the contents of log database attached as a compressed file attachement
   */
-  static emailLog(email) {
-    return Logger.emailLog(email);    
+  static emailLog(email, query) {
+    query = query || {};
+    return Logger.emailLog(email, query);
   }
 
   /**

package/src/specs/NativeRNBackgroundGeolocation.js

@@ -0,0 +1,104 @@
+// @flow
+// @ts-nocheck
+import type {TurboModule} from 'react-native';
+import {TurboModuleRegistry} from 'react-native';
+import type {Int32, Double} from 'react-native/Libraries/Types/CodegenTypes';
+
+/**
+ * TurboModule spec for RNBackgroundGeolocation.
+ * This matches the Promise-based @ReactMethod signatures in
+ * RNBackgroundGeolocationModule.java.
+ */
+export interface Spec extends TurboModule {
+  // Core / config
+  +registerPlugin: (name: string) => void;
+
+  +ready: (params: Object) => Promise<Object>;
+  +configure: (params: Object) => Promise<Object>;
+  +setConfig: (params: Object) => Promise<Object>;
+  +reset: (defaultConfig: Object) => Promise<Object>;
+
+  +start: () => Promise<Object>;
+  +startSchedule: () => Promise<Object>;
+  +stopSchedule: () => Promise<Object>;
+  +startGeofences: () => Promise<Object>;
+  +stop: () => Promise<Object>;
+
+  +changePace: (moving: boolean) => Promise<boolean>;
+  +getState: () => Promise<Object>;
+
+  // Locations / persistence
+  +getLocations: () => Promise<Array<Object>>;
+  +getCount: () => Promise<Int32>;
+  +insertLocation: (params: Object) => Promise<string>;
+
+  // Deprecated alias -> destroyLocations
+  +clearDatabase: () => Promise<boolean>;
+
+  +destroyLocations: () => Promise<boolean>;
+  +destroyLocation: (uuid: string) => Promise<boolean>;
+
+  +destroyLog: () => Promise<boolean>;
+  +sync: () => Promise<Array<Object>>;
+
+  // Geolocation
+  +getCurrentPosition: (options: Object) => Promise<Object>;
+  +watchPosition: (options: Object) => Promise<Int32>;
+  +stopWatchPosition: (watchId: Int32) => Promise<boolean>;
+
+  +getOdometer: () => Promise<Double>;
+  +setOdometer: (value: Double) => Promise<Object>;
+
+  // Geofences
+  +addGeofence: (config: Object) => Promise<boolean>;
+  +addGeofences: (geofences: Array<Object>) => Promise<boolean>;
+  +removeGeofence: (identifier: string) => Promise<boolean>;
+  +removeGeofences: () => Promise<boolean>;
+  +getGeofences: () => Promise<Array<Object>>;
+  +getGeofence: (identifier: string) => Promise<Object>;
+  +geofenceExists: (identifier: string) => Promise<boolean>;
+
+  // Background tasks
+  +beginBackgroundTask: () => Promise<Int32>;
+  +finish: (taskId: Int32) => Promise<Int32>;
+  +finishHeadlessTask: (taskId: Int32) => Promise<boolean>;
+
+  // Transistor auth token
+  +getTransistorToken: (
+    orgname: string,
+    username: string,
+    url: string,
+  ) => Promise<Object>;
+
+  +destroyTransistorToken: (url: string) => Promise<boolean>;
+
+  // Logging
+
+  +playSound: (soundId: string) => Promise<boolean>;
+  +getLog: (query: Object) => Promise<string>;
+  +emailLog: (email: string, query: Object) => Promise<boolean>;
+  +uploadLog: (url: string, query: Object) => Promise<boolean>;
+  +log: (level: string, message: string) => Promise<boolean>;
+
+  // Device / sensors / settings
+  +getSensors: () => Promise<Object>;
+  +getDeviceInfo: () => Promise<Object>;
+  +isPowerSaveMode: () => Promise<boolean>;
+  +isIgnoringBatteryOptimizations: () => Promise<boolean>;
+
+  +requestSettings: (args: Object) => Promise<Object>;
+  +showSettings: (args: Object) => Promise<boolean>;
+
+  +getProviderState: () => Promise<Object>;
+  +requestPermission: () => Promise<Int32>;
+  +requestTemporaryFullAccuracy: (purpose: string) => Promise<Int32>;
+
+  // Required by NativeEventEmitter
+  +addListener: (eventName: string) => void;
+  +removeListeners: (count: Int32) => void;
+}
+
+// Default export used by RN at runtime (for Turbo path).
+export default (TurboModuleRegistry.getEnforcing<Spec>(
+  'RNBackgroundGeolocation',
+): Spec);