From f59e9d2dc5d60091465dfc0e35eb280377977d16 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <darken@darken.eu>
Date: Mon, 7 Nov 2022 19:42:31 +0100
Subject: [PATCH] Fix comparison that determines which list item is the primary
 device. (#54)

---
 .../main/java/eu/darken/capod/monitor/core/PodMonitor.kt   | 2 ++
 .../eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app-common/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt b/app-common/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt
index 54963047..b2d5797d 100644
--- a/app-common/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt
+++ b/app-common/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt
@@ -12,6 +12,7 @@ import eu.darken.capod.common.debug.logging.asLog
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.flow.replayingShare
+import eu.darken.capod.common.flow.setupCommonEventHandlers
 import eu.darken.capod.main.core.GeneralSettings
 import eu.darken.capod.main.core.PermissionTool
 import eu.darken.capod.pods.core.PodDevice
@@ -79,6 +80,7 @@ class PodMonitor @Inject constructor(
 
     val mainDevice: Flow<PodDevice?> = devices
         .map { determineMainDevice(it) }
+        .setupCommonEventHandlers(TAG) { "mainDevice" }
         .replayingShare(appScope)
 
     private fun createBleScanner() = combine(
diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt
index 87b5ac29..77ffc54d 100644
--- a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt
+++ b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt
@@ -130,24 +130,25 @@ class OverviewFragmentVM @Inject constructor(
         if (permissions.isEmpty() && isBluetoothEnabled) {
             pods.map {
                 val now = Instant.now()
+                val isMainPod = it.identifier == mainPod?.identifier
                 when (it) {
                     is DualPodDevice -> DualPodsCardVH.Item(
                         now = now,
                         device = it,
                         showDebug = isDebugMode,
-                        isMainPod = it == mainPod,
+                        isMainPod = isMainPod,
                     )
                     is SinglePodDevice -> SinglePodsCardVH.Item(
                         now = now,
                         device = it,
                         showDebug = isDebugMode,
-                        isMainPod = it == mainPod,
+                        isMainPod = isMainPod,
                     )
                     else -> UnknownPodDeviceCardVH.Item(
                         now = now,
                         device = it,
                         showDebug = isDebugMode,
-                        isMainPod = it == mainPod,
+                        isMainPod = isMainPod,
                     )
                 }
             }.run { items.addAll(this) }