@woosmap/react-native-plugin-geofencing 1.0.0-beta.1 → 1.0.0-beta.3

package/android/src/main/java/com/{reactnativeplugingeofencing → woosmap/reactnativeplugingeofencing}/WoosmapGeofencingTurboPackage.java

@@ -1,4 +1,4 @@
-package com.reactnativeplugingeofencing;
+package com.woosmap.reactnativeplugingeofencing;
 
 import androidx.annotation.Nullable;
 
@@ -12,12 +12,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * TurboReactPackage that registers {@link WoosmapGeofencingTurboModule}.
- *
- * <p>Kept separate from {@code PluginGeofencingPackage} so the New-Architecture
- * module and the legacy module load independently. To avoid the startup-race
- * register this package <em>before</em> the legacy one
- * in the host app's {@code MainApplication} package list.
+ * TurboReactPackage that registers {@link WoosmapGeofencingTurboModule}, the
+ * single native module exposed by the plugin.
  */
 public class WoosmapGeofencingTurboPackage extends TurboReactPackage {
 

package/android/src/main/java/com/{reactnativeplugingeofencing → woosmap/reactnativeplugingeofencing}/WoosmapMessageAndKey.java

@@ -1,4 +1,4 @@
-package com.reactnativeplugingeofencing;
+package com.woosmap.reactnativeplugingeofencing;
 
 
 import com.webgeoservices.woosmapgeofencing.WoosmapSettings;
@@ -41,6 +41,7 @@ public class WoosmapMessageAndKey {
   protected static String regionErrorCallbackName="woosmapgeofenceRegionError";
   protected static String regionWatchAlreadyStarted="Region watch already added";
   protected static String regionWatchNotStarted="region watch not started";
+  protected static String permissionRequestInProgress="A permission request is already in progress";
   protected static String radiusEmptyMessage="Radius value can not be empty";
   protected static String invalidRadiusMessage="POI Radius should be an integer or a string.";
   protected static String regionInfoEmptyMessage="regionInfo cannot be empty or null.";
@@ -51,10 +52,8 @@ public class WoosmapMessageAndKey {
   protected static String requiredVenueId="Venue id cannot be empty";
   protected static String requiredLocationid="Location id cannot be empty or null";
   protected static String invalidRegionid="Unable to fetch region info";
-  protected static String invalidLocationid="Unable to fetch POI info";
   protected static String deleteMessage="Deleted";
   protected static String requiredLocationID = "Location id cannot be empty or null";
-  protected static String invalidLocationID = "Unable to fetch location info";
   protected static String invalidProfileSourceType = "Provide valid source type type (local/external)";
   protected static String invalidProfileFile = "Invalid profile file";
   protected static String localMode="local";

package/android/src/main/java/com/{reactnativeplugingeofencing → woosmap/reactnativeplugingeofencing}/WoosmapTask.java

@@ -1,4 +1,4 @@
-package com.reactnativeplugingeofencing;
+package com.woosmap.reactnativeplugingeofencing;
 
 import android.content.Context;
 import android.os.Build;
@@ -69,55 +69,6 @@ public class WoosmapTask {
     });
   }
 
-  @RequiresApi(api = Build.VERSION_CODES.N)
-  public void enqueGetRegionsRequest(String regionID,Promise promise) {
-    CompletableFuture.supplyAsync(() -> {
-      try {
-        Region region;
-        region = WoosmapDb.getInstance(context).getRegionsDAO().getRegionFromId(regionID);
-        if(region!=null){
-          return WoosmapUtil.getRegionWritableMap(region);
-        }
-      } catch (Exception ex) {
-        throw new CompletionException(ex);
-      }
-      return null;
-    }).whenComplete((data, throwable) -> {
-      if (throwable == null) {
-        if(data==null){
-          promise.reject(WoosmapMessageAndKey.errorCode,WoosmapMessageAndKey.invalidRegionid);
-        }else {
-          promise.resolve(data);
-        }
-      } else {
-        promise.reject(WoosmapMessageAndKey.errorCode,throwable.getMessage());
-      }
-    });
-  }
-
-  @RequiresApi(api = Build.VERSION_CODES.N)
-  public void enqueGetRegionsRequest(Promise promise) {
-    CompletableFuture.supplyAsync(() -> {
-      try {
-        Region[] regions;
-        WritableArray array= Arguments.createArray();
-        regions = WoosmapDb.getInstance(context).getRegionsDAO().getAllRegions();
-        for (Region region : regions) {
-          array.pushMap(WoosmapUtil.getRegionWritableMap(region));
-        }
-        return array;
-      } catch (Exception ex) {
-        throw new CompletionException(ex);
-      }
-    }).whenComplete((data, throwable) -> {
-      if (throwable == null) {
-        promise.resolve(data);
-      } else {
-        promise.reject(WoosmapMessageAndKey.errorCode,throwable.getMessage());
-      }
-    });
-  }
-
   /**
    * Resolves regions as a {@link WritableArray} in all cases. Used by the
    * WoosmapGeofencingTurbo module, whose getRegions spec always returns a
@@ -203,15 +154,24 @@ public class WoosmapTask {
     });
   }
 
+  /** Returns an array; if locationID is null/empty all locations are returned, otherwise the single match. */
   @RequiresApi(api = Build.VERSION_CODES.N)
-  public void enqueGetAllPoiRequest(Promise promise) {
+  public void enqueueGetLocationsAsArrayRequest(@androidx.annotation.Nullable String locationID, Promise promise) {
     CompletableFuture.supplyAsync(() -> {
       try {
-        POI[] pois;
-        WritableArray array= Arguments.createArray();
-        pois = WoosmapDb.getInstance(context).getPOIsDAO().getAllPOIs();
-        for (POI poi : pois) {
-          array.pushMap(WoosmapUtil.getPOIWritableMap(poi));
+        WritableArray array = Arguments.createArray();
+        MovingPosition[] movingPositions = WoosmapDb.getInstance(context).getMovingPositionsDao().getMovingPositions(-1);
+        if (locationID == null || locationID.isEmpty()) {
+          for (MovingPosition location : movingPositions) {
+            array.pushMap(WoosmapUtil.getMovingPositionObject(location));
+          }
+        } else {
+          for (MovingPosition location : movingPositions) {
+            if (location.id == Integer.parseInt(locationID)) {
+              array.pushMap(WoosmapUtil.getMovingPositionObject(location));
+              break;
+            }
+          }
         }
         return array;
       } catch (Exception ex) {
@@ -221,85 +181,30 @@ public class WoosmapTask {
       if (throwable == null) {
         promise.resolve(data);
       } else {
-        promise.reject(WoosmapMessageAndKey.errorCode,throwable.getMessage());
+        promise.reject(WoosmapMessageAndKey.errorCode, throwable.getMessage());
       }
     });
   }
+
+  /** Returns an array; if poiID is null/empty all POIs are returned, otherwise the single match. */
   @RequiresApi(api = Build.VERSION_CODES.N)
-  public void enqueGetPOIRequest(String locationID,Promise promise) {
+  public void enqueueGetPoisAsArrayRequest(@androidx.annotation.Nullable String poiID, Promise promise) {
     CompletableFuture.supplyAsync(() -> {
       try {
-        POI poi;
-        poi = WoosmapDb.getInstance(context).getPOIsDAO().getPOIbyStoreId(locationID);
-        if(poi!=null){
-          return WoosmapUtil.getPOIWritableMap(poi);
-        }else {
-          if(WoosmapUtil.onlyContainsNumbers(locationID)){
-            poi = WoosmapDb.getInstance(context).getPOIsDAO().getPOIbyLocationID(Integer.parseInt(locationID));
-            if(poi!=null){
-              return WoosmapUtil.getPOIWritableMap(poi);
-            }
+        WritableArray array = Arguments.createArray();
+        if (poiID == null || poiID.isEmpty()) {
+          POI[] pois = WoosmapDb.getInstance(context).getPOIsDAO().getAllPOIs();
+          for (POI poi : pois) {
+            array.pushMap(WoosmapUtil.getPOIWritableMap(poi));
           }
-        }
-      } catch (Exception ex) {
-        throw new CompletionException(ex);
-      }
-      return null;
-    }).whenComplete((data, throwable) -> {
-      if (throwable == null) {
-        if(data==null){
-          promise.reject(WoosmapMessageAndKey.errorCode,WoosmapMessageAndKey.invalidLocationid);
-        }else {
-          promise.resolve(data);
-        }
-      } else {
-        promise.reject(WoosmapMessageAndKey.errorCode,throwable.getMessage());
-      }
-    });
-  }
-  @RequiresApi(api = Build.VERSION_CODES.N)
-  protected void enqueueGetLocationRequest(String locationID,Promise promise) {
-    CompletableFuture.supplyAsync(() -> {
-      try {
-        MovingPosition requiredLocation=null;
-        MovingPosition[]movingPosition;
-        movingPosition = WoosmapDb.getInstance(context).getMovingPositionsDao().getMovingPositions(-1);
-        for (MovingPosition location : movingPosition) {
-          if(location.id==Integer.parseInt(locationID)){
-            requiredLocation=location;
-            break;
+        } else {
+          POI poi = WoosmapDb.getInstance(context).getPOIsDAO().getPOIbyStoreId(poiID);
+          if (poi == null && WoosmapUtil.onlyContainsNumbers(poiID)) {
+            poi = WoosmapDb.getInstance(context).getPOIsDAO().getPOIbyLocationID(Integer.parseInt(poiID));
+          }
+          if (poi != null) {
+            array.pushMap(WoosmapUtil.getPOIWritableMap(poi));
           }
-        }
-        if(requiredLocation!=null){
-          return WoosmapUtil.getMovingPositionObject(requiredLocation);
-        }
-
-      } catch (Exception ex) {
-        throw new CompletionException(ex);
-      }
-      return null;
-    }).whenComplete((data, throwable) -> {
-      if (throwable == null) {
-        if(data==null){
-          promise.reject(WoosmapMessageAndKey.errorCode,WoosmapMessageAndKey.invalidLocationID);
-        }else {
-          promise.resolve(data);
-        }
-      } else {
-        promise.reject(WoosmapMessageAndKey.errorCode,throwable.getMessage());
-      }
-    });
-  }
-
-  @RequiresApi(api = Build.VERSION_CODES.N)
-  protected void enqueueGetLocationRequest(Promise promise) {
-    CompletableFuture.supplyAsync(() -> {
-      try {
-        MovingPosition[]movingPosition;
-        WritableArray array= Arguments.createArray();
-        movingPosition = WoosmapDb.getInstance(context).getMovingPositionsDao().getMovingPositions(-1);
-        for (MovingPosition location : movingPosition) {
-          array.pushMap(WoosmapUtil.getMovingPositionObject(location));
         }
         return array;
       } catch (Exception ex) {
@@ -309,10 +214,11 @@ public class WoosmapTask {
       if (throwable == null) {
         promise.resolve(data);
       } else {
-        promise.reject(WoosmapMessageAndKey.errorCode,throwable.getMessage());
+        promise.reject(WoosmapMessageAndKey.errorCode, throwable.getMessage());
       }
     });
   }
+
   @RequiresApi(api = Build.VERSION_CODES.N)
   protected void removeAllLocation(final Promise promise){
     CompletableFuture.supplyAsync((Supplier<Void>) () -> {

package/android/src/main/java/com/{reactnativeplugingeofencing → woosmap/reactnativeplugingeofencing}/WoosmapUtil.java

@@ -1,4 +1,4 @@
-package com.reactnativeplugingeofencing;
+package com.woosmap.reactnativeplugingeofencing;
 
 import static android.content.Context.MODE_PRIVATE;
 

package/ios/WoosmapGeofenceMessage.swift

@@ -21,6 +21,7 @@ internal struct WoosmapGeofenceMessage {
     static let replacePermission = "You already given location permission to app. Do you want to change it? Please modified it from settings at privacy -> location service -> %@"
     static let deniedPermission = "You are previously denied location permission to app. To change it? Please modified it from settings at privacy -> location service -> %@"
     static let samePermission = "Already allow permission for it"
+    static let permissionRequestInProgress = "A permission request is already in progress"
     static let initialize = "OK"
     static let invalidGoogleKey = "Google key Not provided"
     static let invalidWoosmapKey = "Woosmap API key not provided"

package/ios/WoosmapGeofencingTurbo.mm

@@ -1,4 +1,5 @@
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
 // Generated by codegen from src/NativeWoosmapGeofencingTurbo.ts via the
@@ -9,13 +10,21 @@
 #endif
 
 // Bridges the Swift `WoosmapGeofencingTurbo` implementation to React Native.
-// The selectors below must match the @objc(...) selectors declared in
-// WoosmapGeofencingTurbo.swift.
-@interface RCT_EXTERN_MODULE(WoosmapGeofencingTurbo, NSObject)
+// The base class is RCTEventEmitter (was NSObject) so the module can both
+// expose native methods and fire JS events via NativeEventEmitter.
+// Selectors must match the @objc(...) annotations in WoosmapGeofencingTurbo.swift.
+@interface RCT_EXTERN_MODULE(WoosmapGeofencingTurbo, RCTEventEmitter)
 
-// Selectors follow the React Native codegen Promise convention
-// (`<method>:resolve:reject:`, or `<method>:reject:` for no-arg methods) so the
-// generated NativeWoosmapGeofencingTurboSpecJSI bindings dispatch correctly.
+// ── NativeEventEmitter contract ────────────────────────────────────────────
+RCT_EXTERN_METHOD(addListener:(NSString *)eventName)
+RCT_EXTERN_METHOD(removeListeners:(double)count)
+
+// ── Lifecycle / initialization ─────────────────────────────────────────────
+RCT_EXTERN_METHOD(initialize:(NSDictionary *)command
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+// ── Region CRUD ──────────────────────────────────────────────
 RCT_EXTERN_METHOD(setWoosmapApiKey:(NSString *)apiKey
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
@@ -39,6 +48,98 @@ RCT_EXTERN_METHOD(removeRegion:(NSString *)regionId
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
+// ── Tracking ─────────────────────────────────────────────────
+RCT_EXTERN_METHOD(startTracking:(NSString *)profile
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(stopTracking:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(startCustomTracking:(NSString *)mode
+                  source:(NSString *)source
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+// ── Event watches ────────────────────────────────
+RCT_EXTERN_METHOD(watchLocation:(NSString *)watchID
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(clearLocationWatch:(NSString *)watchID
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(clearAllLocationWatch:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(watchRegions:(NSString *)watchID
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(clearRegionsWatch:(NSString *)watchID
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(clearAllRegionsWatch:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+// ── Permission requests ──────────────────────────
+RCT_EXTERN_METHOD(requestPermissions:(BOOL)background
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(requestBLEPermissions:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(requestNotificationPermissions:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+// ── Permission status ───────────────────────────────────────
+RCT_EXTERN_METHOD(getPermissionsStatus:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(getBLEPermissionsStatus:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(getNotificationPermissionsStatus:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+// ── Configuration ────────────────────────────────────────────
+RCT_EXTERN_METHOD(setSFMCCredentials:(NSDictionary *)credentials
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(setProtectedRegionSlot:(NSNumber *)slots
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+// ── Data queries ─────────────────────────────────────────────
+RCT_EXTERN_METHOD(getLocations:(NSString *)locationId
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(getPois:(NSString *)poiId
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(getIndoorBeacons:(NSString *)venueId
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+// ── Data removal ─────────────────────────────────────────────
+RCT_EXTERN_METHOD(removeLocations:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(removePois:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(removeIndoorBeacons:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(refreshPois:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
 + (BOOL)requiresMainQueueSetup
 {
   return YES;
@@ -47,10 +148,9 @@ RCT_EXTERN_METHOD(removeRegion:(NSString *)regionId
 @end
 
 #ifdef RCT_NEW_ARCH_ENABLED
-// Vends the JSI TurboModule so the 6 methods dispatch through the generated
-// codegen path (no ObjCTurboModule reflection fallback). Implemented as a
-// category on the Swift class because getTurboModule: returns a C++ type that
-// cannot be expressed in Swift.
+// Vends the JSI TurboModule so all methods dispatch through the generated
+// codegen path. Implemented as a category on the Swift class because
+// getTurboModule: returns a C++ type that cannot be expressed in Swift.
 @interface WoosmapGeofencingTurbo (TurboModule) <RCTTurboModule>
 @end