react-native-move-sdk 2.13.0 → 2.14.0

package/src/{MoveSdk.ts → index.tsx}

@@ -1,156 +1,91 @@
-import { NativeModules, NativeEventEmitter, Platform, EmitterSubscription } from 'react-native';
-
-export type SdkState = 'UNINITIALIZED' | 'READY' | 'RUNNING';
-export type TripState = 'UNKNOWN' | 'DRIVING' | 'HALT' | 'IDLE' | 'IGNORED';
-export type AuthState = 'UNKNOWN' | 'VALID' | 'EXPIRED' | 'INVALID';
-export type DrivingService = 'DISTRACTION_FREE_DRIVING' | 'DRIVING_BEHAVIOUR' | 'DEVICE_DISCOVERY';
-export type WalkingService = 'WALKING_LOCATION';
-export type OtherService = 'POINTS_OF_INTEREST';
-export type TimelineDetectionService = 'DRIVING' | 'CYCLING' | 'WALKING' | 'PLACES' | 'PUBLIC_TRANSPORT' | 'AUTOMATIC_IMPACT_DETECTION' | 'ASSISTANCE_CALL' | 'POINTS_OF_INTEREST';
-
-export type ErrorReasons =
-  | 'BACKGROUND_LOCATION_PERMISSION_MISSING'
-  | 'LOCATION_PERMISSION_MISSING'
-  | 'MOTION_PERMISSION_MISSING'
-  | 'ACTIVITY_PERMISSION_MISSING'
-  | 'BATTERY_PERMISSION_MISSING'
-  | 'UNAUTHORIZED'
-  | 'INTERNET_PERMISSION_MISSING'
-  | 'PHONE_PERMISSION_MISSING'
-  | 'OVERLAY_PERMISSION_MISSING'
-  | 'NOTIFICATION_MISSING'
-  | 'ACCELEROMETER_MISSING'
-  | 'GOOGLE_PLAY_LOCATION_ACCURACY_MISSING'
-  | 'PRECISE_LOCATION_PERMISSION_MISSING';
-
-export type WarningReasons =
-  | 'BACKGROUND_LOCATION_PERMISSION_MISSING'
-  | 'MOTION_PERMISSION_MISSING'
-  | 'ACTIVITY_PERMISSION_MISSING'
-  | 'BATTERY_OPTIMIZATION'
-  | 'BLUETOOTH_TURNED_OFF'
-  | 'BLUETOOTH_SCAN_PERMISSION_MISSING'
-  | 'BLUETOOTH_CONNECT_PERMISSION_MISSING'
-  | 'GOOGLE_PLAY_LOCATION_ACCURACY_MISSING'
-  | 'NOTIFICATION_PERMISSION_MISSING'
-  | 'FINE_LOCATION_PERMISSION_MISSING'
-  | 'BLUETOOTH_PERMISSION_MISSING'
-  | 'GPS_OFF'
-  | 'OFFLINE'
-  | 'GO_EDITION'
-  | 'ROOTED'
-  | 'NO_SIM'
-  | 'BACKGROUND_RESTRICTED'
-  | 'MOCK_PROVIDER_LOCATION'
-  | 'MOCK_PROVIDER'
-  | 'LOCATION_MODE'
-  | 'PLAY_SERVICES_MISSING'
-  | 'LOCATION_POWER_MODE(0)'
-  | 'LOCATION_POWER_MODE(1)'
-  | 'LOCATION_POWER_MODE(2)'
-  | 'LOCATION_POWER_MODE(3)'
-  | 'LOCATION_POWER_MODE(4)'
-  | 'ENERGY_SAVER';
-
-export type IssueListService = TimelineDetectionService | DrivingService | WalkingService;
-
-export type IssueListItem<ReasonsType> = {
-  reasons: Array<ReasonsType>;
-  service?: IssueListService;
+import { NativeModules, NativeEventEmitter, Platform, type EmitterSubscription } from 'react-native';
+import LazyMoveSdk from './components/LazyMoveSdk';
+
+import type {
+  AuthState,
+  DrivingService,
+  ErrorListType,
+  ErrorReasons,
+  HealthListItem,
+  IssueListService,
+  MoveSdkDeviceFilter,
+  SdkState,
+  ShutdownReturnType,
+  TimelineDetectionService,
+  TripState,
+  WalkingService,
+  WarningListType,
+  WarningReasons,
+
+  AuthStateEvent,
+  IssueListItem,
+  MoveScanResult,
+  MoveSdkAndroidConfig,
+  MoveSdkAuth,
+  MoveSdkConfig,
+  MoveSdkDevice,
+  MoveSdkDeviceDiscovery,
+  MoveSdkOptions,
+  MoveSdkLog,
+  NotificationConfig,
+} from './NativeMoveSdk';
+
+export type {
+  AuthState,
+  DrivingService,
+  ErrorListType,
+  ErrorReasons,
+  HealthListItem,
+  IssueListService,
+  MoveSdkDeviceFilter,
+  SdkState,
+  ShutdownReturnType,
+  TimelineDetectionService,
+  TripState,
+  WalkingService,
+  WarningListType,
+  WarningReasons,
+
+  AuthStateEvent,
+  IssueListItem,
+  MoveScanResult,
+  MoveSdkAndroidConfig,
+  MoveSdkAuth,
+  MoveSdkConfig,
+  MoveSdkDevice,
+  MoveSdkDeviceDiscovery,
+  MoveSdkOptions,
+  MoveSdkLog,
+  NotificationConfig,
 };
 
-export type ErrorListType = Array<IssueListItem<ErrorReasons>>;
+export { LazyMoveSdk };
 
-export type WarningListType = Array<IssueListItem<WarningReasons>>;
+const LINKING_ERROR =
+  `The package 'react-native-move-sdk' doesn't seem to be linked. Make sure: \n\n` +
+  Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
+  '- You rebuilt the app after installing the package\n' +
+  '- You are not using Expo Go\n';
 
-export type HealthReasons =
-  | 'BATTERY_LEVEL'
-  | 'CPU_USAGE'
-  | 'DISK_USAGE'
-  | 'INTERNET_USAGE'
-  | 'MEMORY_USAGE'
-  | 'NEW_VERSION'
-  | 'UNIMPLEMENTED_LISTENERS';
+// @ts-expect-error
+const isTurboModuleEnabled = global.__turboModuleProxy != null;
 
-export type HealthListItem = {
-  reason: HealthReasons;
-  description: string;
-};
-
-export type MoveHealthScore = Array<HealthListItem>;
-
-export type ShutdownReturnType = 'NETWORK_ERROR' | 'SUCCESS' | 'UNINITIALIZED';
-
-export type MoveSdkConfig = {
-  timelineDetectionServices: Array<TimelineDetectionService>;
-  drivingServices: Array<DrivingService>;
-  walkingServices: Array<WalkingService>;
-};
-
-export type MoveSdkDeviceDiscovery = {
-  startDelay?: number;
-  duration?: number;
-  interval?: number;
-  stopScanOnFirstDiscovered?: boolean;
-};
-
-export type MoveSdkOptions = {
-  motionPermissionMandatory?: boolean;
-  backgroundLocationPermissionMandatory?: boolean;
-  overlayPermissionMandatory?: boolean;
-  useBackendConfig?: boolean;
-  deviceDiscovery?: MoveSdkDeviceDiscovery;
-};
-
-export type MoveSdkAuth = {
-  userId: string;
-  accessToken: string;
-  refreshToken: string;
-  projectId: number;
-};
-
-export type NotificationConfig = {
-  title: string;
-  text: string;
-};
-
-export type MoveSdkAndroidConfig = {
-  notifications: {
-    recognitionNotification: NotificationConfig;
-    tripNotification: NotificationConfig;
-  };
-};
-
-export type ListenerSubscription = EmitterSubscription;
-
-export type AuthStateEvent = {
-  state: AuthState;
-  accessToken?: string;
-  refreshToken?: string;
-};
-
-export type MoveSdkDeviceFilter = 'beacon' | 'paired' | 'connected';
-
-export type MoveSdkDevice = {
-  name: string;
-  data: string;
-  id: string;
-  isConnected?: boolean;
-};
+const MoveSdkModule = isTurboModuleEnabled
+  ? require('./NativeMoveSdk').default
+  : NativeModules.MoveSdk;
 
-export type MoveScanResult = {
-  isDiscovered: boolean;
-  device: MoveSdkDevice;
-  name: string;
-};
+const eventEmitter = new NativeEventEmitter(MoveSdkModule);
 
-export type MoveSdkLog = {
-  message: string;
-  value?: string;
-};
-
-const { MoveSdk: NativeMoveSdk } = NativeModules;
-const eventEmitter = new NativeEventEmitter(NativeMoveSdk);
+const NativeMoveSdk = MoveSdkModule
+  ? MoveSdkModule
+  : new Proxy(
+      {},
+      {
+        get() {
+          throw new Error(LINKING_ERROR);
+        },
+      }
+    );
 
 export default class MoveSdk {
   static READY: SdkState = 'READY';
@@ -193,9 +128,6 @@ export default class MoveSdk {
   }
 
   static async setup(config: MoveSdkConfig, auth: MoveSdkAuth, android: MoveSdkAndroidConfig, options?: MoveSdkOptions): Promise<void> {
-    const { timelineDetectionServices, drivingServices, walkingServices } = config;
-
-    const { userId, projectId, accessToken, refreshToken } = auth;
 
     let platformParams: Array<string | boolean> = [];
     if (Platform.OS === 'android') {
@@ -207,26 +139,25 @@ export default class MoveSdk {
         throw new Error('MOVE SDK needs notification configuration for Android');
       }
 
-      platformParams = [recognitionNotification.title, recognitionNotification.text, tripNotification.title, tripNotification.text];
+      platformParams = [
+        recognitionNotification.title,
+        recognitionNotification.text,
+        tripNotification.title,
+        tripNotification.text,
+      ];
     }
 
     return await NativeMoveSdk.setup(
-      userId,
-      accessToken,
-      refreshToken,
-      projectId,
+      auth,
       // Config
-      timelineDetectionServices,
-      drivingServices,
-      walkingServices,
+      config,
       options,
       // Platform config
-      ...platformParams
+      platformParams
     );
   }
 
-  static async setupWithCode(code: string, config: MoveSdkConfig, android: MoveSdkAndroidConfig, options?: MoveSdkOptions): Promise<void> {
-    const { timelineDetectionServices, drivingServices, walkingServices } = config;
+  static async setupWithCode(code:string, config: MoveSdkConfig, android: MoveSdkAndroidConfig, options?: MoveSdkOptions): Promise<void> {
 
     let platformParams: Array<string | boolean> = [];
     if (Platform.OS === 'android') {
@@ -238,18 +169,21 @@ export default class MoveSdk {
         throw new Error('MOVE SDK needs notification configuration for Android');
       }
 
-      platformParams = [recognitionNotification.title, recognitionNotification.text, tripNotification.title, tripNotification.text];
+      platformParams = [
+        recognitionNotification.title,
+        recognitionNotification.text,
+        tripNotification.title,
+        tripNotification.text,
+      ];
     }
 
     return await NativeMoveSdk.setupWithCode(
       code,
       // Config
-      timelineDetectionServices,
-      drivingServices,
-      walkingServices,
+      config,
       options,
       // Platform config
-      ...platformParams
+      platformParams
     );
   }
 
@@ -257,11 +191,6 @@ export default class MoveSdk {
     NativeMoveSdk.allowMockLocations(allowMockLocations);
   }
 
-  /* Deprecated */
-  static init() {
-    NativeMoveSdk.init();
-  }
-
   static resolveError() {
     NativeMoveSdk.resolveError();
   }
@@ -334,21 +263,21 @@ export default class MoveSdk {
     NativeMoveSdk.setAssistanceMetaData(data);
   }
 
-  static addTripStateListener(tripStateChanged: (state: TripState) => void): ListenerSubscription {
+  static addTripStateListener(tripStateChanged: (state: TripState) => void): EmitterSubscription {
     return eventEmitter.addListener('MOVE_SDK_TRIP_STATE', (event) => tripStateChanged(MoveSdk.tripStateFromNative(event.state)));
   }
 
-  static addTripStartListener(tripStartTriggered: (start: Date) => void): ListenerSubscription {
+  static addTripStartListener(tripStartTriggered: (start: Date) => void): EmitterSubscription {
     return eventEmitter.addListener('MOVE_SDK_TRIP_START', (start) => tripStartTriggered(new Date(Number(start))));
   }
 
-  static addSdkStateListener(sdkStateChanged: (state: SdkState) => void): ListenerSubscription {
+  static addSdkStateListener(sdkStateChanged: (state: SdkState) => void): EmitterSubscription {
     return eventEmitter.addListener('MOVE_SDK_STATE', (event) => {
       sdkStateChanged(MoveSdk.sdkStateFromNative(event.state));
     });
   }
 
-  static addAuthStateListener(authStateChanged: (event: AuthStateEvent) => void): ListenerSubscription {
+  static addAuthStateListener(authStateChanged: (event: AuthStateEvent) => void): EmitterSubscription {
     return eventEmitter.addListener('MOVE_SDK_AUTH_STATE', (event) => {
       const transformedEvent = {
         ...event,
@@ -358,39 +287,39 @@ export default class MoveSdk {
     });
   }
 
-  static addErrorsListener(errorsReceived: (errors: ErrorListType) => void): ListenerSubscription {
+  static addErrorsListener(errorsReceived: (errors: ErrorListType) => void): EmitterSubscription {
     return eventEmitter.addListener('MOVE_SDK_ERRORS', (event) => {
       errorsReceived(event.errors);
     });
   }
 
-  static addWarningsListener(warningsReceived: (warnings: WarningListType) => void): ListenerSubscription {
+  static addWarningsListener(warningsReceived: (warnings: WarningListType) => void): EmitterSubscription {
     return eventEmitter.addListener('MOVE_SDK_WARNINGS', (event) => {
       warningsReceived(event.warnings);
     });
   }
 
-  static addAppEventListener(appEventReceived: (event: string) => void): ListenerSubscription {
+  static addAppEventListener(appEventReceived: (event: string) => void): EmitterSubscription {
     return eventEmitter.addListener('MOVE_SDK_APP_EVENT', (event) => {
       appEventReceived(event);
     });
   }
 
-  static addLogListener(logReceived: (event: MoveSdkLog) => void): ListenerSubscription {
+  static addLogListener(logReceived: (event: MoveSdkLog) => void): EmitterSubscription {
     return eventEmitter.addListener('MOVE_SDK_LOG', (event) => {
-      logReceived(event);
+    logReceived(event);
     });
   }
 
-  static addRemoteConfigChangeListener(configChangeReceived: (config: Array<IssueListService>) => void): ListenerSubscription {
+  static addRemoteConfigChangeListener(configChangeReceived: (config: Array<IssueListService>) => void): EmitterSubscription {
     return eventEmitter.addListener('MOVE_SDK_CONFIG_UPDATE', (config) => {
       configChangeReceived(config.services);
     });
   }
 
-  static addHealthListener(scoreReceived: (health: MoveHealthScore) => void): ListenerSubscription {
-    return eventEmitter.addListener('MOVE_SDK_HEALTH', (health) => {
-      scoreReceived(health);
+  static addHealthListener(scoreReceived: (health: Array<HealthListItem>) => void): EmitterSubscription {
+	return eventEmitter.addListener('MOVE_SDK_HEALTH', (health) => {
+		scoreReceived(health);
     });
   }
 
@@ -414,14 +343,6 @@ export default class MoveSdk {
     }
   }
 
-  static async getBluetoothPermission(): Promise<boolean> {
-    return await NativeMoveSdk.getBluetoothPermission();
-  }
-
-  static async getBluetoothState(): Promise<boolean> {
-    return await NativeMoveSdk.getBluetoothState();
-  }
-
   static async shutdown(force: boolean = true): Promise<ShutdownReturnType> {
     return await NativeMoveSdk.shutdown(force);
   }
@@ -466,7 +387,7 @@ export default class MoveSdk {
 
   // **** PERMISSIONS MODULE END *****
 
-  static startScanningDevices(sdkDevicesDetected: (state: Array<MoveSdkDevice>) => void, filter: MoveSdkDeviceFilter[] = ['paired'], uuid?: string, manufacturerId?: number): ListenerSubscription {
+  static startScanningDevices(sdkDevicesDetected: (state: Array<MoveSdkDevice>) => void, filter: MoveSdkDeviceFilter[] = ['paired'], uuid?: string, manufacturerId?: number): EmitterSubscription {
     const subscription = eventEmitter.addListener('MOVE_SDK_DEVICES', (devices) => {
       sdkDevicesDetected(devices);
     });
@@ -492,18 +413,26 @@ export default class MoveSdk {
     return await NativeMoveSdk.unregisterDevices(devices);
   }
 
-  static requestBluetoothAlwaysUsagePermission(): void {
+  static requestBluetoothAlwaysUsagePermission() {
     NativeMoveSdk.requestBluetoothAlwaysUsagePermission();
   }
 
-  static addDeviceDiscoveryListener(onScanResult: (state: Array<MoveScanResult>) => void): ListenerSubscription {
+  static async getBluetoothPermission() {
+  	return await NativeMoveSdk.getBluetoothPermission();
+  }
+
+  static async getBluetoothState() {
+  	return await NativeMoveSdk.getBluetoothState();
+  }
+
+  static addDeviceDiscoveryListener(onScanResult: (state: Array<MoveScanResult>) => void): EmitterSubscription {
     return eventEmitter.addListener('MOVE_SDK_SCAN_RESULT', (results) => {
       onScanResult(results);
     });
   }
 
-  static addDeviceStateListener(onScanResult: (results: Array<MoveSdkDevice>) => void): ListenerSubscription {
-    return eventEmitter.addListener('MOVE_SDK_DEVICE_STATE', (results) => {
+  static addDeviceStateListener(onScanResult: (results: Array<MoveSdkDevice>) => void): EmitterSubscription {
+    return eventEmitter.addListener('MOVE_SDK_DEVICE_STATE', results => {
       onScanResult(results);
     });
   }
@@ -532,11 +461,10 @@ export default class MoveSdk {
   }
 
   static updateConfig(config: MoveSdkConfig, options?: MoveSdkOptions) {
-    const { timelineDetectionServices, drivingServices, walkingServices } = config;
-    NativeMoveSdk.updateConfig(timelineDetectionServices, drivingServices, walkingServices, options);
+    NativeMoveSdk.updateConfig(config, options);
   }
 
-  static setTripMetadata(metadata?: { [key: string]: string }) {
+  static setTripMetadata(metadata?: {[key: string]: string}) {
     NativeMoveSdk.setTripMetadata(metadata);
   }
 
@@ -547,4 +475,8 @@ export default class MoveSdk {
   static startNativeSdkStateListener() {
     NativeMoveSdk.startNativeSdkStateListener();
   }
+
+  static async requestHealthPermissions(): Promise<boolean> {
+    return await NativeMoveSdk.requestHealthPermissions();
+  }
 }

package/android/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>android_</name>
-	<comment>Project android_ created by Buildship.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>

package/android/build.gradle

@@ -1,153 +0,0 @@
-buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['MoveSdk_kotlinVersion']
-
-  repositories {
-    mavenCentral()
-    google()
-
-  }
-
-  dependencies {
-    classpath 'com.android.tools.build:gradle:7.2.2'
-    // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-  }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['MoveSdk_' + name]
-}
-
-def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['MoveSdk_' + name]).toInteger()
-}
-
-android {
-  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
-  defaultConfig {
-    minSdkVersion 26
-    targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 1
-    versionName "1.0"
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-    }
-  }
-  lintOptions {
-    disable 'GradleCompatible'
-  }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-}
-
-repositories {
-
-  mavenLocal()
-  mavenCentral()
-  google()
-  maven {
-    // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-    url "$rootDir/../node_modules/react-native/android"
-  }
-  maven {
-    // Android JSC is installed from npm
-    url "$rootDir/../node_modules/jsc-android/dist"
-  }
-  maven {
-    url "https://dolphin.jfrog.io/artifactory/move-sdk-libs-release"
-  }
-  maven {
-    url "https://dolphin.jfrog.io/artifactory/move-sdk-libs-release"
-  }
-  def found = false
-  def defaultDir = null
-  def androidSourcesName = 'React Native sources'
-
-  if (rootProject.ext.has('reactNativeAndroidRoot')) {
-    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-  } else {
-    defaultDir = new File(
-      projectDir,
-      '/../../../node_modules/react-native/android'
-    )
-  }
-
-  if (defaultDir.exists()) {
-    maven {
-      url defaultDir.toString()
-      name androidSourcesName
-    }
-
-    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
-    found = true
-  } else {
-    def parentDir = rootProject.projectDir
-
-    1.upto(5, {
-      if (found) return true
-      parentDir = parentDir.parentFile
-
-      if (parentDir != null) {
-
-
-        def androidSourcesDir = new File(
-          parentDir,
-          'node_modules/react-native'
-        )
-
-        def androidPrebuiltBinaryDir = new File(
-          parentDir,
-          'node_modules/react-native/android'
-        )
-
-        if (androidPrebuiltBinaryDir.exists()) {
-          maven {
-            url androidPrebuiltBinaryDir.toString()
-            name androidSourcesName
-          }
-
-          logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
-          found = true
-        } else if (androidSourcesDir.exists()) {
-          maven {
-            url androidSourcesDir.toString()
-            name androidSourcesName
-          }
-
-          logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
-          found = true
-        }
-      }
-    })
-  }
-
-  if (!found) {
-    throw new GradleException(
-      "${project.name}: unable to locate React Native android sources. " +
-        "Ensure you have you installed React Native as a dependency in your project and try again."
-    )
-  }
-}
-
-def kotlin_version = getExtOrDefault('kotlinVersion')
-
-dependencies {
-  // noinspection GradleDynamicVersion
-
-  implementation "com.facebook.react:react-native:+"
-  api "io.dolphin.move:move-sdk:2.13.0.94"
-
-  testImplementation 'junit:junit:4.13.2'
-  testImplementation "androidx.test:core:1.4.0"
-  testImplementation 'androidx.test.ext:junit-ktx:1.1.3'
-  testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0"
-}

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-
-android.useAndroidX=true
-android.enableJetifier=true