@sentiance-react-native/core 6.21.0 → 6.22.0-rc.1

package/RNSentianceCore.podspec

@@ -5,7 +5,7 @@ sentiance_sdk_env_var_version = ENV["SENTIANCE_RN_IOS_SDK_VERSION"]
 
 Pod::Spec.new do |s|
   s.name         = "RNSentianceCore"
-  s.version      = "6.21.0"
+  s.version      = "6.22.0-rc.1"
   s.summary      = "RNSentianceCore"
   s.description  = <<-DESC
                    RNSentianceCore

package/ios/AbstractSentianceModule.swift

@@ -11,6 +11,7 @@ import SENTSDK
 open class AbstractSentianceModule: RCTEventEmitter {
 
   public let sentiance: Sentiance
+  public var hasListeners: Bool = false
 
   override convenience init() {
     self.init(sentiance: Sentiance.shared)
@@ -20,6 +21,20 @@ open class AbstractSentianceModule: RCTEventEmitter {
     self.sentiance = sentiance
     super.init()
   }
+  
+  open override func startObserving() {
+    hasListeners = true
+  }
+  
+  open override func stopObserving() {
+    hasListeners = false
+  }
+  
+  open override func sendEvent(withName name: String!, body: Any!) {
+    if (hasListeners) {
+      super.sendEvent(withName: name, body: body)
+    }
+  }
 
   @objc
   func addNativeListener() {

package/ios/RNSentianceCore.m

@@ -59,8 +59,14 @@ RCT_EXPORT_MODULE(SentianceCore)
     return NO;
 }
 
+- (void)sendEventWithName:(NSString *)name body:(id)body {
+  if (self.hasListeners) {
+    [super sendEventWithName:name body:body];
+  }
+}
+
 - (void)onDrivingInsightsReadyWithInsights:(SENTDrivingInsights *)insights {
-    [self sendEventWithName:DrivingInsightsReadyEvent body:[self convertDrivingInsights:insights]];
+  [self sendEventWithName:DrivingInsightsReadyEvent body:[self convertDrivingInsights:insights]];
 }
 
 - (void)onEventTimelineUpdateWithEvent:(SENTTimelineEvent * _Nonnull)event {
@@ -68,19 +74,19 @@ RCT_EXPORT_MODULE(SentianceCore)
 }
 
 - (void)onProvisionalAwareEventTimelineUpdateWithEvent:(SENTTimelineEvent * _Nonnull)event {
-    [self sendEventWithName:TimelineUpdateEvent body:[self convertEvent:event]];
+  [self sendEventWithName:TimelineUpdateEvent body:[self convertEvent:event]];
 }
 
 - (void)onSmartGeofenceEvent:(SENTSmartGeofenceEvent * _Nonnull)smartGeofenceEvent {
-    [self sendEventWithName:SmartGeofenceEvent body:[self convertSmartGeofenceEvent:smartGeofenceEvent]];
+  [self sendEventWithName:SmartGeofenceEvent body:[self convertSmartGeofenceEvent:smartGeofenceEvent]];
 }
 
 - (void)didUpdateProvisionalAwareUserContext:(SENTUserContext *)userContext forCriteriaMask:(SENTUserContextUpdateCriteria)criteriaMask {
-    NSDictionary *dict = @{
-        @"userContext": [self convertUserContextToDict:userContext],
-        @"criteria": [self convertUserContextCriteriaToArray:criteriaMask]
-    };
-    [self sendEventWithName:UserContextUpdateEvent body:dict];
+  NSDictionary *dict = @{
+    @"userContext": [self convertUserContextToDict:userContext],
+    @"criteria": [self convertUserContextCriteriaToArray:criteriaMask]
+  };
+  [self sendEventWithName:UserContextUpdateEvent body:dict];
 }
 
 - (void)didUpdateUserContext:(SENTUserContext *)userContext
@@ -214,20 +220,20 @@ RCT_EXPORT_MODULE(SentianceCore)
 }
 
 - (SENTUserLinker) getUserLinker {
-    if (self.userLinker != nil) {
-        return self.userLinker;
-    }
-
-    __weak typeof(self) weakSelf = self;
-
-    self.userLinker = ^(NSString *installId, void (^linkSuccess)(void),
-                        void (^linkFailed)(void)) {
-        weakSelf.userLinkSuccess = linkSuccess;
-        weakSelf.userLinkFailed = linkFailed;
-        [weakSelf sendEventWithName:UserLinkEvent body:[weakSelf convertInstallIdToDict:installId]];
-    };
-
+  if (self.userLinker != nil) {
     return self.userLinker;
+  }
+  
+  __weak typeof(self) weakSelf = self;
+  
+  self.userLinker = ^(NSString *installId, void (^linkSuccess)(void),
+                      void (^linkFailed)(void)) {
+    weakSelf.userLinkSuccess = linkSuccess;
+    weakSelf.userLinkFailed = linkFailed;
+    [weakSelf sendEventWithName:UserLinkEvent body:[weakSelf convertInstallIdToDict:installId]];
+  };
+  
+  return self.userLinker;
 }
 
 
@@ -237,9 +243,7 @@ RCT_EXPORT_MODULE(SentianceCore)
     __weak typeof(self) weakSelf = self;
 
     [self setSdkStatusHandler:^(SENTSDKStatus *status) {
-        if (weakSelf.hasListeners) {
-            [weakSelf sendEventWithName:SdkStatusUpdateEvent body:[weakSelf convertSdkStatusToDict:status]];
-        }
+      [weakSelf sendEventWithName:SdkStatusUpdateEvent body:[weakSelf convertSdkStatusToDict:status]];
     }];
     return self.sdkStatusHandler;
 }
@@ -771,20 +775,18 @@ RCT_EXPORT_METHOD(deleteKeychainEntries:(RCTPromiseResolveBlock)resolve rejecter
 
 RCT_EXPORT_METHOD(listenUserActivityUpdates:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
-    REJECT_IF_SDK_NOT_INITIALIZED(reject);
-
-    @try {
-        __weak typeof(self) weakSelf = self;
-        [[Sentiance sharedInstance] setUserActivityListener:^(SENTUserActivity *userActivity) {
-            NSDictionary *userActivityDict = [self convertUserActivityToDict:userActivity];
-            if(weakSelf.hasListeners) {
-                [weakSelf sendEventWithName:UserActivityUpdateEvent body:userActivityDict];
-            }
-        }];
-        resolve(nil);
-    } @catch (NSException *e) {
-        reject(e.name, e.reason, nil);
-    }
+  REJECT_IF_SDK_NOT_INITIALIZED(reject);
+  
+  @try {
+    __weak typeof(self) weakSelf = self;
+    [[Sentiance sharedInstance] setUserActivityListener:^(SENTUserActivity *userActivity) {
+      NSDictionary *userActivityDict = [self convertUserActivityToDict:userActivity];
+      [weakSelf sendEventWithName:UserActivityUpdateEvent body:userActivityDict];
+    }];
+    resolve(nil);
+  } @catch (NSException *e) {
+    reject(e.name, e.reason, nil);
+  }
 }
 
 RCT_EXPORT_METHOD(getUserActivity:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
@@ -824,10 +826,8 @@ RCT_EXPORT_METHOD(listenVehicleCrashEvents:(RCTPromiseResolveBlock)resolve rejec
         __weak typeof(self) weakSelf = self;
 
         [[Sentiance sharedInstance] setVehicleCrashHandler:^(SENTVehicleCrashEvent *crashEvent) {
-            if(weakSelf.hasListeners) {
-                NSDictionary *crashEventDict = [self convertVehicleCrashEventToDict:crashEvent];
-                [weakSelf sendEventWithName:VehicleCrashEvent body:crashEventDict];
-            }
+          NSDictionary *crashEventDict = [self convertVehicleCrashEventToDict:crashEvent];
+          [weakSelf sendEventWithName:VehicleCrashEvent body:crashEventDict];
         }];
         resolve(@(YES));
     } @catch (NSException *e) {
@@ -837,21 +837,19 @@ RCT_EXPORT_METHOD(listenVehicleCrashEvents:(RCTPromiseResolveBlock)resolve rejec
 
 RCT_EXPORT_METHOD(listenVehicleCrashDiagnostic:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
-    REJECT_IF_SDK_NOT_INITIALIZED(reject);
-
-    @try {
-        __weak typeof(self) weakSelf = self;
-
-        [[Sentiance sharedInstance] setVehicleCrashDiagnosticHandler:^(SENTVehicleCrashDiagnostic *crashDiagnostic) {
-            if(weakSelf.hasListeners) {
-                NSDictionary *crashDiagnosticEventDict = [self convertVehicleCrashDiagnosticToDict:crashDiagnostic];
-                [weakSelf sendEventWithName:VehicleCrashDiagnosticEvent body:crashDiagnosticEventDict];
-            }
-        }];
-        resolve(@(YES));
-    } @catch (NSException *e) {
-        reject(e.name, e.reason, nil);
-    }
+  REJECT_IF_SDK_NOT_INITIALIZED(reject);
+  
+  @try {
+    __weak typeof(self) weakSelf = self;
+    
+    [[Sentiance sharedInstance] setVehicleCrashDiagnosticHandler:^(SENTVehicleCrashDiagnostic *crashDiagnostic) {
+      NSDictionary *crashDiagnosticEventDict = [self convertVehicleCrashDiagnosticToDict:crashDiagnostic];
+      [weakSelf sendEventWithName:VehicleCrashDiagnosticEvent body:crashDiagnosticEventDict];
+    }];
+    resolve(@(YES));
+  } @catch (NSException *e) {
+    reject(e.name, e.reason, nil);
+  }
 }
 
 RCT_EXPORT_METHOD(isThirdPartyLinked:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
@@ -1031,9 +1029,7 @@ RCT_EXPORT_METHOD(listenTripTimeout:(RCTPromiseResolveBlock)resolve rejecter:(RC
 {
     __weak typeof(self) weakSelf = self;
     [[Sentiance sharedInstance] setTripTimeoutListener:^ {
-        if (weakSelf.hasListeners) {
-            [weakSelf sendEventWithName:TripTimeoutEvent body:nil];
-        }
+      [weakSelf sendEventWithName:TripTimeoutEvent body:nil];
     }];
     resolve(nil);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentiance-react-native/core",
-  "version": "6.21.0",
+  "version": "6.22.0-rc.1",
   "description": "The Sentiance Core library",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -23,10 +23,10 @@
       "targetSdk": 34,
       "compileSdk": 34,
       "buildTools": "34.0.0",
-      "sentiance": "6.21.+"
+      "sentiance": "6.22.0-rc1"
     },
     "ios": {
-      "sentiance": "~> 6.21.0"
+      "sentiance": "6.22.0-rc1"
     }
   },
   "scripts": {