@sentiance-react-native/core 6.6.0-rc1 → 6.7.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.6.0-rc1"
+  s.version      = "6.7.0-rc.1"
   s.summary      = "RNSentianceCore"
   s.description  = <<-DESC
                    RNSentianceCore
@@ -26,4 +26,6 @@ Pod::Spec.new do |s|
     s.dependency "SENTSDK", sentiance_sdk_package_version
   else
     s.dependency "SENTSDK", sentiance_sdk_env_var_version
+  end
+
 end

package/android/build.gradle

@@ -19,6 +19,10 @@ def sentianceSdkVersion = getSentianceSdkVersion()
 dependencies {
   implementation(platform("com.sentiance:sdk-bom:${sentianceSdkVersion}"))
   api("com.sentiance:sdk") { transitive = true }
+
+  if (findProject(':test-common')) {
+    testImplementation project(':test-common')
+  }
 }
 
 applyReactNativeDependency()

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

@@ -1,7 +1,5 @@
 package com.sentiance.react.bridge.core;
 
-import static com.sentiance.react.bridge.core.common.SentianceCommonConverter.convertLocation;
-
 import android.location.Location;
 
 import com.facebook.react.bridge.Arguments;
@@ -40,11 +38,18 @@ import java.util.Map;
 
 public class SentianceConverter {
 
-  public static WritableMap createEmptyResult() {
+  public static final String JS_KEY_ALTITUDE = "altitude";
+  public static final String JS_KEY_PROVIDER = "provider";
+  public static final String JS_KEY_TIMESTAMP = "timestamp";
+  public static final String JS_KEY_LATITUDE = "latitude";
+  public static final String JS_KEY_LONGITUDE = "longitude";
+  public static final String JS_KEY_ACCURACY = "accuracy";
+
+  public WritableMap createEmptyResult() {
     return Arguments.createMap();
   }
 
-  public static Map<String, String> convertReadableMapToMap(ReadableMap inputMap) {
+  public Map<String, String> convertReadableMapToMap(ReadableMap inputMap) {
     Map<String, String> map = new HashMap<>();
     ReadableMapKeySetIterator iterator = inputMap.keySetIterator();
     while (iterator.hasNextKey()) {
@@ -58,7 +63,7 @@ public class SentianceConverter {
     return map;
   }
 
-  public static TripType toTripType(final String type) {
+  public TripType toTripType(final String type) {
     if (type.equals("sdk") || type.equals("TRIP_TYPE_SDK")) {
       return TripType.SDK_TRIP;
     } else if (type.equals("external") || type.equals("TRIP_TYPE_EXTERNAL")) {
@@ -68,7 +73,7 @@ public class SentianceConverter {
     }
   }
 
-  public static TransportMode toTransportMode(int t) {
+  public TransportMode toTransportMode(int t) {
     switch (t) {
       case 2:
         return TransportMode.CAR;
@@ -95,7 +100,7 @@ public class SentianceConverter {
     }
   }
 
-  public static String convertInitState(InitState initState) {
+  public String convertInitState(InitState initState) {
     switch (initState) {
       case NOT_INITIALIZED:
         return "NOT_INITIALIZED";
@@ -110,7 +115,7 @@ public class SentianceConverter {
     }
   }
 
-  public static WritableMap convertToken(Token token) {
+  public WritableMap convertToken(Token token) {
     WritableMap map = Arguments.createMap();
     try {
       map.putString("tokenId", token.getTokenId());
@@ -121,7 +126,7 @@ public class SentianceConverter {
     return map;
   }
 
-  public static WritableMap convertUserCreationResult(UserCreationResult result) {
+  public WritableMap convertUserCreationResult(UserCreationResult result) {
     UserInfo userInfo = result.getUserInfo();
     Token token = userInfo.getToken();
 
@@ -136,7 +141,7 @@ public class SentianceConverter {
     return userCreationResult;
   }
 
-  public static WritableMap convertUserLinkingResult(UserLinkingResult result) {
+  public WritableMap convertUserLinkingResult(UserLinkingResult result) {
     UserInfo userInfo = result.getUserInfo();
     Token token = userInfo.getToken();
 
@@ -151,14 +156,14 @@ public class SentianceConverter {
     return userLinkingResult;
   }
 
-  public static WritableMap convertInstallId(String installId) {
+  public WritableMap convertInstallId(String installId) {
     WritableMap map = Arguments.createMap();
     map.putString("installId", installId);
 
     return map;
   }
 
-  public static WritableMap convertSdkStatus(SdkStatus status) {
+  public WritableMap convertSdkStatus(SdkStatus status) {
     WritableMap map = Arguments.createMap();
     map.putString("startStatus", status.startStatus.name());
     map.putString("detectionStatus", status.detectionStatus.name());
@@ -186,7 +191,7 @@ public class SentianceConverter {
     return map;
   }
 
-  public static WritableMap convertUserActivity(UserActivity activity) {
+  public WritableMap convertUserActivity(UserActivity activity) {
     WritableMap map = Arguments.createMap();
     map.putString("type", convertUserActivityType(activity.getActivityType()));
 
@@ -209,7 +214,7 @@ public class SentianceConverter {
     return map;
   }
 
-  public static String convertTripType(TripType tripType) {
+  public String convertTripType(TripType tripType) {
     switch (tripType) {
       case ANY:
         return "ANY";
@@ -222,7 +227,7 @@ public class SentianceConverter {
     }
   }
 
-  public static String convertUserActivityType(UserActivityType activityType) {
+  public String convertUserActivityType(UserActivityType activityType) {
     switch (activityType) {
       case TRIP:
         return "USER_ACTIVITY_TYPE_TRIP";
@@ -235,23 +240,23 @@ public class SentianceConverter {
     }
   }
 
-  public static WritableMap convertEnableDetectionsResult(EnableDetectionsResult enableDetectionsResult) {
+  public WritableMap convertEnableDetectionsResult(EnableDetectionsResult enableDetectionsResult) {
     return convertDetectionsResult(enableDetectionsResult.getSdkStatus(),
       enableDetectionsResult.getDetectionStatus());
   }
 
-  public static WritableMap convertDisableDetectionsResult(DisableDetectionsResult disableDetectionsResult) {
+  public WritableMap convertDisableDetectionsResult(DisableDetectionsResult disableDetectionsResult) {
     return convertDetectionsResult(disableDetectionsResult.getSdkStatus(),
       disableDetectionsResult.getDetectionStatus());
   }
 
-  public static WritableMap convertResetResult(ResetResult resetResult) {
+  public WritableMap convertResetResult(ResetResult resetResult) {
     WritableMap result = Arguments.createMap();
     result.putString("initState", resetResult.getInitState().name());
     return result;
   }
 
-  private static WritableMap convertDetectionsResult(SdkStatus sdkStatus, DetectionStatus detectionStatus) {
+  private WritableMap convertDetectionsResult(SdkStatus sdkStatus, DetectionStatus detectionStatus) {
     WritableMap result = Arguments.createMap();
     WritableMap sdkStatusMap = convertSdkStatus(sdkStatus);
 
@@ -261,7 +266,22 @@ public class SentianceConverter {
     return result;
   }
 
-  public static String stringifyEnableDetectionsError(EnableDetectionsError error) {
+  public WritableMap convertLocation(Location location) {
+    WritableMap locationMap = Arguments.createMap();
+    locationMap.putDouble(JS_KEY_TIMESTAMP, location.getTime());
+    locationMap.putDouble(JS_KEY_LATITUDE, location.getLatitude());
+    locationMap.putDouble(JS_KEY_LONGITUDE, location.getLongitude());
+    if (location.hasAccuracy()) {
+      locationMap.putDouble(JS_KEY_ACCURACY, location.getAccuracy());
+    }
+    if (location.hasAltitude()) {
+      locationMap.putDouble(JS_KEY_ALTITUDE, location.getAltitude());
+    }
+    locationMap.putString(JS_KEY_PROVIDER, location.getProvider());
+    return locationMap;
+  }
+
+  public String stringifyEnableDetectionsError(EnableDetectionsError error) {
     EnableDetectionsFailureReason reason = error.getReason();
     String details = "";
     switch (reason) {
@@ -278,19 +298,19 @@ public class SentianceConverter {
     return String.format("Reason: %s - %s", reason.name(), details);
   }
 
-  public static String stringifyUserLinkingError(UserLinkingError error) {
+  public String stringifyUserLinkingError(UserLinkingError error) {
     return String.format("Reason: %s - %s", error.getReason().name(), error.getDetails());
   }
 
-  public static String stringifyUserCreationError(UserCreationError error) {
+  public String stringifyUserCreationError(UserCreationError error) {
     return String.format("Reason: %s - %s", error.getReason().name(), error.getDetails());
   }
 
-  public static String stringifyResetError(ResetError error) {
+  public String stringifyResetError(ResetError error) {
     return String.format("%s - caused by: %s", error.getReason().name(), error.getException());
   }
 
-  public static String stringifyStartTripError(StartTripError error) {
+  public String stringifyStartTripError(StartTripError error) {
     StartTripFailureReason reason = error.getReason();
     String details = "";
     switch (reason) {
@@ -313,7 +333,7 @@ public class SentianceConverter {
     return String.format("Reason: %s - %s", reason.name(), details);
   }
 
-  public static String stringifyStopTripError(StopTripError error) {
+  public String stringifyStopTripError(StopTripError error) {
     StopTripFailureReason reason = error.getReason();
     String details = "";
     if (reason == StopTripFailureReason.NO_ONGOING_TRIP) {
@@ -322,7 +342,7 @@ public class SentianceConverter {
     return String.format("Reason: %s - %s", reason.name(), details);
   }
 
-  public static String stringifyUserAccessTokenError(UserAccessTokenError error) {
+  public String stringifyUserAccessTokenError(UserAccessTokenError error) {
     UserAccessTokenFailureReason reason = error.getReason();
     String details = "";
     switch (reason) {

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

@@ -1,13 +1,9 @@
 package com.sentiance.react.bridge.core;
 
-import static com.sentiance.react.bridge.core.SentianceConverter.convertInstallId;
-import static com.sentiance.react.bridge.core.SentianceConverter.convertSdkStatus;
-import static com.sentiance.react.bridge.core.SentianceConverter.convertUserActivity;
-
 import android.content.Context;
 
 import com.facebook.react.bridge.Arguments;
-import com.sentiance.react.bridge.core.base.AbstractSentianceEmitter;
+import com.sentiance.react.bridge.core.common.base.AbstractSentianceEmitter;
 import com.sentiance.sdk.SdkStatus;
 import com.sentiance.sdk.detectionupdates.UserActivity;
 
@@ -16,21 +12,23 @@ public class SentianceEmitter extends AbstractSentianceEmitter {
   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_TRIP_TIMED_OUT = "SENTIANCE_ON_TRIP_TIMED_OUT_EVENT";
+  private final SentianceConverter converter;
 
   public SentianceEmitter(Context context) {
     super(context);
+    converter = new SentianceConverter();
   }
 
   void sendUserLinkEvent(String installId) {
-    sendEvent(USER_LINK, convertInstallId(installId));
+    sendEvent(USER_LINK, converter.convertInstallId(installId));
   }
 
   public void sendStatusUpdateEvent(SdkStatus status) {
-    sendEvent(STATUS_UPDATE, convertSdkStatus(status));
+    sendEvent(STATUS_UPDATE, converter.convertSdkStatus(status));
   }
 
   void sendUserActivityUpdate(UserActivity userActivity) {
-    sendEvent(USER_ACTIVITY_UPDATE, convertUserActivity(userActivity));
+    sendEvent(USER_ACTIVITY_UPDATE, converter.convertUserActivity(userActivity));
   }
 
   void sendOnTripTimedOutEvent() {

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

@@ -1,9 +1,9 @@
 package com.sentiance.react.bridge.core;
 
-import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_DISABLE_DETECTIONS_ERROR;
-import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_ENABLE_DETECTIONS_ERROR;
-import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_USER_LINK_AUTH_CODE_ERROR;
-import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_USER_LINK_ERROR;
+import static com.sentiance.react.bridge.core.common.util.ErrorCodes.E_SDK_DISABLE_DETECTIONS_ERROR;
+import static com.sentiance.react.bridge.core.common.util.ErrorCodes.E_SDK_ENABLE_DETECTIONS_ERROR;
+import static com.sentiance.react.bridge.core.common.util.ErrorCodes.E_SDK_USER_LINK_AUTH_CODE_ERROR;
+import static com.sentiance.react.bridge.core.common.util.ErrorCodes.E_SDK_USER_LINK_ERROR;
 
 import android.app.Notification;
 import android.content.Context;
@@ -38,20 +38,19 @@ public class SentianceHelper {
   private final SentianceEmitter emitter;
   private final WeakReference<Context> weakContext;
   private final UserLinker userLinker;
-
   private final OnSdkStatusUpdateHandler onSdkStatusUpdateHandler = this::onSdkStatusUpdated;
-
   private final SdkStatusUpdateListener onSdkStatusUpdateListener = this::onSdkStatusUpdated;
+  private final SentianceConverter converter;
 
   SdkStatusUpdateListener getOnSdkStatusUpdateListener() {
     return onSdkStatusUpdateListener;
   }
 
-
   protected SentianceHelper(Context context) {
     emitter = new SentianceEmitter(context);
     weakContext = new WeakReference<>(context);
     userLinker = new UserLinker(emitter);
+    converter = new SentianceConverter();
   }
 
   public static SentianceHelper getInstance(Context context) {
@@ -143,13 +142,13 @@ public class SentianceHelper {
         if (pendingOperation.isSuccessful()) {
           EnableDetectionsResult result = pendingOperation.getResult();
           if (promise != null) {
-            promise.resolve(SentianceConverter.convertEnableDetectionsResult(result));
+            promise.resolve(converter.convertEnableDetectionsResult(result));
           }
         } else {
           EnableDetectionsError error = pendingOperation.getError();
           if (promise != null) {
             promise.reject(E_SDK_ENABLE_DETECTIONS_ERROR,
-              SentianceConverter.stringifyEnableDetectionsError(error));
+              converter.stringifyEnableDetectionsError(error));
           }
         }
       });
@@ -161,7 +160,7 @@ public class SentianceHelper {
             .addOnCompleteListener(pendingOperation -> {
               if (pendingOperation.isSuccessful()) {
                 DisableDetectionsResult result = pendingOperation.getResult();
-                promise.resolve(SentianceConverter.convertDisableDetectionsResult(result));
+                promise.resolve(converter.convertDisableDetectionsResult(result));
               } else {
                 promise.reject(E_SDK_DISABLE_DETECTIONS_ERROR, "");
               }
@@ -173,11 +172,11 @@ public class SentianceHelper {
     sentiance.linkUser(userLinker)
       .addOnCompleteListener(pendingOperation -> {
         if (pendingOperation.isSuccessful()) {
-          promise.resolve(SentianceConverter.convertUserLinkingResult(pendingOperation.getResult()));
+          promise.resolve(converter.convertUserLinkingResult(pendingOperation.getResult()));
         } else {
           UserLinkingError error = pendingOperation.getError();
           promise.reject(E_SDK_USER_LINK_ERROR,
-            SentianceConverter.stringifyUserLinkingError(error));
+            converter.stringifyUserLinkingError(error));
         }
       });
   }
@@ -187,11 +186,11 @@ public class SentianceHelper {
     sentiance.linkUser(authCode)
       .addOnCompleteListener(pendingOperation -> {
         if (pendingOperation.isSuccessful()) {
-          promise.resolve(SentianceConverter.convertUserLinkingResult(pendingOperation.getResult()));
+          promise.resolve(converter.convertUserLinkingResult(pendingOperation.getResult()));
         } else {
           UserLinkingError error = pendingOperation.getError();
           promise.reject(E_SDK_USER_LINK_AUTH_CODE_ERROR,
-            SentianceConverter.stringifyUserLinkingError(error));
+            converter.stringifyUserLinkingError(error));
         }
       });
   }

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

@@ -1,11 +1,11 @@
 package com.sentiance.react.bridge.core;
 
-import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_GET_TOKEN_ERROR;
-import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_MISSING_PARAMS;
-import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_RESET_ERROR;
-import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_START_TRIP_ERROR;
-import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_STOP_TRIP_ERROR;
-import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_SUBMIT_DETECTIONS_ERROR;
+import static com.sentiance.react.bridge.core.common.util.ErrorCodes.E_SDK_GET_TOKEN_ERROR;
+import static com.sentiance.react.bridge.core.common.util.ErrorCodes.E_SDK_MISSING_PARAMS;
+import static com.sentiance.react.bridge.core.common.util.ErrorCodes.E_SDK_RESET_ERROR;
+import static com.sentiance.react.bridge.core.common.util.ErrorCodes.E_SDK_START_TRIP_ERROR;
+import static com.sentiance.react.bridge.core.common.util.ErrorCodes.E_SDK_STOP_TRIP_ERROR;
+import static com.sentiance.react.bridge.core.common.util.ErrorCodes.E_SDK_SUBMIT_DETECTIONS_ERROR;
 
 import android.annotation.SuppressLint;
 import android.app.Notification;
@@ -22,8 +22,8 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
-import com.sentiance.react.bridge.core.base.AbstractSentianceModule;
 import com.sentiance.react.bridge.core.common.SentianceSubscriptionsManager;
+import com.sentiance.react.bridge.core.common.base.AbstractSentianceModule;
 import com.sentiance.react.bridge.core.utils.SentianceUtils;
 import com.sentiance.react.bridge.core.utils.UserCreationCompletionHandler;
 import com.sentiance.sdk.InitState;
@@ -53,11 +53,18 @@ public class SentianceModule extends AbstractSentianceModule {
   private final Handler mHandler = new Handler(Looper.getMainLooper());
   private final SentianceHelper sentianceHelper;
   private final SentianceEmitter emitter;
+  private final SentianceConverter converter;
 
-  public SentianceModule(ReactApplicationContext reactContext) {
-    super(reactContext, Sentiance.getInstance(reactContext), new SentianceSubscriptionsManager());
-    sentianceHelper = SentianceHelper.getInstance(reactContext);
-    emitter = new SentianceEmitter(reactContext);
+  public SentianceModule(ReactApplicationContext reactContext,
+                         Sentiance sentiance,
+                         SentianceSubscriptionsManager subscriptionsManager,
+                         SentianceHelper sentianceHelper,
+                         SentianceEmitter sentianceEmitter,
+                         SentianceConverter converter) {
+    super(reactContext, sentiance, subscriptionsManager);
+    this.sentianceHelper = sentianceHelper;
+    this.emitter = sentianceEmitter;
+    this.converter = converter;
   }
 
   @NonNull
@@ -166,10 +173,10 @@ public class SentianceModule extends AbstractSentianceModule {
     mSdk.reset()
       .addOnCompleteListener(pendingOperation -> {
         if (pendingOperation.isSuccessful()) {
-          promise.resolve(SentianceConverter.convertResetResult(pendingOperation.getResult()));
+          promise.resolve(converter.convertResetResult(pendingOperation.getResult()));
         } else {
           ResetError error = pendingOperation.getError();
-          promise.reject(E_SDK_RESET_ERROR, SentianceConverter.stringifyResetError(error));
+          promise.reject(E_SDK_RESET_ERROR, converter.stringifyResetError(error));
         }
       });
   }
@@ -178,7 +185,7 @@ public class SentianceModule extends AbstractSentianceModule {
   @SuppressWarnings("unused")
   public void getInitState(final Promise promise) {
     InitState initState = mSdk.getInitState();
-    promise.resolve(SentianceConverter.convertInitState(initState));
+    promise.resolve(converter.convertInitState(initState));
   }
 
   @ReactMethod
@@ -194,15 +201,15 @@ public class SentianceModule extends AbstractSentianceModule {
         metadataMap.put(entry.getKey(), entry.getValue().toString());
       }
     }
-    final TransportMode transportModeHint = SentianceConverter.toTransportMode(hint);
+    final TransportMode transportModeHint = converter.toTransportMode(hint);
     mSdk.startTrip(metadataMap, transportModeHint)
       .addOnCompleteListener(pendingOperation -> {
         if (pendingOperation.isSuccessful()) {
-          promise.resolve(SentianceConverter.createEmptyResult());
+          promise.resolve(converter.createEmptyResult());
         } else {
           StartTripError error = pendingOperation.getError();
           promise.reject(E_SDK_START_TRIP_ERROR,
-            SentianceConverter.stringifyStartTripError(error));
+            converter.stringifyStartTripError(error));
         }
       });
   }
@@ -216,11 +223,11 @@ public class SentianceModule extends AbstractSentianceModule {
     mSdk.stopTrip()
       .addOnCompleteListener(pendingOperation -> {
         if (pendingOperation.isSuccessful()) {
-          promise.resolve(SentianceConverter.createEmptyResult());
+          promise.resolve(converter.createEmptyResult());
         } else {
           StopTripError error = pendingOperation.getError();
           promise.reject(E_SDK_STOP_TRIP_ERROR,
-            SentianceConverter.stringifyStopTripError(error));
+            converter.stringifyStopTripError(error));
         }
       });
   }
@@ -233,7 +240,7 @@ public class SentianceModule extends AbstractSentianceModule {
     }
 
     SdkStatus sdkStatus = mSdk.getSdkStatus();
-    promise.resolve(SentianceConverter.convertSdkStatus(sdkStatus));
+    promise.resolve(converter.convertSdkStatus(sdkStatus));
   }
 
   @ReactMethod
@@ -254,7 +261,7 @@ public class SentianceModule extends AbstractSentianceModule {
       promise.reject(E_SDK_MISSING_PARAMS, "TripType is required");
       return;
     }
-    final TripType type = SentianceConverter.toTripType(typeParam);
+    final TripType type = converter.toTripType(typeParam);
     Boolean isTripOngoing = mSdk.isTripOngoing(type);
     promise.resolve(isTripOngoing);
   }
@@ -270,11 +277,11 @@ public class SentianceModule extends AbstractSentianceModule {
       .addOnCompleteListener(pendingOperation -> {
         if (pendingOperation.isSuccessful()) {
           Token token = pendingOperation.getResult();
-          promise.resolve(SentianceConverter.convertToken(token));
+          promise.resolve(converter.convertToken(token));
         } else {
           UserAccessTokenError error = pendingOperation.getError();
           promise.reject(E_SDK_GET_TOKEN_ERROR,
-            SentianceConverter.stringifyUserAccessTokenError(error));
+            converter.stringifyUserAccessTokenError(error));
         }
       });
   }
@@ -313,7 +320,7 @@ public class SentianceModule extends AbstractSentianceModule {
       return;
     }
 
-    final Map<String, String> metadata = SentianceConverter.convertReadableMapToMap(inputMetadata);
+    final Map<String, String> metadata = converter.convertReadableMapToMap(inputMetadata);
     boolean result = mSdk.addTripMetadata(metadata);
     promise.resolve(result);
   }
@@ -330,7 +337,7 @@ public class SentianceModule extends AbstractSentianceModule {
       return;
     }
 
-    final Map<String, String> metadata = SentianceConverter.convertReadableMapToMap(inputMetadata);
+    final Map<String, String> metadata = converter.convertReadableMapToMap(inputMetadata);
     mSdk.addUserMetadataFields(metadata);
     promise.resolve(null);
   }
@@ -361,7 +368,7 @@ public class SentianceModule extends AbstractSentianceModule {
     mSdk.submitDetections()
       .addOnCompleteListener(pendingOperation -> {
         if (pendingOperation.isSuccessful()) {
-          promise.resolve(SentianceConverter.createEmptyResult());
+          promise.resolve(converter.createEmptyResult());
         } else {
           SubmitDetectionsError error = pendingOperation.getError();
           promise.reject(E_SDK_SUBMIT_DETECTIONS_ERROR, error.getReason().name());
@@ -466,7 +473,7 @@ public class SentianceModule extends AbstractSentianceModule {
     }
 
     UserActivity activity = Sentiance.getInstance(mReactContext).getUserActivity();
-    promise.resolve(SentianceConverter.convertUserActivity(activity));
+    promise.resolve(converter.convertUserActivity(activity));
   }
 
   @ReactMethod
@@ -561,6 +568,25 @@ public class SentianceModule extends AbstractSentianceModule {
     promise.resolve(args);
   }
 
+  @ReactMethod
+  public void setIsAllowedToUseMobileData(boolean isAllowed, Promise promise) {
+    if (rejectIfNotInitialized(promise)) {
+      return;
+    }
+
+    mSdk.setIsAllowedToUseMobileData(isAllowed);
+    promise.resolve(null);
+  }
+
+  @ReactMethod
+  public void isAllowedToUseMobileData(Promise promise) {
+    if (rejectIfNotInitialized(promise)) {
+      return;
+    }
+
+    promise.resolve(mSdk.isAllowedToUseMobileData());
+  }
+
   @Override
   @ReactMethod
   protected void addNativeListener(String eventName, int subscriptionId, Promise promise) {

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

@@ -6,6 +6,8 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
+import com.sentiance.react.bridge.core.common.SentianceSubscriptionsManager;
+import com.sentiance.sdk.Sentiance;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,7 +19,15 @@ public class SentiancePackage implements ReactPackage {
   @Override
   public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
     List<NativeModule> modules = new ArrayList<>();
-    SentianceModule sentianceModule = new SentianceModule(reactContext);
+
+    SentianceModule sentianceModule = new SentianceModule(
+        reactContext,
+        Sentiance.getInstance(reactContext),
+        new SentianceSubscriptionsManager(),
+        SentianceHelper.getInstance(reactContext),
+        new SentianceEmitter(reactContext),
+        new SentianceConverter()
+    );
     modules.add(sentianceModule);
     return modules;
   }

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

@@ -3,7 +3,7 @@ package com.sentiance.react.bridge.core.common;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.sentiance.react.bridge.core.utils.SingleParamRunnable;
+import com.sentiance.react.bridge.core.common.util.SingleParamRunnable;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,14 +23,14 @@ public class SentianceSubscriptionsManager {
   }
 
   public <T> void addSupportedSubscription(String eventType, SingleParamRunnable<T> nativeSubscribeLogic,
-                                       SingleParamRunnable<T> nativeUnsubscribeLogic, SubscriptionType subscriptionType) {
+                                           SingleParamRunnable<T> nativeUnsubscribeLogic, SubscriptionType subscriptionType) {
     if (mSupportedSubscriptions.containsKey(eventType)) {
       throw new IllegalArgumentException(String.format("A subscription definition for %s has already been added.",
-                                                       eventType));
+        eventType));
     }
 
     mSupportedSubscriptions.put(eventType, new SubscriptionDefinition<>(eventType, nativeSubscribeLogic,
-                                                                        nativeUnsubscribeLogic, subscriptionType));
+      nativeUnsubscribeLogic, subscriptionType));
   }
 
   public <T> void addSubscription(@NonNull String eventType, int subscriptionId, @NonNull T eventEmitterLogic) {

package/android/src/main/java/com/sentiance/react/bridge/core/{base → common/base}/AbstractSentianceEmitter.java

@@ -1,4 +1,4 @@
-package com.sentiance.react.bridge.core.base;
+package com.sentiance.react.bridge.core.common.base;
 
 import android.content.Context;
 import android.os.Handler;

package/android/src/main/java/com/sentiance/react/bridge/core/{base → common/base}/AbstractSentianceModule.java

@@ -1,8 +1,6 @@
-package com.sentiance.react.bridge.core.base;
+package com.sentiance.react.bridge.core.common.base;
 
-import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_NOT_INITIALIZED;
-
-import androidx.annotation.NonNull;
+import static com.sentiance.react.bridge.core.common.util.ErrorCodes.E_SDK_NOT_INITIALIZED;
 
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -46,14 +44,6 @@ public abstract class AbstractSentianceModule extends ReactContextBaseJavaModule
 
   }
 
-  protected <T> void addSubscription(@NonNull String eventType, int subscriptionId, @NonNull T eventEmitterLogic) {
-    mSubscriptionsManager.addSubscription(eventType, subscriptionId, eventEmitterLogic);
-  }
-
-  protected <T> void removeSubscription(int subscriptionId, @NonNull String eventType) {
-    mSubscriptionsManager.removeSubscription(subscriptionId, eventType);
-  }
-
   protected abstract void removeNativeListener(String eventName, int subscriptionId, Promise promise);
 
   protected abstract void addNativeListener(String eventName, int subscriptionId, Promise promise);

package/android/src/main/java/com/sentiance/react/bridge/core/{utils → common/util}/ErrorCodes.java

@@ -1,4 +1,4 @@
-package com.sentiance.react.bridge.core.utils;
+package com.sentiance.react.bridge.core.common.util;
 
 public class ErrorCodes {
   public static final String E_SDK_MISSING_PARAMS = "E_SDK_MISSING_PARAMS";

package/android/src/main/java/com/sentiance/react/bridge/core/{utils → common/util}/SingleParamRunnable.java

@@ -1,4 +1,4 @@
-package com.sentiance.react.bridge.core.utils;
+package com.sentiance.react.bridge.core.common.util;
 
 @FunctionalInterface
 public interface SingleParamRunnable<T> {

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

@@ -1,6 +1,6 @@
 package com.sentiance.react.bridge.core.utils;
 
-import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_CREATE_USER_ERROR;
+import static com.sentiance.react.bridge.core.common.util.ErrorCodes.E_SDK_CREATE_USER_ERROR;
 
 import androidx.annotation.NonNull;
 
@@ -14,18 +14,20 @@ import com.sentiance.sdk.usercreation.UserCreationResult;
 public class UserCreationCompletionHandler implements OnCompleteListener<UserCreationResult, UserCreationError> {
 
   private final Promise promise;
+  private final SentianceConverter converter;
 
   public UserCreationCompletionHandler(Promise promise) {
     this.promise = promise;
+    converter = new SentianceConverter();
   }
 
   @Override
   public void onComplete(@NonNull PendingOperation<UserCreationResult, UserCreationError> pendingOperation) {
     if (pendingOperation.isSuccessful()) {
-      promise.resolve(SentianceConverter.convertUserCreationResult(pendingOperation.getResult()));
+      promise.resolve(converter.convertUserCreationResult(pendingOperation.getResult()));
     } else {
       promise.reject(E_SDK_CREATE_USER_ERROR,
-        SentianceConverter.stringifyUserCreationError(pendingOperation.getError()));
+        converter.stringifyUserCreationError(pendingOperation.getError()));
     }
   }
 }

package/ios/RNSentianceCore+Converter.h

@@ -54,5 +54,6 @@ typedef NS_ENUM(NSInteger, UIBackgroundRefreshStatus);
 - (NSArray *)convertPhoneUsageEvents:(NSArray<SENTPhoneUsageEvent*> *)phoneUsageEvents;
 - (NSArray *)convertCallWhileMovingEvents:(NSArray<SENTCallWhileMovingEvent*> *)callWhileMovingEvents;
 - (NSArray *)convertSpeedingEvents:(NSArray<SENTSpeedingEvent*> *)speedingEvents;
+- (NSMutableDictionary*)convertEvent:(SENTTimelineEvent*)event;
 
 @end

package/ios/RNSentianceCore+Converter.m

@@ -20,7 +20,6 @@
 - (void)addStationaryEventInfoToDict:(NSMutableDictionary*)dict event:(SENTStationaryEvent*)event;
 - (NSString*)convertTransportModeToString:(SENTTimelineTransportMode) mode;
 - (void)addTransportEventInfoToDict:(NSMutableDictionary*)dict event:(SENTTransportEvent*)event;
-- (NSMutableDictionary*)convertEvent:(SENTTimelineEvent*)event;
 - (nullable NSString*)convertSegmentCategoryToString:(SENTSegmentCategory)category;
 - (nullable NSString*)convertSegmentSubcategoryToString:(SENTSegmentSubcategory)subcategory;
 - (nullable NSString*)convertSegmentTypeToString:(SENTSegmentType)type;
@@ -235,6 +234,7 @@
     if (waypoint.isSpeedLimitInfoSet) {
         dict[@"speedLimitInMps"] = @(waypoint.speedLimitInMps);
     }
+    dict[@"isSpeedLimitInfoSet"] = @(waypoint.isSpeedLimitInfoSet);
     dict[@"hasUnlimitedSpeedLimit"] = @(waypoint.isSpeedLimitUnlimited);
 
     return dict;
@@ -269,6 +269,8 @@
     eventDict[@"id"] = [event eventId];
     eventDict[@"startTime"] = [event.startDate description];
     eventDict[@"startTimeEpoch"] = @((long) (event.startDate.timeIntervalSince1970 * 1000));
+    eventDict[@"lastUpdateTime"] = [event.lastUpdateDate description];
+    eventDict[@"lastUpdateTimeEpoch"] = @((long) (event.lastUpdateDate.timeIntervalSince1970 * 1000));
     if (event.endDate != nil) {
         eventDict[@"endTime"] = [event.endDate description];
         eventDict[@"endTimeEpoch"] = @((long) (event.endDate.timeIntervalSince1970 * 1000));
@@ -612,6 +614,7 @@
                            @"isRemoteEnabled":@(status.isRemoteEnabled),
                            @"locationPermission":[self convertLocationPermissionToString:status.locationPermission],
                            @"isPreciseLocationAuthorizationGranted":@(status.isPreciseLocationAuthorizationGranted),
+                           @"isLocationAvailable":@(status.isLocationAvailable),
                            @"isAccelPresent":@(status.isAccelPresent),
                            @"isGyroPresent":@(status.isGyroPresent),
                            @"isGpsPresent":@(status.isGpsPresent),
@@ -1223,13 +1226,13 @@
 }
 
 - (NSDictionary<NSString *, NSNumber *> *)convertSpeedingEvent:(SENTSpeedingEvent *)speedingEvent {
-    NSMutableDictionary<NSString *, NSNumber *> *dict = [self convertDrivingEvent:speedingEvent];
+    NSMutableDictionary *dict = [self convertDrivingEvent:speedingEvent];
     dict[@"waypoints"] = [self convertWaypointArray:speedingEvent.waypoints];
     return dict;
 }
 
 - (NSMutableDictionary<NSString *, NSNumber *> *)convertDrivingEvent:(SENTDrivingEvent *)drivingEvent {
-    NSMutableDictionary<NSString *, NSNumber *> *dict = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
     dict[@"startTime"] = [drivingEvent.startDate description];
     dict[@"startTimeEpoch"] = @((long) (drivingEvent.startDate.timeIntervalSince1970 * 1000));
     dict[@"endTime"] = [drivingEvent.endDate description];

package/ios/RNSentianceCore.h

@@ -13,8 +13,9 @@ static NSString * _Nonnull const VehicleCrashEvent = @"SENTIANCE_VEHICLE_CRASH_E
 static NSString * _Nonnull const VehicleCrashDiagnosticEvent = @"SENTIANCE_VEHICLE_CRASH_DIAGNOSTIC_EVENT";
 static NSString * _Nonnull const UserContextUpdateEvent = @"SENTIANCE_USER_CONTEXT_UPDATE_EVENT";
 static NSString * _Nonnull const DrivingInsightsReadyEvent = @"SENTIANCE_DRIVING_INSIGHTS_READY_EVENT";
+static NSString * _Nonnull const TimelineUpdateEvent = @"SENTIANCE_TIMELINE_UPDATE_EVENT";
 
-@interface RNSentianceCore : RCTEventEmitter <RCTBridgeModule, SENTUserContextDelegate, SENTDrivingInsightsReadyDelegate>
+@interface RNSentianceCore : RCTEventEmitter <RCTBridgeModule, SENTUserContextDelegate, SENTDrivingInsightsReadyDelegate, SENTEventTimelineDelegate>
 typedef void (^SdkStatusHandler)(SENTSDKStatus * _Nonnull status);
 - (SENTUserLinker _Nonnull ) getUserLinker;
 - (SdkStatusHandler _Nonnull) getSdkStatusUpdateHandler;

package/ios/RNSentianceCore.m

@@ -35,7 +35,7 @@ RCT_EXPORT_MODULE(SentianceCore)
 
 - (NSArray<NSString *> *)supportedEvents
 {
-    return @[SdkStatusUpdateEvent, TripTimeoutEvent, UserLinkEvent, UserActivityUpdateEvent, VehicleCrashEvent, VehicleCrashDiagnosticEvent, UserLinkEvent, UserContextUpdateEvent, DrivingInsightsReadyEvent];
+    return @[SdkStatusUpdateEvent, TripTimeoutEvent, UserLinkEvent, UserActivityUpdateEvent, VehicleCrashEvent, VehicleCrashDiagnosticEvent, UserLinkEvent, UserContextUpdateEvent, DrivingInsightsReadyEvent, TimelineUpdateEvent];
 }
 
 // Will be called when this module's first listener is added.
@@ -58,6 +58,10 @@ RCT_EXPORT_MODULE(SentianceCore)
     [self sendEventWithName:DrivingInsightsReadyEvent body:[self convertDrivingInsights:insights]];
 }
 
+- (void)onEventTimelineUpdateWithEvent:(SENTTimelineEvent * _Nonnull)event {
+    [self sendEventWithName:TimelineUpdateEvent body:[self convertEvent:event]];
+}
+
 - (instancetype)init
 {
     self = [super init];
@@ -70,6 +74,12 @@ RCT_EXPORT_MODULE(SentianceCore)
         [[Sentiance sharedInstance] setDrivingInsightsReadyDelegate:nil];
     } subscriptionType:SENTSubscriptionTypeSingle];
 
+    [_subscriptionsManager addSupportedSubscriptionForEventType:TimelineUpdateEvent nativeSubscribeLogic:^{
+        [[Sentiance sharedInstance] setEventTimelineDelegate:weakSelf];
+    } nativeUnsubscribeLogic:^{
+        [[Sentiance sharedInstance] setEventTimelineDelegate:nil];
+    } subscriptionType:SENTSubscriptionTypeSingle];
+
     return self;
 }
 
@@ -1094,6 +1104,63 @@ RCT_EXPORT_METHOD(removeNativeListener:(NSString *)eventName subscriptionId:(NSI
     resolve(nil);
 }
 
+RCT_EXPORT_METHOD(getTimelineEvent:(NSString *)eventId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    REJECT_IF_SDK_NOT_INITIALIZED(reject);
+
+    SENTTimelineEvent* event = [[Sentiance sharedInstance] getTimelineEventWithEventId:eventId];
+    if (event == nil) {
+        resolve(nil);
+    } else {
+        resolve([self convertEvent:event]);
+    }
+}
+
+RCT_EXPORT_METHOD(getTimelineUpdates:(nonnull NSNumber *)afterEpochTimeMs resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    REJECT_IF_SDK_NOT_INITIALIZED(reject);
+
+    NSTimeInterval interval = afterEpochTimeMs.longValue / 1000.0;
+    NSDate* date = [NSDate dateWithTimeIntervalSince1970:interval];
+    NSArray<SENTTimelineEvent *>* events = [[Sentiance sharedInstance] getTimelineUpdatesAfter:date];
+
+    NSMutableArray *array = [[NSMutableArray alloc] init];
+    for (SENTTimelineEvent* event in events) {
+        [array addObject:[self convertEvent:event]];
+    }
+
+    resolve(array);
+}
+
+RCT_EXPORT_METHOD(getTimelineEvents:(nonnull NSNumber *)fromEpochTimeMs toEpochTimeMs:(nonnull NSNumber *)toEpochTimeMs resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    REJECT_IF_SDK_NOT_INITIALIZED(reject);
+
+    NSTimeInterval fromInterval = fromEpochTimeMs.longValue / 1000.0;
+    NSDate* fromDate = [NSDate dateWithTimeIntervalSince1970:fromInterval];
+    NSTimeInterval toInterval = toEpochTimeMs.longValue / 1000.0;
+    NSDate* toDate = [NSDate dateWithTimeIntervalSince1970:toInterval];
+    NSArray<SENTTimelineEvent *>* events = [[Sentiance sharedInstance] getTimelineEventsFrom:fromDate to:toDate];
+
+    NSMutableArray *array = [[NSMutableArray alloc] init];
+    for (SENTTimelineEvent* event in events) {
+        [array addObject:[self convertEvent:event]];
+    }
+
+    resolve(array);
+}
+
+RCT_EXPORT_METHOD(setIsAllowedToUseMobileData:(BOOL)isAllowed resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    REJECT_IF_SDK_NOT_INITIALIZED(reject);
+
+    [[Sentiance sharedInstance] setAllowedToUseMobileData:isAllowed];
+
+    resolve(nil);
+}
+
+RCT_EXPORT_METHOD(isAllowedToUseMobileData:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    REJECT_IF_SDK_NOT_INITIALIZED(reject);
+
+    resolve(@(Sentiance.sharedInstance.isAllowedToUseMobileData));
+}
+
 - (void)didUpdateUserContext:(SENTUserContext *)userContext
              forCriteriaMask:(SENTUserContextUpdateCriteria)criteriaMask {
     NSDictionary *dict = @{

package/lib/index.d.ts

@@ -122,7 +122,10 @@ declare module "@sentiance-react-native/core" {
     isBgAccessPermGranted?: boolean; // iOS only
     locationSetting?: string; // Android only
     isAirplaneModeEnabled?: boolean; // Android only
-    isLocationAvailable?: boolean; // Android only
+    /**
+     * This field is always set starting from version 6.7.0, but is kept nullable for backwards compatibility.
+     */
+    isLocationAvailable?: boolean;
     isGooglePlayServicesMissing?: boolean; // Android only
     isBatteryOptimizationEnabled?: boolean; // Android only
     isBackgroundProcessingRestricted?: boolean; // Android only
@@ -235,6 +238,10 @@ declare module "@sentiance-react-native/core" {
     ): Promise<void>;
 
     getTransmittableDataTypes(): Promise<Array<TransmittableDataType>>;
+
+    setIsAllowedToUseMobileData(isAllowed: boolean): Promise<void>;
+
+    isAllowedToUseMobileData(): Promise<boolean>;
   }
 
   const SentianceCore: SentianceCore;

package/lib/index.js

@@ -33,6 +33,8 @@ const getWiFiQuotaLimit = () => core.getWiFiQuotaLimit();
 const getWiFiQuotaUsage = () => core.getWiFiQuotaUsage();
 const linkUserWithAuthCode = (authCode) => core.linkUserWithAuthCode(authCode);
 const NO_OP_LINKER = {}
+const setIsAllowedToUseMobileData = (isAllowed) => core.setIsAllowedToUseMobileData(isAllowed);
+const isAllowedToUseMobileData = () => core.isAllowedToUseMobileData();
 
 var startTrip
 var stopTrip
@@ -237,6 +239,8 @@ module.exports = {
   listenTripTimeout,
   setTransmittableDataTypes,
   getTransmittableDataTypes,
+  setIsAllowedToUseMobileData,
+  isAllowedToUseMobileData,
   transportModes,
   NO_OP_LINKER
 };

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@sentiance-react-native/core",
-  "version": "6.6.0-rc1",
-  "description": "React Native Sentiance core library",
+  "version": "6.7.0-rc.1",
+  "description": "The Sentiance Core library",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "jest --verbose",
     "lint": "npx eslint lib/index.d.ts"
   },
   "keywords": [
@@ -18,7 +18,7 @@
   },
   "author": "",
   "license": "",
-  "homepage": "https://github.com/sentiance/react-native-sentiance/sentiance#readme",
+  "homepage": "https://github.com/sentiance/react-native-sentiance/tree/main/packages/core",
   "repository": "github:sentiance/react-native-sentiance",
   "publishConfig": {
     "access": "public"
@@ -29,10 +29,10 @@
       "targetSdk": 31,
       "compileSdk": 31,
       "buildTools": "30.0.3",
-      "sentiance": "6.6.0-rc2"
+      "sentiance": "6.7.0-rc1"
     },
     "ios": {
-      "sentiance": "6.6.0-rc1"
+      "sentiance": "6.7.0-rc1"
     }
   }
 }

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

@@ -1,24 +0,0 @@
-package com.sentiance.react.bridge.core.common;
-
-import android.location.Location;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-
-public class SentianceCommonConverter {
-
-  public static WritableMap convertLocation(Location location) {
-    WritableMap locationMap = Arguments.createMap();
-    locationMap.putDouble("timestamp", location.getTime());
-    locationMap.putDouble("latitude", location.getLatitude());
-    locationMap.putDouble("longitude", location.getLongitude());
-    if (location.hasAccuracy()) {
-      locationMap.putDouble("accuracy", location.getAccuracy());
-    }
-    if (location.hasAltitude()) {
-      locationMap.putDouble("altitude", location.getAltitude());
-    }
-    locationMap.putString("provider", location.getProvider());
-    return locationMap;
-  }
-}