fix(editor,diagnostic): readable condition values, one entry per action

The operator and the value of a condition were the smallest text on the screen that
carries what the condition means. Both come from the same spinner row layout, so
raising it to title size fixes the closed drop-down and its open list at once.

Two catalogue entries are duplicates of an entry that is offered: PLAY_RADIO, which
"Tune and play radio" expands into, and CALL_CONTACT, the deprecated alias kept so
rules saved by older releases still load. The picker hid only the first, the
Diagnostic tab hid neither, so both screens listed two radio actions and two call
actions with the same verdict. CatalogVisibility now holds the set both consult; the
engine and the exported debug report keep every entry, since an imported rule can
still carry either one. The Diagnostic summary counts blocked actions from the rows
actually listed, so it cannot disagree with the list over an entry not on screen.

The stored support record survives an upgrade, and an upgrade can delete catalogue
entries — the four STAR_*_PRESS conditions became one PHYSICAL_BUTTON. Until the next
check ran, the record still named the removed ones and the Diagnostic tab counted them
as supported. Names the current catalogue does not define are dropped on read.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

Author: malys

CHANGELOG.md

@@ -35,6 +35,20 @@ All notable changes to this project are documented here. Format follows
 
 ### Changed
 
+- **The operator and the value of a condition are read at title size** (26sp) rather than
+  body. "is equal to" and the value next to it are the two words that decide what a
+  condition means, and they were the smallest text on the screen carrying them — in the
+  closed drop-down and in its open list alike.
+- **The picker and the Diagnostic tab no longer list an entry twice.** "Play the radio" is
+  not a choice — "Tune and play radio" expands into it — and "Call a contact" is the
+  deprecated alias kept for old saved rules. Both showed next to the entry they duplicate,
+  giving two radio actions and two call actions. They are hidden from the two screens the
+  driver reads, not from the engine or the exported debug report, where an imported rule can
+  still carry either one.
+- **The stored support record drops entries this build no longer defines.** It survives an
+  upgrade, and an upgrade can delete catalogue entries — the four `STAR_*_PRESS` conditions
+  became one `PHYSICAL_BUTTON`. Until the next check ran, the Diagnostic tab counted the
+  removed ones as supported.
 - **Crash reporting and paste upload now come from MG4Hardware** (`com.mg4.hardware.diag`)
   instead of being carried here. The crash report gains the cause chain and a truncation
   that counts bytes rather than characters, so a report full of accented log lines no longer

app/src/main/java/com/mg4/tasker/store/SupportStore.kt

@@ -1,6 +1,8 @@
 package com.mg4.tasker.store
 
 import android.content.Context
+import com.mg4.hardware.catalog.ActionType
+import com.mg4.hardware.catalog.ConditionType
 import com.mg4.tasker.BuildConfig
 
 /**
@@ -41,12 +43,24 @@ object SupportStore {
 
     /** Supported ConditionType names, or null when never checked (caller must not filter). */
     fun supportedConditions(context: Context): Set<String>? =
-        prefs(context).takeIf { it.contains(KEY_CONDITIONS) }
-            ?.getStringSet(KEY_CONDITIONS, emptySet())?.toSet()
+        stored(context, KEY_CONDITIONS)?.let { known(it, ConditionType.entries.map { e -> e.name }) }
 
     fun supportedActions(context: Context): Set<String>? =
-        prefs(context).takeIf { it.contains(KEY_ACTIONS) }
-            ?.getStringSet(KEY_ACTIONS, emptySet())?.toSet()
+        stored(context, KEY_ACTIONS)?.let { known(it, ActionType.entries.map { e -> e.name }) }
+
+    private fun stored(context: Context, key: String): Set<String>? =
+        prefs(context).takeIf { it.contains(key) }?.getStringSet(key, emptySet())?.toSet()
+
+    /**
+     * Drops names the current catalogue no longer defines.
+     *
+     * The record survives an update, and an update can remove entries — the four
+     * `STAR_*_PRESS` conditions became one `PHYSICAL_BUTTON`. Until the next check runs,
+     * the stored set still names the removed ones, which the Diagnostic screen counted as
+     * supported conditions the app cannot offer any more.
+     */
+    private fun known(stored: Set<String>, catalogue: List<String>): Set<String> =
+        stored.intersect(catalogue.toSet())
 
     /** Firmware and timestamp of the last check, for the Diagnostic screen; null when never run. */
     fun lastCheck(context: Context): Info? {

app/src/main/java/com/mg4/tasker/ui/CatalogPicker.kt

@@ -71,7 +71,7 @@ object CatalogPicker {
         // Applying a profile is the one action that cannot work without MG4Control. Offering
         // it with an empty profile list only produces a rule that fails at ignition.
         val hasProfiles = ProfileBridge.isMG4ControlInstalled(context)
-        val visible = ActionType.entries.filter { it != ActionType.PLAY_RADIO }
+        val visible = ActionType.entries.filterNot { it in CatalogVisibility.hiddenActions }
         val grouped = visible.groupBy { type ->
             when (type) {
                 ActionType.APPLY_PROFILE, ActionType.WEBHOOK_GET, ActionType.WEBHOOK_POST -> IntegrationGroup

app/src/main/java/com/mg4/tasker/ui/CatalogVisibility.kt

@@ -0,0 +1,25 @@
+package com.mg4.tasker.ui
+
+import com.mg4.hardware.catalog.ActionType
+
+/**
+ * Catalogue entries the user never picks, and therefore never has to read about.
+ *
+ * Both are duplicates of an entry that IS offered, with the same verdict and the same
+ * vendor service behind them, so leaving them in produced two radio entries and two call
+ * entries — in the picker, and again in the Diagnostic list.
+ *
+ * - [ActionType.PLAY_RADIO] is not a choice: "Tune and play radio" expands into it
+ *   ([ActionBundles]), so it always appears in a rule that needs it.
+ * - `CALL_CONTACT` is the deprecated alias kept only so rules saved by older releases still
+ *   load; `CALL_NUMBER`'s editor already accepts a contact.
+ *
+ * Hidden from the two screens the driver reads, not from the engine or the exported debug
+ * report: a rule imported from another car can still carry either one, and whoever debugs
+ * it needs to see the verdict.
+ */
+internal object CatalogVisibility {
+
+    @Suppress("DEPRECATION")
+    val hiddenActions: Set<ActionType> = setOf(ActionType.PLAY_RADIO, ActionType.CALL_CONTACT)
+}

app/src/main/java/com/mg4/tasker/ui/DiagnosticFragment.kt

@@ -110,10 +110,19 @@ class DiagnosticFragment : Fragment() {
         report = fresh
         binding.exportButton.isEnabled = true
 
-        val blocked = fresh.blockedConditions + fresh.blockedActions
+        // The report keeps every catalogue entry, the screen shows the ones the user can
+        // pick: a duplicate the picker never offers ([CatalogVisibility]) would otherwise
+        // appear here as a second radio and a second call entry.
+        val actions = fresh.actions.filterNot {
+            ActionType.valueOf(it.name) in CatalogVisibility.hiddenActions
+        }
+        // Counted from the rows actually listed, so the summary and the list cannot
+        // disagree over an entry that is not on screen.
+        val blockedActions = actions.count { !it.ok }
+        val blocked = fresh.blockedConditions + blockedActions
         binding.summaryStatus.text =
             if (blocked == 0) getString(R.string.diag_summary_ok)
-            else getString(R.string.diag_summary_blocked, fresh.blockedConditions, fresh.blockedActions)
+            else getString(R.string.diag_summary_blocked, fresh.blockedConditions, blockedActions)
         binding.summaryStatus.setTextColor(color(blocked == 0))
 
         binding.bridgeHint.visibility =
@@ -130,9 +139,9 @@ class DiagnosticFragment : Fragment() {
             }
 
             add(Row.Header(getString(R.string.diag_section_actions)))
-            fresh.actions.forEach { entry ->
+            actions.forEach { entry ->
                 val type = ActionType.valueOf(entry.name)
-                add(Row.Item(getString(type.labelRes), actionValue(entry), entry.ok))
+                add(Row.Item(actionLabel(type), actionValue(entry), entry.ok))
             }
         }
         binding.diagList.adapter = Adapter(rows)
@@ -266,6 +275,11 @@ class DiagnosticFragment : Fragment() {
         return if (label != null) "$label ($value)" else value.toString()
     }
 
+    /** Same wording as the picker: tuning a station also switches the source to the radio. */
+    private fun actionLabel(type: ActionType): String =
+        if (type == ActionType.TUNE_RADIO) getString(R.string.editor_tune_and_play_radio)
+        else getString(type.labelRes)
+
     private fun actionValue(entry: Diagnostics.Entry): String =
         if (entry.ok) getString(R.string.diag_action_ready) + hiddenSuffix(entry) else reason(entry)
 

app/src/main/res/layout/item_value_choice.xml

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Both the closed spinner and its dropdown rows. Title size rather than body: the
+     operator ("is equal to") and the chosen value are the two words that decide what a
+     condition means, and they were the smallest text on the screen that carries them. -->
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
     android:layout_width="match_parent"
@@ -7,4 +10,4 @@
     android:minHeight="@dimen/touch_target"
     android:paddingHorizontal="@dimen/spacing_md"
     android:textColor="@color/mg4_text_primary"
-    android:textSize="@dimen/text_body" />
+    android:textSize="@dimen/text_title" />

app/src/test/java/com/mg4/tasker/store/SupportStoreTest.kt

@@ -0,0 +1,41 @@
+package com.mg4.tasker.store
+
+import androidx.test.core.app.ApplicationProvider
+import com.mg4.hardware.catalog.ConditionType
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+/**
+ * The record survives app updates, and an update can delete catalogue entries — the four
+ * `STAR_*_PRESS` conditions became one `PHYSICAL_BUTTON`. What is read back must name only
+ * entries this build still defines, or the Diagnostic screen counts conditions the editor
+ * can no longer offer.
+ */
+// Plain Application: MG4TaskerApp runs a support check of its own on a background thread,
+// which would race this test for the same record.
+@RunWith(RobolectricTestRunner::class)
+@Config(application = android.app.Application::class)
+class SupportStoreTest {
+
+    private val context = ApplicationProvider.getApplicationContext<android.content.Context>()
+
+    @Test fun `names removed from the catalogue are dropped on read`() {
+        val alive = ConditionType.PHYSICAL_BUTTON.name
+        SupportStore.save(context, "SWI68", setOf(alive, "STAR_SHORT_PRESS"), emptySet())
+
+        val read = SupportStore.supportedConditions(context)!!
+        assertTrue(alive in read)
+        assertFalse("STAR_SHORT_PRESS" in read)
+        assertEquals(1, read.size)
+    }
+
+    @Test fun `never checked stays null so the caller does not filter`() {
+        assertNull(SupportStore.supportedConditions(context))
+    }
+}