@expofp/react-native-efp-crowdconnected 0.1.3 → 0.1.5

package/android/src/main/java/com/expofpcrowdconnected/ExpoFpPosition.kt

@@ -78,12 +78,20 @@ data class ExpoFpPosition(
                     lat = null,
                     lng = null
                 )
+                "GEO" -> ExpoFpPosition(
+                    x = null,
+                    y = null,
+                    z = z,
+                    angle = angle,
+                    lat = latitude,
+                    lng = longitude
+                )
                 else -> {
-                    // GEO and unknown types: only lat/lng, no x/y
-                    // GEO location type uses lat/lng only
+                    // Unknown or mixed types: include all available coordinates
+                    // This ensures blue dot works even if locationType is unexpected
                     ExpoFpPosition(
-                        x = null,
-                        y = null,
+                        x = xPixels,
+                        y = yPixels,
                         z = z,
                         angle = angle,
                         lat = latitude,

package/android/src/main/java/com/expofpcrowdconnected/RCTCrowdConnectedLocationProviderModule.kt

@@ -407,8 +407,11 @@ class RCTCrowdConnectedLocationProviderModule(
         val statusCallback = object : StatusCallback {
             override fun onStartUpSuccess() {
                 Log.d(TAG, "StatusCallback: SDK startup successful")
-                // Cancel timeout on SDK startup success
                 cancelTimeoutJob()
+                registerPositionCallback()
+                CrowdConnected.getInstance()?.getDeviceId()?.let {
+                    providerInfo = providerInfo.copy(deviceId = it)
+                }
             }
 
             override fun onStartUpFailure(reason: String) {
@@ -466,20 +469,8 @@ class RCTCrowdConnectedLocationProviderModule(
             CrowdConnected.start(app, config)
 
             Log.i(TAG, "CrowdConnected SDK start initiated")
-
-            // Get device ID from CrowdConnected instance
-            val deviceId = CrowdConnected.getInstance()?.getDeviceId()
-            if (deviceId != null) {
-                providerInfo = providerInfo.copy(deviceId = deviceId)
-                Log.d(TAG, "Device ID set: $deviceId")
-            }
-
-            // Mark as started (SDK successfully started)
             isStarted = true
 
-            // Register position callback
-            registerPositionCallback()
-
             // Apply aliases
             if (currentSettings.aliases.isNotEmpty()) {
                 Log.d(TAG, "Applying ${currentSettings.aliases.size} aliases")

package/ios/RCTCrowdConnectedLocationProvider.swift

@@ -16,11 +16,14 @@ import React
 import UIKit
 
 // See example https://github.com/nathvarun/react-native-native-module-swift-tutorial/blob/master/ios/Counter.swift
+@MainActor
 @objc(RCTCrowdConnectedLocationProvider)
 class RCTCrowdConnectedLocationProvider: RCTEventEmitter, CLLocationManagerDelegate, CrowdConnectedDelegate {
 
   // MARK: - Properties
 
+  override var methodQueue: DispatchQueue! { .main }
+
   private let locationEventName = "onLocationChange"
   private let locationErrorName = "onLocationError"
 
@@ -43,6 +46,8 @@ class RCTCrowdConnectedLocationProvider: RCTEventEmitter, CLLocationManagerDeleg
     [locationEventName, locationErrorName]
   }
 
+  @objc override static func requiresMainQueueSetup() -> Bool { true }
+
   @objc func setup(
     _ settings: NSDictionary,
     resolver resolve: @escaping RCTPromiseResolveBlock,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expofp/react-native-efp-crowdconnected",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "React Native wrapper for ExpoFP around CrowdConnected SDK",
   "keywords": [
     "react-native",