Skip to content

Commit 2b6d736

Browse files
committed
fix(android): Return null if MCUBOOT mode query isn't supported
1 parent 27db1fe commit 2b6d736

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

react-native-mcu-manager/android/src/main/java/uk/co/playerdata/reactnativemcumanager/ReactNativeMcuManagerModule.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,14 @@ class ReactNativeMcuManagerModule() : Module() {
6666
try {
6767
val nameResult = manager.bootloaderInfo(DefaultManager.BOOTLOADER_INFO_QUERY_BOOTLOADER)
6868
info.bootloader = nameResult.bootloader
69-
} catch(ex: McuMgrErrorException) {
69+
70+
if (info.bootloader == MCUBOOT) {
71+
val mcuMgrResult = manager.bootloaderInfo(DefaultManager.BOOTLOADER_INFO_MCUBOOT_QUERY_MODE)
72+
73+
info.mode = mcuMgrResult.mode
74+
info.noDowngrade = mcuMgrResult.noDowngrade
75+
}
76+
} catch (ex: McuMgrErrorException) {
7077
transport.release()
7178

7279
// For consistency with iOS, if the error code is 8 (MGMT_ERR_ENOTSUP), return null
@@ -78,13 +85,6 @@ class ReactNativeMcuManagerModule() : Module() {
7885
throw ex;
7986
}
8087

81-
if (info.bootloader == MCUBOOT) {
82-
val mcuMgrResult = manager.bootloaderInfo(DefaultManager.BOOTLOADER_INFO_MCUBOOT_QUERY_MODE)
83-
84-
info.mode = mcuMgrResult.mode
85-
info.noDowngrade = mcuMgrResult.noDowngrade
86-
}
87-
8888
transport.release()
8989
promise.resolve(info)
9090
}

0 commit comments

Comments
 (0)