react-native-background-geolocation 5.0.1 → 5.0.3

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}

package/RNBackgroundGeolocation.podspec

@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.preserve_paths      = 'docs', 'CHANGELOG.md', 'LICENSE', 'package.json', 'RNBackgroundGeolocation.ios.js'
 
   s.dependency 'CocoaLumberjack', '~> 3.8.5'
-  s.dependency 'TSLocationManager', '~> 4.0.0'
+  s.dependency 'TSLocationManager', '~> 4.0.10'
 
   s.libraries           = 'sqlite3', 'z', 'stdc++'
   s.resource_bundles    = {

package/android/build.gradle

@@ -4,8 +4,8 @@ plugins {
 }
 
 // Android dependencies
-def DEFAULT_COMPILE_SDK_VERSION                     = 36
-def DEFAULT_TARGET_SDK_VERSION                      = 36
+def DEFAULT_COMPILE_SDK_VERSION                     = 35
+def DEFAULT_TARGET_SDK_VERSION                      = 35
 
 // Plugin dependencies
 def DEFAULT_PLAY_SERVICES_LOCATION_VERSION          = "21.3.0"

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

@@ -326,18 +326,13 @@ public class RNBackgroundGeolocationModule
 
     @Override
     public void onHostPause() {
-        Context context = getReactApplicationContext();
-        TSConfig config = TSConfig.getInstance(context);
-        if (config.getEnabled()) {
-            TSScheduleManager.getInstance(context).oneShot(TerminateEvent.ACTION, 10000);
-        }
+        
     }
     @Override
     public void onHostDestroy() {
         mInitialized = false;
         mReady = false;
         removeAllListeners();
-        getAdapter().onActivityDestroy();
     }
 
     @Override
@@ -1017,8 +1012,7 @@ public class RNBackgroundGeolocationModule
     private void removeAllListeners() {
         synchronized (mListeners) {
             mListeners.clear();
-        }
-        getAdapter().removeListeners();
+        }        
     }
 
     private void onLocationError(Integer code) {
@@ -1274,11 +1268,5 @@ public class RNBackgroundGeolocationModule
 
     private BackgroundGeolocation getAdapter() {
         return BackgroundGeolocation.getInstance(getReactApplicationContext());
-    }
-
-    @Override
-    public void onCatalystInstanceDestroy() {
-        mInitialized = false;
-        removeAllListeners();
-    }
+    }    
 }

package/ios/RNBackgroundGeolocation/RNBackgroundGeolocation.mm

@@ -363,7 +363,7 @@ RCT_EXPORT_METHOD(getCurrentPosition:(NSDictionary*)options resolve:(RCTPromiseR
 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]];
+        [self sendEvent:EVENT_WATCHPOSITION body:[event.locationEvent toDictionary]];
     } failure:^(NSError *error) {
         // No reject; stream API
     }];

package/package.json

@@ -1,7 +1,7 @@
 {
 
   "name": "react-native-background-geolocation",  
-  "version": "5.0.1",
+  "version": "5.0.3",
   "description": "The most sophisticated cross-platform background location-tracking & geofencing module with battery-conscious motion-detection intelligence",
   "scripts": {
     "build": "yarn run build:expo",

package/src/Logger.js

@@ -13,19 +13,7 @@ const ORDER_ASC = 1;
 const ORDER_DESC = -1;
 
 function log(level, msg) {
-  // Call the native logger via NativeModule.logger[level](msg),
-  // fallback to debug if missing.
-  if (
-    NativeModule.logger &&
-    typeof NativeModule.logger[level] === 'function'
-  ) {
-    NativeModule.logger[level](msg);
-  } else if (
-    NativeModule.logger &&
-    typeof NativeModule.logger.debug === 'function'
-  ) {
-    NativeModule.logger.debug(msg);
-  }
+  return NativeModule.log(level, msg);
 }
 
 function validateQuery(query) {
@@ -43,11 +31,11 @@ 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)  { return log(LOG_LEVEL_DEBUG, msg);  }
+  static error(msg)  { return log(LOG_LEVEL_ERROR, msg);  }
+  static warn(msg)   { return log(LOG_LEVEL_WARN, msg);   }
+  static info(msg)   { return log(LOG_LEVEL_INFO, msg);   }
+  static notice(msg) { return log(LOG_LEVEL_NOTICE, msg); }
 
   static getLog(query) {
     return NativeModule.getLog(validateQuery(query));

package/src/NativeModule.js

@@ -51,31 +51,31 @@ const PLATFORM_IOS      = "ios";
 */
 const LOGGER = {
   error: function(msg) {
-    RNBackgroundGeolocation.log('error', msg);
+    return RNBackgroundGeolocation.log('error', msg);
   },
   warn: function(msg) {
-    RNBackgroundGeolocation.log('warn', msg);
+    return RNBackgroundGeolocation.log('warn', msg);
   },
   debug: function(msg) {
-    RNBackgroundGeolocation.log('debug', msg);
+    return RNBackgroundGeolocation.log('debug', msg);
   },
   info: function(msg) {
-    RNBackgroundGeolocation.log('info', msg);
+    return RNBackgroundGeolocation.log('info', msg);
   },
   notice: function(msg) {
-    RNBackgroundGeolocation.log('notice', msg);
+    return RNBackgroundGeolocation.log('notice', msg);
   },
   header: function(msg) {
-    RNBackgroundGeolocation.log('header', msg);
+    return RNBackgroundGeolocation.log('header', msg);
   },
   on: function(msg) {
-    RNBackgroundGeolocation.log('on', msg);
+    return RNBackgroundGeolocation.log('on', msg);
   },
   off: function(msg) {
-    RNBackgroundGeolocation.log('off', msg);
+    return RNBackgroundGeolocation.log('off', msg);
   },
   ok: function(msg) {
-    RNBackgroundGeolocation.log('ok', msg);
+    return RNBackgroundGeolocation.log('ok', msg);
   }
 }
 
@@ -300,7 +300,6 @@ export default class NativeModule {
       let watchId;
       try {
         watchId = await RNBackgroundGeolocation.watchPosition(options);
-        console.log("********** watchPositonId: ", watchId)
         // Resolve with our wrapped Subscription instance.
         resolve({
           id: watchId,
@@ -391,6 +390,10 @@ export default class NativeModule {
   * Logging & Debug Methods
   */
 
+  static log(level, message) {
+    return RNBackgroundGeolocation.log(level, message);
+  }
+
   static setLogLevel(value) {
     return RNBackgroundGeolocation.setLogLevel(value);
   }

package/src/native/specs/NativeBackgroundGeolocation.ts

@@ -43,11 +43,11 @@ export interface Spec extends TurboModule {
   destroyTransistorToken(url: string): Promise<void>;
 
   // Logging
-  log(level: string, message: string): Promise<void>;
+  log(level: string, message: string): Promise<boolean>;
   getLog(query: Object): Promise<string>;
-  emailLog(email: string, query: Object): Promise<void>;
-  uploadLog(url: string, query: Object): Promise<void>;
-  destroyLog(): Promise<void>;
+  emailLog(email: string, query: Object): Promise<boolean>;
+  uploadLog(url: string, query: Object): Promise<boolean>;
+  destroyLog(): Promise<boolean>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('RNBackgroundGeolocation');

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

@@ -1,13 +0,0 @@
-arguments=--init-script /var/folders/qk/r2r49k7527b6r81484vtk0g40000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/qk/r2r49k7527b6r81484vtk0g40000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
-auto.sync=false
-build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.9))
-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
-jvm.arguments=
-offline.mode=false
-override.workspace.settings=true
-show.console.view=true
-show.executions.view=true