@sentiance-react-native/core 6.0.0-beta.9 → 6.0.0

package/README.md

@@ -1,24 +1,9 @@
-## Installation
+# Sentiance Core module for React Native
 
-```bash
-npm i @sentiance-react-native/core
-```
+## Demo Application
 
-## Usage
-
-### Importing the package
-
-You can import the entire contents of the package for use under a namespace of your choosing:
+https://github.com/sentiance/sample-apps-react-native
 
-```javascript
-import * as SentianceCore from "@sentiance-react-native/core";
-```
-
-or you can require specific functionality using named imports:
+## Usage
 
-```javascript
-import {
-    enableDetections, 
-    createUser
-} from "@sentiance-react-native/core";
-```
+To use the core SDK module, please visit the corresponding [API reference page.](https://docs.sentiance.com/sdk/api-reference/react-native/core)

package/android/build.gradle

@@ -2,6 +2,13 @@ plugins {
   id "com.android.library"
 }
 
+android {
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+}
+
 apply from: "$project.projectDir/package-json-reader.gradle"
 apply from: "$project.projectDir/sentiance-version-finder.gradle"
 

package/android/src/main/java/com/sentiance/react/bridge/core/SentianceConverter.java

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.WritableMap;
+import com.sentiance.react.bridge.core.utils.SentianceUtils;
 import com.sentiance.sdk.DetectionStatus;
 import com.sentiance.sdk.DisableDetectionsResult;
 import com.sentiance.sdk.EnableDetectionsError;
@@ -42,7 +43,7 @@ public class SentianceConverter {
   }
 
   public static Map<String, String> convertReadableMapToMap(ReadableMap inputMap) {
-    Map<String, String> map = new HashMap<String, String>();
+    Map<String, String> map = new HashMap<>();
     ReadableMapKeySetIterator iterator = inputMap.keySetIterator();
     while (iterator.hasNextKey()) {
       String key = iterator.nextKey();
@@ -111,7 +112,7 @@ public class SentianceConverter {
     WritableMap map = Arguments.createMap();
     try {
       map.putString("tokenId", token.getTokenId());
-      map.putString("expiryDate", String.valueOf(token.getExpiryDate()));
+      map.putString("expiryDate", SentianceUtils.toDateString(token.getExpiryDate()));
     } catch (Exception ignored) {
     }
 
@@ -119,98 +120,88 @@ public class SentianceConverter {
   }
 
   public static WritableMap convertUserCreationResult(UserCreationResult result) {
-    WritableMap map = Arguments.createMap();
     UserInfo userInfo = result.getUserInfo();
-    try {
-      Token token = userInfo.getToken();
-      map.putString("userId", userInfo.getUserId());
-      map.putString("tokenId", token.getTokenId());
-      map.putString("tokenExpiryDate", token.getExpiryDate().toString());
-      map.putBoolean("isTokenExpired", token.isExpired());
-    } catch (Exception ignored) {
-    }
+    Token token = userInfo.getToken();
 
-    return map;
+    WritableMap userInfoMap = Arguments.createMap();
+    userInfoMap.putString("userId", userInfo.getUserId());
+    userInfoMap.putString("tokenId", token.getTokenId());
+    userInfoMap.putString("tokenExpiryDate", SentianceUtils.toDateString(token.getExpiryDate()));
+    userInfoMap.putBoolean("isTokenExpired", token.isExpired());
+
+    WritableMap userCreationResult = Arguments.createMap();
+    userCreationResult.putMap("userInfo", userInfoMap);
+    return userCreationResult;
   }
 
   public static WritableMap convertUserLinkingResult(UserLinkingResult result) {
-    WritableMap map = Arguments.createMap();
     UserInfo userInfo = result.getUserInfo();
-    try {
-      Token token = userInfo.getToken();
-      map.putString("userId", userInfo.getUserId());
-      map.putString("tokenId", token.getTokenId());
-      map.putString("tokenExpiryDate", token.getExpiryDate().toString());
-      map.putBoolean("isTokenExpired", token.isExpired());
-    } catch (Exception ignored) {
-    }
+    Token token = userInfo.getToken();
 
-    return map;
+    WritableMap userInfoMap = Arguments.createMap();
+    userInfoMap.putString("userId", userInfo.getUserId());
+    userInfoMap.putString("tokenId", token.getTokenId());
+    userInfoMap.putString("tokenExpiryDate", SentianceUtils.toDateString(token.getExpiryDate()));
+    userInfoMap.putBoolean("isTokenExpired", token.isExpired());
+
+    WritableMap userLinkingResult = Arguments.createMap();
+    userLinkingResult.putMap("userInfo", userInfoMap);
+    return userLinkingResult;
   }
 
   public static WritableMap convertInstallId(String installId) {
     WritableMap map = Arguments.createMap();
-    try {
-      map.putString("installId", installId);
-    } catch (Exception ignored) {
-    }
+    map.putString("installId", installId);
+
     return map;
   }
 
   public static WritableMap convertSdkStatus(SdkStatus status) {
     WritableMap map = Arguments.createMap();
-    try {
-      map.putString("startStatus", status.startStatus.name());
-      map.putString("detectionStatus", status.detectionStatus.name());
-      map.putBoolean("canDetect", status.canDetect);
-      map.putBoolean("isRemoteEnabled", status.isRemoteEnabled);
-      map.putString("locationPermission", status.locationPermission.toString());
-      map.putBoolean("isActivityRecognitionPermGranted", status.isActivityRecognitionPermGranted);
-      map.putString("locationSetting", status.locationSetting.name());
-      map.putBoolean("isAirplaneModeEnabled", status.isAirplaneModeEnabled);
-      map.putBoolean("isLocationAvailable", status.isLocationAvailable);
-      map.putBoolean("isAccelPresent", status.isAccelPresent);
-      map.putBoolean("isGyroPresent", status.isGyroPresent);
-      map.putBoolean("isGpsPresent", status.isGpsPresent);
-      map.putBoolean("isGooglePlayServicesMissing", status.isGooglePlayServicesMissing);
-      map.putBoolean("isBatteryOptimizationEnabled", status.isBatteryOptimizationEnabled);
-      map.putBoolean("isBatterySavingEnabled", status.isBatterySavingEnabled);
-      map.putBoolean("isBackgroundProcessingRestricted", status.isBackgroundProcessingRestricted);
-      map.putBoolean("isPreciseLocationAuthorizationGranted", status.isPreciseLocationPermGranted);
-      map.putBoolean("isSchedulingExactAlarmsPermitted", status.isSchedulingExactAlarmsPermitted);
-      map.putString("wifiQuotaStatus", status.wifiQuotaStatus.toString());
-      map.putString("mobileQuotaStatus", status.mobileQuotaStatus.toString());
-      map.putString("diskQuotaStatus", status.diskQuotaStatus.toString());
-    } catch (Exception ignored) {
-    }
+    map.putString("startStatus", status.startStatus.name());
+    map.putString("detectionStatus", status.detectionStatus.name());
+    map.putBoolean("canDetect", status.canDetect);
+    map.putBoolean("isRemoteEnabled", status.isRemoteEnabled);
+    map.putString("locationPermission", status.locationPermission.toString());
+    map.putBoolean("isActivityRecognitionPermGranted", status.isActivityRecognitionPermGranted);
+    map.putString("locationSetting", status.locationSetting.name());
+    map.putBoolean("isAirplaneModeEnabled", status.isAirplaneModeEnabled);
+    map.putBoolean("isLocationAvailable", status.isLocationAvailable);
+    map.putBoolean("isAccelPresent", status.isAccelPresent);
+    map.putBoolean("isGyroPresent", status.isGyroPresent);
+    map.putBoolean("isGpsPresent", status.isGpsPresent);
+    map.putBoolean("isGooglePlayServicesMissing", status.isGooglePlayServicesMissing);
+    map.putBoolean("isBatteryOptimizationEnabled", status.isBatteryOptimizationEnabled);
+    map.putBoolean("isBatterySavingEnabled", status.isBatterySavingEnabled);
+    map.putBoolean("isBackgroundProcessingRestricted", status.isBackgroundProcessingRestricted);
+    map.putBoolean("isPreciseLocationAuthorizationGranted", status.isPreciseLocationPermGranted);
+    map.putBoolean("isSchedulingExactAlarmsPermitted", status.isSchedulingExactAlarmsPermitted);
+    map.putString("wifiQuotaStatus", status.wifiQuotaStatus.toString());
+    map.putString("mobileQuotaStatus", status.mobileQuotaStatus.toString());
+    map.putString("diskQuotaStatus", status.diskQuotaStatus.toString());
+    map.putBoolean("userExists", status.userExists);
 
     return map;
   }
 
   public static WritableMap convertUserActivity(UserActivity activity) {
     WritableMap map = Arguments.createMap();
-    try {
-      map.putString("type", convertUserActivityType(activity.getActivityType()));
-
-      //Trip Info
-      if (activity.getTripInfo() != null) {
-        WritableMap tripInfoMap = Arguments.createMap();
-        String tripType = convertTripType(activity.getTripInfo().getTripType());
-        tripInfoMap.putString("type", tripType);
-        map.putMap("tripInfo", tripInfoMap);
-      }
-
-      //Stationary Info
-      if (activity.getStationaryInfo() != null) {
-        WritableMap stationaryInfoMap = Arguments.createMap();
-        if (activity.getStationaryInfo().getLocation() != null) {
-          WritableMap locationMap = convertLocation(activity.getStationaryInfo().getLocation());
-          stationaryInfoMap.putMap("location", locationMap);
-        }
-        map.putMap("stationaryInfo", stationaryInfoMap);
-      }
+    map.putString("type", convertUserActivityType(activity.getActivityType()));
+
+    //Trip Info
+    if (activity.getTripInfo() != null) {
+      WritableMap tripInfoMap = Arguments.createMap();
+      String tripType = convertTripType(activity.getTripInfo().getTripType());
+      tripInfoMap.putString("type", tripType);
+      map.putMap("tripInfo", tripInfoMap);
+    }
 
-    } catch (Exception ignored) {
+    //Stationary Info
+    if (activity.getStationaryInfo() != null) {
+      WritableMap stationaryInfoMap = Arguments.createMap();
+      WritableMap locationMap = convertLocation(activity.getStationaryInfo().getLocation());
+      stationaryInfoMap.putMap("location", locationMap);
+      map.putMap("stationaryInfo", stationaryInfoMap);
     }
 
     return map;
@@ -336,10 +327,8 @@ public class SentianceConverter {
   public static String stringifyStopTripError(StopTripError error) {
     StopTripFailureReason reason = error.getReason();
     String details = "";
-    switch (reason) {
-      case NO_ONGOING_TRIP:
-        details = "There is no ongoing external trip.";
-        break;
+    if (reason == StopTripFailureReason.NO_ONGOING_TRIP) {
+      details = "There is no ongoing external trip.";
     }
     return String.format("Reason: %s - %s", reason.name(), details);
   }

package/android/src/main/java/com/sentiance/react/bridge/core/SentianceEmitter.java

@@ -15,7 +15,6 @@ public class SentianceEmitter extends AbstractSentianceEmitter {
   private static final String USER_LINK = "SENTIANCE_USER_LINK_EVENT";
   private static final String STATUS_UPDATE = "SENTIANCE_STATUS_UPDATE_EVENT";
   private static final String USER_ACTIVITY_UPDATE = "SENTIANCE_USER_ACTIVITY_UPDATE_EVENT";
-  private static final String ON_DETECTIONS_ENABLED = "SENTIANCE_ON_DETECTIONS_ENABLED_EVENT";
   private static final String ON_TRIP_TIMED_OUT = "SENTIANCE_ON_TRIP_TIMED_OUT_EVENT";
 
   public SentianceEmitter(Context context) {
@@ -34,10 +33,6 @@ public class SentianceEmitter extends AbstractSentianceEmitter {
     sendEvent(USER_ACTIVITY_UPDATE, convertUserActivity(userActivity));
   }
 
-  void sendOnDetectionsEnabledEvent(SdkStatus status) {
-    sendEvent(ON_DETECTIONS_ENABLED, convertSdkStatus(status));
-  }
-
   void sendOnTripTimedOutEvent() {
     sendEvent(ON_TRIP_TIMED_OUT, Arguments.createMap());
   }

package/android/src/main/java/com/sentiance/react/bridge/core/SentianceHelper.java

@@ -142,7 +142,6 @@ public class SentianceHelper {
       .addOnCompleteListener(pendingOperation -> {
         if (pendingOperation.isSuccessful()) {
           EnableDetectionsResult result = pendingOperation.getResult();
-          emitter.sendOnDetectionsEnabledEvent(result.getSdkStatus());
           if (promise != null) {
             promise.resolve(SentianceConverter.convertEnableDetectionsResult(result));
           }

package/android/src/main/java/com/sentiance/react/bridge/core/SentianceModule.java

@@ -525,5 +525,15 @@ public class SentianceModule extends AbstractSentianceModule {
       .setTripTimeoutListener(emitter::sendOnTripTimedOutEvent);
     promise.resolve(null);
   }
+
+  @ReactMethod
+  public void addListener(String eventName) {
+    // Set up any upstream listeners or background tasks as necessary
+  }
+
+  @ReactMethod
+  public void removeListeners(Integer count) {
+    // Remove upstream listeners, stop unnecessary background tasks
+  }
 }
 

package/android/src/main/java/com/sentiance/react/bridge/core/utils/SentianceUtils.java

@@ -10,9 +10,13 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 
+import androidx.annotation.NonNull;
 import androidx.core.app.NotificationCompat;
 
 import java.lang.ref.WeakReference;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
 
 public class SentianceUtils {
 
@@ -20,12 +24,14 @@ public class SentianceUtils {
   public static final String SENTIANCE_FALLBACK_NOTIFICATION_CHANNEL_NAME = "Sentiance";
   public static final String SENTIANCE_FALLBACK_NOTIFICATION_CHANNEL_ID = "Sentiance";
 
-  public static final String SENTIANCE_NOTIFICATION_ID = "com.sentiance.react.bridge.notification_id";
-  public static final String SENTIANCE_NOTIFICATION_TITLE = "com.sentiance.react.bridge.notification_title";
-  public static final String SENTIANCE_NOTIFICATION_ICON = "com.sentiance.react.bridge.notification_icon";
-  public static final String SENTIANCE_NOTIFICATION_CHANNEL_ID = "com.sentiance.react.bridge.channel_id";
-  public static final String SENTIANCE_NOTIFICATION_CHANNEL_NAME = "com.sentiance.react.bridge.notification_channel_name";
-  public static final String SENTIANCE_NOTIFICATION_NOTIFICATION_TEXT = "com.sentiance.react.bridge.notification_text";
+  public static final String SENTIANCE_NOTIFICATION_ID = "com.sentiance.react.bridge.core.notification_id";
+  public static final String SENTIANCE_NOTIFICATION_TITLE = "com.sentiance.react.bridge.core.notification_title";
+  public static final String SENTIANCE_NOTIFICATION_ICON = "com.sentiance.react.bridge.core.notification_icon";
+  public static final String SENTIANCE_NOTIFICATION_CHANNEL_ID = "com.sentiance.react.bridge.core.channel_id";
+  public static final String SENTIANCE_NOTIFICATION_CHANNEL_NAME = "com.sentiance.react.bridge.core.notification_channel_name";
+  public static final String SENTIANCE_NOTIFICATION_NOTIFICATION_TEXT = "com.sentiance.react.bridge.core.notification_text";
+
+  private static final String DATE_TIME_PATTERN_M = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";  // ISO_8601
 
   public static Notification createNotificationFromManifestData(WeakReference<Context> weakContext,
                                                                 String title, String message) {
@@ -100,6 +106,12 @@ public class SentianceUtils {
     return SENTIANCE_FALLBACK_NOTIFICATION_ID;
   }
 
+  @NonNull
+  public static String toDateString(Date date) {
+    SimpleDateFormat formatter = new SimpleDateFormat(DATE_TIME_PATTERN_M, Locale.ENGLISH);
+    return formatter.format(date.getTime());
+  }
+
   private static Notification createNotification(WeakReference<Context> weakContext, PendingIntent pendingIntent,
                                                  String title, String message, String channelName, String channelId,
                                                  Integer icon) {

package/ios/RNSentianceCore+Converter.h

@@ -1,12 +1,14 @@
 //
-//  RNSentiance+Converter.h
-//  RNSentiance
+//  RNSentianceCore+Converter.h
+//  RNSentianceCore
 //
 //  Created by Sebouh Aguehian on 10/10/2021.
 //  Copyright © 2021 Facebook. All rights reserved.
 //
 #import "RNSentianceCore.h"
 
+typedef NS_ENUM(NSInteger, UIBackgroundRefreshStatus);
+
 @interface RNSentianceCore (Converter)
 
 - (NSDictionary*) convertUserContextToDict:(SENTUserContext*) userContext;
@@ -43,4 +45,6 @@
 - (NSDictionary *)convertDisableDetectionsResult:(SENTDisableDetectionsResult *)disableDetectionsResult;
 - (NSString *)stringifyDisableDetectionsError:(SENTDisableDetectionsError *)disableDetectionsError;
 - (NSString *)stringifyUserContextError:(SENTRequestUserContextError *)userContextError;
+- (NSString*)convertBackgroundRefreshStatus:(UIBackgroundRefreshStatus)backgroundRefreshStatus;
+
 @end

package/ios/RNSentianceCore+Converter.m

@@ -1,12 +1,13 @@
 //
-//  RNSentianceConverter.m
-//  RNSentiance
+//  RNSentianceCore+Converter.m
+//  RNSentianceCore
 //
 //  Created by Sebouh Aguehian on 10/10/2021.
 //  Copyright © 2021 Facebook. All rights reserved.
 //
 
 #import "RNSentianceCore+Converter.h"
+@import UIKit.UIApplication;
 
 @interface RNSentianceCore (Private)
 
@@ -25,6 +26,8 @@
 - (nullable NSString*)convertSegmentTypeToString:(SENTSegmentType)type;
 - (NSMutableDictionary*)convertSegmentAttributesToDict:(NSArray<SENTAttribute *>*)attributes;
 - (nullable NSDictionary*)convertSegment:(SENTSegment*)segment;
+- (NSString*)convertBackgroundRefreshStatus:(UIBackgroundRefreshStatus)backgroundRefreshStatus;
+
 @end
 
 @implementation RNSentianceCore (Converter)
@@ -561,7 +564,9 @@
                            @"isGpsPresent":@(status.isGpsPresent),
                            @"wifiQuotaStatus":[self convertQuotaStatusToString:status.wifiQuotaStatus],
                            @"mobileQuotaStatus":[self convertQuotaStatusToString:status.mobileQuotaStatus],
-                           @"diskQuotaStatus":[self convertQuotaStatusToString:status.diskQuotaStatus]
+                           @"diskQuotaStatus":[self convertQuotaStatusToString:status.diskQuotaStatus],
+                           @"userExists":@(status.userExists),
+                           @"backgroundRefreshStatus":[self convertBackgroundRefreshStatus:status.backgroundRefreshStatus]
                            };
 
     return dict;
@@ -621,13 +626,13 @@
 
 - (NSString*)convertInitStateToString:(SENTSDKInitState) state {
     switch (state) {
-        case SENTNotInitialized:
+        case SENTSDKInitStateNotInitialized:
             return @"NOT_INITIALIZED";
-        case SENTInitInProgress:
+        case SENTSDKInitStateInProgress:
             return @"INIT_IN_PROGRESS";
-        case SENTInitialized:
+        case SENTSDKInitStateInitialized:
             return @"INITIALIZED";
-        case SENTResetting:
+        case SENTSDKInitStateResetting:
             return @"RESETTING";
         default:
             return @"UNRECOGNIZED_STATE";
@@ -680,14 +685,18 @@
 }
 
 - (NSDictionary *)convertUserCreationResult:(SENTUserCreationResult *)userCreationResult {
-    NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] init];
 
-    dict[@"userId"] = userCreationResult.userInfo.userId;
-    dict[@"tokenId"] = userCreationResult.userInfo.token.tokenId;
-    dict[@"tokenExpiryDate"] = userCreationResult.userInfo.token.expiryDate;
-    dict[@"isTokenExpired"] = @(NO);
+    userInfo[@"userId"] = userCreationResult.userInfo.userId;
+    userInfo[@"tokenId"] = userCreationResult.userInfo.token.tokenId;
 
-    return dict;
+    NSString *tokenExpiryDate = [[SENTDate alloc]initWithNSDate: userCreationResult.userInfo.token.expiryDate].description;
+    userInfo[@"tokenExpiryDate"] = tokenExpiryDate;
+    userInfo[@"isTokenExpired"] = @(userCreationResult.userInfo.token.isExpired);
+
+    NSMutableDictionary *userCreationResultDict = [[NSMutableDictionary alloc] init];
+    userCreationResultDict[@"userInfo"] = userInfo;
+    return userCreationResultDict;
 }
 
 - (NSString *)stringifyUserCreationError:(SENTUserCreationError *)userCreationError {
@@ -747,14 +756,18 @@
 }
 
 - (NSDictionary *)convertUserLinkingResult:(SENTUserLinkingResult *)userLinkingResult {
-    NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
-
-    dict[@"userId"] = userLinkingResult.userInfo.userId;
-    dict[@"tokenId"] = userLinkingResult.userInfo.token.tokenId;
-    dict[@"tokenExpiryDate"] = userLinkingResult.userInfo.token.expiryDate;
-    dict[@"isTokenExpired"] = @(NO);
+    NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] init];
+    
+    userInfo[@"userId"] = userLinkingResult.userInfo.userId;
+    userInfo[@"tokenId"] = userLinkingResult.userInfo.token.tokenId;
+    
+    NSString *tokenExpiryDate = [[SENTDate alloc]initWithNSDate: userLinkingResult.userInfo.token.expiryDate].description;
+    userInfo[@"tokenExpiryDate"] = tokenExpiryDate;
+    userInfo[@"isTokenExpired"] = @(userLinkingResult.userInfo.token.isExpired);
 
-    return dict;
+    NSMutableDictionary *userLinkingResultDict = [[NSMutableDictionary alloc] init];
+    userLinkingResultDict[@"userInfo"] = userInfo;
+    return userLinkingResultDict;
 }
 
 - (NSString *)stringifyUserLinkingError:(SENTUserLinkingError *)userLinkingError {
@@ -867,8 +880,10 @@
     NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
 
     dict[@"tokenId"] = userAccessTokenResult.token.tokenId;
-    dict[@"expiryDate"] = userAccessTokenResult.token.expiryDate;
-
+    
+    NSString *tokenExpiryDate = [[SENTDate alloc]initWithNSDate: userAccessTokenResult.token.expiryDate].description;
+    dict[@"expiryDate"] = tokenExpiryDate;
+    
     return dict;
 }
 
@@ -983,4 +998,16 @@
     }
     return [NSString stringWithFormat:@"Reason: %@ - %@", reason, details];
 }
+
+- (NSString *)convertBackgroundRefreshStatus:(UIBackgroundRefreshStatus)backgroundRefreshStatus {
+    if (backgroundRefreshStatus == UIBackgroundRefreshStatusAvailable) {
+        return @"AVAILABLE";
+    } else if(backgroundRefreshStatus == UIBackgroundRefreshStatusDenied) {
+        return @"DENIED";
+    } else if(backgroundRefreshStatus == UIBackgroundRefreshStatusRestricted) {
+        return @"RESTRICTED";
+    }
+    return @"";
+}
+
 @end

package/ios/RNSentianceCore.m

@@ -33,7 +33,7 @@ RCT_EXPORT_MODULE(SentianceCore)
 
 - (NSArray<NSString *> *)supportedEvents
 {
-    return @[SdkStatusUpdateEvent, TripTimeoutEvent, UserLinkEvent, UserActivityUpdateEvent, VehicleCrashEvent, UserLinkEvent, UserContextUpdateEvent, @"SENTIANCE_ON_DETECTIONS_ENABLED_EVENT"];
+    return @[SdkStatusUpdateEvent, TripTimeoutEvent, UserLinkEvent, UserActivityUpdateEvent, VehicleCrashEvent, UserLinkEvent, UserContextUpdateEvent];
 }
 
 // Will be called when this module's first listener is added.
@@ -313,8 +313,6 @@ RCT_EXPORT_METHOD(disableDetections:(RCTPromiseResolveBlock)resolve rejecter:(RC
 
 RCT_EXPORT_METHOD(getInitState:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
-    REJECT_IF_SDK_NOT_INITIALIZED(reject);
-
     @try {
         SENTSDKInitState initState = [[Sentiance sharedInstance] getInitState];
         resolve([self convertInitStateToString:initState]);
@@ -1030,7 +1028,7 @@ RCT_EXPORT_METHOD(listenTripTimeout:(RCTPromiseResolveBlock)resolve rejecter:(RC
 }
 
 - (BOOL)isSdkNotInitialized {
-    return [Sentiance sharedInstance].initState != SENTInitialized;
+    return [Sentiance sharedInstance].initState != SENTSDKInitStateInitialized;
 }
 
 @end

package/ios/RNSentianceErrorCodes.h

@@ -1,6 +1,6 @@
 //
-//  ErrorCodes.h
-//  Pods
+//  RNSentianceErrorCodes.h
+//  RNSentianceCore
 //
 //  Created by Hassan Shakeel on 05/05/2022.
 //

package/ios/RNSentianceErrorCodes.m

@@ -1,6 +1,6 @@
 //
-//  ErrorCodes.m
-//  RNSentiance
+//  RNSentianceErrorCodes.m
+//  RNSentianceCore
 //
 //  Created by Hassan Shakeel on 05/05/2022.
 //

package/ios/RNSentianceHelper.h

@@ -1,6 +1,6 @@
 //
-//  SentianceHelper.h
-//  Pods
+//  RNSentianceHelper.h
+//  RNSentianceCore
 //
 //  Created by Hassan Shakeel on 10/05/2022.
 //
@@ -27,5 +27,7 @@
                   							 launchOptions:(nullable NSDictionary *)launchOptions
   NS_SWIFT_NAME(initializeSDK(platformUrl:isAppSessionDataCollectionAllowed:launchOptions:));
 
+- (void)enableDetectionsIfUserExists;
+
 @end
 

package/ios/RNSentianceHelper.m

@@ -1,6 +1,6 @@
 //
-//  SentianceHelper.m
-//  DoubleConversion
+//  RNSentianceHelper.m
+//  RNSentianceCore
 //
 //  Created by Hassan Shakeel on 10/05/2022.
 //
@@ -28,11 +28,17 @@
 - (SENTInitializationResult *)initializeSDKWithPlatformUrl:(NSString *)platformUrl
                          isAppSessionDataCollectionAllowed:(BOOL *)isAppSessionDataCollectionAllowed
                                              launchOptions:(nullable NSDictionary *)launchOptions {
-    SENTOptions *options = [[SENTOptions alloc] init];
+    SENTOptions *options = [[SENTOptions alloc] initFor:SENTOptionsInitPurposeAppLaunch];
     options.platformUrl = platformUrl;
     options.isAppSessionDataCollectionAllowed = isAppSessionDataCollectionAllowed;
     return [[Sentiance sharedInstance] initializeWithOptions:options launchOptions:launchOptions];
 }
 
+- (void)enableDetectionsIfUserExists {
+    if ([Sentiance sharedInstance].userExists) {
+        [[Sentiance sharedInstance] enableDetectionsWithCompletionHandler:nil];
+    }
+}
+
 @end
 

package/lib/core.js

@@ -4,61 +4,55 @@ const {SentianceCore} = NativeModules;
 
 const SDK_STATUS_UPDATE_EVENT = "SENTIANCE_STATUS_UPDATE_EVENT";
 const SDK_USER_LINK_EVENT = "SENTIANCE_USER_LINK_EVENT";
-const SDK_ON_DETECTIONS_ENABLED_EVENT = "SENTIANCE_ON_DETECTIONS_ENABLED_EVENT";
 const SDK_USER_ACTIVITY_UPDATE_EVENT = "SENTIANCE_USER_ACTIVITY_UPDATE_EVENT";
 const SDK_ON_TRIP_TIMED_OUT_EVENT = "SENTIANCE_ON_TRIP_TIMED_OUT_EVENT";
 
+let coreModule = {};
 if (!SentianceCore) {
   const nativeModuleName = varToString({SentianceCore});
-  throw `Could not locate the native ${nativeModuleName} module.
-  Make sure that your native code is properly linked, and that the module name you specified is correct.`;
+  console.error(`Could not locate the native ${nativeModuleName} module.
+  Make sure that your native code is properly linked, and that the module name you specified is correct.`);
+} else {
+  const SENTIANCE_EMITTER = new NativeEventEmitter(SentianceCore);
+
+  const _addSdkStatusUpdateListener = async (onSdkStatusUpdated) => {
+    await SentianceCore.listenSdkStatusUpdates();
+    return SENTIANCE_EMITTER.addListener(SDK_STATUS_UPDATE_EVENT, (sdkStatus) => {
+      onSdkStatusUpdated(sdkStatus);
+    });
+  };
+
+  const _addUserLinkListener = async (linker) => {
+    const subscription = SENTIANCE_EMITTER.addListener(SDK_USER_LINK_EVENT, async (data) => {
+      const {installId} = data;
+      const linkingResult = await linker(installId);
+      if (typeof linkingResult != "boolean") {
+        console.error('Expected linker result of type boolean, got: ' + typeof linkingResult);
+        SentianceCore.userLinkCallback(false);
+      } else {
+        SentianceCore.userLinkCallback(linkingResult);
+      }
+      subscription.remove();
+    });
+  };
+
+  const _addSdkUserActivityUpdateListener = async (onUserActivityUpdated) => {
+    await SentianceCore.listenUserActivityUpdates();
+    return SENTIANCE_EMITTER.addListener(SDK_USER_ACTIVITY_UPDATE_EVENT, (data) => {
+      onUserActivityUpdated(data);
+    });
+  };
+
+  const _addTripTimeoutListener = async (onTripTimedOut) => {
+    await SentianceCore.listenTripTimeout();
+    return SENTIANCE_EMITTER.addListener(SDK_ON_TRIP_TIMED_OUT_EVENT, onTripTimedOut);
+  };
+
+  SentianceCore._addSdkStatusUpdateListener = _addSdkStatusUpdateListener;
+  SentianceCore._addUserLinkListener = _addUserLinkListener;
+  SentianceCore._addSdkUserActivityUpdateListener = _addSdkUserActivityUpdateListener;
+  SentianceCore._addTripTimeoutListener = _addTripTimeoutListener;
+  coreModule = SentianceCore;
 }
 
-const SENTIANCE_EMITTER = new NativeEventEmitter(SentianceCore);
-
-const _addSdkStatusUpdateListener = async (onSdkStatusUpdated) => {
-  await SentianceCore.listenSdkStatusUpdates();
-  return SENTIANCE_EMITTER.addListener(SDK_STATUS_UPDATE_EVENT, (sdkStatus) => {
-    onSdkStatusUpdated(sdkStatus);
-  });
-};
-
-const _addUserLinkListener = async (linker) => {
-  const subscription = SENTIANCE_EMITTER.addListener(SDK_USER_LINK_EVENT, async (data) => {
-    const {installId} = data;
-    const linkingResult = await linker(installId);
-    if (typeof linkingResult != "boolean") {
-      console.error('Expected linker result of type boolean, got: ' + typeof linkingResult);
-      SentianceCore.userLinkCallback(false);
-    } else {
-      SentianceCore.userLinkCallback(linkingResult);
-    }
-    subscription.remove();
-  });
-};
-
-const _addOnDetectionsEnabledListener = async (onDetectionsEnabled) => {
-  return SENTIANCE_EMITTER.addListener(SDK_ON_DETECTIONS_ENABLED_EVENT, (data) => {
-    onDetectionsEnabled(data);
-  });
-};
-
-const _addSdkUserActivityUpdateListener = async (onUserActivityUpdated) => {
-  await SentianceCore.listenUserActivityUpdates();
-  return SENTIANCE_EMITTER.addListener(SDK_USER_ACTIVITY_UPDATE_EVENT, (data) => {
-    onUserActivityUpdated(data);
-  });
-};
-
-const _addTripTimeoutListener = async (onTripTimedOut) => {
-  await SentianceCore.listenTripTimeout();
-  return SENTIANCE_EMITTER.addListener(SDK_ON_TRIP_TIMED_OUT_EVENT, onTripTimedOut);
-};
-
-SentianceCore._addSdkStatusUpdateListener = _addSdkStatusUpdateListener;
-SentianceCore._addUserLinkListener = _addUserLinkListener;
-SentianceCore._addOnDetectionsEnabledListener = _addOnDetectionsEnabledListener;
-SentianceCore._addSdkUserActivityUpdateListener = _addSdkUserActivityUpdateListener;
-SentianceCore._addTripTimeoutListener = _addTripTimeoutListener;
-
-export default SentianceCore;
+module.exports = coreModule;

package/lib/index.d.ts

@@ -1,7 +1,9 @@
 declare module "sentiance-react-native-core" {
   import {EmitterSubscription} from "react-native";
 
+  export type DetectionStatus = "DISABLED" | "EXPIRED" | "ENABLED_BUT_BLOCKED" | "ENABLED_AND_DETECTING";
   export type LocationPermission = "ALWAYS" | "ONLY_WHILE_IN_USE" | "NEVER";
+  export type BackgroundRefreshStatus = "AVAILABLE" | "DENIED" | "RESTRICTED";
   export type SdkInitState =
     "NOT_INITIALIZED"
     | "INIT_IN_PROGRESS"
@@ -84,6 +86,7 @@ declare module "sentiance-react-native-core" {
 
   export interface SdkStatus {
     startStatus: string;
+    detectionStatus: DetectionStatus;
     canDetect: boolean;
     isRemoteEnabled: boolean;
     isAccelPresent: boolean;
@@ -93,6 +96,7 @@ declare module "sentiance-react-native-core" {
     mobileQuotaStatus: string;
     diskQuotaStatus: string;
     locationPermission: LocationPermission;
+    userExists: boolean;
     isBgAccessPermGranted?: boolean; // iOS only
     isActivityRecognitionPermGranted?: boolean; // Android only
     locationSetting?: string; // Android only
@@ -104,11 +108,17 @@ declare module "sentiance-react-native-core" {
     isBackgroundProcessingRestricted?: boolean; // Android only
     isPreciseLocationAuthorizationGranted: boolean;
     isSchedulingExactAlarmsPermitted?: boolean; // Android only
+    backgroundRefreshStatus: BackgroundRefreshStatus; // iOS only
   }
 
-  export interface EnableDisableDetectionsResult {
+  export interface EnableDetectionsResult {
     sdkStatus: SdkStatus,
-    detectionStatus: string
+    detectionStatus: DetectionStatus
+  }
+
+  export interface DisableDetectionsResult {
+    sdkStatus: SdkStatus,
+    detectionStatus: DetectionStatus
   }
 
   export interface SentianceCore {
@@ -116,11 +126,11 @@ declare module "sentiance-react-native-core" {
 
     userExists(): Promise<boolean>;
 
-    enableDetections(): Promise<EnableDisableDetectionsResult>;
+    enableDetections(): Promise<EnableDetectionsResult>;
 
-    enableDetectionsWithExpiryDate(expiryEpochTimeMs: number | null): Promise<EnableDisableDetectionsResult>;
+    enableDetectionsWithExpiryDate(expiryEpochTimeMs: number | null): Promise<EnableDetectionsResult>;
 
-    disableDetections(): Promise<EnableDisableDetectionsResult>;
+    disableDetections(): Promise<DisableDetectionsResult>;
 
     reset(): Promise<ResetResult>;
 
@@ -180,7 +190,7 @@ declare module "sentiance-react-native-core" {
 
     createUser(options: UserCreationOptions): Promise<CreateUserResult>;
 
-    linkUser(): Promise<UserLinkingResult>;
+    linkUser(linker: (installId) => boolean): Promise<UserLinkingResult>;
 
     linkUserWithAuthCode(authCode: string): Promise<UserLinkingResult>;
 
@@ -188,8 +198,6 @@ declare module "sentiance-react-native-core" {
 
     addTripTimeoutListener(onTripTimedOut: () => void): Promise<EmitterSubscription>;
 
-    addOnDetectionsEnabledListener(onDetectionsEnabled: (sdkStatus: SdkStatus) => void): Promise<EmitterSubscription>;
-
     addSdkUserActivityUpdateListener(onUserActivityUpdated: (userActivity: UserActivity) => void): Promise<EmitterSubscription>;
   }
 

package/lib/index.js

@@ -1,5 +1,5 @@
-import core from './core';
-import Platform from 'react-native';
+const core = require('./core');
+const {Platform} = require('react-native');
 
 const enableDetections = () => core.enableDetections();
 const enableDetectionsWithExpiryDate = (expiryTime) => core.enableDetectionsWithExpiryDate(expiryTime);
@@ -31,6 +31,7 @@ const getMobileQuotaUsage = () => core.getMobileQuotaUsage();
 const getWiFiQuotaLimit = () => core.getWiFiQuotaLimit();
 const getWiFiQuotaUsage = () => core.getWiFiQuotaUsage();
 const linkUserWithAuthCode = (authCode) => core.linkUserWithAuthCode(authCode);
+const NO_OP_LINKER = {}
 
 var startTrip
 var stopTrip
@@ -42,8 +43,7 @@ if (Platform.OS === 'ios') {
   stopTrip = () => core.stopTripNewApi();
   submitDetections = () => core.submitDetectionsNewApi();
   reset = () => core.resetNewApi();
-}
-else {
+} else {
   startTrip = (metadata, hint) => core.startTrip(metadata, hint);
   stopTrip = () => core.stopTrip();
   submitDetections = () => core.submitDetections();
@@ -80,6 +80,16 @@ const linkUser = async (linker) => {
  *  }
  *
  *  createUser(userCreationOptions);
+ *
+ * Or unlinked user with appId / appSecret (Not recommended)
+ *
+ * const userCreationOptions = {
+ *    linker : NO_OP_LINKER,
+ *    appId : "<APP_ID>",
+ *    appSecret: "<APP_SECRET>"
+ *  }
+ *
+ * createUser(userCreationOptions);
  */
 
 
@@ -106,9 +116,20 @@ const linkUser = async (linker) => {
  *    appSecret: "<APP_SECRET>"
  *  }
  *
- *  createUser(userCreationOptions);
+ * createUser(userCreationOptions);
+ *
+ * Or unlinked user with appId / appSecret (Not recommended)
+ *
+ * const userCreationOptions = {
+ *    linker : NO_OP_LINKER,
+ *    appId : "<APP_ID>",
+ *    appSecret: "<APP_SECRET>"
+ *  }
+ *
+ * createUser(userCreationOptions);
  */
 const createUser = async (userCreationOptions) => {
+
   const appId = userCreationOptions.appId;
   const appSecret = userCreationOptions.appSecret;
   const authCode = userCreationOptions.authCode;
@@ -116,21 +137,24 @@ const createUser = async (userCreationOptions) => {
   const linker = userCreationOptions.linker;
 
   if (!appId && !appSecret && !authCode) {
-    return Promise.reject('Invalid userCreationOptions passed, please set authCode or  appId/appSecret with a linker to create user');
+    return Promise.reject('Invalid userCreationOptions passed, please set authCode or appId/appSecret with a linker to create user');
   }
 
   if (authCode) {
     return core.createLinkedUserWithAuthCode(authCode, platformUrl);
   } else if (linker) {
-    await core._addUserLinkListener(linker);
-    return core.createLinkedUser(appId, appSecret, platformUrl);
+    if (linker === NO_OP_LINKER) {
+      return core.createUnlinkedUser(appId, appSecret, platformUrl);
+    } else {
+      await core._addUserLinkListener(linker);
+      return core.createLinkedUser(appId, appSecret, platformUrl);
+    }
   } else {
-    return core.createUnlinkedUser(appId, appSecret, platformUrl);
+    return Promise.reject('Invalid userCreationOptions passed, no authcode or linker specified.');
   }
 }
 
 const addSdkStatusUpdateListener = core._addSdkStatusUpdateListener;
-const addOnDetectionsEnabledListener = core._addOnDetectionsEnabledListener;
 const addSdkUserActivityUpdateListener = core._addSdkUserActivityUpdateListener;
 const addTripTimeoutListener = core._addTripTimeoutListener;
 
@@ -186,9 +210,9 @@ module.exports = {
   linkUser,
   linkUserWithAuthCode,
   addSdkStatusUpdateListener,
-  addOnDetectionsEnabledListener,
   addSdkUserActivityUpdateListener,
   addTripTimeoutListener,
   listenTripTimeout,
-  transportModes
+  transportModes,
+  NO_OP_LINKER
 };

package/lib/utils.js

@@ -1 +1,3 @@
-export const varToString = varObj => Object.keys(varObj)[0];
+module.exports.varToString = function (varObj) {
+  return Object.keys(varObj)[0];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentiance-react-native/core",
-  "version": "6.0.0-beta.9",
+  "version": "6.0.0",
   "description": "React Native Sentiance core library",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -29,10 +29,10 @@
       "targetSdk": 31,
       "compileSdk": 31,
       "buildTools": "30.0.3",
-      "sentiance": "6.0.0-beta4"
+      "sentiance": "6.0.0"
     },
     "ios": {
-      "sentiance": "6.0.0-beta10"
+      "sentiance": "6.0.0"
     }
   }
 }