@sentiance-react-native/core 6.9.1-rc.2 → 6.10.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.9.1-rc.2"
+  s.version      = "6.10.0-rc.1"
   s.summary      = "RNSentianceCore"
   s.description  = <<-DESC
                    RNSentianceCore

package/ios/RNSentianceCore+Converter.m

@@ -222,6 +222,10 @@ static NSString * const SmartGeofencesErrorDomain = @"com.sentiance.SmartGeofenc
     if (event.distanceInMeters != nil) {
         dict[@"distance"] = event.distanceInMeters;
     }
+
+    if (event.tags != nil) {
+        dict[@"transportTags"] = event.tags;
+    }
 }
 
 - (NSDictionary*)convertWaypoint:(SENTWaypoint*)waypoint {
@@ -1139,14 +1143,12 @@ static NSString * const SmartGeofencesErrorDomain = @"com.sentiance.SmartGeofenc
     return [typesSet copy];
 }
 
-- (NSDictionary<NSString *, NSDictionary<NSString *, NSNumber *> *> *)convertDrivingInsights:(SENTDrivingInsights *)drivingInsights {
+- (NSDictionary<NSString *, NSDictionary<NSString *, id> *> *)convertDrivingInsights:(SENTDrivingInsights *)drivingInsights {
     NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
     NSMutableDictionary *transportEventDict = [[NSMutableDictionary alloc] init];
     NSMutableDictionary *safetyScoresDict = [[NSMutableDictionary alloc] init];
 
-    [self _addBaseEventFields:transportEventDict event:drivingInsights.transportEvent];
-    [self addTransportEventInfoToDict:transportEventDict event:drivingInsights.transportEvent];
-    dict[@"transportEvent"] = transportEventDict;
+    dict[@"transportEvent"] = [self convertEvent:drivingInsights.transportEvent];
 
     NSNumber* smoothScore = drivingInsights.safetyScores.smoothScore;
     if (smoothScore != nil) {
@@ -1178,7 +1180,7 @@ static NSString * const SmartGeofencesErrorDomain = @"com.sentiance.SmartGeofenc
     return dict;
 }
 
-- (NSArray<NSDictionary<NSString *, NSNumber *> *> *)convertHarshDrivingEvents:(NSArray<SENTHarshDrivingEvent*> *)harshDrivingEvents {
+- (NSArray<NSDictionary<NSString *, id> *> *)convertHarshDrivingEvents:(NSArray<SENTHarshDrivingEvent*> *)harshDrivingEvents {
     NSMutableArray <NSDictionary<NSString *, NSNumber *> *> *array = [[NSMutableArray alloc] init];
     for (SENTHarshDrivingEvent *event in harshDrivingEvents) {
         [array addObject:[self convertHarshDrivingEvent:event]];
@@ -1186,13 +1188,15 @@ static NSString * const SmartGeofencesErrorDomain = @"com.sentiance.SmartGeofenc
     return array;
 }
 
-- (NSDictionary<NSString *, NSNumber *> *)convertHarshDrivingEvent:(SENTHarshDrivingEvent *)harshDrivingEvent {
-    NSMutableDictionary<NSString *, NSNumber *> *dict = [self convertDrivingEvent:harshDrivingEvent];
+- (NSDictionary<NSString *, id> *)convertHarshDrivingEvent:(SENTHarshDrivingEvent *)harshDrivingEvent {
+    NSMutableDictionary<NSString *, id> *dict = [self convertDrivingEvent:harshDrivingEvent];
     dict[@"magnitude"] = @(harshDrivingEvent.magnitude);
+    dict[@"confidence"] = @(harshDrivingEvent.confidence);
+    dict[@"type"] = [self stringifyHarshEventType:harshDrivingEvent.type];
     return dict;
 }
 
-- (NSArray<NSDictionary<NSString *, NSNumber *> *> *)convertPhoneUsageEvents:(NSArray<SENTPhoneUsageEvent*> *)phoneUsageEvents {
+- (NSArray<NSDictionary<NSString *, id> *> *)convertPhoneUsageEvents:(NSArray<SENTPhoneUsageEvent*> *)phoneUsageEvents {
     NSMutableArray <NSDictionary<NSString *, NSNumber *> *> *array = [[NSMutableArray alloc] init];
     for (SENTPhoneUsageEvent *event in phoneUsageEvents) {
         [array addObject:[self convertPhoneUsageEvent:event]];
@@ -1200,11 +1204,11 @@ static NSString * const SmartGeofencesErrorDomain = @"com.sentiance.SmartGeofenc
     return array;
 }
 
-- (NSDictionary<NSString *, NSNumber *> *)convertPhoneUsageEvent:(SENTPhoneUsageEvent *)phoneUsageEvent {
+- (NSDictionary<NSString *, id> *)convertPhoneUsageEvent:(SENTPhoneUsageEvent *)phoneUsageEvent {
     return [self convertDrivingEvent:phoneUsageEvent];
 }
 
-- (NSArray<NSDictionary<NSString *, NSNumber *> *> *)convertCallWhileMovingEvents:(NSArray<SENTCallWhileMovingEvent*> *)callWhileMovingEvents {
+- (NSArray<NSDictionary<NSString *, id> *> *)convertCallWhileMovingEvents:(NSArray<SENTCallWhileMovingEvent*> *)callWhileMovingEvents {
     NSMutableArray <NSDictionary<NSString *, NSNumber *> *> *array = [[NSMutableArray alloc] init];
     for (SENTCallWhileMovingEvent *event in callWhileMovingEvents) {
         [array addObject:[self convertCallWhileMovingEvent:event]];
@@ -1212,8 +1216,8 @@ static NSString * const SmartGeofencesErrorDomain = @"com.sentiance.SmartGeofenc
     return array;
 }
 
-- (NSDictionary<NSString *, NSNumber *> *)convertCallWhileMovingEvent:(SENTCallWhileMovingEvent *)callWhileMovingEvent {
-    NSMutableDictionary<NSString *, NSNumber *> *dict = [self convertDrivingEvent:callWhileMovingEvent];
+- (NSDictionary<NSString *, id> *)convertCallWhileMovingEvent:(SENTCallWhileMovingEvent *)callWhileMovingEvent {
+    NSMutableDictionary<NSString *, id> *dict = [self convertDrivingEvent:callWhileMovingEvent];
     if (callWhileMovingEvent.minTraveledSpeedInMps != nil) {
         dict[@"minTravelledSpeedInMps"] = callWhileMovingEvent.minTraveledSpeedInMps;
     }
@@ -1223,7 +1227,7 @@ static NSString * const SmartGeofencesErrorDomain = @"com.sentiance.SmartGeofenc
     return dict;
 }
 
-- (NSArray<NSDictionary<NSString *, NSNumber *> *> *)convertSpeedingEvents:(NSArray<SENTSpeedingEvent*> *)speedingEvents {
+- (NSArray<NSDictionary<NSString *, id> *> *)convertSpeedingEvents:(NSArray<SENTSpeedingEvent*> *)speedingEvents {
     NSMutableArray <NSDictionary<NSString *, NSNumber *> *> *array = [[NSMutableArray alloc] init];
     for (SENTSpeedingEvent *event in speedingEvents) {
         [array addObject:[self convertSpeedingEvent:event]];
@@ -1231,13 +1235,13 @@ static NSString * const SmartGeofencesErrorDomain = @"com.sentiance.SmartGeofenc
     return array;
 }
 
-- (NSDictionary<NSString *, NSNumber *> *)convertSpeedingEvent:(SENTSpeedingEvent *)speedingEvent {
+- (NSDictionary<NSString *, id> *)convertSpeedingEvent:(SENTSpeedingEvent *)speedingEvent {
     NSMutableDictionary *dict = [self convertDrivingEvent:speedingEvent];
     dict[@"waypoints"] = [self convertWaypointArray:speedingEvent.waypoints];
     return dict;
 }
 
-- (NSMutableDictionary<NSString *, NSNumber *> *)convertDrivingEvent:(SENTDrivingEvent *)drivingEvent {
+- (NSMutableDictionary<NSString *, id> *)convertDrivingEvent:(SENTDrivingEvent *)drivingEvent {
     NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
     dict[@"startTime"] = [drivingEvent.startDate description];
     dict[@"startTimeEpoch"] = @((long) (drivingEvent.startDate.timeIntervalSince1970 * 1000));
@@ -1345,4 +1349,15 @@ static NSString * const SmartGeofencesErrorDomain = @"com.sentiance.SmartGeofenc
     return dict;
 }
 
+- (NSString *)stringifyHarshEventType:(HarshDrivingEventType)type {
+    switch (type) {
+        case HarshDrivingEventTypeAcceleration:
+            return @"ACCELERATION";
+        case HarshDrivingEventTypeBraking:
+            return @"BRAKING";
+        case HarshDrivingEventTypeTurn:
+            return @"TURN";
+    }
+}
+
 @end

package/ios/RNSentianceCore.m

@@ -8,9 +8,9 @@
 #import "RNSentianceSubscriptionsManager.h"
 
 #define REJECT_IF_SDK_NOT_INITIALIZED(reject) if ([self isSdkNotInitialized]) {                            \
-                                                  reject(ESDKNotInitialized, @"Sdk not initialized", nil); \
-                                                  return;                                                  \
-                                              }
+reject(ESDKNotInitialized, @"Sdk not initialized", nil); \
+return;                                                  \
+}
 
 @interface RNSentianceCore()
 
@@ -135,11 +135,11 @@ RCT_EXPORT_MODULE(SentianceCore)
 }
 
 - (BOOL) initSDKIfUserLinkingCompleted:(NSString *)appId
-          secret:(NSString *)secret
-         baseURL:(nullable NSString *)baseURL
-     shouldStart:(BOOL)shouldStart
-        resolver:(RCTPromiseResolveBlock)resolve
-        rejecter:(RCTPromiseRejectBlock)reject
+                                secret:(NSString *)secret
+                               baseURL:(nullable NSString *)baseURL
+                           shouldStart:(BOOL)shouldStart
+                              resolver:(RCTPromiseResolveBlock)resolve
+                              rejecter:(RCTPromiseRejectBlock)reject
 {
     BOOL isThirdPartyLinked = [self isThirdPartyLinked];
     if (isThirdPartyLinked) {
@@ -303,8 +303,8 @@ RCT_EXPORT_METHOD(startWithStopDate:(nonnull NSNumber *)stopEpochTimeMs
 }
 
 RCT_EXPORT_METHOD(enableDetectionsWithExpiryDate:(nonnull NSNumber *)expiryEpochTimeMs
-                                        resolver:(RCTPromiseResolveBlock)resolve
-                                        rejecter:(RCTPromiseRejectBlock)reject)
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     REJECT_IF_SDK_NOT_INITIALIZED(reject);
 
@@ -1198,6 +1198,25 @@ RCT_EXPORT_METHOD(getDetectionMode:(RCTPromiseResolveBlock)resolve rejecter:(RCT
     }
 }
 
+RCT_EXPORT_METHOD(setTransportTags:(NSDictionary *)tags
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    REJECT_IF_SDK_NOT_INITIALIZED(reject);
+    NSError *error = nil;
+
+    [[Sentiance sharedInstance] setTransportTags:tags error:&error];
+
+    if (error != nil) {
+        if ([error.domain isEqualToString:@"SENTTransportTaggingDomain"]) {
+            reject(ESDKTransportTaggingError, error.localizedDescription, nil);
+        } else {
+            reject(@"E_SDK_SET_TRANSPORT_TAGS", @"Unexpected error while attempting to set transport tags", error);
+        }
+    } else {
+        resolve(nil);
+    }
+}
+
 - (void)didUpdateUserContext:(SENTUserContext *)userContext
              forCriteriaMask:(SENTUserContextUpdateCriteria)criteriaMask {
     NSDictionary *dict = @{

package/ios/RNSentianceErrorCodes.h

@@ -19,3 +19,4 @@ extern NSString * const ESDKCreateUserError;
 extern NSString * const ESDKResetError;
 extern NSString * const ESDKRequestUserContextError;
 extern NSString * const ESDKSmartGeofencesRefreshError;
+extern NSString * const ESDKTransportTaggingError;

package/ios/RNSentianceErrorCodes.m

@@ -21,3 +21,4 @@ NSString * const ESDKCreateUserError = @"E_SDK_CREATE_USER_ERROR";
 NSString * const ESDKResetError = @"E_SDK_RESET_ERROR";
 NSString * const ESDKRequestUserContextError = @"E_SDK_REQUEST_USER_CONTEXT_ERROR";
 NSString * const ESDKSmartGeofencesRefreshError = @"E_SDK_SMART_GEOFENCES_REFRESH_ERROR";
+NSString * const ESDKTransportTaggingError = @"E_TRANSPORT_TAG_ERROR";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentiance-react-native/core",
-  "version": "6.9.1-rc.2",
+  "version": "6.10.0-rc.1",
   "description": "The Sentiance Core library",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -29,10 +29,10 @@
       "targetSdk": 34,
       "compileSdk": 34,
       "buildTools": "34.0.0",
-      "sentiance": "6.9.1-rc2"
+      "sentiance": "6.10.0-rc1"
     },
     "ios": {
-      "sentiance": "6.9.1-rc1"
+      "sentiance": "6.10.0-rc1"
     }
   }
 }