@sentiance-react-native/core 6.1.2 → 6.2.0-rc.1

package/ios/RNSentianceCore+Converter.m

@@ -14,9 +14,7 @@
 - (NSString*)convertTimelineEventTypeToString:(SENTTimelineEventType)type;
 - (NSDictionary*)convertGeolocation:(SENTGeolocation*)location;
 - (NSString*)convertVenueSignificance:(SENTVenueSignificance)type;
-- (NSDictionary*)convertVisit:(SENTVisit*)visit;
 - (NSDictionary*)convertVenue:(SENTVenue*)venue;
-- (NSDictionary*)convertVenueCandidate:(SENTVenueCandidate*)candidate;
 - (void)addStationaryEventInfoToDict:(NSMutableDictionary*)dict event:(SENTStationaryEvent*)event;
 - (NSString*)convertTransportModeToString:(SENTTimelineTransportMode) mode;
 - (void)addTransportEventInfoToDict:(NSMutableDictionary*)dict event:(SENTTransportEvent*)event;
@@ -68,62 +66,87 @@
     }
 }
 
-- (NSDictionary*)convertVisit:(SENTVisit*)visit {
-    return @{
-        @"startTime": [visit.startDate description],
-        @"startTimeEpoch": [NSString stringWithFormat:@"%d",visit.startDate.timeIntervalSince1970],
-        @"endTime": [visit.endDate description],
-        @"endTimeEpoch": [NSString stringWithFormat:@"%d",visit.startDate.timeIntervalSince1970],
-        @"durationInSeconds": [NSNumber numberWithInt:(int)visit.durationInSeconds],
-    };
+- (NSString*)convertVenueType:(SENTVenueType)type {
+    switch (type) {
+        case SENTVenueTypeDrinkDay:
+            return @"DRINK_DAY";
+        case SENTVenueTypeDrinkEvening:
+            return @"DRINK_EVENING";
+        case SENTVenueTypeEducationIndependent:
+            return @"EDUCATION_INDEPENDENT";
+        case SENTVenueTypeEducationParents:
+            return @"EDUCATION_PARENTS";
+        case SENTVenueTypeHealth:
+            return @"HEALTH";
+        case SENTVenueTypeIndustrial:
+            return @"INDUSTRIAL";
+        case SENTVenueTypeLeisureBeach:
+            return @"LEISURE_BEACH";
+        case SENTVenueTypeLeisureDay:
+            return @"LEISURE_DAY";
+        case SENTVenueTypeLeisureEvening:
+            return @"LEISURE_EVENING";
+        case SENTVenueTypeLeisureMuseum:
+            return @"LEISURE_MUSEUM";
+        case SENTVenueTypeLeisureNature:
+            return @"LEISURE_NATURE";
+        case SENTVenueTypeLeisurePark:
+            return @"LEISURE_PARK";
+        case SENTVenueTypeOffice:
+            return @"OFFICE";
+        case SENTVenueTypeReligion:
+            return @"RELIGION";
+        case SENTVenueTypeResidential:
+            return @"RESIDENTIAL";
+        case SENTVenueTypeRestoMid:
+            return @"RESTO_MID";
+        case SENTVenueTypeRestoShort:
+            return @"RESTO_SHORT";
+        case SENTVenueTypeShopLong:
+            return @"SHOP_LONG";
+        case SENTVenueTypeShopShort:
+            return @"SHOP_SHORT";
+        case SENTVenueTypeSport:
+            return @"SPORT";
+        case SENTVenueTypeSportAttend:
+            return @"SPORT_ATTEND";
+        case SENTVenueTypeTravelBus:
+            return @"TRAVEL_BUS";
+        case SENTVenueTypeTravelConference:
+            return @"TRAVEL_CONFERENCE";
+        case SENTVenueTypeTravelFill:
+            return @"TRAVEL_FILL";
+        case SENTVenueTypeTravelHotel:
+            return @"TRAVEL_HOTEL";
+        case SENTVenueTypeTravelLong:
+            return @"TRAVEL_LONG";
+        case SENTVenueTypeTravelShort:
+            return @"TRAVEL_SHORT";
+        case SENTVenueTypeUnknown:
+        default:
+            return @"UNKNOWN";
+    }
 }
 
 - (NSDictionary*)convertVenue:(SENTVenue*)venue {
     NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
 
-    if (venue.name != nil) {
-        dict[@"name"] = venue.name;
-    }
-
     if (venue.location != nil) {
         dict[@"location"] = [self convertGeolocation:venue.location];
     }
-
-    NSMutableDictionary* labels = [[NSMutableDictionary alloc] init];
-    [venue.labels enumerateKeysAndObjectsUsingBlock:
-        ^(NSString * _Nonnull key, NSString * _Nonnull obj, BOOL * _Nonnull stop) {
-            labels[key] = obj;
-    }];
-    dict[@"venueLabels"] = labels;
+    
+    dict[@"significance"] = [self convertVenueSignificance:venue.significance];
+    dict[@"type"] = [self convertVenueType:venue.type];
 
     return dict;
 }
 
-- (NSDictionary*)convertVenueCandidate:(SENTVenueCandidate*)candidate {
-    NSMutableArray* visits = [[NSMutableArray alloc] init];
-    for (SENTVisit* visit in candidate.visits) {
-        [visits addObject:[self convertVisit:visit]];
-    }
-
-    return @{
-        @"venue": [self convertVenue:candidate.venue],
-        @"likelihood": @(candidate.likelihood),
-        @"visits": visits
-    };
-}
-
 - (void)addStationaryEventInfoToDict:(NSMutableDictionary*)dict event:(SENTStationaryEvent*)event {
     if (event.location != nil) {
         dict[@"location"] = [self convertGeolocation:event.location];
     }
 
-    dict[@"venueSignificance"] = [self convertVenueSignificance:event.venueSignificance];
-
-    NSMutableArray* venueCandidates = [[NSMutableArray alloc] init];
-    for (SENTVenueCandidate* candidate in event.venueCandidates) {
-        [venueCandidates addObject:[self convertVenueCandidate:candidate]];
-    }
-    dict[@"venueCandidates"] = venueCandidates;
+    dict[@"venue"] = [self convertVenue:event.venue];
 }
 
 - (NSString*)convertTransportModeToString:(SENTTimelineTransportMode)mode {
@@ -152,13 +175,37 @@
 
 - (void)addTransportEventInfoToDict:(NSMutableDictionary*)dict event:(SENTTransportEvent*)event {
     dict[@"transportMode"] = [self convertTransportModeToString:event.transportMode];
+    dict[@"waypoints"] = [self convertWaypointArray:event.waypoints];
+
+    if (event.distanceInMeters != nil) {
+        dict[@"distance"] = event.distanceInMeters;
+    }
+}
+
+- (NSDictionary*)convertWaypoint:(SENTWaypoint*)waypoint {
+    return @{
+        @"latitude": @(waypoint.latitude),
+        @"longitude": @(waypoint.longitude),
+        @"accuracy": @(waypoint.accuracyInMeters),
+        @"timestamp": @(waypoint.timestamp * 1000)
+    };
+}
+
+- (NSArray<NSDictionary *> *)convertWaypointArray:(NSArray<SENTWaypoint *> *)waypoints {
+    NSMutableArray *array = [[NSMutableArray alloc] init];
+    for (SENTWaypoint *waypoint in waypoints) {
+        [array addObject:[self convertWaypoint:waypoint]];
+    }
+    return array;
 }
 
 - (NSMutableDictionary*)convertEvent:(SENTTimelineEvent*)event {
     NSMutableDictionary *eventDict = [[NSMutableDictionary alloc] init];
     eventDict[@"startTime"] = [event.startDate description];
+    eventDict[@"startTimeEpoch"] = @((long) (event.startDate.timeIntervalSince1970 * 1000));
     if (event.endDate != nil) {
         eventDict[@"endTime"] = [event.endDate description];
+        eventDict[@"endTimeEpoch"] = @((long) (event.endDate.timeIntervalSince1970 * 1000));
 
         NSInteger durationInSeconds = event.durationInSeconds;
         if (durationInSeconds != SENTDurationUnknown) {
@@ -436,11 +483,11 @@
     dict[@"type"] = type;
     dict[@"id"] = @(segment.uniqueId);
     dict[@"startTime"] = [segment.startDate description];
-    dict[@"startTimeEpoch"] = [NSString stringWithFormat:@"%d",segment.startDate.timeIntervalSince1970];
-
+    dict[@"startTimeEpoch"] = @((long) (segment.startDate.timeIntervalSince1970 * 1000));
+    
     if (segment.endDate != nil) {
         dict[@"endTime"] = [segment.endDate description];
-        dict[@"endTimeEpoch"] = [NSString stringWithFormat:@"%d",segment.endDate.timeIntervalSince1970];
+        dict[@"endTimeEpoch"] = @((long) (segment.endDate.timeIntervalSince1970 * 1000));
     }
     dict[@"attributes"] = [self convertSegmentAttributesToDict:segment.attributes];
 
@@ -489,10 +536,6 @@
         [criteria addObject:@"CURRENT_EVENT"];
     }
 
-    if (criteriaMask & SENTUserContextUpdateCriteriaActiveMoments) {
-        [criteria addObject:@"ACTIVE_MOMENTS"];
-    }
-
     if (criteriaMask & SENTUserContextUpdateCriteriaVisitedVenues) {
         [criteria addObject:@"VISITED_VENUES"];
     }
@@ -572,6 +615,8 @@
                            @"mobileQuotaStatus":[self convertQuotaStatusToString:status.mobileQuotaStatus],
                            @"diskQuotaStatus":[self convertQuotaStatusToString:status.diskQuotaStatus],
                            @"userExists":@(status.userExists),
+                           @"isBatterySavingEnabled":@(status.isDeviceLowPowerModeEnabled),
+                           @"isActivityRecognitionPermGranted":@(status.isMotionActivityPermissionGranted),
                            @"backgroundRefreshStatus":[self convertBackgroundRefreshStatus:status.backgroundRefreshStatus]
                            };
 

package/ios/RNSentianceCore.m

@@ -828,7 +828,6 @@ RCT_EXPORT_METHOD(listenUserContextUpdates:(RCTPromiseResolveBlock)resolve rejec
     [Sentiance sharedInstance].userContextDelegate = self;
     [Sentiance sharedInstance].criteriaMaskForUserContextUpdates = SENTUserContextUpdateCriteriaCurrentEvent |
                                                                             SENTUserContextUpdateCriteriaActiveSegments |
-                                                                            SENTUserContextUpdateCriteriaActiveMoments |
                                                                             SENTUserContextUpdateCriteriaVisitedVenues;
     resolve(nil);
 }

package/lib/index.d.ts

@@ -9,13 +9,17 @@ declare module "@sentiance-react-native/core" {
   export type LocationPermission = "ALWAYS" | "ONLY_WHILE_IN_USE" | "NEVER";
   export type BackgroundRefreshStatus = "AVAILABLE" | "DENIED" | "RESTRICTED";
   export type SdkInitState =
-    "NOT_INITIALIZED"
+    | "NOT_INITIALIZED"
     | "INIT_IN_PROGRESS"
     | "INITIALIZED"
     | "RESETTING"
     | "UNRECOGNIZED_STATE";
   export type TripType = "TRIP_TYPE_SDK" | "TRIP_TYPE_EXTERNAL";
-  export type TransmittableDataType = "ALL" | "SDK_INFO" | "VEHICLE_CRASH_INFO" | "GENERAL_DETECTIONS";
+  export type TransmittableDataType =
+    | "ALL"
+    | "SDK_INFO"
+    | "VEHICLE_CRASH_INFO"
+    | "GENERAL_DETECTIONS";
 
   export enum TransportMode {
     UNKNOWN = 1,
@@ -46,8 +50,8 @@ declare module "@sentiance-react-native/core" {
     userInfo: UserInfo;
   }
 
-  export type Linker = (installId: string) => Promise<boolean>
-  
+  export type Linker = (installId: string) => Promise<boolean>;
+
   export interface UserCreationOptions {
     appId?: string;
     appSecret?: string;
@@ -112,16 +116,16 @@ declare module "@sentiance-react-native/core" {
     diskQuotaStatus: string;
     locationPermission: LocationPermission;
     userExists: boolean;
+    isBatterySavingEnabled?: boolean;
+    isActivityRecognitionPermGranted?: boolean;
+    isPreciseLocationAuthorizationGranted: boolean;
     isBgAccessPermGranted?: boolean; // iOS only
-    isActivityRecognitionPermGranted?: boolean; // Android only
     locationSetting?: string; // Android only
     isAirplaneModeEnabled?: boolean; // Android only
     isLocationAvailable?: boolean; // Android only
     isGooglePlayServicesMissing?: boolean; // Android only
     isBatteryOptimizationEnabled?: boolean; // Android only
-    isBatterySavingEnabled?: boolean; // Android only
     isBackgroundProcessingRestricted?: boolean; // Android only
-    isPreciseLocationAuthorizationGranted: boolean;
     isSchedulingExactAlarmsPermitted?: boolean; // Android only
     backgroundRefreshStatus: BackgroundRefreshStatus; // iOS only
   }
@@ -226,7 +230,9 @@ declare module "@sentiance-react-native/core" {
       onUserActivityUpdated: (userActivity: UserActivity) => void
     ): Promise<EmitterSubscription>;
 
-    setTransmittableDataTypes(types: Array<TransmittableDataType>): Promise<void>;
+    setTransmittableDataTypes(
+      types: Array<TransmittableDataType>
+    ): Promise<void>;
 
     getTransmittableDataTypes(): Promise<Array<TransmittableDataType>>;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentiance-react-native/core",
-  "version": "6.1.2",
+  "version": "6.2.0-rc.1",
   "description": "React Native Sentiance core library",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",