@woosmap/react-native-plugin-geofencing 0.7.3 → 0.7.4-beta.1

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.7.4
+- Bug fix: Geofencing bridge breaks after React Native upgrade from v0.71 → v0.79.5
+
 ## 0.7.3
 - Enhancement: Added ESModule support
 

package/android/src/main/java/com/reactnativeplugingeofencing/PluginGeofencingModule.java

@@ -104,7 +104,7 @@ public class PluginGeofencingModule extends ReactContextBaseJavaModule implement
       }
       this.woosmap.onResume();
       //Add region listener
-      regionReadyListener = new WoosRegionReadyListener(getReactApplicationContext());
+      regionReadyListener = new WoosRegionReadyListener(reactContext);
       woosmap.setRegionLogReadyListener(regionReadyListener);
       woosmap.setRegionReadyListener(regionReadyListener);
       if (!trackingProfile.isEmpty()) {

package/android/src/main/java/com/reactnativeplugingeofencing/WoosLocationReadyListener.java

@@ -1,12 +1,7 @@
 package com.reactnativeplugingeofencing;
 
-import android.content.Context;
 import android.location.Location;
-
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.webgeoservices.woosmapgeofencing.Woosmap;
 
@@ -14,24 +9,19 @@ import com.webgeoservices.woosmapgeofencing.Woosmap;
  * Implements Woosmap Location Ready callbacks
  */
 public class WoosLocationReadyListener implements Woosmap.LocationReadyListener {
-  private ReactNativeHost reactNativeHost;
-  private Context context;
-  public WoosLocationReadyListener(Context context){
+  private ReactApplicationContext context;
+  public WoosLocationReadyListener(ReactApplicationContext context){
     this.context=context;
   }
 
   private void sendEvent(final String eventName, final Object data) {
-    final ReactInstanceManager reactInstanceManager = reactNativeHost.getReactInstanceManager();
-    ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-    if (reactContext != null) {
-      reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, data);
+    if (context != null) {
+      context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, data);
     }
   }
   @Override
   public void LocationReadyCallback(Location location) {
     try {
-      ReactApplication reactApplication = ((ReactApplication)context.getApplicationContext());
-      reactNativeHost = reactApplication.getReactNativeHost();
       sendEvent(WoosmapMessageAndKey.locationSuccessCallbackName, WoosmapUtil.getLocationWritableMap(location));
     }catch (Exception ex){
       sendEvent(WoosmapMessageAndKey.locationErrorCallbackName, ex.getMessage());

package/android/src/main/java/com/reactnativeplugingeofencing/WoosRegionReadyListener.java

@@ -1,11 +1,6 @@
 package com.reactnativeplugingeofencing;
 
-import android.content.Context;
-
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.webgeoservices.woosmapgeofencing.Woosmap;
 import com.webgeoservices.woosmapgeofencingcore.database.Region;
@@ -17,11 +12,9 @@ import java.util.HashMap;
  * Implements Woosmap Region callbacks
  */
 public class WoosRegionReadyListener implements Woosmap.RegionReadyListener,Woosmap.RegionLogReadyListener {
-
-  private ReactNativeHost reactNativeHost;
-  private Context context;
+  private ReactApplicationContext context;
   private boolean isRegionWatchEnabled = false;
-  public WoosRegionReadyListener(Context context){
+  public WoosRegionReadyListener(ReactApplicationContext context){
     this.context=context;
   }
 
@@ -33,10 +26,8 @@ public class WoosRegionReadyListener implements Woosmap.RegionReadyListener,Woos
     isRegionWatchEnabled = value;
   }
   private void sendEvent(final String eventName, final Object data) {
-    final ReactInstanceManager reactInstanceManager = reactNativeHost.getReactInstanceManager();
-    ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-    if (reactContext != null) {
-      reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, data);
+    if (context != null) {
+      context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, data);
     }
   }
   @Override
@@ -49,8 +40,6 @@ public class WoosRegionReadyListener implements Woosmap.RegionReadyListener,Woos
         airshipPushHelper.pushDataToCloud(data);
       }
       if (isRegionWatchEnabled){
-        ReactApplication reactApplication = ((ReactApplication)context.getApplicationContext());
-        reactNativeHost = reactApplication.getReactNativeHost();
         sendEvent(WoosmapMessageAndKey.regionSuccessCallbackName, WoosmapUtil.getRegionWritableMap(regionLog));
       }
     }catch (Exception ex){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@woosmap/react-native-plugin-geofencing",
-	"version": "0.7.3",
+	"version": "0.7.4-beta.1",
   "description": "This react-native plugin extends the functionality offered by the Woosmap Geofencing Mobile SDKs. Find more about the Woosmap Geofencing SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",