Include the still-preferred network name in the import-not-promoted message

When the device still prefers a different network after import, look up
which app-added credential is currently preferred and surface its
network name so the user can identify the lingering credential. Refactor
appAddedIsPreferredCredentials into appAddedPreferredCredential so the
preferred credential is reused for both the boolean check and the
network-name lookup, and propagate the name via a new
devicePreferredNetworkName field on AllHaveCredentials.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: agners

app/src/full/kotlin/io/homeassistant/companion/android/thread/ThreadManagerImpl.kt

@@ -78,7 +78,7 @@ class ThreadManagerImpl @Inject constructor(
         return if (getDeviceDataset == null) {
             ThreadManager.SyncResult.NoneHaveCredentials
         } else {
-            val appIsDevicePreferred = appAddedIsPreferredCredentials(context)
+            val appIsDevicePreferred = appAddedPreferredCredential(context) != null
             Timber.d("Thread: device ${if (appIsDevicePreferred) "prefers" else "doesn't prefer" } dataset from app")
 
             return if (appIsDevicePreferred) {
@@ -128,14 +128,16 @@ class ThreadManagerImpl @Inject constructor(
                 Timber.d(
                     "Thread: device ${if (coreIsDevicePreferred) "prefers" else "doesn't prefer" } core preferred dataset",
                 )
-                val appIsDevicePreferred = coreIsDevicePreferred || appAddedIsPreferredCredentials(context)
+                val appPreferredCredential = if (coreIsDevicePreferred) null else appAddedPreferredCredential(context)
+                val appIsDevicePreferred = coreIsDevicePreferred || appPreferredCredential != null
                 Timber.d(
                     "Thread: device ${if (appIsDevicePreferred) "prefers" else "doesn't prefer" } dataset from app",
                 )
 
                 var exportFromDevice = false
                 var updated: Boolean? = null
                 var deviceNowPrefersCore: Boolean? = null
+                var devicePreferredNetworkName: String? = null
                 if (!coreIsDevicePreferred) {
                     if (appIsDevicePreferred) {
                         // Update or remove the device preferred credential to match core state.
@@ -188,6 +190,9 @@ class ThreadManagerImpl @Inject constructor(
                                         }
                                     } core preferred dataset",
                                 )
+                                if (deviceNowPrefersCore == false) {
+                                    devicePreferredNetworkName = appAddedPreferredCredential(context)?.networkName
+                                }
                                 true
                             } else { // Core prefers imported from other app, this shouldn't be managed by HA
                                 localIds.forEach { baId ->
@@ -217,6 +222,7 @@ class ThreadManagerImpl @Inject constructor(
                     fromApp = appIsDevicePreferred,
                     updated = updated,
                     deviceNowPrefersCore = deviceNowPrefersCore,
+                    devicePreferredNetworkName = devicePreferredNetworkName,
                     exportIntent = if (exportFromDevice) deviceThreadIntent else null,
                 )
             } catch (e: Exception) {
@@ -226,6 +232,7 @@ class ThreadManagerImpl @Inject constructor(
                     fromApp = null,
                     updated = null,
                     deviceNowPrefersCore = null,
+                    devicePreferredNetworkName = null,
                     exportIntent = null,
                 )
             }
@@ -284,29 +291,25 @@ class ThreadManagerImpl @Inject constructor(
     }
 
     @OptIn(ExperimentalStdlibApi::class)
-    private suspend fun appAddedIsPreferredCredentials(context: Context): Boolean {
+    private suspend fun appAddedPreferredCredential(context: Context): ThreadNetworkCredentials? {
         val appCredentials = suspendCoroutine { cont ->
             ThreadNetwork.getNetworkClient(context)
                 .allCredentials
                 .addOnSuccessListener { cont.resume(it) }
                 .addOnFailureListener { cont.resume(null) }
         }
         return try {
-            appCredentials?.any {
-                val isPreferred = isPreferredCredentials(context, it)
-                if (isPreferred) {
-                    Timber.d(
-                        "Thread device prefers app added dataset: %s (PAN %s, EXTPAN %s)",
-                        it.networkName,
-                        it.panId,
-                        it.extendedPanId.toHexString(HexFormat.UpperCase),
-                    )
-                }
-                isPreferred
-            } ?: false
+            appCredentials?.firstOrNull { isPreferredCredentials(context, it) }?.also {
+                Timber.d(
+                    "Thread device prefers app added dataset: %s (PAN %s, EXTPAN %s)",
+                    it.networkName,
+                    it.panId,
+                    it.extendedPanId.toHexString(HexFormat.UpperCase),
+                )
+            }
         } catch (e: Exception) {
             Timber.e(e, "Thread app added credentials preferred check failed")
-            false
+            null
         }
     }
 

app/src/main/kotlin/io/homeassistant/companion/android/settings/developer/DeveloperSettingsPresenterImpl.kt

@@ -101,7 +101,16 @@ class DeveloperSettingsPresenterImpl @Inject constructor(
                             view.onThreadDebugResult(context.getString(commonR.string.thread_debug_result_match), true)
                         } else if (syncResult.fromApp == true && syncResult.updated == true) {
                             val message = if (syncResult.deviceNowPrefersCore == false) {
-                                context.getString(commonR.string.thread_debug_result_updated_not_preferred)
+                                val base = context.getString(commonR.string.thread_debug_result_updated_not_preferred)
+                                val name = syncResult.devicePreferredNetworkName
+                                if (name != null) {
+                                    "$base ${context.getString(
+                                        commonR.string.thread_debug_result_mismatch_detail,
+                                        name,
+                                    )}"
+                                } else {
+                                    base
+                                }
                             } else {
                                 context.getString(commonR.string.thread_debug_result_updated)
                             }

app/src/main/kotlin/io/homeassistant/companion/android/thread/ThreadManager.kt

@@ -19,6 +19,7 @@ interface ThreadManager {
             val fromApp: Boolean?,
             val updated: Boolean?,
             val deviceNowPrefersCore: Boolean?,
+            val devicePreferredNetworkName: String?,
             val exportIntent: IntentSender?,
         ) : SyncResult()
         object NoneHaveCredentials : SyncResult()