react-native-move-sdk 2.10.0 → 2.10.2

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

@@ -1,12 +1,15 @@
 package `in`.dolph.move.sdk
 
 import android.annotation.SuppressLint
+import android.bluetooth.BluetoothManager
 import android.content.Context
+import android.os.Build
 import android.util.Log
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.google.gson.Gson
+import `in`.dolph.move.sdk.extentions.PermissionUtils
 import `in`.dolph.move.sdk.metadata.METADATA_PREF
 import `in`.dolph.move.sdk.metadata.MetadataStorage
 import `in`.dolph.move.sdk.metadata.MetadataStorageImpl
@@ -21,6 +24,7 @@ import io.dolphin.move.MoveConfig
 import io.dolphin.move.MoveConfigurationError
 import io.dolphin.move.MoveDetectionService
 import io.dolphin.move.MoveDevice
+import io.dolphin.move.MoveNotification
 import io.dolphin.move.MoveOptions
 import io.dolphin.move.MoveScanResult
 import io.dolphin.move.MoveSdk
@@ -128,14 +132,8 @@ class NativeMoveSdkWrapper(private val context: Context) : MoveSdk.StateListener
     // Platform config
     recognitionNotificationTitle: String,
     recognitionNotificationText: String,
-    recognitionNotificationChannelId: String,
-    recognitionNotificationChannelName: String,
-    recognitionNotificationChannelDescription: String,
     tripNotificationTitle: String,
     tripNotificationText: String,
-    tripNotificationChannelId: String,
-    tripNotificationChannelName: String,
-    tripNotificationChannelDescription: String,
     promise: Promise?
   ) {
 
@@ -169,28 +167,6 @@ class NativeMoveSdkWrapper(private val context: Context) : MoveSdk.StateListener
         )
       )
     }
-//    TODO there was a bug on building local npm, fix it and uncomment
-//    val recognitionNotificationIcon = getIconIdByName(recognitionIconName)
-//    val tripNotificationIcon = getIconIdByName(tripIconName)
-
-    val recognitionNotification = MoveNotificationConfig(
-      recognitionNotificationTitle,
-      recognitionNotificationText,
-      null,
-      recognitionNotificationChannelId,
-      recognitionNotificationChannelName,
-      recognitionNotificationChannelDescription,
-    )
-    val tripNotification = MoveNotificationConfig(
-      tripNotificationTitle,
-      tripNotificationText,
-      null,
-      tripNotificationChannelId,
-      tripNotificationChannelName,
-      tripNotificationChannelDescription,
-    )
-    // TODO - just use recognition notification for now
-    val walkingNotification = recognitionNotification
 
     val featureOptions = options?.toHashMap()
     val moveOptions = try {
@@ -229,11 +205,16 @@ class NativeMoveSdkWrapper(private val context: Context) : MoveSdk.StateListener
         refreshToken = refreshToken,
         projectId = projectId.toLong(),
       )
-      MoveSdk.get()?.let {
-        it.tripNotification(tripNotification.toMoveNotification(context))
-        it.recognitionNotification(recognitionNotification.toMoveNotification(context))
-        it.walkingLocationNotification(walkingNotification.toMoveNotification(context))
-      }
+      MoveSdk.get()?.setNotificationText(
+        notification = MoveNotification(
+          recognitionTitle = recognitionNotificationTitle,
+          recognitionText = recognitionNotificationText,
+          drivingTitle = tripNotificationTitle,
+          drivingText = tripNotificationText,
+          walkingTitle = recognitionNotificationTitle,
+          walkingText = recognitionNotificationText
+        )
+      )
       val moveConfig = MoveConfig(timelineDetectionServicesToUse)
       MoveSdk.setup(
         auth = moveAuth,
@@ -241,15 +222,6 @@ class NativeMoveSdkWrapper(private val context: Context) : MoveSdk.StateListener
         options = moveOptions,
       )
 
-      val moveSdkConfig = MoveSdkConfig(
-        timelineDetectionServices = timelineDetectionServicesToUse,
-        auth = moveAuth,
-        recognitionNotification = recognitionNotification,
-        tripNotification = tripNotification,
-        walkingNotification = walkingNotification
-      )
-      configRepository.storeConfig(moveSdkConfig)
-
       promise?.resolve(PROMISE_OK)
     } catch (t: Throwable) {
       val message = "SETUP_ERROR: ${t.message}"
@@ -270,14 +242,8 @@ class NativeMoveSdkWrapper(private val context: Context) : MoveSdk.StateListener
     // Platform config
     recognitionNotificationTitle: String,
     recognitionNotificationText: String,
-    recognitionNotificationChannelId: String,
-    recognitionNotificationChannelName: String,
-    recognitionNotificationChannelDescription: String,
     tripNotificationTitle: String,
     tripNotificationText: String,
-    tripNotificationChannelId: String,
-    tripNotificationChannelName: String,
-    tripNotificationChannelDescription: String,
     promise: Promise?
   ) {
 
@@ -311,28 +277,6 @@ class NativeMoveSdkWrapper(private val context: Context) : MoveSdk.StateListener
         )
       )
     }
-//    TODO there was a bug on building local npm, fix it and uncomment
-//    val recognitionNotificationIcon = getIconIdByName(recognitionIconName)
-//    val tripNotificationIcon = getIconIdByName(tripIconName)
-
-    val recognitionNotification = MoveNotificationConfig(
-      recognitionNotificationTitle,
-      recognitionNotificationText,
-      null,
-      recognitionNotificationChannelId,
-      recognitionNotificationChannelName,
-      recognitionNotificationChannelDescription,
-    )
-    val tripNotification = MoveNotificationConfig(
-      tripNotificationTitle,
-      tripNotificationText,
-      null,
-      tripNotificationChannelId,
-      tripNotificationChannelName,
-      tripNotificationChannelDescription,
-    )
-    // TODO - just use recognition notification for now
-    val walkingNotification = recognitionNotification
 
     val featureOptions = options?.toHashMap()
     val moveOptions = try {
@@ -365,11 +309,16 @@ class NativeMoveSdkWrapper(private val context: Context) : MoveSdk.StateListener
     try {
       Log.d(MoveSdkModule.LOG_TAG, "MOVE SDK Version " + MoveSdk.version)
 
-      MoveSdk.get()?.let {
-        it.tripNotification(tripNotification.toMoveNotification(context))
-        it.recognitionNotification(recognitionNotification.toMoveNotification(context))
-        it.walkingLocationNotification(walkingNotification.toMoveNotification(context))
-      }
+      MoveSdk.get()?.setNotificationText(
+        notification = MoveNotification(
+          recognitionTitle = recognitionNotificationTitle,
+          recognitionText = recognitionNotificationText,
+          drivingTitle = tripNotificationTitle,
+          drivingText = tripNotificationText,
+          walkingTitle = recognitionNotificationTitle,
+          walkingText = recognitionNotificationText
+        )
+      )
       val moveConfig = MoveConfig(timelineDetectionServicesToUse)
       MoveSdk.setup(
         authCode = code,
@@ -400,12 +349,10 @@ class NativeMoveSdkWrapper(private val context: Context) : MoveSdk.StateListener
   }
 
   fun startAutomaticDetection(): Boolean {
-    configRepository.storeRunningState(true)
     return MoveSdk.get()?.startAutomaticDetection() == true
   }
 
   fun stopAutomaticDetection(): Boolean {
-    configRepository.storeRunningState(false)
     return MoveSdk.get()?.stopAutomaticDetection() == true
   }
 
@@ -521,17 +468,7 @@ class NativeMoveSdkWrapper(private val context: Context) : MoveSdk.StateListener
     data.putString(ARGUMENT_ERROR_REASON, state.reason.toString())
     }**/
     emitDeviceEvent(EVENT_MOVE_STATE, data)
-
-    if (state is MoveSdkState.Ready) {
-      val isInRunningState = configRepository.loadRunningState()
-      if (isInRunningState) {
-        startAutomaticDetection()
-      }
-    } else if (state is MoveSdkState.Running) {
-      Log.d(MoveSdkModule.LOG_TAG, "Move SDK Running")
-      // Nothing to do here, all good.
-      // You may call additional features like #keepInForeground(bool)
-    }
+    Log.d(MoveSdkModule.LOG_TAG, "Move SDK $state")
   }
 
   override fun onTripStateChanged(tripState: MoveTripState) {
@@ -557,8 +494,6 @@ class NativeMoveSdkWrapper(private val context: Context) : MoveSdk.StateListener
       refreshToken = refreshToken,
     )
 
-    configRepository.storeAuth(auth)
-
     MoveSdk.get()?.updateAuth(auth) { configurationError ->
       val data = mutableMapOf<Any, Any>()
       data[ARGUMENT_ERROR] = configurationError.toString()
@@ -605,10 +540,12 @@ class NativeMoveSdkWrapper(private val context: Context) : MoveSdk.StateListener
   }
 
   override fun onLogReceived(eventName: String, value: String?) {
-    // TBD
     val data = mutableMapOf<Any, Any>()
-    data[ARGUMENT_LOG] = "$eventName ${value ?: ""}".trim()
-    emitDeviceEvent(EVENT_INIT_ERROR, data)
+    data["message"] = eventName.trim()
+    value?.let {
+      data["value"] = it.trim()
+    }
+    emitDeviceEvent(EVENT_MOVE_SDK_LOG, data)
   }
 
   override fun onMoveError(serviceFailures: List<MoveServiceFailure>) {
@@ -792,6 +729,31 @@ class NativeMoveSdkWrapper(private val context: Context) : MoveSdk.StateListener
     map["isConnected"] = device.isConnected
     emitDeviceEvent(EVENT_MOVE_SDK_DEVICE_STATE, map)
   }
+
+  fun isBluetoothEnabled(): Boolean {
+    val adapter = context.getSystemService(BluetoothManager::class.java)?.adapter
+    if (adapter == null) {
+      Log.i(MoveSdkModule.LOG_TAG, "BluetoothManager is missing or BT adapter is null")
+    }
+    return adapter?.isEnabled == true
+  }
+  fun hasDiscoveryPermissions(): Boolean {
+    var hasPermissions = true
+    val hasBluetoothScanPermission = PermissionUtils.hasBluetoothScanPermission(context)
+    Log.i(MoveSdkModule.LOG_TAG, "Discovery permission check: BluetoothScanPermission = $hasBluetoothScanPermission")
+    hasPermissions = hasPermissions && hasBluetoothScanPermission
+    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
+      val hasFineLocationPermission = PermissionUtils.hasFineLocationPermission(context)
+      Log.i(MoveSdkModule.LOG_TAG, "Discovery permission check: FineLocationPermission = $hasFineLocationPermission")
+      hasPermissions = hasPermissions && hasFineLocationPermission
+    }
+    if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R || Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
+      val hasBackgroundLocationPermission = PermissionUtils.hasBackgroundLocationPermission(context)
+      Log.i(MoveSdkModule.LOG_TAG, "Discovery permission check: BackgroundLocationPermission = $hasBackgroundLocationPermission")
+      hasPermissions = hasPermissions && hasBackgroundLocationPermission
+    }
+    return hasPermissions
+  }
 }
 
 fun List<MoveServiceFailure>.failuresToArray(): Array<Any> {

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

@@ -0,0 +1,58 @@
+package `in`.dolph.move.sdk.extentions
+
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.core.content.ContextCompat
+
+object PermissionUtils {
+
+  fun hasFineLocationPermission(context: Context?): Boolean {
+    return if (context != null) {
+      ContextCompat.checkSelfPermission(
+        context,
+        Manifest.permission.ACCESS_FINE_LOCATION
+      ) == PackageManager.PERMISSION_GRANTED
+    } else {
+      false
+    }
+  }
+
+  fun hasBluetoothScanPermission(context: Context): Boolean {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      ContextCompat.checkSelfPermission(
+        context,
+        Manifest.permission.BLUETOOTH_SCAN
+      ) == PackageManager.PERMISSION_GRANTED
+    } else {
+      true
+    }
+  }
+
+  fun hasBackgroundLocationPermission(context: Context?): Boolean {
+    return if (context != null) {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        ContextCompat.checkSelfPermission(
+          context,
+          Manifest.permission.ACCESS_BACKGROUND_LOCATION
+        ) == PackageManager.PERMISSION_GRANTED
+      } else {
+        true
+      }
+    } else {
+      false
+    }
+  }
+
+  fun hasBluetoothConnectPermission(context: Context): Boolean {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      ContextCompat.checkSelfPermission(
+        context,
+        Manifest.permission.BLUETOOTH_CONNECT
+      ) == PackageManager.PERMISSION_GRANTED
+    } else {
+      true
+    }
+  }
+}

package/ios/NativeModule/MoveSdk.h

@@ -134,4 +134,10 @@ RCT_EXTERN_METHOD(requestMotionPermission)
 
 RCT_EXTERN_METHOD(requestBluetoothAlwaysUsagePermission)
 
+RCT_EXTERN_METHOD(getBluetoothPermission: (RCTPromiseResolveBlock)resolve
+				  rejecter: (RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(getBluetoothState: (RCTPromiseResolveBlock)resolve
+				  rejecter: (RCTPromiseRejectBlock)reject)
+
 @end

package/ios/NativeModule/MoveSdk.swift

@@ -96,7 +96,7 @@ class RCTMoveSdk: RCTEventEmitter {
 	/// Audio/iBeacon device scanner.
 	private var scanner: MoveSdkDeviceScanner?
 	/// Bluetooth manager for permission.
-	private var bleManager: CBCentralManager?
+	lazy var bluetoothManager = MoveSdkBluetoothManager()
 
 	override func startObserving() {
 		MoveSDKLauncher.shared.delegate = self
@@ -469,7 +469,7 @@ class RCTMoveSdk: RCTEventEmitter {
 		if MoveSDK.shared.startAutomaticDetection() {
 			resolve(true)
 		} else {
-			reject("false", nil, nil)
+			resolve(false)
 		}
 	}
 
@@ -482,7 +482,7 @@ class RCTMoveSdk: RCTEventEmitter {
 		if MoveSDK.shared.setLiveLocationTag(tag) {
 			resolve(true)
 		} else {
-			reject("false", nil, nil)
+			resolve(false)
 		}
 	}
 
@@ -495,7 +495,7 @@ class RCTMoveSdk: RCTEventEmitter {
 		if MoveSDK.shared.startTrip(metadata: data) {
 			resolve(true)
 		} else {
-			reject("false", nil, nil)
+			resolve(false)
 		}
 	}
 
@@ -516,7 +516,7 @@ class RCTMoveSdk: RCTEventEmitter {
 		if MoveSDK.shared.stopAutomaticDetection() {
 			resolve(true)
 		} else {
-			reject("false", nil, nil)
+			resolve(false)
 		}
 	}
 
@@ -665,7 +665,53 @@ class RCTMoveSdk: RCTEventEmitter {
 	/// Requests user bluetooth permission.
 	@objc
 	func requestBluetoothAlwaysUsagePermission() {
-		bleManager = CBCentralManager()
+		bluetoothManager.getBluetoothState() { _ in }
+	}
+
+	@objc
+	func getBluetoothPermission(_ resolve: @escaping RCTPromiseResolveBlock,
+						  rejecter _: @escaping RCTPromiseRejectBlock) {
+		bluetoothManager.getBluetoothState() { state in
+			switch state {
+			case .unknown:
+				resolve(false)
+			case .resetting:
+				resolve(false)
+			case .unsupported:
+				resolve(false)
+			case .unauthorized:
+				resolve(false)
+			case .poweredOff:
+				resolve(true)
+			case .poweredOn:
+				resolve(true)
+			@unknown default:
+				resolve(false)
+			}
+		}
+	}
+
+	@objc
+	func getBluetoothState(_ resolve: @escaping RCTPromiseResolveBlock,
+						   rejecter reject: @escaping RCTPromiseRejectBlock) {
+		bluetoothManager.getBluetoothState() { state in
+			switch state {
+			case .unknown:
+				resolve(false)
+			case .resetting:
+				resolve(false)
+			case .unsupported:
+				resolve(false)
+			case .unauthorized:
+				resolve(false)
+			case .poweredOff:
+				resolve(false)
+			case .poweredOn:
+				resolve(true)
+			@unknown default:
+				resolve(false)
+			}
+		}
 	}
 
 	/// Delegates initialize with launch options to the launcher.
@@ -735,6 +781,8 @@ internal class MoveSDKLauncher {
 		case configUpdate = "MOVE_SDK_CONFIG_UPDATE"
 		/// SDK trip start event.
 		case tripStart = "MOVE_SDK_TRIP_START"
+		/// Log event.
+		case logEvent = "MOVE_SDK_LOG"
 	}
 
 	/// User defaults kets.
@@ -828,8 +876,20 @@ internal class MoveSDKLauncher {
             self.tripMetaData = [:]
 			return metadata
 		}
+
+		sdk.setLogListener { (event, value) in
+			DispatchQueue.main.async {
+				var data: [String: Any] = ["message": event]
+
+				if let value = value {
+					data["value"] = value
+				}
+
+				self.send(event: .logEvent, data: data)
+			}
+		}
 	}
-	
+
 	/// Send event to observer.
 	/// - Parameters:
 	///   - event: Event key.

package/ios/NativeModule/MoveSdkDeviceScanner.swift

@@ -1,4 +1,5 @@
 import AVFoundation
+import CoreBluetooth
 import CoreLocation
 import Foundation
 import DolphinMoveSDK
@@ -119,3 +120,19 @@ extension MoveSdkDeviceScanner: CLLocationManagerDelegate {
 		print("didDetermineState: \(region) : \(state)")
 	}
 }
+
+internal class MoveSdkBluetoothManager: NSObject, CBCentralManagerDelegate {
+
+	private var stateCallback: ((CBManagerState) -> Void)?
+	private var manager: CBCentralManager?
+
+	func getBluetoothState(_ callback: @escaping(CBManagerState) -> Void) {
+		stateCallback = callback
+		manager = CBCentralManager(delegate: self, queue: nil, options: [CBCentralManagerOptionShowPowerAlertKey: false])
+	}
+
+	func centralManagerDidUpdateState(_ central: CBCentralManager) {
+		stateCallback?(central.state)
+		stateCallback = nil
+	}
+}

package/lib/commonjs/MoveSdk.js

@@ -66,7 +66,7 @@ class MoveSdk {
         throw new Error('MOVE SDK needs notification configuration for Android');
       }
 
-      platformParams = [recognitionNotification.title, recognitionNotification.text, recognitionNotification.channel.id, recognitionNotification.channel.name, recognitionNotification.channel.description, tripNotification.title, tripNotification.text, tripNotification.channel.id, tripNotification.channel.name, tripNotification.channel.description];
+      platformParams = [recognitionNotification.title, recognitionNotification.text, tripNotification.title, tripNotification.text];
     }
 
     return await NativeMoveSdk.setup(userId, accessToken, refreshToken, projectId, // Config
@@ -95,7 +95,7 @@ class MoveSdk {
         throw new Error('MOVE SDK needs notification configuration for Android');
       }
 
-      platformParams = [recognitionNotification.title, recognitionNotification.text, recognitionNotification.channel.id, recognitionNotification.channel.name, recognitionNotification.channel.description, tripNotification.title, tripNotification.text, tripNotification.channel.id, tripNotification.channel.name, tripNotification.channel.description];
+      platformParams = [recognitionNotification.title, recognitionNotification.text, tripNotification.title, tripNotification.text];
     }
 
     return await NativeMoveSdk.setupWithCode(code, // Config
@@ -232,6 +232,12 @@ class MoveSdk {
     });
   }
 
+  static addLogListener(logReceived) {
+    return eventEmitter.addListener('MOVE_SDK_LOG', event => {
+      logReceived(event);
+    });
+  }
+
   static addRemoteConfigChangeListener(configChangeReceived) {
     return eventEmitter.addListener('MOVE_SDK_CONFIG_UPDATE', config => {
       configChangeReceived(config);
@@ -258,6 +264,14 @@ class MoveSdk {
     }
   }
 
+  static async getBluetoothPermission() {
+    return await NativeMoveSdk.getBluetoothPermission();
+  }
+
+  static async getBluetoothState() {
+    return await NativeMoveSdk.getBluetoothState();
+  }
+
   static async shutdown() {
     let force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     return await NativeMoveSdk.shutdown(force);