@sentiance-react-native/user-context 6.6.0-rc1 → 6.6.0

package/android/build.gradle

@@ -15,6 +15,17 @@ if (findProject(':core')) {
   throw new GradleException('Could not find the @sentiance-react-native/core package, have you installed it?')
 }
 
+def eventTimelineProj
+if (findProject(':event-timeline')) {
+  eventTimelineProj = project(':event-timeline')
+} else if (findProject(':sentiance-react-native_event-timeline')) {
+  eventTimelineProj = project(':sentiance-react-native_event-timeline')
+} else if (findProject(':@sentiance-react-native_event-timeline')) {
+  eventTimelineProj = project(':@sentiance-react-native_event-timeline')
+} else {
+  throw new GradleException('Could not find the @sentiance-react-native/event-timeline package, have you installed it?')
+}
+
 android {
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8
@@ -30,10 +41,10 @@ applyAndroidVersionsFrom(corePackageJson)
 def sentianceSdkVersion = getSentianceSdkVersion()
 
 dependencies {
-  api coreProj
-
   implementation(platform("com.sentiance:sdk-bom:${sentianceSdkVersion}"))
   api("com.sentiance:sdk-user-context") { transitive = true }
+  implementation coreProj
+  implementation eventTimelineProj
 }
 
 applyReactNativeDependency()

package/android/src/main/java/com/sentiance/react/bridge/usercontext/SentianceUserContextConverter.java

@@ -3,14 +3,10 @@ package com.sentiance.react.bridge.usercontext;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
+import com.sentiance.react.bridge.eventtimeline.converters.OnDeviceTypesConverter;
 import com.sentiance.sdk.ondevice.api.Attribute;
-import com.sentiance.sdk.ondevice.api.GeoLocation;
-import com.sentiance.sdk.ondevice.api.Waypoint;
 import com.sentiance.sdk.ondevice.api.event.Event;
-import com.sentiance.sdk.ondevice.api.event.StationaryEvent;
-import com.sentiance.sdk.ondevice.api.event.TransportEvent;
 import com.sentiance.sdk.ondevice.api.segment.Segment;
-import com.sentiance.sdk.ondevice.api.venue.Venue;
 import com.sentiance.sdk.usercontext.api.RequestUserContextError;
 import com.sentiance.sdk.usercontext.api.RequestUserContextFailureReason;
 import com.sentiance.sdk.usercontext.api.UserContext;
@@ -20,18 +16,13 @@ import com.sentiance.sdk.util.DateTime;
 import java.util.List;
 
 public class SentianceUserContextConverter {
+  private final OnDeviceTypesConverter onDeviceTypesConverter;
 
-  public static WritableMap convertGeoLocation(GeoLocation location) {
-    WritableMap locationMap = Arguments.createMap();
-
-    locationMap.putDouble("latitude", location.getLatitude());
-    locationMap.putDouble("longitude", location.getLongitude());
-    locationMap.putInt("accuracy", location.getAccuracyInMeters());
-
-    return locationMap;
+  public SentianceUserContextConverter() {
+    onDeviceTypesConverter = new OnDeviceTypesConverter();
   }
 
-  private static WritableMap convertSegment(Segment segment) {
+  private WritableMap convertSegment(Segment segment) {
     WritableMap map = Arguments.createMap();
 
     map.putString("category", segment.getCategory().name());
@@ -59,34 +50,7 @@ public class SentianceUserContextConverter {
     return map;
   }
 
-  private static WritableMap convertEvent(Event event) {
-    WritableMap map = Arguments.createMap();
-
-    map.putString("id", event.getId());
-    map.putString("startTime", event.getStartTime().toString());
-    map.putDouble("startTimeEpoch", event.getStartTime().getEpochTime());
-    if (event.getEndTime() != null) {
-      map.putString("endTime", event.getEndTime().toString());
-      map.putDouble("endTimeEpoch", event.getEndTime().getEpochTime());
-
-      Long durationInSeconds = event.getDurationInSeconds();
-      if (durationInSeconds != null) {
-        map.putDouble("durationInSeconds", durationInSeconds);
-      }
-    }
-
-    map.putString("type", event.getEventType().toString());
-
-    if (event instanceof StationaryEvent) {
-      addStationaryEventInfo(map, (StationaryEvent) event);
-    } else if (event instanceof TransportEvent) {
-      addTransportEventInfo(map, (TransportEvent) event);
-    }
-
-    return map;
-  }
-
-  public static WritableArray convertCriteriaList(List<UserContextUpdateCriteria> criteria) {
+  public WritableArray convertCriteriaList(List<UserContextUpdateCriteria> criteria) {
     WritableArray array = Arguments.createArray();
     for (UserContextUpdateCriteria criterion : criteria) {
       array.pushString(criterion.toString());
@@ -94,13 +58,13 @@ public class SentianceUserContextConverter {
     return array;
   }
 
-  public static WritableMap convertUserContext(UserContext userContext) {
+  public WritableMap convertUserContext(UserContext userContext) {
     WritableMap userContextMap = Arguments.createMap();
 
     // Events
     WritableArray eventArray = Arguments.createArray();
     for (Event event : userContext.getEvents()) {
-      eventArray.pushMap(convertEvent(event));
+      eventArray.pushMap(onDeviceTypesConverter.convertEvent(event));
     }
     userContextMap.putArray("events", eventArray);
 
@@ -113,17 +77,17 @@ public class SentianceUserContextConverter {
 
     // Last know location
     if (userContext.getLastKnownLocation() != null) {
-      userContextMap.putMap("lastKnownLocation", convertGeoLocation(userContext.getLastKnownLocation()));
+      userContextMap.putMap("lastKnownLocation", onDeviceTypesConverter.convertGeoLocation(userContext.getLastKnownLocation()));
     }
 
     // Home
     if (userContext.getHome() != null) {
-      userContextMap.putMap("home", convertVenue(userContext.getHome()));
+      userContextMap.putMap("home", onDeviceTypesConverter.convertVenue(userContext.getHome()));
     }
 
     // Work
     if (userContext.getWork() != null) {
-      userContextMap.putMap("work", convertVenue(userContext.getWork()));
+      userContextMap.putMap("work", onDeviceTypesConverter.convertVenue(userContext.getWork()));
     }
 
     // Semantic time
@@ -132,7 +96,7 @@ public class SentianceUserContextConverter {
     return userContextMap;
   }
 
-  public static String stringifyGetUserContextError(RequestUserContextError error) {
+  public String stringifyGetUserContextError(RequestUserContextError error) {
     RequestUserContextFailureReason reason = error.getReason();
     String details = "";
     switch (reason) {
@@ -148,52 +112,4 @@ public class SentianceUserContextConverter {
     }
     return String.format("Reason: %s - %s", reason.name(), details);
   }
-
-  private static void addStationaryEventInfo(WritableMap map, StationaryEvent event) {
-    if (event.getLocation() != null) {
-      map.putMap("location", convertGeoLocation(event.getLocation()));
-    }
-    map.putMap("venue", convertVenue(event.getVenue()));
-  }
-
-  private static WritableMap convertVenue(Venue venue) {
-    WritableMap venueMap = Arguments.createMap();
-
-    if (venue.getLocation() != null) {
-      venueMap.putMap("location", convertGeoLocation(venue.getLocation()));
-    }
-    venueMap.putString("significance", venue.getSignificance().name());
-    venueMap.putString("type", venue.getType().name());
-
-    return venueMap;
-  }
-
-  private static void addTransportEventInfo(WritableMap map, TransportEvent event) {
-    map.putString("transportMode", event.getTransportMode().toString());
-    map.putArray("waypoints", convertWaypointList(event.getWaypoints()));
-
-    if (event.getDistanceInMeters() != null) {
-      map.putInt("distance", event.getDistanceInMeters());
-    }
-  }
-
-  public static WritableMap convertWaypoint(Waypoint waypoint) {
-    WritableMap waypointMap = Arguments.createMap();
-
-    waypointMap.putDouble("latitude", waypoint.getLatitude());
-    waypointMap.putDouble("longitude", waypoint.getLongitude());
-    waypointMap.putInt("accuracy", waypoint.getAccuracyInMeters());
-    waypointMap.putDouble("timestamp", waypoint.getTimestamp());
-
-    return waypointMap;
-  }
-
-  private static WritableArray convertWaypointList(List<Waypoint> waypointList) {
-    WritableArray array = Arguments.createArray();
-    for (Waypoint waypoint : waypointList) {
-      array.pushMap(convertWaypoint(waypoint));
-    }
-    return array;
-  }
-
 }

package/android/src/main/java/com/sentiance/react/bridge/usercontext/SentianceUserContextEmitter.java

@@ -1,13 +1,10 @@
 package com.sentiance.react.bridge.usercontext;
 
-import static com.sentiance.react.bridge.usercontext.SentianceUserContextConverter.convertCriteriaList;
-import static com.sentiance.react.bridge.usercontext.SentianceUserContextConverter.convertUserContext;
-
 import android.content.Context;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
-import com.sentiance.react.bridge.core.base.AbstractSentianceEmitter;
+import com.sentiance.react.bridge.core.common.base.AbstractSentianceEmitter;
 import com.sentiance.sdk.usercontext.api.UserContext;
 import com.sentiance.sdk.usercontext.api.UserContextUpdateCriteria;
 
@@ -16,15 +13,17 @@ import java.util.List;
 class SentianceUserContextEmitter extends AbstractSentianceEmitter {
 
   private static final String USER_CONTEXT_EVENT = "SENTIANCE_USER_CONTEXT_UPDATE_EVENT";
+  private final SentianceUserContextConverter converter;
 
   public SentianceUserContextEmitter(Context context) {
     super(context);
+    converter = new SentianceUserContextConverter();
   }
 
   void sendUserContext(List<UserContextUpdateCriteria> criteria, UserContext userContext) {
     WritableMap map = Arguments.createMap();
-    map.putMap("userContext", convertUserContext(userContext));
-    map.putArray("criteria", convertCriteriaList(criteria));
+    map.putMap("userContext", converter.convertUserContext(userContext));
+    map.putArray("criteria", converter.convertCriteriaList(criteria));
 
     sendEvent(USER_CONTEXT_EVENT, map);
   }

package/android/src/main/java/com/sentiance/react/bridge/usercontext/SentianceUserContextModule.java

@@ -6,8 +6,8 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
-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.usercontext.utils.ErrorCodes;
 import com.sentiance.sdk.Sentiance;
 import com.sentiance.sdk.usercontext.api.RequestUserContextError;
@@ -20,12 +20,14 @@ public class SentianceUserContextModule extends AbstractSentianceModule {
   private static final String NATIVE_MODULE_NAME = "SentianceUserContext";
 
   private final SentianceUserContextEmitter emitter;
+  private final SentianceUserContextConverter converter;
   private @Nullable
   UserContextUpdateListener mUserContextUpdateListener;
 
   public SentianceUserContextModule(ReactApplicationContext reactContext) {
     super(reactContext, Sentiance.getInstance(reactContext), new SentianceSubscriptionsManager());
     emitter = new SentianceUserContextEmitter(reactContext);
+    converter = new SentianceUserContextConverter();
   }
 
   @NonNull
@@ -46,11 +48,11 @@ public class SentianceUserContextModule extends AbstractSentianceModule {
       .addOnCompleteListener(pendingOperation -> {
         if (pendingOperation.isSuccessful()) {
           UserContext userContext = pendingOperation.getResult();
-          promise.resolve(SentianceUserContextConverter.convertUserContext(userContext));
+          promise.resolve(converter.convertUserContext(userContext));
         } else {
           RequestUserContextError error = pendingOperation.getError();
           promise.reject(ErrorCodes.E_SDK_REQUEST_USER_CONTEXT_ERROR,
-            SentianceUserContextConverter.stringifyGetUserContextError(error));
+            converter.stringifyGetUserContextError(error));
         }
       });
   }

package/lib/index.d.ts

@@ -199,6 +199,10 @@ declare module "@sentiance-react-native/user-context" {
     longitude: number;
     accuracy: number;   // in meters
     timestamp: number;  // UTC epoch time in milliseconds
+    speedInMps?: number;  // in meters per second
+    speedLimitInMps?: number;  // in meters per second
+    hasUnlimitedSpeedLimit: boolean;
+    isSpeedLimitInfoSet: boolean;
   }
 
   export interface Venue {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentiance-react-native/user-context",
-  "version": "6.6.0-rc1",
-  "description": "React Native Sentiance - This module provides an easy API to add user context awareness into your apps.",
+  "version": "6.6.0",
+  "description": "The Sentiance User Context library",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "scripts": {
@@ -14,11 +14,11 @@
     "sentiance"
   ],
   "peerDependencies": {
-    "@sentiance-react-native/core": "6.6.0-rc1"
+    "@sentiance-react-native/core": "6.6.0"
   },
   "author": "",
   "license": "",
-  "homepage": "https://github.com/sentiance/react-native-sentiance/user-context#readme",
+  "homepage": "https://github.com/sentiance/react-native-sentiance/tree/main/packages/user-context",
   "repository": "github:sentiance/react-native-sentiance",
   "publishConfig": {
     "access": "public"