react-native-background-geolocation 4.1.1 → 4.4.1

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # Change Log
 
+## 4.4.1 — 2021-10-29
+* [Added] Added a `Subscription` interface to Typescript API.  Added helpful docs to Subscription for new event-handler subscriptions.
+
+```typescript
+import BackgroundGeolocation, {
+  Subscription
+} from "...";
+.
+.
+.
+const subscription:Subscription = BacckgroundGeolocation.onLocation(myHandler);
+```
+
+## 4.4.0 — 2021-10-25
+* [Added] New `Authorization.strategy "SAS"` (alternative to default `JWT`).
+* [Fixed] Fixed __`RCTEventEmitter`__ warning "addListener", "removeListeners".  A corresponding fix has also been released for [react-native-background-fetch](https://github.com/transistorsoft/react-native-background-fetch/blob/master/CHANGELOG.md#404--2021-10-22) so be sure to update to `background-fetch >= 4.0.4`.
+* [Changed] **Deprecated** `BackgroundGeolocation.removeListener`.  All event-handlers now return a `react-native` `Subscription` instance containing a `.remove()` method.  You will keep track of your own `subscription` instances and call `.remove()` upon them when you wish to remove an event listener.  Eg:
+
+```javascript
+/// OLD
+const onLocation = (location) => {
+    console.log('[onLocation');
+}
+BackgroundGeolocation.onLocation(onLocation);
+...
+// deprecated: removeListener
+BackgroundGeolocation.removeListener('location', onLocation);
+
+/// NEW:  capture returned subscription instance.
+const onLocationSubscription = BackgroundGeolocation.onLocation(onLocation);
+...
+// Removing an event-listener.
+onLocationSubscription.remove();
+```
+
+## 4.3.0 — 2021-09-14
+
+* [Added][Android] Implement new Android 12 "reduced accuracy" mechanism `requestTemporaryFullAccuracy`.
+* [Fixed][iOS] `Authorization.refreshPayload refreshToken` was not performing a String replace on the `{refreshToken}` template, instead over-writing the entire string.  Eg:  if provided with `'refresh_token': 'Bearer {refreshToken}`, `Bearer ` would be over-written and replaced with only the refresh-token.
+* [Fixed][Android] Fixed crash reported by Huawei device, where verticalAccuracy returns NaN.
+
+## [4.2.2] — 2021-08-23
+* [Fixed][iOS] add config change listeners for `heartbeatInterval` and `preventSuspend` to dynamically update interval when changed with `setConfig`.
+* [Fixed][Android] Add `accuracyAuthorization` param to event data provided to `onProviderChange` event.
+* [Changed][Android] Update Android default `okhttp` version to `3.12.13`.
+* [Changed][Android] Update Android `eventbus` version to `3.2.0`.
+* [Changed][Android] Update Android `android-permissions` to import from *MavenCentral* instead of deprecated `jCenter`.
+* [Fixed][Android] Fix an edge-case requesting motion permission.  If `getCurrentPosition()` is executed before `.start()`, the Android SDK fails to request motion permission.
+
+## 4.1.2 — 2021-07-05
+* [Changed] Build iOS TSLocationManager.xcframework with XCode 12.4 instead of 12.5
+
 ## 4.1.1 — 2021-06-11
 * [Fixed][iOS] Reports 2 reports of iOS crash `NSInvalidArgumentException (TSLocation.m line 178)` with iOS 14
 .x.  Wrap JSON serialization in @try/@catch block.  iOS JSON serialization docs state the supplied NSError err

package/android/build.gradle

@@ -3,13 +3,13 @@ apply plugin: 'com.android.library'
 // Android dependencies
 def DEFAULT_COMPILE_SDK_VERSION                     = 28
 def DEFAULT_TARGET_SDK_VERSION                      = 28
-def DEFAULT_APP_COMPAT_VERSION                      = "28.0.0"
+def DEFAULT_APP_COMPAT_VERSION                      = "1.3.1"
 
 // Plugin dependencies
-def DEFAULT_GOOGLE_PLAY_SERVICES_LOCATION_VERSION   = "17.0.0"
-def DEFAULT_OK_HTTP_VERSION                         = "3.12.1"
+def DEFAULT_GOOGLE_PLAY_SERVICES_LOCATION_VERSION   = "18.0.0"
+def DEFAULT_OK_HTTP_VERSION                         = "3.12.13"
 def DEFAULT_ANDROID_PERMISSIONS_VERSION             = "0.1.8"
-def DEFAULT_EVENTBUS_VERSION                        = "3.0.0"
+def DEFAULT_EVENTBUS_VERSION                        = "3.2.0"
 def DEFAULT_LOCAL_BROADCAST_MANAGER_VERSION         = "1.0.0"
 
 def useAndroidX = (project.hasProperty("android.useAndroidX")) ? project.property("android.useAndroidX") : false
@@ -37,10 +37,7 @@ repositories{
 
 dependencies {
     // Prefer appCompatVersion vs supportLibVersion.
-    def appCompatVersion = safeExtGet('appCompatVersion', safeExtGet('supportLibVersion', DEFAULT_APP_COMPAT_VERSION))
-
-    def appCompatMajorVersion = appCompatVersion.split('\\.')[0] as int
-    def appCompatLibName =  (appCompatMajorVersion < 20) ? "androidx.appcompat:appcompat" : "com.android.support:appcompat-v7"
+    def appCompatVersion = safeExtGet('appCompatVersion', DEFAULT_APP_COMPAT_VERSION)
     def playServicesLocationVersion = safeExtGet('googlePlayServicesLocationVersion', DEFAULT_GOOGLE_PLAY_SERVICES_LOCATION_VERSION)
     def okHttpVersion = safeExtGet('okHttpVersion', DEFAULT_OK_HTTP_VERSION)
     def androidPermissionsVersion = safeExtGet('androidPermissionsVersion', DEFAULT_ANDROID_PERMISSIONS_VERSION)
@@ -55,11 +52,11 @@ dependencies {
         api(group: 'com.transistorsoft', name:'tslocationmanager-reverse', version: '+')
     }
 
-    implementation "$appCompatLibName:$appCompatVersion"
+    implementation "androidx.appcompat:appcompat:$appCompatVersion"
     implementation "com.google.android.gms:play-services-location:$playServicesLocationVersion"
     implementation "org.greenrobot:eventbus:$eventBusVersion"
     implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
     implementation 'org.slf4j:slf4j-api:1.7.25'
     implementation 'com.github.tony19:logback-android:2.0.0'
-    implementation "com.intentfilter:android-permissions:$androidPermissionsVersion"
+    implementation "io.github.nishkarsh:android-permissions:$androidPermissionsVersion"
 }

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

@@ -0,0 +1 @@
+b29e51d5d171bd1836954c83f1657dd3

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

@@ -0,0 +1 @@
+738f4f927fde78332eeeb300ca1ac2ffbe6ddc26

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

@@ -0,0 +1 @@
+a3dd1567edc75edbf1feb8bc3682d5e02ded8605e49854ba3169f391bfc8d09f

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

@@ -0,0 +1 @@
+8d405b0427fd37b225dd4ca90633614371c994f4e1fa2ada7c453a067c08ebc9f7b41b1ebfe13f09bafacfa948385b3a27b6964e3936ecb4e822c184603afe58

package/android/libs/com/transistorsoft/tslocationmanager/{3.1.29/tslocationmanager-3.1.29.pom → 3.1.34/tslocationmanager-3.1.34.pom}

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

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

@@ -0,0 +1 @@
+20aafcf94ea9673cc521f064d46ade7b

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

@@ -0,0 +1 @@
+008bd7362c4446af36bef9e156b6c702a7e3b781

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

@@ -0,0 +1 @@
+5dc8c142d50c9e6c9986a1b3d374e9ed86427da743e4030d24c45c9c0c4c2fdf

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

@@ -0,0 +1 @@
+d8d251199fbd1fa61abcb4bf82b4e67624d82fc03fb34d114b10d99bcf4e5d443f65e38e16620a0020c566d844a51e600f4f5aa073c754a4ac2824210ba30498

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

@@ -3,11 +3,13 @@
   <groupId>com.transistorsoft</groupId>
   <artifactId>tslocationmanager</artifactId>
   <versioning>
-    <latest>3.1.29</latest>
-    <release>3.1.29</release>
+    <latest>3.1.34</latest>
+    <release>3.1.34</release>
     <versions>
-      <version>3.1.29</version>
+      <version>3.1.32</version>
+      <version>3.1.33</version>
+      <version>3.1.34</version>
     </versions>
-    <lastUpdated>20210609215254</lastUpdated>
+    <lastUpdated>20211013180057</lastUpdated>
   </versioning>
 </metadata>

package/android/libs/com/transistorsoft/tslocationmanager-reverse/3.1.34/tslocationmanager-reverse-3.1.34.aar.md5

@@ -0,0 +1 @@
+c18e72e1b8a4706f760959f59a0d918c

package/android/libs/com/transistorsoft/tslocationmanager-reverse/3.1.34/tslocationmanager-reverse-3.1.34.aar.sha1

@@ -0,0 +1 @@
+2e0c81175a1b44c05be8dbf607d65886d402f656

package/android/libs/com/transistorsoft/tslocationmanager-reverse/3.1.34/tslocationmanager-reverse-3.1.34.aar.sha256

@@ -0,0 +1 @@
+649f4c006732c5b2a04b6f90fba952377fa7281dda7374a20f5c67661439b45f

package/android/libs/com/transistorsoft/tslocationmanager-reverse/3.1.34/tslocationmanager-reverse-3.1.34.aar.sha512

@@ -0,0 +1 @@
+cfa5f14f859d2bd881867cc63b1968a7527b5a7e8082b551d3e3ad854783fcadefd9f2e21f2071201e1570347348cf4355e5d74c2049a1af4f21c1cca8c208f7

package/android/libs/com/transistorsoft/tslocationmanager-reverse/{3.1.29/tslocationmanager-reverse-3.1.29.pom → 3.1.34/tslocationmanager-reverse-3.1.34.pom}

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

package/android/libs/com/transistorsoft/tslocationmanager-reverse/3.1.34/tslocationmanager-reverse-3.1.34.pom.md5

@@ -0,0 +1 @@
+103b24060fe7ea19fe001a12852489b4

package/android/libs/com/transistorsoft/tslocationmanager-reverse/3.1.34/tslocationmanager-reverse-3.1.34.pom.sha1

@@ -0,0 +1 @@
+fbb3841eba4fdd2ffbb024d1a791abe6eb15533b

package/android/libs/com/transistorsoft/tslocationmanager-reverse/3.1.34/tslocationmanager-reverse-3.1.34.pom.sha256

@@ -0,0 +1 @@
+e6ebe3816a4c6ddb141b433b631e4e00c67adec24e46e45d0f06279cc0677e4f

package/android/libs/com/transistorsoft/tslocationmanager-reverse/3.1.34/tslocationmanager-reverse-3.1.34.pom.sha512

@@ -0,0 +1 @@
+f4c9c0482e0b822dcca71dcc32eaa5ee3a0caa93e0936e13e1ae38fb53f0b3137125b7cd90ff0469e53bb88caf961955972dc86a442dc2d937ae826a156df7f1

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

@@ -3,11 +3,13 @@
   <groupId>com.transistorsoft</groupId>
   <artifactId>tslocationmanager-reverse</artifactId>
   <versioning>
-    <latest>3.1.29</latest>
-    <release>3.1.29</release>
+    <latest>3.1.34</latest>
+    <release>3.1.34</release>
     <versions>
-      <version>3.1.29</version>
+      <version>3.1.32</version>
+      <version>3.1.33</version>
+      <version>3.1.34</version>
     </versions>
-    <lastUpdated>20210609215254</lastUpdated>
+    <lastUpdated>20211013180057</lastUpdated>
   </versioning>
 </metadata>

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

@@ -115,6 +115,22 @@ public class RNBackgroundGeolocationModule extends ReactContextBaseJavaModule im
         mEvents.add(TSAuthorization.NAME);
 
         reactContext.addLifecycleEventListener(this);
+
+        BackgroundGeolocation adapter = getAdapter();
+        adapter.onLocation(new LocationCallback());
+        adapter.onMotionChange(new MotionChangeCallback());
+        adapter.onActivityChange(new ActivityChangeCallback());
+        adapter.onLocationProviderChange(new LocationProviderChangeCallback());
+        adapter.onGeofencesChange(new GeofencesChangeCallback());
+        adapter.onGeofence(new GeofenceCallback());
+        adapter.onHeartbeat(new HeartbeatCallback());
+        adapter.onHttp(new HttpResponseCallback());
+        adapter.onSchedule(new ScheduleCallback());
+        adapter.onPowerSaveChange(new PowerSaveChangeCallack());
+        adapter.onConnectivityChange(new ConnectivityChangeCallback());
+        adapter.onEnabledChange(new EnabledChangeCallback());
+        adapter.onNotificationAction(new NotificationActionCallback());
+        HttpService.getInstance(getReactApplicationContext()).onAuthorization(new AuthorizationCallback());
     }
 
     @Override
@@ -184,6 +200,7 @@ public class RNBackgroundGeolocationModule extends ReactContextBaseJavaModule im
             params.putBoolean("network", event.isNetworkEnabled());
             params.putBoolean("gps", event.isGPSEnabled());
             params.putBoolean("enabled", event.isEnabled());
+            params.putInt("accuracyAuthorization", event.getAccuracyAuthorization());
             params.putInt("status", event.getStatus());
             sendEvent(BackgroundGeolocation.EVENT_PROVIDERCHANGE, params);
         }
@@ -305,6 +322,7 @@ public class RNBackgroundGeolocationModule extends ReactContextBaseJavaModule im
             }
         }
     }
+
     @Override
     public void onHostResume() {
         if (!mInitialized) {
@@ -345,19 +363,24 @@ public class RNBackgroundGeolocationModule extends ReactContextBaseJavaModule im
     public void ready(ReadableMap params, final Callback success, final Callback failure) {
         TSConfig config = TSConfig.getInstance(getReactApplicationContext());
 
+        boolean reset = true;
+        if (params.hasKey("reset")) {
+            reset = params.getBoolean("reset");
+        }
+
         if (mReady) {
-            TSLog.logger.warn(TSLog.warn("#ready already called.  Redirecting to #setConfig"));
-            setConfig(params, success, failure);
+            if (reset) {
+                TSLog.logger.warn(TSLog.warn("#ready already called.  Redirecting to #setConfig"));
+                setConfig(params, success, failure);
+            } else {
+                TSLog.logger.warn(TSLog.warn("#ready already called.  Ignored config since reset: false"));
+            }
             return;
         }
         mReady = true;
         if (config.isFirstBoot()) {
             config.updateWithJSONObject(mapToJson(setHeadlessJobService(params)));
         } else {
-            boolean reset = true;
-            if (params.hasKey("reset")) {
-                reset = params.getBoolean("reset");
-            }
             if (reset) {
                 config.reset();
                 config.updateWithJSONObject(mapToJson(setHeadlessJobService(params)));
@@ -972,92 +995,31 @@ public class RNBackgroundGeolocationModule extends ReactContextBaseJavaModule im
                 success.invoke(status);
             }
             @Override public void onFailure(int status) {
-                error.invoke(status);
+                success.invoke(status);
             }
         });
     }
 
     @ReactMethod
-    public void requestTemporaryFullAccuracy(String purpose, Callback success, Callback failure) {
-        // Note:  No Android implementation -- this is an iOS-only mechanism currently.
-        // return iOS CLAccuracyAuthorizationFull (0)
-        success.invoke(LocationProviderChangeEvent.ACCURACY_AUTHORIZATION_FULL);
-    }
-
-    @ReactMethod
-    public void addEventListener(String event) {
-
-        if (!mEvents.contains(event)) {
-            TSLog.logger.warn(TSLog.warn("[RNBackgroundGeolocation addListener] Unknown event: " + event));
-            return;
-        }
-        BackgroundGeolocation adapter = getAdapter();
-        Integer count;
-
-        synchronized(mListeners) {
-            if (mListeners.containsKey(event)) {
-                count = mListeners.get(event);
-                count++;
-                mListeners.put(event, count);
-            } else {
-                count = 1;
-                mListeners.put(event, count);
+    public void requestTemporaryFullAccuracy(String purpose, final Callback success, final Callback failure) {
+        getAdapter().requestTemporaryFullAccuracy(purpose, new TSRequestPermissionCallback() {
+            @Override public void onSuccess(int accuracyAuthorization) {
+                success.invoke(accuracyAuthorization);
             }
-        }
-        if (count == 1) {
-            if (event.equalsIgnoreCase(BackgroundGeolocation.EVENT_LOCATION)) {
-                adapter.onLocation(new LocationCallback());
-            } else if (event.equalsIgnoreCase(BackgroundGeolocation.EVENT_MOTIONCHANGE)) {
-                adapter.onMotionChange(new MotionChangeCallback());
-            } else if (event.equalsIgnoreCase(BackgroundGeolocation.EVENT_ACTIVITYCHANGE)) {
-                adapter.onActivityChange(new ActivityChangeCallback());
-            } else if (event.equalsIgnoreCase(BackgroundGeolocation.EVENT_PROVIDERCHANGE)) {
-                adapter.onLocationProviderChange(new LocationProviderChangeCallback());
-            } else if (event.equalsIgnoreCase(BackgroundGeolocation.EVENT_GEOFENCESCHANGE)) {
-                adapter.onGeofencesChange(new GeofencesChangeCallback());
-            } else if (event.equalsIgnoreCase(BackgroundGeolocation.EVENT_GEOFENCE)) {
-                adapter.onGeofence(new GeofenceCallback());
-            } else if (event.equalsIgnoreCase(BackgroundGeolocation.EVENT_HEARTBEAT)) {
-                adapter.onHeartbeat(new HeartbeatCallback());
-            } else if (event.equalsIgnoreCase(BackgroundGeolocation.EVENT_HTTP)) {
-                adapter.onHttp(new HttpResponseCallback());
-            } else if (event.equalsIgnoreCase(BackgroundGeolocation.EVENT_SCHEDULE)) {
-                adapter.onSchedule(new ScheduleCallback());
-            } else if (event.equalsIgnoreCase(BackgroundGeolocation.EVENT_POWERSAVECHANGE)) {
-                adapter.onPowerSaveChange(new PowerSaveChangeCallack());
-            } else if (event.equalsIgnoreCase(BackgroundGeolocation.EVENT_CONNECTIVITYCHANGE)) {
-                adapter.onConnectivityChange(new ConnectivityChangeCallback());
-            } else if (event.equalsIgnoreCase(BackgroundGeolocation.EVENT_ENABLEDCHANGE)) {
-                adapter.onEnabledChange(new EnabledChangeCallback());
-            } else if (event.equalsIgnoreCase(BackgroundGeolocation.EVENT_NOTIFICATIONACTION)) {
-                adapter.onNotificationAction(new NotificationActionCallback());
-            } else if (event.equalsIgnoreCase(TSAuthorization.NAME)) {
-                HttpService.getInstance(getReactApplicationContext()).onAuthorization(new AuthorizationCallback());
+            @Override public void onFailure(int accuracyAuthorization) {
+                success.invoke(accuracyAuthorization);
             }
-        }
+        });
     }
 
     @ReactMethod
-    public void removeListener(String event) {
-        Integer count;
-
-        synchronized (mListeners) {
-            if (mListeners.containsKey(event)) {
-                count = mListeners.get(event);
-                count--;
-                if (count > 0) {
-                    mListeners.put(event, count);
-                } else {
-                    getAdapter().removeListeners(event);
-                }
-            }
-        }
+    public void addListener(String event) {
+        // Keep:  Required for RN built-in NativeEventEmitter calls.
     }
 
     @ReactMethod
-    public void removeAllListeners(Callback success, Callback failure) {
-        removeAllListeners();
-        success.invoke();
+    public void removeListeners(Integer count) {
+        // Keep:  Required for RN built-in NativeEventEmitter calls.
     }
 
     private void removeAllListeners() {

package/ios/RNBackgroundGeolocation/RNBackgroundGeolocation.m

@@ -30,22 +30,7 @@ static NSString *const EVENT_NOTIFICATIONACTION = @"notificationaction";
 static NSString *const EVENT_AUTHORIZATION      = @"authorization";
 
 @implementation RNBackgroundGeolocation {
-    NSMutableDictionary *listeners;
     BOOL ready;
-    void(^onLocation)(TSLocation*);
-    void(^onLocationError)(NSError*);
-    void(^onMotionChange)(TSLocation*);
-    void(^onActivityChange)(TSActivityChangeEvent*);
-    void(^onHeartbeat)(TSHeartbeatEvent*);
-    void(^onGeofence)(TSGeofenceEvent*);
-    void(^onGeofencesChange)(TSGeofencesChangeEvent*);
-    void(^onHttp)(TSHttpEvent*);
-    void(^onProviderChange)(TSProviderChangeEvent*);
-    void(^onSchedule)(TSScheduleEvent*);
-    void(^onPowerSaveChange)(TSPowerSaveChangeEvent*);
-    void(^onConnectivityChange)(TSConnectivityChangeEvent*);
-    void(^onEnabledChange)(TSEnabledChangeEvent*);
-    void(^onAuthorization)(TSAuthorizationEvent*);
 }
 
 @synthesize locationManager;
@@ -66,60 +51,7 @@ RCT_EXPORT_MODULE();
     if (self) {
         ready = NO;
 
-        __typeof(self) __weak me = self;
-
         // Build event-listener blocks
-        onLocation = ^void(TSLocation *location) {
-            [me sendEvent:EVENT_LOCATION body:[location toDictionary]];
-        };
-        onLocationError = ^void(NSError *error) {
-            [me sendEvent:EVENT_LOCATION body: @{@"error":@(error.code)}];
-        };
-        onMotionChange = ^void(TSLocation *location) {
-            [me sendEvent:EVENT_MOTIONCHANGE body:@{@"isMoving":@(location.isMoving), @"location":[location toDictionary]}];
-        };
-        onActivityChange = ^void(TSActivityChangeEvent *event) {
-            NSDictionary *params = @{@"activity": event.activity, @"confidence": @(event.confidence)};
-            [me sendEvent:EVENT_ACTIVITYCHANGE body:params];
-        };
-        onHeartbeat = ^void(TSHeartbeatEvent *event) {
-            [me sendEvent:EVENT_HEARTBEAT body:@{@"location":[event.location toDictionary]}];
-        };
-        onGeofence = ^void(TSGeofenceEvent *event) {
-            NSMutableDictionary *params = [[event toDictionary] mutableCopy];
-            [params setObject:[event.location toDictionary] forKey:@"location"];
-            [me sendEvent:EVENT_GEOFENCE body:params];
-        };
-        onGeofencesChange = ^void(TSGeofencesChangeEvent *event) {
-            [me sendEvent:EVENT_GEOFENCESCHANGE body:[event toDictionary]];
-        };
-        onHttp = ^void(TSHttpEvent *response) {
-            NSDictionary *params = @{@"success": @(response.isSuccess), @"status": @(response.statusCode), @"responseText":response.responseText};
-            [me sendEvent:EVENT_HTTP body:params];
-        };
-        onProviderChange = ^void(TSProviderChangeEvent *event) {
-            [me sendEvent:EVENT_PROVIDERCHANGE body:[event toDictionary]];
-        };
-        onSchedule = ^void(TSScheduleEvent *event) {
-            [me sendEvent:EVENT_SCHEDULE body:event.state];
-        };
-        onPowerSaveChange = ^void(TSPowerSaveChangeEvent *event) {
-            [me sendEvent:EVENT_POWERSAVECHANGE body:@(event.isPowerSaveMode)];
-        };
-        onConnectivityChange = ^void(TSConnectivityChangeEvent *event) {
-            NSDictionary *params = @{@"connected":@(event.hasConnection)};
-            [me sendEvent:EVENT_CONNECTIVITYCHANGE body:params];
-        };
-        onEnabledChange = ^void(TSEnabledChangeEvent *event) {
-            [me sendEvent:EVENT_ENABLEDCHANGE body:@(event.enabled)];
-        };
-        onAuthorization = ^void(TSAuthorizationEvent *event) {
-            [me sendEvent:EVENT_AUTHORIZATION body:[event toDictionary]];
-        };
-
-        // EventEmitter listener-counts
-        listeners = [NSMutableDictionary new];
-
         // TSLocationManager instance
         locationManager = [TSLocationManager sharedInstance];
 
@@ -127,10 +59,59 @@ RCT_EXPORT_MODULE();
         UIViewController *root = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
         locationManager.viewController = root;
     }
-
     return self;
 }
 
+-(void) registerEventListeners {
+    __typeof(self) __weak me = self;
+    [locationManager onLocation:^(TSLocation *location) {
+        [me sendEvent:EVENT_LOCATION body:[location toDictionary]];
+    } failure:^(NSError *error) {
+        [me sendEvent:EVENT_LOCATION body: @{@"error":@(error.code)}];
+    }];
+    [locationManager onMotionChange:^(TSLocation *location) {
+        [me sendEvent:EVENT_MOTIONCHANGE body:@{@"isMoving":@(location.isMoving), @"location":[location toDictionary]}];
+    }];
+    [locationManager onActivityChange:^(TSActivityChangeEvent *event) {
+        NSDictionary *params = @{@"activity": event.activity, @"confidence": @(event.confidence)};
+        [me sendEvent:EVENT_ACTIVITYCHANGE body:params];
+    }];
+    [locationManager onHeartbeat:^(TSHeartbeatEvent *event) {
+        [me sendEvent:EVENT_HEARTBEAT body:@{@"location":[event.location toDictionary]}];
+    }];
+    [locationManager onGeofence:^(TSGeofenceEvent *event) {
+        NSMutableDictionary *params = [[event toDictionary] mutableCopy];
+        [params setObject:[event.location toDictionary] forKey:@"location"];
+        [me sendEvent:EVENT_GEOFENCE body:params];
+    }];
+    [locationManager onGeofencesChange:^(TSGeofencesChangeEvent *event) {
+        [me sendEvent:EVENT_GEOFENCESCHANGE body:[event toDictionary]];
+    }];
+    [locationManager onHttp:^(TSHttpEvent *response) {
+        NSDictionary *params = @{@"success": @(response.isSuccess), @"status": @(response.statusCode), @"responseText":response.responseText};
+        [me sendEvent:EVENT_HTTP body:params];
+    }];
+    [locationManager onProviderChange:^(TSProviderChangeEvent *event) {
+        [me sendEvent:EVENT_PROVIDERCHANGE body:[event toDictionary]];
+    }];
+    [locationManager onSchedule:^(TSScheduleEvent *event) {
+        [me sendEvent:EVENT_SCHEDULE body:event.state];
+    }];
+    [locationManager onPowerSaveChange:^(TSPowerSaveChangeEvent *event) {
+        [me sendEvent:EVENT_POWERSAVECHANGE body:@(event.isPowerSaveMode)];
+    }];
+    [locationManager onConnectivityChange:^(TSConnectivityChangeEvent *event) {
+        NSDictionary *params = @{@"connected":@(event.hasConnection)};
+        [me sendEvent:EVENT_CONNECTIVITYCHANGE body:params];
+    }];
+    [locationManager onEnabledChange:^(TSEnabledChangeEvent *event) {
+        [me sendEvent:EVENT_ENABLEDCHANGE body:@(event.enabled)];
+    }];
+    [locationManager onAuthorization:^(TSAuthorizationEvent *event) {
+        [me sendEvent:EVENT_AUTHORIZATION body:[event toDictionary]];
+    }];
+}
+
 - (NSArray<NSString *> *)supportedEvents {
     return @[
         EVENT_LOCATION,
@@ -174,20 +155,26 @@ RCT_EXPORT_METHOD(reset:(NSDictionary*)params success:(RCTResponseSenderBlock)su
  */
 RCT_EXPORT_METHOD(ready:(NSDictionary*)params success:(RCTResponseSenderBlock)success failure:(RCTResponseSenderBlock)failure)
 {
+    BOOL reset = (params[@"reset"]) ? [params[@"reset"] boolValue] : YES;
     if (ready) {
-        [locationManager log:@"warn" message:@"#ready already called.  Redirecting to #setConfig"];
         TSConfig *config = [TSConfig sharedInstance];
-        [config updateWithDictionary:params];
+        if (reset) {
+            [locationManager log:@"warn" message:@"#ready already called.  Redirecting to #setConfig"];
+            [config updateWithDictionary:params];
+        } else {
+            [locationManager log:@"warn" message:@"#ready already called.  Ignored Config since reset: false"];
+        }
         success(@[[config toDictionary]]);
         return;
     }
     ready = YES;
+    [self registerEventListeners];
+
     dispatch_async(dispatch_get_main_queue(), ^{
         TSConfig *config = [TSConfig sharedInstance];
         if (config.isFirstBoot) {
             [config updateWithDictionary:params];
         } else {
-            BOOL reset = (params[@"reset"]) ? [params[@"reset"] boolValue] : YES;
             if (reset) {
                 [config reset:YES];
                 [config updateWithDictionary:params];
@@ -215,72 +202,10 @@ RCT_EXPORT_METHOD(configure:(NSDictionary*)params success:(RCTResponseSenderBloc
     });
 }
 
-RCT_EXPORT_METHOD(addEventListener:(NSString*)event)
-{
-    @synchronized(listeners) {
-        if ([listeners objectForKey:event]) {
-            // Increment listener-count for this event
-            NSInteger count = [[listeners objectForKey:event] integerValue];
-            count++;
-            [listeners setObject:@(count) forKey:event];
-        } else {
-            // First listener for this event
-            [listeners setObject:@(1) forKey:event];
-
-            if ([event isEqualToString:EVENT_LOCATION]) {
-                [locationManager onLocation:onLocation failure:onLocationError];
-            } else if ([event isEqualToString:EVENT_MOTIONCHANGE]) {
-                [locationManager onMotionChange:onMotionChange];
-            } else if ([event isEqualToString:EVENT_ACTIVITYCHANGE]) {
-                [locationManager onActivityChange:onActivityChange];
-            } else if ([event isEqualToString:EVENT_HEARTBEAT]) {
-                [locationManager onHeartbeat:onHeartbeat];
-            } else if ([event isEqualToString:EVENT_GEOFENCE]) {
-                [locationManager onGeofence:onGeofence];
-            } else if ([event isEqualToString:EVENT_GEOFENCESCHANGE]) {
-                [locationManager onGeofencesChange:onGeofencesChange];
-            } else if ([event isEqualToString:EVENT_HTTP]) {
-                [locationManager onHttp:onHttp];
-            } else if ([event isEqualToString:EVENT_PROVIDERCHANGE]) {
-                [locationManager onProviderChange:onProviderChange];
-            } else if ([event isEqualToString:EVENT_SCHEDULE]) {
-                [locationManager onSchedule:onSchedule];
-            } else if ([event isEqualToString:EVENT_POWERSAVECHANGE]) {
-                [locationManager onPowerSaveChange:onPowerSaveChange];
-            } else if ([event isEqualToString:EVENT_CONNECTIVITYCHANGE]) {
-                [locationManager onConnectivityChange:onConnectivityChange];
-            } else if ([event isEqualToString:EVENT_ENABLEDCHANGE]) {
-                [locationManager onEnabledChange:onEnabledChange];
-            } else if ([event isEqualToString:EVENT_AUTHORIZATION]) {
-                [[TSHttpService sharedInstance] onAuthorization:onAuthorization];
-            } else if ([event isEqualToString:EVENT_NOTIFICATIONACTION]) {
-                // No iOS implementation.
-            }
-        }
-    }
-}
 
-RCT_EXPORT_METHOD(removeListener:(NSString*)event)
-{
-    @synchronized(listeners) {
-        if ([listeners objectForKey:event]) {
-            // Decrement listener-count for this event.
-            NSInteger count = [[listeners objectForKey:event] integerValue];
-            count--;
-            if (count > 0) {
-                [listeners setObject:@(count) forKey:event];
-            } else {
-                // No more listeners: tell TSLocationManager to removeListeners for this event.
-                [locationManager removeListeners];
-                [listeners removeObjectForKey:event];
-            }
-        }
-    }
-}
 
 RCT_EXPORT_METHOD(removeAllListeners:(RCTResponseSenderBlock)success failure:(RCTResponseSenderBlock)failure)
 {
-    @synchronized(listeners) { [listeners removeAllObjects]; }
     [locationManager removeListeners];
     success(@[]);
 }
@@ -736,7 +661,7 @@ RCT_EXPORT_METHOD(playSound:(int)soundId)
 
 - (void)invalidate
 {
-    @synchronized(listeners) { [listeners removeAllObjects]; }
+    [super invalidate];
     [locationManager removeListeners];
     dispatch_async(dispatch_get_main_queue(), ^{
         [self.locationManager stopWatchPosition];
@@ -745,7 +670,6 @@ RCT_EXPORT_METHOD(playSound:(int)soundId)
 
 - (void)dealloc
 {
-    @synchronized(listeners) { [listeners removeAllObjects]; }
     [locationManager removeListeners];
     locationManager = nil;
 }