react-native-background-geolocation 4.17.6 → 4.18.1

package/android/build.gradle

@@ -14,7 +14,7 @@ def DEFAULT_TARGET_SDK_VERSION                      = 30
 def DEFAULT_APP_COMPAT_VERSION                      = "1.6.1"
 
 // Plugin dependencies
-def DEFAULT_PLAY_SERVICES_LOCATION_VERSION   	    = "20.0.0"
+def DEFAULT_PLAY_SERVICES_LOCATION_VERSION          = "20.0.0"
 def DEFAULT_HMS_LOCATION_VERSION                    = "6.9.0.300"
 def DEFAULT_OK_HTTP_VERSION                         = "3.12.13"
 def DEFAULT_ANDROID_PERMISSIONS_VERSION             = "2.1.6"
@@ -42,9 +42,14 @@ android {
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 16)
         targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
+        consumerProguardFiles 'proguard-rules.pro'
         versionCode 1
         versionName "1.0"
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 repositories{
@@ -98,4 +103,5 @@ dependencies {
     def workVersion = safeExtGet('workVersion', DEFAULT_WORK_VERSION)
     def concurrentFuturesVersion = safeExtGet('concurrentFuturesVersion', DEFAULT_CONCURRENT_FUTURES_VERSION)
     implementation "androidx.work:work-runtime:$workVersion"
-    implementation "androidx.concurrent:concurrent-futures:$concurrentFuturesVersion"}
+    implementation "androidx.concurrent:concurrent-futures:$concurrentFuturesVersion"
+}

package/android/libs/com/transistorsoft/tslocationmanager/3.6.4/tslocationmanager-3.6.4.aar.md5

@@ -0,0 +1 @@
+bd49466dd13ba67b82ab2752a1d71318

package/android/libs/com/transistorsoft/tslocationmanager/3.6.4/tslocationmanager-3.6.4.aar.sha1

@@ -0,0 +1 @@
+d8523b683cf9d70e53317362389b81bebe6f1d9f

package/android/libs/com/transistorsoft/tslocationmanager/3.6.4/tslocationmanager-3.6.4.aar.sha256

@@ -0,0 +1 @@
+328f8a4a248f6d9d5ae95fad7d996eca1470e7e0d56bad5cba04d0fabf8c6632

package/android/libs/com/transistorsoft/tslocationmanager/3.6.4/tslocationmanager-3.6.4.aar.sha512

@@ -0,0 +1 @@
+18b6dea8cdb386ac662f7bbeff3a0061fa4855ae63e717db14a6009ed3027090407cc6c0ed97b566a260b57e1f8facbcdeb8b4424c47a27c237d6985878d75dd

package/android/libs/com/transistorsoft/tslocationmanager/{3.6.3/tslocationmanager-3.6.3.pom → 3.6.4/tslocationmanager-3.6.4.pom}

@@ -4,6 +4,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.transistorsoft</groupId>
   <artifactId>tslocationmanager</artifactId>
-  <version>3.6.3</version>
+  <version>3.6.4</version>
   <packaging>aar</packaging>
 </project>

package/android/libs/com/transistorsoft/tslocationmanager/3.6.4/tslocationmanager-3.6.4.pom.md5

@@ -0,0 +1 @@
+9a0e698b655e8d6b1de240345eb0bb1e

package/android/libs/com/transistorsoft/tslocationmanager/3.6.4/tslocationmanager-3.6.4.pom.sha1

@@ -0,0 +1 @@
+d4c0e936144e9629f09726d231ffb65382d117f8

package/android/libs/com/transistorsoft/tslocationmanager/3.6.4/tslocationmanager-3.6.4.pom.sha256

@@ -0,0 +1 @@
+29f18c0813aab1f46f264aae982c92a937c752f9d347371d0504db62885c615a

package/android/libs/com/transistorsoft/tslocationmanager/3.6.4/tslocationmanager-3.6.4.pom.sha512

@@ -0,0 +1 @@
+1710cfc5d6b4638db7eca4ba894a346d024f6041c79cbcdd165c3da68939eac4e1e1cb5c5b4ea7d933d6576fab4db08e79301efb42073186349a90bf00b283ed

package/android/libs/com/transistorsoft/tslocationmanager/maven-metadata.xml

@@ -3,14 +3,15 @@
   <groupId>com.transistorsoft</groupId>
   <artifactId>tslocationmanager</artifactId>
   <versioning>
-    <latest>3.6.3</latest>
-    <release>3.6.3</release>
+    <latest>3.6.4</latest>
+    <release>3.6.4</release>
     <versions>
       <version>3.6.0</version>
       <version>3.6.1</version>
       <version>3.6.2</version>
       <version>3.6.3</version>
+      <version>3.6.4</version>
     </versions>
-    <lastUpdated>20241112183131</lastUpdated>
+    <lastUpdated>20241203042324</lastUpdated>
   </versioning>
 </metadata>

package/android/libs/com/transistorsoft/tslocationmanager-v21/3.6.4/tslocationmanager-v21-3.6.4.aar.md5

@@ -0,0 +1 @@
+74bb14fd07fb16ee170c5ad3d07f817d

package/android/libs/com/transistorsoft/tslocationmanager-v21/3.6.4/tslocationmanager-v21-3.6.4.aar.sha1

@@ -0,0 +1 @@
+6c1c89301376ea993978bc06f919edaaa29fb3fb

package/android/libs/com/transistorsoft/tslocationmanager-v21/3.6.4/tslocationmanager-v21-3.6.4.aar.sha256

@@ -0,0 +1 @@
+961d0d90ccb09bf5731a3a297c4e7fbacb9f24d20bdaa9dabc79b729d5a109eb

package/android/libs/com/transistorsoft/tslocationmanager-v21/3.6.4/tslocationmanager-v21-3.6.4.aar.sha512

@@ -0,0 +1 @@
+01e530f5a7f3db6a9d9d436f345093e5538421d16b663daf9682317829d67bb9a80d4a58de10e485235744793ae039267335c0dc680c54bdc814a7bc31d4f01f

package/android/libs/com/transistorsoft/tslocationmanager-v21/{3.6.3/tslocationmanager-v21-3.6.3.pom → 3.6.4/tslocationmanager-v21-3.6.4.pom}

@@ -4,6 +4,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.transistorsoft</groupId>
   <artifactId>tslocationmanager-v21</artifactId>
-  <version>3.6.3</version>
+  <version>3.6.4</version>
   <packaging>aar</packaging>
 </project>

package/android/libs/com/transistorsoft/tslocationmanager-v21/3.6.4/tslocationmanager-v21-3.6.4.pom.md5

@@ -0,0 +1 @@
+95c1c712873b163f6641ce4b071e7af7

package/android/libs/com/transistorsoft/tslocationmanager-v21/3.6.4/tslocationmanager-v21-3.6.4.pom.sha1

@@ -0,0 +1 @@
+d003fdeb61221dbe7eccd3eae06a88464f4837ca

package/android/libs/com/transistorsoft/tslocationmanager-v21/3.6.4/tslocationmanager-v21-3.6.4.pom.sha256

@@ -0,0 +1 @@
+7e76a8d9ad740486eed08130a444e02a80959b615d0ae87899af8e85a3e0aa8b

package/android/libs/com/transistorsoft/tslocationmanager-v21/3.6.4/tslocationmanager-v21-3.6.4.pom.sha512

@@ -0,0 +1 @@
+56a88d4d6a4ca5061f3061bd5bd950a0c6afa271c6bdc5cfa960d77c39092d902736ffc32c53c99c2e55c02ea85f27aeec646e1cc3baceb48160a54dd86fe9b2

package/android/libs/com/transistorsoft/tslocationmanager-v21/maven-metadata.xml

@@ -3,14 +3,15 @@
   <groupId>com.transistorsoft</groupId>
   <artifactId>tslocationmanager-v21</artifactId>
   <versioning>
-    <latest>3.6.3</latest>
-    <release>3.6.3</release>
+    <latest>3.6.4</latest>
+    <release>3.6.4</release>
     <versions>
       <version>3.6.0</version>
       <version>3.6.1</version>
       <version>3.6.2</version>
       <version>3.6.3</version>
+      <version>3.6.4</version>
     </versions>
-    <lastUpdated>20241112183131</lastUpdated>
+    <lastUpdated>20241203042324</lastUpdated>
   </versioning>
 </metadata>

package/android/proguard-rules.pro

@@ -1,4 +1,20 @@
 -keepnames class com.facebook.react.ReactActivity
+
+# for react-native Headless on new architecture
+-keep class com.facebook.react.defaults.DefaultNewArchitectureEntryPoint {
+  public <methods>;
+}
+-keep class com.facebook.react.ReactApplication {
+  public <methods>;
+}
+-keep class com.facebook.react.ReactHost {
+  public <methods>;
+}
+-keep class * extends com.facebook.react.ReactHost {
+  public <methods>;
+}
+-keep class com.facebook.react.fabric.** { *; }
+
 -keepnames class com.transistorsoft.rnbackgroundgeolocation.RNBackgroundGeolocation
 
 -keep class com.transistorsoft** { *; }

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.transistorsoft.rnbackgroundgeolocation">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">    
     <application android:label="@string/app_name"></application>
-
 </manifest>

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

@@ -1,22 +1,12 @@
 package com.transistorsoft.rnbackgroundgeolocation;
 
-import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
-
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.jstasks.HeadlessJsTaskConfig;
-import com.facebook.react.jstasks.HeadlessJsTaskContext;
-import com.facebook.react.jstasks.HeadlessJsTaskEventListener;
 
 import org.greenrobot.eventbus.Subscribe;
 
 import com.transistorsoft.locationmanager.adapter.BackgroundGeolocation;
+import com.transistorsoft.locationmanager.event.FinishHeadlessTaskEvent;
 import com.transistorsoft.locationmanager.event.HeadlessEvent;
 import com.transistorsoft.locationmanager.logger.TSLog;
 
@@ -24,20 +14,23 @@ import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
+ * The BackgroundGeolocation SDK creates a single instance of this class (via reflection upon Config.headlessJobService)
+ * The SDK delivers events to this instance by dropping them onto EventBus (see @Subscribe).  Because this instance is subscribed
+ * into EventBus, it's protected from GC.
+ *
  * Created by chris on 2018-01-23.
  */
 
 public class HeadlessTask {
-    private static String HEADLESS_TASK_NAME = "BackgroundGeolocation";
-    // Hard-coded time-limit for headless-tasks is 30000 @todo configurable?
-    private static int TASK_TIMEOUT = 30000;
-
-    private final List<Integer> mTasks = new ArrayList<>();
+    private static final String HEADLESS_TASK_NAME = "BackgroundGeolocation";
+    // Hard-coded time-limit for headless-tasks is 60000 @todo configurable?
+    private static final int TASK_TIMEOUT = 60000 * 2;
 
+    /**
+     * EventBus receiver for a HeadlessTask HeadlessEvent
+     * @param event
+     */
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onHeadlessEvent(HeadlessEvent event) {
         String name = event.getName();
@@ -95,81 +88,43 @@ public class HeadlessTask {
             } catch (JSONException e) {
                 clientEvent.putNull("params");
                 clientEvent.putString("error", e.getMessage());
-                TSLog.logger.error(TSLog.error(e.getMessage()));
-                e.printStackTrace();
+                TSLog.logger.error(TSLog.error(e.getMessage()), e);
             }
         }
 
-        HeadlessJsTaskConfig config = new HeadlessJsTaskConfig(HEADLESS_TASK_NAME, clientEvent, TASK_TIMEOUT);
         try {
-            startTask(event.getContext(), config);
-        } catch (AssertionError e) {
-            TSLog.logger.warn(TSLog.warn("Failed invoke HeadlessTask " + name + ".  Task ignored." + e.getMessage()));
+            HeadlessTaskManager.getInstance().startTask(event.getContext(), new HeadlessTaskManager.Task.Builder()
+                    .setName(HEADLESS_TASK_NAME)
+                    .setParams(clientEvent)
+                    .setTimeout(TASK_TIMEOUT)
+                    .setOnInvokeCallback((reactContext, task) -> {
+                        //TSLog.logger.debug("*** onInvoke: " + task.getId());
+                    })
+                    .setOnFinishCallback(taskId -> {
+                        //TSLog.logger.debug("*** onFinish: " + taskId);
+                    })
+                    .setOnErrorCallback((task, e) -> {
+                        TSLog.logger.warn("⚠\uFE0F  HeadlessTaskError: " + e.getMessage() + ": " + task.toString());
+                    })
+                    .build()
+            );
+        } catch (Exception e) {
+            TSLog.logger.warn(TSLog.warn("Failed invoke HeadlessTask " + name + ".  Task ignored:  " + e.getMessage()));
+            e.printStackTrace();
         }
     }
 
     /**
-     * Start a task. This method handles starting a new React instance if required.
-     *
-     * Has to be called on the UI thread.
-     *
-     * @param taskConfig describes what task to start and the parameters to pass to it
+     * EventBus Receiver.  Called when developer runs BackgroundGeolocation.finishHeadlessTask(taskId) from within their registered HeadlessTask.
+     * Calls RN's HeadlessJsTaskContext.finishTask(taskId);
+     * @param event
      */
-    private void startTask(Context context, final HeadlessJsTaskConfig taskConfig) throws AssertionError {
-        ReactApplication reactApplication = ((ReactApplication) context);
-
-        UiThreadUtil.assertOnUiThread();
-        final ReactInstanceManager reactInstanceManager = reactApplication.getReactNativeHost().getReactInstanceManager();
-
-        ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-        if (reactContext == null) {
-            reactInstanceManager.addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
-                @Override public void onReactContextInitialized(final ReactContext reactContext) {
-                    // Hack to fix unknown problem executing asynchronous BackgroundTask when ReactContext is created *first time*.  Fixed by adding short delay before #invokeStartTask
-                    new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            invoke(reactContext, taskConfig);
-                        }
-                    }, 500);
-                    reactInstanceManager.removeReactInstanceEventListener(this);
-                }
-            });
-            if (!reactInstanceManager.hasStartedCreatingInitialContext()) {
-                reactInstanceManager.createReactContextInBackground();
-            }
-        } else {
-            invoke(reactContext, taskConfig);
-        }
-    }
-
-    private void invoke(ReactContext reactContext, final HeadlessJsTaskConfig taskConfig) {
-        final HeadlessJsTaskContext headlessJsTaskContext = HeadlessJsTaskContext.getInstance(reactContext);
-
-        synchronized(mTasks) {
-            if (mTasks.isEmpty()) {
-                headlessJsTaskContext.addTaskEventListener(new HeadlessJsTaskEventListener() {
-                    @Override public void onHeadlessJsTaskStart(int taskId) {
-                        TSLog.logger.debug("taskId: " + taskId);
-                    }
-                    @Override public void onHeadlessJsTaskFinish(int taskId) {
-                        TSLog.logger.debug("taskId: " + taskId);
-                        synchronized (mTasks) {
-                            if (!mTasks.isEmpty()) {
-                                mTasks.remove(0);
-                            }
-                            if (mTasks.isEmpty()) {
-                                headlessJsTaskContext.removeTaskEventListener(this);
-                            }
-                        }
-                    }
-                });
-            }
-            try {
-                mTasks.add(headlessJsTaskContext.startTask(taskConfig));
-            } catch (IllegalStateException e) {
-                TSLog.logger.error(TSLog.error(e.getMessage()));
-            }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onFinishHeadlessTask(FinishHeadlessTaskEvent event) {
+        try {
+            HeadlessTaskManager.getInstance().finishTask(event.getContext(), event.getTaskId());
+        } catch (Exception e) {
+            TSLog.logger.warn(TSLog.warn(e.getMessage()));
         }
     }
 }