react-native-move-sdk 2.10.0 → 2.10.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Dolphin Technologies
+Copyright (c) 2024 Dolphin Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -14,7 +14,7 @@ copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

package/README.md

@@ -1,6 +1,6 @@
 # react-native-move-sdk
 
-React Native library for MOVE SDK - please see https://docs.movesdk.com/move/ for features and details about the MOVE SDK.
+React Native library for MOVE SDK - please see https://docs.movesdk.com/move-platform for features and details about the MOVE SDK.
 
 ## Installation
 
@@ -61,7 +61,7 @@ public class MainApplication extends Application implements ReactApplication {
 
 ## Usage
 
-See https://docs.movesdk.com/move/sdk-1/api-interface/react-native/intialization
+See https://docs.movesdk.com/move-platform/sdk/api-interface/react-native/intialization
 
 ```js
 import MoveSdk from 'react-native-move-sdk';
@@ -107,7 +107,7 @@ MoveSdk.setup(CONFIG, auth, ANDROID_CONFIG)
 
 # Methods
 
-See: https://docs.movesdk.com/move/sdk-1/api-interface/react-native/services
+See: https://docs.movesdk.com/move-platform/sdk/api-interface/react-native/services
 
 Required permissions description ios and android...
 
@@ -151,6 +151,9 @@ MoveSdk.addErrorsListener((errors: ErrorListType) => {
 	...
 });
 
+MoveSdk.addLogListener((log: MoveSdkLog) => {
+	...
+});
 ```
 
 ## License

package/android/build.gradle

@@ -144,7 +144,7 @@ dependencies {
   // noinspection GradleDynamicVersion
 
   implementation "com.facebook.react:react-native:+"
-  api "io.dolphin.move:move-sdk:2.10.0.87"
+  api "io.dolphin.move:move-sdk:2.10.1.88"
 
   testImplementation 'junit:junit:4.13.2'
   testImplementation "androidx.test:core:1.4.0"

package/android/src/main/java/in/dolph/move/sdk/DeviceScanner.kt

@@ -12,6 +12,7 @@ import android.os.Build
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import com.google.gson.Gson
+import `in`.dolph.move.sdk.extentions.PermissionUtils
 import io.dolphin.move.MoveDevice
 import io.dolphin.move.MoveSdk
 import java.nio.ByteBuffer
@@ -55,9 +56,12 @@ class DeviceScanner(
     onNewDevices: (List<MoveDevice>) -> Unit,
     onNewEvent: (String, String?) -> Unit,
   ) {
-    if (filters.contains(MoveDeviceFilter.PAIRED.filter)) {
+    if (filters.contains(MoveDeviceFilter.CONNECTED.filter)) {
       proceedWithConnectedDevices(onNewDevices, onNewEvent)
     }
+    if (filters.contains(MoveDeviceFilter.PAIRED.filter)) {
+      proceedWithPairedDevices(onNewDevices, onNewEvent)
+    }
     if (filters.contains(MoveDeviceFilter.BEACON.filter)) {
       this.onNewDevices = onNewDevices
       this.proximityId = uuid
@@ -93,6 +97,22 @@ class DeviceScanner(
     }
   }
 
+  @SuppressLint("MissingPermission")
+  private fun proceedWithPairedDevices(
+    onNewDevices: (List<MoveDevice>) -> Unit,
+    onNewEvent: (String, String?) -> Unit,
+  ) {
+    if (PermissionUtils.hasBluetoothConnectPermission(context)) {
+      val bondedDevices = btManager?.adapter?.bondedDevices
+        ?.mapNotNull { MoveSdk.get()?.convertToMoveDevice(it) }
+      onNewEvent(TAG, "Bonded devices: ${bondedDevices?.map { it.name }}")
+      bondedDevices ?: return
+      onNewDevices(bondedDevices)
+    } else {
+      onNewEvent(TAG, "Missing BLUETOOTH_CONNECT permission")
+    }
+  }
+
   private fun proceedWithConnectedDevices(
     onNewDevices: (List<MoveDevice>) -> Unit,
     onNewEvent: (String, String?) -> Unit,
@@ -182,5 +202,6 @@ class DeviceScanner(
 
 enum class MoveDeviceFilter(val filter: String) {
   BEACON("beacon"),
-  PAIRED("paired");
+  PAIRED("paired"),
+  CONNECTED("connected");
 }

package/android/src/main/java/in/dolph/move/sdk/MoveSdkModule.kt

@@ -2,6 +2,7 @@ package `in`.dolph.move.sdk
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.bluetooth.BluetoothManager
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -42,6 +43,7 @@ internal const val EVENT_MOVE_SDK_APP = "MOVE_SDK_APP_EVENT"
 internal const val EVENT_MOVE_CONFIG_UPDATE = "MOVE_SDK_CONFIG_UPDATE"
 internal const val EVENT_MOVE_SDK_TRIP_START = "MOVE_SDK_TRIP_START"
 internal const val EVENT_MOVE_SDK_DEVICE_STATE = "MOVE_SDK_DEVICE_STATE"
+internal const val EVENT_MOVE_SDK_LOG = "MOVE_SDK_LOG"
 
 internal const val ARGUMENT_ACCESS_TOKEN = "accessToken"
 internal const val ARGUMENT_REFRESH_TOKEN = "refreshToken"
@@ -104,14 +106,8 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
     // Platform config
     recognitionNotificationTitle: String,
     recognitionNotificationText: String,
-    recognitionNotificationChannelId: String,
-    recognitionNotificationChannelName: String,
-    recognitionNotificationChannelDescription: String,
     tripNotificationTitle: String,
     tripNotificationText: String,
-    tripNotificationChannelId: String,
-    tripNotificationChannelName: String,
-    tripNotificationChannelDescription: String,
     promise: Promise?
   ) {
     nativeSdkWrapper.setup(
@@ -127,14 +123,8 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
       // Platform config
       recognitionNotificationTitle,
       recognitionNotificationText,
-      recognitionNotificationChannelId,
-      recognitionNotificationChannelName,
-      recognitionNotificationChannelDescription,
       tripNotificationTitle,
       tripNotificationText,
-      tripNotificationChannelId,
-      tripNotificationChannelName,
-      tripNotificationChannelDescription,
       promise = promise
     )
   }
@@ -150,14 +140,8 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
     // Platform config
     recognitionNotificationTitle: String,
     recognitionNotificationText: String,
-    recognitionNotificationChannelId: String,
-    recognitionNotificationChannelName: String,
-    recognitionNotificationChannelDescription: String,
     tripNotificationTitle: String,
     tripNotificationText: String,
-    tripNotificationChannelId: String,
-    tripNotificationChannelName: String,
-    tripNotificationChannelDescription: String,
     promise: Promise?
   ) {
     nativeSdkWrapper.setup(
@@ -170,14 +154,8 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
       // Platform config
       recognitionNotificationTitle,
       recognitionNotificationText,
-      recognitionNotificationChannelId,
-      recognitionNotificationChannelName,
-      recognitionNotificationChannelDescription,
       tripNotificationTitle,
       tripNotificationText,
-      tripNotificationChannelId,
-      tripNotificationChannelName,
-      tripNotificationChannelDescription,
       promise = promise
     )
   }
@@ -199,20 +177,12 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
 
   @ReactMethod
   fun startAutomaticDetection(promise: Promise?) {
-    if (nativeSdkWrapper.startAutomaticDetection()) {
-      promise?.resolve(true)
-    } else {
-      promise?.reject(Throwable())
-    }
+    promise?.resolve(nativeSdkWrapper.startAutomaticDetection())
   }
 
   @ReactMethod
   fun stopAutomaticDetection(promise: Promise?) {
-    if (nativeSdkWrapper.stopAutomaticDetection()) {
-      promise?.resolve(true)
-    } else {
-      promise?.reject(Throwable())
-    }
+    promise?.resolve(nativeSdkWrapper.stopAutomaticDetection())
   }
 
   @ReactMethod
@@ -447,11 +417,7 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
   @ReactMethod
   fun startTrip(metadata: ReadableMap?, promise: Promise?) {
     val metadataMap = metadata?.toHashMap()?.mapValues { it.value.toString() }
-    if (MoveSdk.get()?.startTrip(metadataMap) == true) {
-      promise?.resolve(true)
-    } else {
-      promise?.reject(Throwable("Can't start manual trip"))
-    }
+    promise?.resolve(MoveSdk.get()?.startTrip(metadataMap) == true)
   }
 
   @ReactMethod
@@ -482,6 +448,16 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
     }
   }
 
+  @ReactMethod
+  fun getBluetoothState(promise: Promise) {
+    promise.resolve(nativeSdkWrapper.isBluetoothEnabled())
+  }
+
+  @ReactMethod
+  fun getBluetoothPermission(promise: Promise) {
+    promise.resolve(nativeSdkWrapper.hasDiscoveryPermissions())
+  }
+
   // region PERMISSIONS MODULE
   @SuppressLint("NewApi")
   override fun onActivityResult(
@@ -503,14 +479,9 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
 
   @ReactMethod
   fun canDrawOverlays(promise: Promise) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-      promise.resolve(Settings.canDrawOverlays(reactContext))
-    } else {
-      promise.resolve(true)
-    }
+    promise.resolve(Settings.canDrawOverlays(reactContext))
   }
 
-  @RequiresApi(Build.VERSION_CODES.M)
   @ReactMethod
   fun requestDrawOverlaysPermission() {
     val intent = Intent(
@@ -523,12 +494,7 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
   private fun isAppIgnoringBatteryOptimization(): Boolean {
     val packageName = reactContext.packageName
     val pm: PowerManager = reactContext.getSystemService(Context.POWER_SERVICE) as PowerManager
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-      return pm.isIgnoringBatteryOptimizations(packageName)
-    } else {
-      return true
-    }
+    return pm.isIgnoringBatteryOptimizations(packageName)
   }
 
   @ReactMethod
@@ -537,7 +503,6 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
   }
 
   @SuppressLint("BatteryLife")
-  @RequiresApi(Build.VERSION_CODES.M)
   @ReactMethod
   fun requestAppIgnoringBatteryOptimization() {
     val intent = Intent(

package/android/src/main/java/in/dolph/move/sdk/MoveSdkRepository.kt

@@ -3,34 +3,16 @@ package `in`.dolph.move.sdk
 import android.content.Context
 import android.content.SharedPreferences
 import io.dolphin.move.DrivingService
-import io.dolphin.move.MoveAuth
 import io.dolphin.move.MoveDetectionService
 import io.dolphin.move.WalkingService
 
 private const val SHARED_PREF_NAME = "move-react"
 
-private const val PROPERTY_TIMELINE_SERVICES = "timelineDetectionServices"
-private const val PROPERTY_DRIVING_SERVICES = "drivingServices"
-private const val PROPERTY_WALKING_SERVICES = "walkingServices"
-
 private const val PROPERTY_PRODUCT_ID = "productId"
 private const val PROPERTY_USER_ID = "contractId"
 private const val PROPERTY_ACCESS_TOKEN = "accessToken"
 private const val PROPERTY_REFRESH_TOKEN = "refreshToken"
 
-private const val PROPERTY_STARTED = "isInRunningState"
-
-private const val PROPERTY_NOTIFICATION_TITLE = "NotificationTitle"
-private const val PROPERTY_NOTIFICATION_TEXT = "NotificationText"
-private const val PROPERTY_NOTIFICATION_CHANNELID = "NotificationChannelId"
-private const val PROPERTY_NOTIFICATION_CHANNELNAME = "NotificationChannelName"
-private const val PROPERTY_NOTIFICATION_CHANNELDESCRIPTION = "NotificationChannelName"
-private const val PROPERTY_NOTIFICATION_ICON = "NotificationIcon"
-
-private const val NOTIFICATION_RECOGNITION = "recognition"
-private const val NOTIFICATION_TRIP = "trip"
-private const val NOTIFICATION_WALKING = "walking"
-
 class MoveSdkConfigRepository(context: Context) {
 
   private val sharedPreferences: SharedPreferences =
@@ -39,139 +21,20 @@ class MoveSdkConfigRepository(context: Context) {
       Context.MODE_PRIVATE
     )
 
-  fun storeConfig(config: MoveSdkConfig) {
-
-    // Persist data for native init next app start
-    val editor = sharedPreferences.edit()
-    editor.putStringSet(
-      PROPERTY_TIMELINE_SERVICES,
-      config.timelineDetectionServices.map { service -> service.name() }.toSet()
-    )
-    editor.apply()
-
-    storeAuth(config.auth)
-
-    // Platform config
-    val recognitionNotification = config.recognitionNotification
-    storeNotificationConfig(NOTIFICATION_RECOGNITION, recognitionNotification)
-
-    val tripNotification = config.tripNotification
-    storeNotificationConfig(NOTIFICATION_TRIP, tripNotification)
-
-    val walkingNotification = config.walkingNotification
-    storeNotificationConfig(NOTIFICATION_WALKING, walkingNotification)
-  }
-
-  private fun storeNotificationConfig(
-    prefix: String,
-    recognitionNotification: MoveNotificationConfig
-  ) {
-    val editor = sharedPreferences.edit()
-    editor.putString(prefix + PROPERTY_NOTIFICATION_TITLE, recognitionNotification.title)
-    editor.putString(prefix + PROPERTY_NOTIFICATION_TEXT, recognitionNotification.text)
-    editor.putString(
-      prefix + PROPERTY_NOTIFICATION_CHANNELID,
-      recognitionNotification.channelId
-    )
-    editor.putString(
-      prefix + PROPERTY_NOTIFICATION_CHANNELNAME,
-      recognitionNotification.channelName
-    )
-    editor.putString(
-      prefix + PROPERTY_NOTIFICATION_CHANNELDESCRIPTION,
-      recognitionNotification.channelDescription
-    )
-    editor.putInt(
-      prefix + PROPERTY_NOTIFICATION_ICON,
-      recognitionNotification.icon ?: 0,
-    )
-    editor.apply()
-  }
-
-  fun storeAuth(auth: MoveAuth) {
-    // Persist data for native init next app start
-    val editor = sharedPreferences.edit()
-    editor.putInt(PROPERTY_PRODUCT_ID, auth.projectId.toInt())
-    editor.putString(PROPERTY_USER_ID, auth.userId)
-    editor.putString(PROPERTY_ACCESS_TOKEN, auth.accessToken)
-    editor.putString(PROPERTY_REFRESH_TOKEN, auth.refreshToken)
-    editor.apply()
-  }
-
-  fun loadConfig(): MoveSdkConfig {
-
-    val projectId = sharedPreferences.getInt(PROPERTY_PRODUCT_ID, 0)
-    val userId = sharedPreferences.getString(PROPERTY_USER_ID, "") ?: ""
-    val accessToken: String = sharedPreferences.getString(PROPERTY_ACCESS_TOKEN, "") ?: ""
-    val refreshToken = sharedPreferences.getString(PROPERTY_REFRESH_TOKEN, "") ?: ""
-
-    // Config
-
-    /*
-    val drivingServices: List<DrivingService> =
-      sharedPreferences.getStringSet(PROPERTY_DRIVING_SERVICES, emptySet())?.map { service ->
-        DrivingService.valueOf(service)
-      } ?: emptyList()
-
-    val walkingServices: List<WalkingService> =
-      sharedPreferences.getStringSet(PROPERTY_WALKING_SERVICES, emptySet())?.map { service ->
-        WalkingService.valueOf(service)
-      } ?: emptyList()
-
-    val timelineDetectionServices: List<MoveDetectionService> = emptyList()
-      sharedPreferences.getStringSet(PROPERTY_TIMELINE_SERVICES, emptySet())?.map { service ->
-        valueOfMoveDetectionService(service, drivingServices, walkingServices)
-      } ?: emptyList()
-     */
-
-    val recognitionNotification = loadNotificationConfig(NOTIFICATION_RECOGNITION)
-    val tripNotification = loadNotificationConfig(NOTIFICATION_TRIP)
-    val walkingNotification = loadNotificationConfig(NOTIFICATION_WALKING)
-
-    return MoveSdkConfig(
-      auth = MoveAuth(
-        userId = userId,
-        accessToken = accessToken,
-        refreshToken = refreshToken,
-        projectId = projectId.toLong(),
-      ),
-      timelineDetectionServices = emptyList(),
-      tripNotification = tripNotification,
-      recognitionNotification = recognitionNotification,
-      walkingNotification = walkingNotification
-    )
-  }
-
-  private fun loadNotificationConfig(prefix: String): MoveNotificationConfig {
-    val notificationTitle: String =
-      sharedPreferences.getString(prefix + PROPERTY_NOTIFICATION_TITLE, "") ?: ""
-    val notificationText: String =
-      sharedPreferences.getString(prefix + PROPERTY_NOTIFICATION_TEXT, "") ?: ""
-    val notificationChannelId: String =
-      sharedPreferences.getString(prefix + PROPERTY_NOTIFICATION_CHANNELID, "") ?: ""
-    val notificationChannelName: String =
-      sharedPreferences.getString(prefix + PROPERTY_NOTIFICATION_CHANNELNAME, "") ?: ""
-    val notificationChannelDescription: String =
-      sharedPreferences.getString(prefix + PROPERTY_NOTIFICATION_CHANNELDESCRIPTION, "") ?: ""
-    val notificationIcon: Int =
-      sharedPreferences.getInt(prefix + PROPERTY_NOTIFICATION_ICON, 0)
-
-    return MoveNotificationConfig(
-      title = notificationTitle,
-      text = notificationText,
-      icon = notificationIcon.takeIf { it != 0 },
-      channelId = notificationChannelId,
-      channelName = notificationChannelName,
-      channelDescription = notificationChannelDescription
-    )
-  }
-
-  fun storeRunningState(running: Boolean) {
-    sharedPreferences.edit().putBoolean(PROPERTY_STARTED, running).apply()
-  }
-
-  fun loadRunningState(): Boolean {
-    return sharedPreferences.getBoolean(PROPERTY_STARTED, false)
+  // Migration part. We must remove token stored in shared prefs.
+  init {
+    if (sharedPreferences.contains(PROPERTY_PRODUCT_ID)) {
+      sharedPreferences.edit().remove(PROPERTY_PRODUCT_ID).apply()
+    }
+    if (sharedPreferences.contains(PROPERTY_USER_ID)) {
+      sharedPreferences.edit().remove(PROPERTY_USER_ID).apply()
+    }
+    if (sharedPreferences.contains(PROPERTY_ACCESS_TOKEN)) {
+      sharedPreferences.edit().remove(PROPERTY_ACCESS_TOKEN).apply()
+    }
+    if (sharedPreferences.contains(PROPERTY_REFRESH_TOKEN)) {
+      sharedPreferences.edit().remove(PROPERTY_REFRESH_TOKEN).apply()
+    }
   }
 
   fun clear() {