Properly cleanup disconnected AM/RHMI apps

BimmerGestalt · Dec 4, 2023 · ae5765a · ae5765a
1 parent b2852f2
commit ae5765a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/android/src/main/kotlin/io/bimmergestalt/headunit/BMWRemotingServerImpl.kt b/android/src/main/kotlin/io/bimmergestalt/headunit/BMWRemotingServerImpl.kt
@@ -1,10 +1,8 @@
 package io.bimmergestalt.headunit
 
-import androidx.collection.SparseArrayCompat
 import de.bmw.idrive.BMWRemoting
 import de.bmw.idrive.BMWRemotingClient
 import de.bmw.idrive.BaseBMWRemotingServer
-import io.bimmergestalt.headunit.Utils.values
 import io.bimmergestalt.headunit.managers.AMManager
 import io.bimmergestalt.headunit.managers.RHMIManager
 import io.flutter.Log
@@ -98,10 +96,10 @@ class BMWRemotingServerImpl(val client: BMWRemotingClient,
 
 	override fun am_dispose(handle: Int?) {
 		Log.i(TAG, "am_dispose")
+		val amHandle = amHandle ?: return
 		if (amHandle != handle) {
 			throw BMWRemoting.IllegalArgumentException(-1, "Incorrect AM handle")
 		}
-		val amHandle = amHandle ?: return
 		amManager.unregisterAppsByHandle(amHandle)
 		amManager.removeEventHandler(amHandle)
 		this.amHandle = null
@@ -276,10 +274,10 @@ class BMWRemotingServerImpl(val client: BMWRemotingClient,
 
 	override fun rhmi_dispose(handle: Int?) {
 		Log.i(TAG, "rhmi_dispose")
+		val rhmiHandle = rhmiHandle ?: return
 		if (rhmiHandle != handle) {
 			throw BMWRemoting.IllegalArgumentException(-1, "Incorrect RHMI handle")
 		}
-		val rhmiHandle = rhmiHandle ?: return
 		rhmiManager.unregisterAppsByHandle(rhmiHandle)
 		rhmiManager.removeActionHandler(rhmiHandle)
 		rhmiManager.removeEventHandler(rhmiHandle)

diff --git a/android/src/main/kotlin/io/bimmergestalt/headunit/managers/AMManager.kt b/android/src/main/kotlin/io/bimmergestalt/headunit/managers/AMManager.kt
@@ -36,7 +36,7 @@ class AMManager(val callbacks: HeadunitCallbacks) {
 	}
 
 	fun unregisterApp(appId: String) {
-		val existing = knownApps[appId]
+		val existing = knownApps.remove(appId)
 		if (existing != null) {
 			callbacks.amUnregisterApp(appId)
 		}

diff --git a/android/src/main/kotlin/io/bimmergestalt/headunit/managers/RHMIManager.kt b/android/src/main/kotlin/io/bimmergestalt/headunit/managers/RHMIManager.kt
@@ -43,7 +43,7 @@ class RHMIManager(val callbacks: HeadunitCallbacks) {
 	}
 
 	fun unregisterApp(appId: String) {
-		val existing = knownApps[appId]
+		val existing = knownApps.remove(appId)
 		if (existing != null) {
 			callbacks.rhmiUnregisterApp(appId)
 		}
@@ -82,6 +82,7 @@ class RHMIManager(val callbacks: HeadunitCallbacks) {
 				value.id
 				// assume the destination model is ID
 			}
+			is Boolean -> value
 			is ByteArray -> value
 			is Number -> value
 			is String -> value