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

package/README.md

@@ -30,7 +30,7 @@ Also available for [Flutter](https://github.com/transistorsoft/flutter_backgroun
 
 # Contents
 - ### 😫 [Help!](../../wiki/Help)
-- ### :books: [API Documentation](https://transistorsoft.github.io/react-native-background-geolocation)
+- ### :books: [API Documentation](https://transistorsoft.github.io/react-native-background-geolocation/5.0.0-beta)
 - ### [Installing the Plugin](#large_blue_diamond-installing-the-plugin)
 - ### [Setup Guides](#large_blue_diamond-setup-guides)
 - ### [Configure your License](#large_blue_diamond-configure-your-license)

package/RNBackgroundGeolocation.podspec

@@ -15,14 +15,14 @@ Pod::Spec.new do |s|
   s.license             = package['license']
   s.author              = package['author']
   s.source              = { :git => 'https://github.com/transistorsoft/react-native-background-geolocation.git', :tag => s.version }
-  s.platform            = :ios, '9.0'
+  s.platform            = :ios, '12.0'
 
   s.dependency 'React-Core'
   s.static_framework = true
   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.vendored_frameworks = 'ios/RNBackgroundGeolocation/TSLocationManager.xcframework'
+  s.libraries           = 'sqlite3', 'z', 'stdc++'  
   s.resource_bundles = {'TSLocationManagerPrivacy' => ['ios/Resources/PrivacyInfo.xcprivacy']}
 end

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

@@ -0,0 +1,13 @@
+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=../../../android
+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

package/android/build.gradle

@@ -1,21 +1,15 @@
-rootProject.allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
+plugins {
+    id "com.android.library"
+    id "com.facebook.react"
 }
 
-apply plugin: 'com.android.library'
-
 // Android dependencies
-def DEFAULT_COMPILE_SDK_VERSION                     = 31
-def DEFAULT_TARGET_SDK_VERSION                      = 30
-def DEFAULT_APP_COMPAT_VERSION                      = "1.6.1"
+def DEFAULT_COMPILE_SDK_VERSION                     = 36
+def DEFAULT_TARGET_SDK_VERSION                      = 36
 
 // Plugin dependencies
-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_PLAY_SERVICES_LOCATION_VERSION          = "21.3.0"
+def DEFAULT_OK_HTTP_VERSION                         = "4.12.0"
 def DEFAULT_ANDROID_PERMISSIONS_VERSION             = "2.1.6"
 def DEFAULT_EVENTBUS_VERSION                        = "3.3.1"
 def DEFAULT_LOCAL_BROADCAST_MANAGER_VERSION         = "1.0.0"
@@ -26,16 +20,16 @@ def DEFAULT_SLF4J_VERSION                           = "1.7.36"
 def DEFAULT_WORK_VERSION                            = "2.8.1"
 def DEFAULT_CONCURRENT_FUTURES_VERSION              = "1.1.0"
 
-def useAndroidX = (project.hasProperty("android.useAndroidX")) ? project.property("android.useAndroidX") : false
-
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
+react {
+    libraryName = "react-native-background-geolocation"
+}
 android {
-    if (project.android.hasProperty("namespace")) {
-        namespace("com.transistorsoft.rnbackgroundgeolocation")
-    }
+    namespace("com.transistorsoft.rnbackgroundgeolocation")
+
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
 
     defaultConfig {
@@ -49,6 +43,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    sourceSets {
+        main {
+            // Where Codegen put NativeBackgroundGeolocationSpec.java
+            java.srcDir("$buildDir/generated/source/codegen/java")
+        }
+    }
 }
 
 repositories{
@@ -58,45 +58,10 @@ repositories{
 }
 
 dependencies {
-    // Prefer appCompatVersion vs supportLibVersion.
-    def appCompatVersion = safeExtGet('appCompatVersion', DEFAULT_APP_COMPAT_VERSION)
     def playServicesLocationVersion = safeExtGet('playServicesLocationVersion', safeExtGet('googlePlayServicesLocationVersion', DEFAULT_PLAY_SERVICES_LOCATION_VERSION))
-    def hmsLocationVersion = safeExtGet('hmsLocationVersion', DEFAULT_HMS_LOCATION_VERSION);
-    def okHttpVersion = safeExtGet('okHttpVersion', DEFAULT_OK_HTTP_VERSION)
-    def androidPermissionsVersion = safeExtGet('androidPermissionsVersion', DEFAULT_ANDROID_PERMISSIONS_VERSION)
-    def eventBusVersion = safeExtGet('eventBusVersion', DEFAULT_EVENTBUS_VERSION)
-    def localBroadcastManagerVersion = safeExtGet('localBroadcastManagerVersion', DEFAULT_LOCAL_BROADCAST_MANAGER_VERSION)
-    def lifeCycleRuntimeVersion = safeExtGet('lifeCycleRuntimeVersion', DEFAULT_LIFE_CYCLE_RUNTIME_VERSION)
-    def lifeCycleExtensionsVersion = safeExtGet('lifeCycleExtensionsVersion', DEFAULT_LIFE_CYCLE_EXTENSIONS_VERSION)
-    def logbackVersion = safeExtGet('logbackVersion', DEFAULT_LOGBACK_VERSION);
-    def slf4jVersion = safeExtGet('slf4jVersion', DEFAULT_SLF4J_VERSION);
-    
-    implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
 
-    def locationMajorVersion = playServicesLocationVersion.split('\\.')[0] as int
-    if (locationMajorVersion >= 21) {
-        api(group: 'com.transistorsoft', name:'tslocationmanager-v21', version: '3.+')
-    } else {
-        api(group: 'com.transistorsoft', name:'tslocationmanager', version: '3.+')
-    }
-    
-    implementation "androidx.appcompat:appcompat:$appCompatVersion"
+    implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
     implementation "com.google.android.gms:play-services-location:$playServicesLocationVersion"
-
-    implementation "org.greenrobot:eventbus:$eventBusVersion"
-    implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
-    // logback-android
-    implementation "com.github.tony19:logback-android:$logbackVersion"
-    implementation "org.slf4j:slf4j-api:$slf4jVersion"
-
-    implementation "io.github.nishkarsh:android-permissions:$androidPermissionsVersion"
-    // LifeCycleObserver
-    implementation "androidx.lifecycle:lifecycle-runtime:$lifeCycleRuntimeVersion"
-    implementation "androidx.lifecycle:lifecycle-extensions:$lifeCycleExtensionsVersion"
-    
-    // WorkManager
-    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 "com.transistorsoft:tslocationmanager:4.0.0-beta.+"
+    implementation 'org.greenrobot:eventbus:3.3.1'
 }

package/android/proguard-rules.pro

@@ -1,56 +1,84 @@
--keepnames class com.facebook.react.ReactActivity
+# JNI surface
+-keepnames class com.transistorsoft.locationmanager.a.A
+-keepclassmembers class com.transistorsoft.locationmanager.a.A {
+    public static void r(boolean);
+    public static boolean getDBFlag();
+}
+#######################################################################
+# TSConfig reflection (metadata + state + editors)
+#######################################################################
+-keepattributes *Annotation*,Signature,EnclosingMethod,InnerClasses
+
+# Keep the annotation TYPES so they exist at runtime
+-keep class com.transistorsoft.locationmanager.config.meta.ConfigProp { *; }
+-keep class com.transistorsoft.locationmanager.config.meta.ConfigSpec { *; }
+-keep class com.transistorsoft.locationmanager.config.meta.ConfigGroup { *; }
+-keep class com.transistorsoft.locationmanager.config.meta.CtorOrder { *; }
 
-# for react-native Headless on new architecture
--keep class com.facebook.react.defaults.DefaultNewArchitectureEntryPoint {
-  public <methods>;
+# Keep field names + ctors for state modules; FieldIndex uses getters/ctors by name/signature
+-keepnames class com.transistorsoft.locationmanager.config.state.** { *; }
+-keepclassmembers class com.transistorsoft.locationmanager.config.state.** {
+    <fields>;
+    <init>(...);
 }
--keep class com.facebook.react.ReactApplication {
-  public <methods>;
+
+# Keep module field names on the aggregate ConfigState
+-keepnames class com.transistorsoft.locationmanager.config.state.ConfigState {
+    <fields>;
+    <init>(...);
 }
--keep class com.facebook.react.ReactHost {
-  public <methods>;
+
+# Keep Editor and sub-editors members that routing may reflect
+-keepnames class com.transistorsoft.locationmanager.config.edit.Editor { *; }
+-keepclassmembers class com.transistorsoft.locationmanager.config.edit.Editor {
+    <fields>;
+    <init>(...);
 }
--keep class * extends com.facebook.react.ReactHost {
-  public <methods>;
+-keepclassmembers class com.transistorsoft.locationmanager.config.edit.** {
+    public <init>(...);
+    public ** set*(...);
+    <fields>;
 }
--keep class com.facebook.react.fabric.** { *; }
+-keepnames class com.transistorsoft.locationmanager.config.TSConfig
+-keepclassmembers class com.transistorsoft.locationmanager.config.TSConfig { public static void r(boolean); }
+-keepnames class com.transistorsoft.locationmanager.logger.TSLog
+-keepclassmembers class com.transistorsoft.locationmanager.logger.TSLog { public static void r(boolean); }
+-keepnames class com.transistorsoft.locationmanager.service.AbstractService
+-keepclassmembers class com.transistorsoft.locationmanager.service.AbstractService { public static void r(boolean); }
 
--keepnames class com.transistorsoft.rnbackgroundgeolocation.RNBackgroundGeolocation
+# Services (names + ctors)
+-keep class com.transistorsoft.locationmanager.service.** extends com.transistorsoft.locationmanager.service.AbstractService
+-keepclassmembers class com.transistorsoft.locationmanager.service.** extends com.transistorsoft.locationmanager.service.AbstractService { <init>(...); }
 
--keep class com.transistorsoft** { *; }
--dontwarn com.transistorsoft.**
+# Scheduler components
+-keep class com.transistorsoft.locationmanager.scheduler.ScheduleAlarmReceiver
+-keep class com.transistorsoft.locationmanager.scheduler.ScheduleJobService
+-keep class com.transistorsoft.locationmanager.scheduler.ScheduleService
+-keepclassmembers class com.transistorsoft.locationmanager.scheduler.ScheduleAlarmReceiver { <init>(...); }
+-keepclassmembers class com.transistorsoft.locationmanager.scheduler.ScheduleJobService { <init>(...); }
+-keepclassmembers class com.transistorsoft.locationmanager.scheduler.ScheduleService { <init>(...); }
 
-# Huawei HMS Adapter
--dontwarn com.transistorsoft.xms.**
--dontwarn com.huawei.**
+# Cross-module DTOs
+-keepnames class com.transistorsoft.locationmanager.data.SQLQuery
+-keepclassmembers class com.transistorsoft.locationmanager.data.SQLQuery { public static *; }
+-keepnames class com.transistorsoft.locationmanager.data.LocationModel
+-keepclassmembers class com.transistorsoft.locationmanager.data.LocationModel { public *; }
 
--keep class com.google.android.gms.** {*;}
--keep interface com.google.android.gms.** {*;}
-
-# BackgroundGeolocation (EventBus)
+# EventBus reflection
 -keepattributes *Annotation*
--keepclassmembers class * {
-    @org.greenrobot.eventbus.Subscribe <methods>;
-}
+-keepclassmembers class * { @org.greenrobot.eventbus.Subscribe <methods>; }
 -keep enum org.greenrobot.eventbus.ThreadMode { *; }
+-keep class org.greenrobot.eventbus.android.AndroidComponentsImpl
 
-# And if you use AsyncExecutor:
--keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
-    <init>(java.lang.Throwable);
-}
+# (Optional) Flutter plugin entry
+-keepnames class com.transistorsoft.flutter.backgroundgeolocation.FLTBackgroundGeolocationPlugin
 
-# logback
--keep class ch.qos** { *; }
--keep class org.slf4j** { *; }
--dontwarn ch.qos.logback.core.net.*
-
-# OkHttp3
+# OkHttp/logging quiets (unchanged)
 -dontwarn okio.**
 -dontwarn okhttp3.**
 -dontwarn javax.annotation.**
 -dontwarn org.conscrypt.**
-# A resource is loaded with a relative path so the package of this class must be preserved.
 -keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
-
-# LifecycleObserver
--keep class androidx.lifecycle.FullLifecycleObserver
+-keep class ch.qos** { *; }
+-keep class org.slf4j** { *; }
+-dontwarn ch.qos.logback.core.net.*

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

@@ -5,14 +5,17 @@ import com.facebook.react.bridge.WritableNativeMap;
 
 import org.greenrobot.eventbus.Subscribe;
 
-import com.transistorsoft.locationmanager.adapter.BackgroundGeolocation;
+import com.transistorsoft.locationmanager.config.TSConfig;
+import com.transistorsoft.locationmanager.event.EventName;
 import com.transistorsoft.locationmanager.event.FinishHeadlessTaskEvent;
 import com.transistorsoft.locationmanager.event.HeadlessEvent;
+import com.transistorsoft.locationmanager.http.HttpResponse;
 import com.transistorsoft.locationmanager.logger.TSLog;
 
 import org.greenrobot.eventbus.ThreadMode;
-import org.json.JSONException;
-import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * The BackgroundGeolocation SDK creates a single instance of this class (via reflection upon Config.headlessJobService)
@@ -33,49 +36,52 @@ public class HeadlessTask {
      */
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onHeadlessEvent(HeadlessEvent event) {
+        TSConfig config = TSConfig.getInstance(event.getContext());
+
         String name = event.getName();
         TSLog.logger.debug("\uD83D\uDC80  event: " + name);
 
         WritableMap clientEvent = new WritableNativeMap();
-        JSONObject params = null;
+        Map<String, ?> params = null;
         clientEvent.putString("name", name);
 
-        if (name.equals(BackgroundGeolocation.EVENT_TERMINATE)) {
-            params = event.getTerminateEvent();
-        } else if (name.equals(BackgroundGeolocation.EVENT_LOCATION)) {
-            try {
-                params = event.getLocationEvent().toJson();
-            } catch (JSONException e) {
-                TSLog.logger.error(e.getMessage(), e);
-            }
-        } else if (name.equals(BackgroundGeolocation.EVENT_MOTIONCHANGE)) {
-            params = event.getMotionChangeEvent().toJson();
-        } else if (name.equals(BackgroundGeolocation.EVENT_HTTP)) {
-            params = event.getHttpEvent().toJson();
-        } else if (name.equals(BackgroundGeolocation.EVENT_PROVIDERCHANGE)) {
-            params = event.getProviderChangeEvent().toJson();
-        } else if (name.equals(BackgroundGeolocation.EVENT_ACTIVITYCHANGE)) {
-            params = event.getActivityChangeEvent().toJson();
-        } else if (name.equals(BackgroundGeolocation.EVENT_SCHEDULE)) {
-            params = event.getScheduleEvent();
-        } else if (name.equals(BackgroundGeolocation.EVENT_BOOT)) {
-            params = event.getBootEvent();
-        } else if (name.equals(BackgroundGeolocation.EVENT_GEOFENCE)) {
-            params = event.getGeofenceEvent().toJson();
-        } else if (name.equals(BackgroundGeolocation.EVENT_GEOFENCESCHANGE)) {
-            params = event.getGeofencesChangeEvent().toJson();
-        } else if (name.equals(BackgroundGeolocation.EVENT_HEARTBEAT)) {
-            params = event.getHeartbeatEvent().toJson();
-        } else if (name.equals(BackgroundGeolocation.EVENT_POWERSAVECHANGE)) {
+        if (name.equals(EventName.TERMINATE)) {
+            params = config.toMap(false);
+        } else if (name.equals(EventName.LOCATION)) {
+            params = event.getLocationEvent().toMap();
+        } else if (name.equals(EventName.MOTIONCHANGE)) {
+            params = event.getMotionChangeEvent().toMap();
+        } else if (name.equals(EventName.HTTP)) {
+            HttpResponse response = (HttpResponse) event.getEvent();
+            Map<String, Object> httpParams = new HashMap<>();
+            httpParams.put("status", response.getStatus());
+            httpParams.put("responseText", response.getResponseText());
+            httpParams.put("success", response.isSuccess());
+            params = httpParams;
+        } else if (name.equals(EventName.PROVIDERCHANGE)) {
+            params = event.getProviderChangeEvent().toMap();
+        } else if (name.equals(EventName.ACTIVITYCHANGE)) {
+            params = event.getActivityChangeEvent().toMap();
+        } else if (name.equals(EventName.SCHEDULE)) {
+            params = config.toMap(false);
+        } else if (name.equals(EventName.BOOT)) {
+            params = config.toMap(false);
+        } else if (name.equals(EventName.GEOFENCE)) {
+            params = event.getGeofenceEvent().toMap();
+        } else if (name.equals(EventName.GEOFENCESCHANGE)) {
+            params = event.getGeofencesChangeEvent().toMap();
+        } else if (name.equals(EventName.HEARTBEAT)) {
+            params = event.getHeartbeatEvent().toMap();
+        } else if (name.equals(EventName.POWERSAVECHANGE)) {
             clientEvent.putBoolean("params", event.getPowerSaveChangeEvent().isPowerSaveMode());
-        } else if (name.equals(BackgroundGeolocation.EVENT_CONNECTIVITYCHANGE)) {
-            params = event.getConnectivityChangeEvent().toJson();
-        } else if (name.equals(BackgroundGeolocation.EVENT_ENABLEDCHANGE)) {
+        } else if (name.equals(EventName.CONNECTIVITYCHANGE)) {
+            params = event.getConnectivityChangeEvent().toMap();
+        } else if (name.equals(EventName.ENABLEDCHANGE)) {
             clientEvent.putBoolean("params", event.getEnabledChangeEvent());
-        } else if (name.equals(BackgroundGeolocation.EVENT_NOTIFICATIONACTION)) {
+        } else if (name.equals(EventName.NOTIFICATIONACTION)) {
             clientEvent.putString("params", event.getNotificationEvent());
-        } else if (name.equals(BackgroundGeolocation.EVENT_AUTHORIZATION)) {
-            params = event.getAuthorizationEvent().toJson();
+        } else if (name.equals(EventName.AUTHORIZATION)) {
+            params = event.getAuthorizationEvent().toMap();
         } else {
             TSLog.logger.warn(TSLog.warn("Unknown Headless Event: " + name));
             clientEvent.putString("error", "Unknown event: " + name);
@@ -83,13 +89,7 @@ public class HeadlessTask {
         }
 
         if (params != null) {
-            try {
-                clientEvent.putMap("params", RNBackgroundGeolocationModule.jsonToMap(params));
-            } catch (JSONException e) {
-                clientEvent.putNull("params");
-                clientEvent.putString("error", e.getMessage());
-                TSLog.logger.error(TSLog.error(e.getMessage()), e);
-            }
+            clientEvent.putMap("params", RNBackgroundGeolocationModule.mapToWritableMap(params));
         }
 
         try {

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

@@ -14,6 +14,7 @@ import com.facebook.react.bridge.JavaScriptModule;
  * Created by chris on 2015-10-30.
  */
 public class RNBackgroundGeolocation implements ReactPackage {
+
     @Override public List<NativeModule> createNativeModules (ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
         modules.add(new RNBackgroundGeolocationModule(reactContext));