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

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

@@ -43,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();
@@ -120,99 +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", SentianceUtils.toDateString(token.getExpiryDate()));
-      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", SentianceUtils.toDateString(token.getExpiryDate()));
-      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());
-      map.putBoolean("userExists", status.userExists);
-    } 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;
@@ -338,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/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/ios/RNSentianceCore+Converter.h

@@ -1,6 +1,6 @@
 //
-//  RNSentiance+Converter.h
-//  RNSentiance
+//  RNSentianceCore+Converter.h
+//  RNSentianceCore
 //
 //  Created by Sebouh Aguehian on 10/10/2021.
 //  Copyright © 2021 Facebook. All rights reserved.

package/ios/RNSentianceCore+Converter.m

@@ -1,6 +1,6 @@
 //
-//  RNSentianceConverter.m
-//  RNSentiance
+//  RNSentianceCore+Converter.m
+//  RNSentianceCore
 //
 //  Created by Sebouh Aguehian on 10/10/2021.
 //  Copyright © 2021 Facebook. All rights reserved.
@@ -626,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";
@@ -685,16 +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;
+    userInfo[@"userId"] = userCreationResult.userInfo.userId;
+    userInfo[@"tokenId"] = userCreationResult.userInfo.token.tokenId;
 
     NSString *tokenExpiryDate = [[SENTDate alloc]initWithNSDate: userCreationResult.userInfo.token.expiryDate].description;
-    dict[@"tokenExpiryDate"] = tokenExpiryDate;
-    dict[@"isTokenExpired"] = @(userCreationResult.userInfo.token.isExpired);
+    userInfo[@"tokenExpiryDate"] = tokenExpiryDate;
+    userInfo[@"isTokenExpired"] = @(userCreationResult.userInfo.token.isExpired);
 
-    return dict;
+    NSMutableDictionary *userCreationResultDict = [[NSMutableDictionary alloc] init];
+    userCreationResultDict[@"userInfo"] = userInfo;
+    return userCreationResultDict;
 }
 
 - (NSString *)stringifyUserCreationError:(SENTUserCreationError *)userCreationError {
@@ -754,16 +756,18 @@
 }
 
 - (NSDictionary *)convertUserLinkingResult:(SENTUserLinkingResult *)userLinkingResult {
-    NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] init];
     
-    dict[@"userId"] = userLinkingResult.userInfo.userId;
-    dict[@"tokenId"] = userLinkingResult.userInfo.token.tokenId;
+    userInfo[@"userId"] = userLinkingResult.userInfo.userId;
+    userInfo[@"tokenId"] = userLinkingResult.userInfo.token.tokenId;
     
     NSString *tokenExpiryDate = [[SENTDate alloc]initWithNSDate: userLinkingResult.userInfo.token.expiryDate].description;
-    dict[@"tokenExpiryDate"] = tokenExpiryDate;
-    dict[@"isTokenExpired"] = @(userLinkingResult.userInfo.token.isExpired);
+    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 {

package/ios/RNSentianceCore.m

@@ -1028,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.
 //

package/ios/RNSentianceHelper.m

@@ -1,6 +1,6 @@
 //
-//  SentianceHelper.m
-//  DoubleConversion
+//  RNSentianceHelper.m
+//  RNSentianceCore
 //
 //  Created by Hassan Shakeel on 10/05/2022.
 //

package/lib/index.d.ts

@@ -111,7 +111,12 @@ declare module "sentiance-react-native-core" {
     backgroundRefreshStatus: BackgroundRefreshStatus; // iOS only
   }
 
-  export interface EnableDisableDetectionsResult {
+  export interface EnableDetectionsResult {
+    sdkStatus: SdkStatus,
+    detectionStatus: DetectionStatus
+  }
+
+  export interface DisableDetectionsResult {
     sdkStatus: SdkStatus,
     detectionStatus: DetectionStatus
   }
@@ -121,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>;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentiance-react-native/core",
-  "version": "6.0.0-beta.19",
+  "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-beta7"
+      "sentiance": "6.0.0"
     },
     "ios": {
-      "sentiance": "6.0.0-beta14"
+      "sentiance": "6.0.0"
     }
   }
 }