ilabs-flir 2.2.32 → 2.3.0

package/android/Flir/src/main/java/flir/android/FlirManager.kt

@@ -95,6 +95,7 @@ object FlirManager {
     /**
      * Start scanning
      */
+    @Synchronized
     fun startDiscovery(retry: Boolean = false) {
         if (!isInitialized && reactContext != null) {
             init(reactContext!!)
@@ -102,6 +103,7 @@ object FlirManager {
         
         if (isScanning && !retry) return
         
+        Log.i(TAG, "Starting FlirManager discovery...")
         isScanning = true
         emitDeviceState("discovering")
         sdkManager?.scan()
@@ -118,7 +120,9 @@ object FlirManager {
     /**
      * Stop scanning
      */
+    @Synchronized
     fun stopDiscovery() {
+        Log.i(TAG, "Stopping FlirManager discovery...")
         sdkManager?.stopScan()
         isScanning = false
     }
@@ -126,7 +130,12 @@ object FlirManager {
     /**
      * Connect to a device
      */
-    fun connectToDevice(deviceId: String) {
+    @Synchronized
+    fun connectToDevice(deviceId: String?) {
+        if (deviceId == null) {
+            Log.e(TAG, "connectToDevice: deviceId is null")
+            return
+        }
         Log.i(TAG, "connectToDevice: $deviceId")
         
         val devices = sdkManager?.discoveredDevices ?: emptyList()
@@ -148,7 +157,9 @@ object FlirManager {
     /**
      * Disconnect
      */
+    @Synchronized
     fun disconnect() {
+        Log.i(TAG, "Disconnecting FlirManager...")
         shouldProcessFrames.set(false)
         sdkManager?.disconnect()
         isConnected = false
@@ -160,11 +171,19 @@ object FlirManager {
     /**
      * Stop everything
      */
+    @Synchronized
     fun stop() {
+        Log.i(TAG, "Stopping FlirManager completely...")
         shouldProcessFrames.set(false)
+        
+        // Clear callbacks first to prevent any more frames/updates from hitting Java/RN
+        textureCallback = null
+        temperatureCallback = null
+        
         disconnect()
         stopDiscovery()
         latestBitmap = null
+        Log.i(TAG, "FlirManager stopped")
     }
     
     // Stub legacy methods

package/android/Flir/src/main/java/flir/android/FlirModule.kt

@@ -34,7 +34,7 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
     // Simple placeholder conversion: converts an ARGB color to a pseudo-temperature value.
     // Replace with SDK call when integrating thermalsdk APIs.
     @ReactMethod
-    fun getTemperatureFromColor(color: Int, promise: Promise) {
+    fun getTemperatureFromColor(color: Int, promise: Promise?) {
         try {
             val r = (color shr 16) and 0xFF
             val g = (color shr 8) and 0xFF
@@ -42,81 +42,81 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
             // Luminance-like value scaled to a plausible temperature range (0°C - 400°C)
             val lum = 0.2126 * r + 0.7152 * g + 0.0722 * b
             val temp = 0.0 + (lum / 255.0) * 400.0
-            promise.resolve(temp)
+            promise?.resolve(temp)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_CONVERT", e)
+            promise?.reject("ERR_FLIR_CONVERT", e)
         }
     }
 
     @ReactMethod
-    fun getLatestFramePath(promise: Promise) {
+    fun getLatestFramePath(promise: Promise?) {
         try {
             val path = FlirFrameCache.latestFramePath
-            if (path != null) promise.resolve(path) else promise.resolve(null)
+            if (path != null) promise?.resolve(path) else promise?.resolve(null)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_PATH", e)
+            promise?.reject("ERR_FLIR_PATH", e)
         }
     }
 
     @ReactMethod
-    fun getTemperatureAt(x: Int, y: Int, promise: Promise) {
+    fun getTemperatureAt(x: Int, y: Int, promise: Promise?) {
         try {
             val temp = FlirManager.getTemperatureAt(x, y)
-            if (temp != null) promise.resolve(temp) else promise.reject("ERR_NO_DATA", "No temperature data available")
+            if (temp != null) promise?.resolve(temp) else promise?.reject("ERR_NO_DATA", "No temperature data available")
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_SAMPLE", e)
+            promise?.reject("ERR_FLIR_SAMPLE", e)
         }
     }
 
     @ReactMethod
-    fun getTemperatureAtNormalized(nx: Double, ny: Double, promise: Promise) {
+    fun getTemperatureAtNormalized(nx: Double, ny: Double, promise: Promise?) {
         try {
             val temp = FlirManager.getTemperatureAtNormalized(nx, ny)
-            if (temp != null) promise.resolve(temp) else promise.resolve(null)
+            if (temp != null) promise?.resolve(temp) else promise?.resolve(null)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_TEMP_NORM", e)
+            promise?.reject("ERR_FLIR_TEMP_NORM", e)
         }
     }
     
     @ReactMethod
-    fun isEmulator(promise: Promise) {
+    fun isEmulator(promise: Promise?) {
         try {
-            promise.resolve(FlirManager.isEmulator())
+            promise?.resolve(FlirManager.isEmulator())
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_EMULATOR_CHECK", e)
+            promise?.reject("ERR_FLIR_EMULATOR_CHECK", e)
         }
     }
     
     @ReactMethod
-    fun isDeviceConnected(promise: Promise) {
+    fun isDeviceConnected(promise: Promise?) {
         try {
-            promise.resolve(FlirManager.isDeviceConnected())
+            promise?.resolve(FlirManager.isDeviceConnected())
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_DEVICE_CHECK", e)
+            promise?.reject("ERR_FLIR_DEVICE_CHECK", e)
         }
     }
     
     @ReactMethod
-    fun getConnectedDeviceInfo(promise: Promise) {
+    fun getConnectedDeviceInfo(promise: Promise?) {
         try {
-            promise.resolve(FlirManager.getConnectedDeviceInfo())
+            promise?.resolve(FlirManager.getConnectedDeviceInfo())
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_DEVICE_INFO", e)
+            promise?.reject("ERR_FLIR_DEVICE_INFO", e)
         }
     }
     
     @ReactMethod
-    fun isSDKDownloaded(promise: Promise) {
+    fun isSDKDownloaded(promise: Promise?) {
         try {
             val available = FlirSDKLoader.isSDKAvailable(reactContext)
-            promise.resolve(available)
+            promise?.resolve(available)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_SDK_CHECK", e)
+            promise?.reject("ERR_FLIR_SDK_CHECK", e)
         }
     }
     
     @ReactMethod
-    fun getSDKStatus(promise: Promise) {
+    fun getSDKStatus(promise: Promise?) {
         try {
             val available = FlirSDKLoader.isSDKAvailable(reactContext)
             val arch = FlirSDKLoader.getDeviceArch()
@@ -131,14 +131,14 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
             result.putBoolean("dexExists", dexPath?.exists() == true)
             result.putBoolean("nativeLibsExist", nativeLibDir?.exists() == true)
             
-            promise.resolve(result)
+            promise?.resolve(result)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_SDK_STATUS", e)
+            promise?.reject("ERR_FLIR_SDK_STATUS", e)
         }
     }
     
     @ReactMethod
-    fun getDiscoveredDevices(promise: Promise) {
+    fun getDiscoveredDevices(promise: Promise?) {
         try {
             val devices = FlirManager.getDiscoveredDevices()
             val result = com.facebook.react.bridge.Arguments.createArray()
@@ -152,129 +152,131 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
                 result.pushMap(deviceMap)
             }
             
-            promise.resolve(result)
+            promise?.resolve(result)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_DEVICES", e)
+            promise?.reject("ERR_FLIR_DEVICES", e)
         }
     }
 
     @ReactMethod
-    fun setPreferSdkRotation(prefer: Boolean, promise: Promise) {
+    fun setPreferSdkRotation(prefer: Boolean, promise: Promise?) {
         try {
             FlirManager.setPreferSdkRotation(prefer)
-            promise.resolve(true)
+            promise?.resolve(true)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_SET_ROTATION_PREF", e)
+            promise?.reject("ERR_FLIR_SET_ROTATION_PREF", e)
         }
     }
 
     @ReactMethod
-    fun isPreferSdkRotation(promise: Promise) {
+    fun isPreferSdkRotation(promise: Promise?) {
         try {
             val v = FlirManager.isPreferSdkRotation()
-            promise.resolve(v)
+            promise?.resolve(v)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_GET_ROTATION_PREF", e)
+            promise?.reject("ERR_FLIR_GET_ROTATION_PREF", e)
         }
     }
 
     @ReactMethod
-    fun getBatteryLevel(promise: Promise) {
+    fun getBatteryLevel(promise: Promise?) {
         try {
             val level = FlirManager.getBatteryLevel()
-            promise.resolve(level)
+            promise?.resolve(level)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_GET_BATTERY", e)
+            promise?.reject("ERR_FLIR_GET_BATTERY", e)
         }
     }
 
     @ReactMethod
-    fun isBatteryCharging(promise: Promise) {
+    fun isBatteryCharging(promise: Promise?) {
         try {
             val v = FlirManager.isBatteryCharging()
-            promise.resolve(v)
+            promise?.resolve(v)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_CHARGING", e)
+            promise?.reject("ERR_FLIR_CHARGING", e)
         }
     }
     
     @ReactMethod
-    fun startEmulator(emulatorType: String, promise: Promise) {
+    fun startEmulator(emulatorType: String?, promise: Promise?) {
         try {
             // Ensure SDK is initialized with context before starting discovery
             FlirManager.init(reactContext)
             // With simplified API, just start discovery - emulators are discovered like any device
             FlirManager.startDiscovery(true)
-            promise.resolve(true)
+            promise?.resolve(true)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_EMULATOR", e)
+            promise?.reject("ERR_FLIR_EMULATOR", e)
         }
     }
     
     @ReactMethod
-    fun connectToDevice(deviceId: String, promise: Promise) {
+    fun connectToDevice(deviceId: String?, promise: Promise?) {
         try {
             // Ensure SDK is initialized with context before connecting
             FlirManager.init(reactContext)
-            FlirManager.connectToDevice(deviceId)
-            promise.resolve(true)
+            if (deviceId != null) {
+                FlirManager.connectToDevice(deviceId)
+            }
+            promise?.resolve(true)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_CONNECT", e)
+            promise?.reject("ERR_FLIR_CONNECT", e)
         }
     }
     
     @ReactMethod
-    fun startDiscovery(promise: Promise) {
+    fun startDiscovery(promise: Promise?) {
         try {
             // Ensure SDK is initialized with context before starting discovery
             FlirManager.init(reactContext)
             FlirManager.startDiscovery(true)
-            promise.resolve(true)
+            promise?.resolve(true)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_DISCOVERY", e)
+            promise?.reject("ERR_FLIR_DISCOVERY", e)
         }
     }
     
     @ReactMethod
-    fun stopDiscovery(promise: Promise) {
+    fun stopDiscovery(promise: Promise?) {
         try {
             FlirManager.stopDiscovery()
-            promise.resolve(true)
+            promise?.resolve(true)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_STOP_DISCOVERY", e)
+            promise?.reject("ERR_FLIR_STOP_DISCOVERY", e)
         }
     }
     
     @ReactMethod
-    fun stopFlir(promise: Promise) {
+    fun stopFlir(promise: Promise?) {
         try {
             FlirManager.stop()
-            promise.resolve(true)
+            promise?.resolve(true)
         } catch (e: Exception) {
-            promise.reject("ERR_FLIR_STOP", e)
+            promise?.reject("ERR_FLIR_STOP", e)
         }
     }
     
     @ReactMethod
-    fun initializeSDK(promise: Promise) {
+    fun initializeSDK(promise: Promise?) {
         try {
             FlirManager.init(reactContext)
             
             val result = com.facebook.react.bridge.Arguments.createMap()
             result.putBoolean("initialized", true)
             result.putString("message", "SDK initialized successfully")
-            promise.resolve(result)
+            promise?.resolve(result)
         } catch (e: Exception) {
             val result = com.facebook.react.bridge.Arguments.createMap()
             result.putBoolean("initialized", false)
             result.putString("error", e.message ?: "Unknown error")
             result.putString("errorType", e.javaClass.simpleName)
-            promise.resolve(result)
+            promise?.resolve(result)
         }
     }
     
     @ReactMethod
-    fun getDebugInfo(promise: Promise) {
+    fun getDebugInfo(promise: Promise?) {
         try {
             val result = com.facebook.react.bridge.Arguments.createMap()
             
@@ -299,9 +301,9 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
             result.putBoolean("isStreaming", FlirManager.isStreaming())
             result.putString("connectedDevice", FlirManager.getConnectedDeviceInfo())
             
-            promise.resolve(result)
+            promise?.resolve(result)
         } catch (e: Exception) {
-            promise.reject("ERR_DEBUG_INFO", e)
+            promise?.reject("ERR_DEBUG_INFO", e)
         }
     }
 }

package/ios/Flir/src/FlirManager.swift

@@ -63,6 +63,9 @@ import ThermalSDK
     private var connectedDeviceId: String?
     private var connectedDeviceName: String?
     
+    // Internal synchronization
+    private let stateLock = NSObject()
+    
     // Dedicated render queue for frame processing (matches sample app pattern)
     private let renderQueue = DispatchQueue(label: "com.flir.render")
     
@@ -122,6 +125,7 @@ import ThermalSDK
     }
     
     @objc public func stopDiscovery() {
+        objc_sync_enter(stateLock); defer { objc_sync_exit(stateLock) }
         NSLog("[FlirManager] stopDiscovery")
         
 #if FLIR_ENABLED
@@ -133,6 +137,7 @@ import ThermalSDK
     // MARK: - Connection
     
     @objc public func connectToDevice(_ deviceId: String) {
+        objc_sync_enter(stateLock); defer { objc_sync_exit(stateLock) }
         NSLog("[FlirManager] connectToDevice: \(deviceId)")
         
 #if FLIR_ENABLED
@@ -270,10 +275,11 @@ import ThermalSDK
     }
     
     @objc public func disconnect() {
+        objc_sync_enter(stateLock); defer { objc_sync_exit(stateLock) }
         NSLog("[FlirManager] disconnect")
         
 #if FLIR_ENABLED
-        stopStream()
+        stopStreamInternalSync()
         camera?.disconnect()
         camera = nil
         _isConnected = false
@@ -289,9 +295,36 @@ import ThermalSDK
     }
     
     @objc public func stop() {
-        stopStream()
-        disconnect()
-        stopDiscovery()
+        objc_sync_enter(stateLock); defer { objc_sync_exit(stateLock) }
+        stopStreamInternalSync()
+        disconnectInternalSync()
+        stopDiscoveryInternalSync()
+    }
+    
+    private func stopDiscoveryInternalSync() {
+        NSLog("[FlirManager] stopDiscovery")
+#if FLIR_ENABLED
+        discovery?.stop()
+        emitStateChange("idle")
+#endif
+    }
+    
+    private func disconnectInternalSync() {
+        NSLog("[FlirManager] disconnect")
+#if FLIR_ENABLED
+        stopStreamInternalSync()
+        camera?.disconnect()
+        camera = nil
+        _isConnected = false
+        connectedDeviceId = nil
+        connectedDeviceName = nil
+        _latestImage = nil
+        
+        DispatchQueue.main.async { [weak self] in
+            self?.delegate?.onDeviceDisconnected()
+            self?.emitStateChange("disconnected")
+        }
+#endif
     }
     
     // MARK: - Streaming
@@ -345,13 +378,18 @@ import ThermalSDK
 #endif
     
     @objc public func stopStream() {
+        objc_sync_enter(stateLock); defer { objc_sync_exit(stateLock) }
+        stopStreamInternalSync()
+    }
+
+    private func stopStreamInternalSync() {
         NSLog("[FlirManager] stopStream")
         
 #if FLIR_ENABLED
+        _isStreaming = false
         stream?.stop()
         stream = nil
         streamer = nil
-        _isStreaming = false
         _latestImage = nil
         
         if _isConnected {
@@ -637,14 +675,18 @@ extension FlirManager: FLIRStreamDelegate {
             
             NSLog("[FLIR-TRACE 2️⃣] Processing on renderQueue")
             
+            objc_sync_enter(self.stateLock)
+            let currentStreamer = self.streamer
+            let streaming = self._isStreaming
+            objc_sync_exit(self.stateLock)
+            
+            guard streaming, let streamer = currentStreamer else {
+                return
+            }
+
             do {
-                // Double check streaming state before update to prevent EXC_BAD_ACCESS during shutdown
-                if self._isStreaming {
-                    try streamer.update()
-                    NSLog("[FLIR-TRACE 3️⃣] Streamer updated successfully")
-                } else {
-                    return
-                }
+                try streamer.update()
+                NSLog("[FLIR-TRACE 3️⃣] Streamer updated successfully")
             } catch {
                 NSLog("[FLIR-TRACE ❌] Streamer update failed: \(error)")
                 return

package/ios/Flir/src/FlirModule.m

@@ -161,7 +161,7 @@ RCT_EXPORT_METHOD(setNetworkDiscoveryEnabled : (BOOL)enabled resolver : (
         setBool:enabled
          forKey:@"ilabsFlir.networkDiscoveryEnabled"];
   }
-  resolve(@(YES));
+  if (resolve) resolve(@(YES));
 }
 
 RCT_EXPORT_METHOD(startDiscovery : (RCTPromiseResolveBlock)
@@ -178,7 +178,7 @@ RCT_EXPORT_METHOD(startDiscovery : (RCTPromiseResolveBlock)
       NSLog(@"[FlirModule] [%@] ⏱ FlirManager.startDiscovery returned",
             [NSDate date]);
     }
-    resolve(@(YES));
+    if (resolve) resolve(@(YES));
   });
 }
 
@@ -191,7 +191,7 @@ RCT_EXPORT_METHOD(stopDiscovery : (RCTPromiseResolveBlock)
       ((void (*)(id, SEL))objc_msgSend)(manager,
                                         sel_registerName("stopDiscovery"));
     }
-    resolve(@(YES));
+    if (resolve) resolve(@(YES));
   });
 }
 
@@ -211,12 +211,16 @@ RCT_EXPORT_METHOD(getDiscoveredDevices : (RCTPromiseResolveBlock)
         }
       }
     }
-    resolve(arr);
+    if (resolve) resolve(arr);
   });
 }
 
 RCT_EXPORT_METHOD(connectToDevice : (NSString *)deviceId resolver : (
     RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  if (!deviceId) {
+    if (reject) reject(@"ERR_INVALID_ARGS", @"deviceId is required", nil);
+    return;
+  }
   NSLog(@"[FlirModule] [%@] ⏱ RN->connectToDevice called for: %@",
         [NSDate date], deviceId);
   dispatch_async(dispatch_get_main_queue(), ^{
@@ -242,10 +246,10 @@ RCT_EXPORT_METHOD(connectToDevice : (NSString *)deviceId resolver : (
             [NSDate date]);
 
       // Resolve immediately - connection status will come via events
-      resolve(@(YES));
+      if (resolve) resolve(@(YES));
     } else {
       NSLog(@"[FlirModule] [%@] ❌ FlirManager not found", [NSDate date]);
-      reject(@"ERR_NO_MANAGER", @"FlirManager not found", nil);
+      if (reject) reject(@"ERR_NO_MANAGER", @"FlirManager not found", nil);
     }
   });
 }
@@ -261,7 +265,7 @@ RCT_EXPORT_METHOD(disconnect : (RCTPromiseResolveBlock)
       ((void (*)(id, SEL))objc_msgSend)(manager,
                                         sel_registerName("disconnect"));
     }
-    resolve(@(YES));
+    if (resolve) resolve(@(YES));
   });
 }
 
@@ -274,7 +278,7 @@ RCT_EXPORT_METHOD(stopFlir : (RCTPromiseResolveBlock)
       [[FlirState shared] reset];
       ((void (*)(id, SEL))objc_msgSend)(manager, sel_registerName("stop"));
     }
-    resolve(@(YES));
+    if (resolve) resolve(@(YES));
   });
 }
 
@@ -295,13 +299,13 @@ RCT_EXPORT_METHOD(startEmulator : (NSString *)emulatorType resolver : (
 
       // Initiate emulator start asynchronously
       ((void (*)(id, SEL, id))objc_msgSend)(
-          manager, sel_registerName("startEmulatorWithType:"), emulatorType);
+          manager, sel_registerName("startEmulatorWithType:"), emulatorType ?: @"FLIR_ONE_EDGE");
 
       // Resolve immediately - connection status will come via events
-      resolve(@(YES));
+      if (resolve) resolve(@(YES));
     } else {
       // Fallback if selector assumption wrong/mismatch
-      reject(@"ERR_NOT_IMPL",
+      if (reject) reject(@"ERR_NOT_IMPL",
              @"startEmulator not implemented or signature mismatch", nil);
       self.connectResolve = nil;
       self.connectReject = nil;
@@ -323,9 +327,9 @@ RCT_EXPORT_METHOD(getTemperatureAt : (nonnull NSNumber *)x y : (
           [y intValue]);
     }
     if (isnan(temp)) {
-      resolve([NSNull null]);
+      if (resolve) resolve([NSNull null]);
     } else {
-      resolve(@(temp));
+      if (resolve) resolve(@(temp));
     }
   });
 }
@@ -346,9 +350,9 @@ RCT_EXPORT_METHOD(getTemperatureAtNormalized : (nonnull NSNumber *)nx y : (
           [nx doubleValue], [ny doubleValue]);
     }
     if (isnan(temp)) {
-      resolve([NSNull null]);
+      if (resolve) resolve([NSNull null]);
     } else {
-      resolve(@(temp));
+      if (resolve) resolve(@(temp));
     }
   });
 }
@@ -360,7 +364,7 @@ RCT_EXPORT_METHOD(getTemperatureFromColor : (NSInteger)color resolver : (
   int b = color & 0xFF;
   double lum = 0.2126 * r + 0.7152 * g + 0.0722 * b;
   double temp = (lum / 255.0) * 400.0;
-  resolve(@(temp));
+  if (resolve) resolve(@(temp));
 }
 
 RCT_EXPORT_METHOD(isEmulator : (RCTPromiseResolveBlock)
@@ -373,7 +377,7 @@ RCT_EXPORT_METHOD(isEmulator : (RCTPromiseResolveBlock)
       isEm = ((BOOL (*)(id, SEL))objc_msgSend)(manager,
                                                sel_registerName("isEmulator"));
     }
-    resolve(@(isEm));
+    if (resolve) resolve(@(isEm));
   });
 }
 
@@ -384,15 +388,15 @@ RCT_EXPORT_METHOD(getLatestFrameBitmap : (RCTPromiseResolveBlock)
     if (!manager ||
         ![manager
             respondsToSelector:sel_registerName("latestFrameBitmapBase64")]) {
-      resolve([NSNull null]);
+      if (resolve) resolve([NSNull null]);
       return;
     }
     NSDictionary *dict = ((NSDictionary * (*)(id, SEL)) objc_msgSend)(
         manager, sel_registerName("latestFrameBitmapBase64"));
     if (!dict) {
-      resolve([NSNull null]);
+      if (resolve) resolve([NSNull null]);
     } else {
-      resolve(dict);
+      if (resolve) resolve(dict);
     }
   });
 }
@@ -407,7 +411,7 @@ RCT_EXPORT_METHOD(isDeviceConnected : (RCTPromiseResolveBlock)
       isC = ((BOOL (*)(id, SEL))objc_msgSend)(manager,
                                               sel_registerName("isConnected"));
     }
-    resolve(@(isC));
+    if (resolve) resolve(@(isC));
   });
 }
 
@@ -421,19 +425,17 @@ RCT_EXPORT_METHOD(getConnectedDeviceInfo : (RCTPromiseResolveBlock)
       info = ((NSString * (*)(id, SEL)) objc_msgSend)(
           manager, sel_registerName("getConnectedDeviceInfo"));
     }
-    resolve(info);
+    if (resolve) resolve(info);
   });
 }
 
-RCT_EXPORT_METHOD(isSDKDownloaded : (RCTPromiseResolveBlock)
-                      resolve rejecter : (RCTPromiseRejectBlock)reject) {
   // Assuming integrated SDK
-  resolve(@(YES));
+  if (resolve) resolve(@(YES));
 }
 
 RCT_EXPORT_METHOD(getSDKStatus : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
-  resolve(@{@"available" : @(YES), @"arch" : @"arm64", @"platform" : @"iOS"});
+  if (resolve) resolve(@{@"available" : @(YES), @"arch" : @"arm64", @"platform" : @"iOS"});
 }
 
 RCT_EXPORT_METHOD(getBatteryLevel : (RCTPromiseResolveBlock)
@@ -446,7 +448,7 @@ RCT_EXPORT_METHOD(getBatteryLevel : (RCTPromiseResolveBlock)
       level = ((int (*)(id, SEL))objc_msgSend)(
           manager, sel_registerName("getBatteryLevel"));
     }
-    resolve(@(level));
+    if (resolve) resolve(@(level));
   });
 }
 
@@ -460,7 +462,7 @@ RCT_EXPORT_METHOD(isBatteryCharging : (RCTPromiseResolveBlock)
       ch = ((BOOL (*)(id, SEL))objc_msgSend)(
           manager, sel_registerName("isBatteryCharging"));
     }
-    resolve(@(ch));
+    if (resolve) resolve(@(ch));
   });
 }
 
@@ -473,7 +475,7 @@ RCT_EXPORT_METHOD(setPreferSdkRotation : (BOOL)prefer resolver : (
       ((void (*)(id, SEL, BOOL))objc_msgSend)(
           manager, sel_registerName("setPreferSdkRotation:"), prefer);
     }
-    resolve(@(YES));
+    if (resolve) resolve(@(YES));
   });
 }
 
@@ -487,7 +489,7 @@ RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
       v = ((BOOL (*)(id, SEL))objc_msgSend)(
           manager, sel_registerName("isPreferSdkRotation"));
     }
-    resolve(@(v));
+    if (resolve) resolve(@(v));
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilabs-flir",
-  "version": "2.2.32",
+  "version": "2.3.0",
   "description": "FLIR Thermal SDK for React Native - iOS & Android (bundled at compile time via postinstall)",
   "main": "src/index.js",
   "types": "src/index.d.ts",