From 6d7ddebbef29019307e6d5a1a44dab225ef76027 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 17 Apr 2026 03:17:21 +0000
Subject: [PATCH] =?UTF-8?q?fix(auto):=20address=20code=20review=20?=
 =?UTF-8?q?=E2=80=94=20filterIndexed,=20remove=20deprecated=20override?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Android/sessions/571f7a66-0c36-43f2-890e-c8ed87ec7164

Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com>
---
 .../org/meshtastic/app/auto/MeshtasticCarAppService.kt      | 4 ----
 .../meshtastic/core/service/ConversationShortcutManager.kt  | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/org/meshtastic/app/auto/MeshtasticCarAppService.kt b/app/src/main/kotlin/org/meshtastic/app/auto/MeshtasticCarAppService.kt
index ad3042405..43f9c97ba 100644
--- a/app/src/main/kotlin/org/meshtastic/app/auto/MeshtasticCarAppService.kt
+++ b/app/src/main/kotlin/org/meshtastic/app/auto/MeshtasticCarAppService.kt
@@ -34,8 +34,4 @@ class MeshtasticCarAppService : CarAppService() {
 
     override fun onCreateSession(sessionInfo: SessionInfo): Session =
         MeshtasticCarSession()
-
-    @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
-    override fun onCreateSession(): Session =
-        MeshtasticCarSession()
 }
diff --git a/core/service/src/androidMain/kotlin/org/meshtastic/core/service/ConversationShortcutManager.kt b/core/service/src/androidMain/kotlin/org/meshtastic/core/service/ConversationShortcutManager.kt
index 524f0b335..6f9588e11 100644
--- a/core/service/src/androidMain/kotlin/org/meshtastic/core/service/ConversationShortcutManager.kt
+++ b/core/service/src/androidMain/kotlin/org/meshtastic/core/service/ConversationShortcutManager.kt
@@ -75,7 +75,11 @@ class ConversationShortcutManager(
                 .distinctUntilChanged()
 
             val channelsFlow = radioConfigRepository.channelSetFlow
-                .map { cs -> cs.settings.filter { it.name.isNotEmpty() || cs.settings.indexOf(it) == 0 } }
+                .map { cs ->
+                    cs.settings.filterIndexed { index, settings ->
+                        settings.name.isNotEmpty() || index == 0
+                    }
+                }
                 .distinctUntilChanged()
 
             combine(favoritesFlow, channelsFlow) { favorites, channels ->