Merge pull request #519 from PlayerData/fix-cancel

ball-hayden · web-flow · commit e72eb28db50c · 2025-06-06T09:50:00.000+01:00
fix(android): Correct cancel function
diff --git a/react-native-mcu-manager/android/src/main/java/uk/co/playerdata/reactnativemcumanager/ReactNativeMcuManagerModule.kt b/react-native-mcu-manager/android/src/main/java/uk/co/playerdata/reactnativemcumanager/ReactNativeMcuManagerModule.kt
@@ -148,15 +148,15 @@ class ReactNativeMcuManagerModule() : Module() {
       upgrade.startUpgrade(promise)
     }
 
-    AsyncFunction("cancelUpgrade") { id: String, promise: Promise ->
+    Function("cancelUpgrade") { id: String ->
       val upgrade = upgrades[id]
 
       if (upgrade == null) {
-        promise.reject(CodedException("UPGRADE_ID_MISSING", "Upgrade ID $id not present", null))
-        return@AsyncFunction
+        Log.w(TAG, "Can't cancel update ID ($id} not present")
+        return@Function
       }
 
-      upgrade.startUpgrade(promise)
+      upgrade.cancel()
     }
 
     Function("destroyUpgrade") { id: String ->

Original file line number	Diff line number	Diff line change
`@@ -148,15 +148,15 @@ class ReactNativeMcuManagerModule() : Module() {`
`148`	`148`	`upgrade.startUpgrade(promise)`
`149`	`149`	`}`
`150`	`150`
`151`		`- AsyncFunction("cancelUpgrade") { id: String, promise: Promise ->`
	`151`	`+ Function("cancelUpgrade") { id: String ->`
`152`	`152`	`val upgrade = upgrades[id]`
`153`	`153`
`154`	`154`	`if (upgrade == null) {`
`155`		`- promise.reject(CodedException("UPGRADE_ID_MISSING", "Upgrade ID $id not present", null))`
`156`		`- return@AsyncFunction`
	`155`	`+ Log.w(TAG, "Can't cancel update ID ($id} not present")`
	`156`	`+ return@Function`
`157`	`157`	`}`
`158`	`158`
`159`		`- upgrade.startUpgrade(promise)`
	`159`	`+ upgrade.cancel()`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`Function("destroyUpgrade") { id: String ->`