Merge pull request #107 from PlayerData/bump-ios-deps

Updating iOS MCU lib

Author: Koalk

android/src/main/java/uk/co/playerdata/reactnativemcumanager/DeviceUpgrade.kt

@@ -14,19 +14,19 @@ import io.runtime.mcumgr.exception.McuMgrException
 import java.io.IOException
 
 val UpgradeModes =
-    mapOf(
-        1 to FirmwareUpgradeManager.Mode.TEST_AND_CONFIRM,
-        2 to FirmwareUpgradeManager.Mode.CONFIRM_ONLY,
-        3 to FirmwareUpgradeManager.Mode.TEST_ONLY
-    )
+        mapOf(
+                1 to FirmwareUpgradeManager.Mode.TEST_AND_CONFIRM,
+                2 to FirmwareUpgradeManager.Mode.CONFIRM_ONLY,
+                3 to FirmwareUpgradeManager.Mode.TEST_ONLY
+        )
 
 class DeviceUpgrade(
-    private val id: String,
-    device: BluetoothDevice,
-    private val context: Context,
-    private val updateFileUri: Uri,
-    private val updateOptions: UpdateOptions,
-    private val manager: ReactNativeMcuManagerModule
+        private val id: String,
+        device: BluetoothDevice,
+        private val context: Context,
+        private val updateFileUri: Uri,
+        private val updateOptions: UpdateOptions,
+        private val manager: ReactNativeMcuManagerModule
 ) : FirmwareUpgradeCallback {
     private val TAG = "DeviceUpdate"
     private var lastNotification = -1
@@ -54,13 +54,7 @@ class DeviceUpgrade(
         disconnectDevice()
         Log.v(this.TAG, "Cancel")
         withSafePromise { promise ->
-            promise.reject(
-                CodedException(
-                    "UPGRADE_CANCELLED",
-                    "Upgrade cancelled",
-                    null
-                )
-            )
+            promise.reject(CodedException("UPGRADE_CANCELLED", "Upgrade cancelled", null))
         }
     }
 
@@ -93,20 +87,16 @@ class DeviceUpgrade(
             disconnectDevice()
             Log.v(this.TAG, "mcu exception")
             withSafePromise { promise ->
-                promise.reject(
-                    ReactNativeMcuMgrException.fromMcuMgrException(
-                        e
-                    )
-                )
+                promise.reject(ReactNativeMcuMgrException.fromMcuMgrException(e))
             }
         }
     }
 
     override fun onUpgradeStarted(controller: FirmwareUpgradeController) {}
 
     override fun onStateChanged(
-        prevState: FirmwareUpgradeManager.State,
-        newState: FirmwareUpgradeManager.State
+            prevState: FirmwareUpgradeManager.State,
+            newState: FirmwareUpgradeManager.State
     ) {
         val stateMap: Map<String, Any?> = mapOf("id" to id, "state" to newState.name)
         manager.upgradeStateCB(stateMap)
@@ -120,24 +110,14 @@ class DeviceUpgrade(
     override fun onUpgradeFailed(state: FirmwareUpgradeManager.State, error: McuMgrException) {
         disconnectDevice()
         withSafePromise { promise ->
-            promise.reject(
-                ReactNativeMcuMgrException.fromMcuMgrException(
-                    error
-                )
-            )
+            promise.reject(ReactNativeMcuMgrException.fromMcuMgrException(error))
         }
     }
 
     override fun onUpgradeCanceled(state: FirmwareUpgradeManager.State) {
         disconnectDevice()
         withSafePromise { promise ->
-            promise.reject(
-                CodedException(
-                    "UPGRADE_CANCELLED",
-                    "Upgrade cancelled",
-                    null
-                )
-            )
+            promise.reject(CodedException("UPGRADE_CANCELLED", "Upgrade cancelled", null))
         }
     }
 

android/src/main/java/uk/co/playerdata/reactnativemcumanager/ReactNativeMcuMgrException.kt

@@ -10,9 +10,9 @@ import io.runtime.mcumgr.exception.McuMgrErrorException
 import io.runtime.mcumgr.exception.McuMgrException
 import io.runtime.mcumgr.exception.McuMgrTimeoutException
 
-class ReactNativeMcuMgrException private constructor(
-    code: String, message: String?, cause: Throwable?
-) : CodedException(code, message, cause) {
+class ReactNativeMcuMgrException
+private constructor(code: String, message: String?, cause: Throwable?) :
+        CodedException(code, message, cause) {
 
     companion object {
         private fun getCode(e: McuMgrException): String {

example/App.tsx

@@ -127,7 +127,7 @@ export default function App() {
         <Text style={styles.block}>Step 4 - Update</Text>
 
         <View style={styles.block}>
-          <Text>Update Progress / State:</Text>
+          <Text>State / Update Progress:</Text>
           <Text>
             {state}: {progress}
           </Text>

example/src/useBluetoothDevices.ts

@@ -27,7 +27,7 @@ const useBluetoothDevices = () => {
           deviceIdRef.current.push(scannedDevice.id);
 
           setDevices((oldDevices) =>
-            sortBy(uniqBy([...oldDevices, scannedDevice], 'id'), 'name')
+            sortBy(uniqBy([scannedDevice, ...oldDevices], 'id'), 'name')
           );
         }
       )