react-native-background-geolocation 5.0.0 → 5.0.2

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/HeadlessTask.java

@@ -39,7 +39,7 @@ public class HeadlessTask {
         TSConfig config = TSConfig.getInstance(event.getContext());
 
         String name = event.getName();
-        TSLog.logger.debug("\uD83D\uDC80  event: " + name);
+        TSLog.d("\uD83D\uDC80  event: " + name);
 
         WritableMap clientEvent = new WritableNativeMap();
         Map<String, ?> params = null;
@@ -83,7 +83,7 @@ public class HeadlessTask {
         } else if (name.equals(EventName.AUTHORIZATION)) {
             params = event.getAuthorizationEvent().toMap();
         } else {
-            TSLog.logger.warn(TSLog.warn("Unknown Headless Event: " + name));
+            TSLog.w(TSLog.warn("Unknown Headless Event: " + name));
             clientEvent.putString("error", "Unknown event: " + name);
             clientEvent.putNull("params");
         }
@@ -98,18 +98,18 @@ public class HeadlessTask {
                     .setParams(clientEvent)
                     .setTimeout(TASK_TIMEOUT)
                     .setOnInvokeCallback((reactContext, task) -> {
-                        //TSLog.logger.debug("*** onInvoke: " + task.getId());
+                        //TSLog.d("*** onInvoke: " + task.getId());
                     })
                     .setOnFinishCallback(taskId -> {
-                        //TSLog.logger.debug("*** onFinish: " + taskId);
+                        //TSLog.d("*** onFinish: " + taskId);
                     })
                     .setOnErrorCallback((task, e) -> {
-                        TSLog.logger.warn("⚠\uFE0F  HeadlessTaskError: " + e.getMessage() + ": " + task.toString());
+                        TSLog.w("⚠\uFE0F  HeadlessTaskError: " + e.getMessage() + ": " + task.toString());
                     })
                     .build()
             );
         } catch (Exception e) {
-            TSLog.logger.warn(TSLog.warn("Failed invoke HeadlessTask " + name + ".  Task ignored:  " + e.getMessage()));
+            TSLog.w("Failed invoke HeadlessTask " + name + ".  Task ignored:  " + e.getMessage());
             e.printStackTrace();
         }
     }
@@ -124,7 +124,7 @@ public class HeadlessTask {
         try {
             HeadlessTaskManager.getInstance().finishTask(event.getContext(), event.getTaskId());
         } catch (Exception e) {
-            TSLog.logger.warn(TSLog.warn(e.getMessage()));
+            TSLog.w(e.getMessage());
         }
     }
 }

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

@@ -161,7 +161,7 @@ public class HeadlessTaskManager implements HeadlessJsTaskEventListener {
         removeTask(task);
         task.onFinish();
 
-        TSLog.logger.debug("[onHeadlessJsTaskFinish] taskId: " + taskId);
+        TSLog.d("[onHeadlessJsTaskFinish] taskId: " + taskId);
     }
 
     private ReactNativeHost getReactNativeHost(Context context) {
@@ -189,7 +189,7 @@ public class HeadlessTaskManager implements HeadlessJsTaskEventListener {
                 Method getCurrentReactContext = reactHost.getClass().getMethod("getCurrentReactContext");
                 return (ReactContext) getCurrentReactContext.invoke(reactHost);
             } catch (Exception e) {
-                TSLog.logger.error(TSLog.error( "Reflection error getCurrentReactContext: " + e.getMessage()), e);
+                TSLog.e(TSLog.error( "Reflection error getCurrentReactContext: " + e.getMessage()), e);
             }
         }
         final ReactInstanceManager reactInstanceManager = getReactNativeHost(context).getReactInstanceManager();
@@ -206,7 +206,7 @@ public class HeadlessTaskManager implements HeadlessJsTaskEventListener {
             return;
         }
         if (mIsInitializingReactContext.compareAndSet(false, true)) {
-            TSLog.logger.debug( "[createReactContextAndScheduleTask] initialize ReactContext");
+            TSLog.d( "[createReactContextAndScheduleTask] initialize ReactContext");
             final Object reactHost = getReactHost(context);
             if (isBridglessArchitectureEnabled()) { // NEW arch
                 ReactInstanceEventListener callback = new ReactInstanceEventListener() {
@@ -218,7 +218,7 @@ public class HeadlessTaskManager implements HeadlessJsTaskEventListener {
                             Method removeReactInstanceEventListener = reactHost.getClass().getMethod("removeReactInstanceEventListener", ReactInstanceEventListener.class);
                             removeReactInstanceEventListener.invoke(reactHost, this);
                         } catch (Exception e) {
-                            TSLog.logger.error(TSLog.error("HeadlessTask reflection error removeReactInstanceEventListener: ") + e);
+                            TSLog.e(TSLog.error("HeadlessTask reflection error removeReactInstanceEventListener: ") + e);
                         }
                     }
                 };
@@ -228,7 +228,7 @@ public class HeadlessTaskManager implements HeadlessJsTaskEventListener {
                     Method startReactHost = reactHost.getClass().getMethod("start");
                     startReactHost.invoke(reactHost);
                 } catch (Exception e) {
-                    TSLog.logger.error(TSLog.error("HeadlessTask reflection error ReactHost start: " + e.getMessage()), e);
+                    TSLog.e(TSLog.error("HeadlessTask reflection error ReactHost start: " + e.getMessage()), e);
                 }
             } else { // OLD arch
                 final ReactInstanceManager reactInstanceManager = getReactNativeHost(context).getReactInstanceManager();
@@ -363,7 +363,7 @@ public class HeadlessTaskManager implements HeadlessJsTaskEventListener {
 
         boolean invoke(ReactContext reactContext) throws IllegalStateException {
             if (mReactTaskId > 0) {
-                TSLog.logger.warn(TSLog.warn("Task already invoked <IGNORED>: " + this));
+                TSLog.w(TSLog.warn("Task already invoked <IGNORED>: " + this));
                 return true;
             }
             HeadlessJsTaskContext headlessJsTaskContext = HeadlessJsTaskContext.getInstance(reactContext);

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.0",
+  "version": "5.0.2",
   "description": "The most sophisticated cross-platform background location-tracking & geofencing module with battery-conscious motion-detection intelligence",
   "scripts": {
     "build": "yarn run build:expo",