fix: revert AMSAT live data route; hardcode FM/Linear satellite lists

User decision: drop the AMSAT live-page fetch pipeline entirely (page
parsing, amateur whitelist, ISS module disambiguation, timeout fallbacks,
amSatListsVersion re-resolution) and hardcode the FM/Linear lists instead.

- Sources: remove amSatLiveUrls + amSatActiveUrls; add
  amSatFmCatnums = {SO-50 27607, ISS ZARYA 25544, AO-123 43137} and
  amSatLinearCatnums = {RS-44 44909, FO-29 24278, AO-7 7530,
  AO-73 39444, JO-97 43803}
- SelectionRepo: virtual types resolve FM/Linear from hardcoded sets;
  SSTV stays (amateur-only mode query + R/B debris exclusion)
- MutualViewModel: FM/Linear chips filter by the hardcoded sets
- DatabaseRepo/SettingsRepo/ISettingsRepo: AMSAT list fetch/persist
  removed; DataParser AMSAT parse helpers removed
- Tests: AMSAT pipeline tests dropped; selection/mutual tests re-targeted
  at the hardcoded lists

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/DatabaseRepo.kt

@@ -116,107 +116,12 @@ class DatabaseRepo(
             localSource.insertRadios(importedRadios)
         }
         if (importedEntries.isNotEmpty()) localSource.insertEntries(importedEntries)
-        updateAmSatLiveLists()
         setUpdateSuccessful(System.currentTimeMillis())
     }
 
-    /**
-     * Refresh the AMSAT Live FM/Linear satellite lists (transponders currently
-     * on the air). Best effort: any failure keeps the previous lists and never
-     * blocks the rest of the data update, so the mutual-match filter simply
-     * falls back to the last successful snapshot.
-     */
-    private suspend fun updateAmSatLiveLists() = withContext(dispatcher) {
-        runCatching {
-            val entries = localSource.getEntriesList() // catnum -> name
-            val jobs = Sources.amSatLiveUrls.map { (type, url) ->
-                async { type to remoteSource.getNetworkStream(url) }
-            } + async { "Active" to fetchAmSatActiveStream() }
-            val results = jobs.awaitAll()
-            val fmNames = results.firstOrNull { it.first == "FM" }?.second?.stream
-                ?.let { dataParser.parseAmSatLivePage(it) }.orEmpty()
-            val linearNames = results.firstOrNull { it.first == "Linear" }?.second?.stream
-                ?.let { dataParser.parseAmSatLivePage(it) }.orEmpty()
-            // Amateur whitelist: a failed fetch yields an empty result, which
-            // must NOT wipe out the last good snapshot. Fall back to the
-            // persisted whitelist, and only persist when this fetch actually
-            // returned a stream.
-            val activeStream = results.firstOrNull { it.first == "Active" }?.second?.stream
-            val activeCatnums = activeStream
-                ?.let { dataParser.parseAmSatActiveCatnums(it) }
-                .orEmpty()
-                .ifEmpty { settingsRepo.getAmSatActiveCatnums() }
-            if (activeStream != null) settingsRepo.setAmSatActiveCatnums(activeCatnums)
-            val nameToCatnum = entries.associate { it.name.uppercase() to it.catnum }
-            // Resolve every matching local entry per AMSAT name. A single match
-            // is kept as-is (so satellites absent from the amateur whitelist,
-            // e.g. JO-97/TO-108, are never dropped). Only when several local
-            // entries share the name (ISS station modules ZARYA/UNITY/ZVEZDA/
-            // DESTINY/NAUKA) is the whitelist used to pick the primary one.
-            fun resolvePerName(name: String): Set<Int> {
-                val keys = dataParser.normalizeAmSatName(name)
-                val all = nameToCatnum.filter { (localName, _) ->
-                    dataParser.matchesAmSatName(localName, keys)
-                }.values.toSet()
-                // No local entry matches this AMSAT name (e.g. a brand-new
-                // satellite not yet in the local TLE, like TEVEL2/RS95S):
-                // skip it. Returning empty is correct — crashing here (via
-                // all.first()) aborted the WHOLE list update and kept the
-                // stale pre-whitelist FM list with all five ISS modules.
-                if (all.isEmpty()) return emptySet()
-                if (all.size <= 1) return all
-                val preferred = all.intersect(activeCatnums)
-                if (preferred.isNotEmpty()) return preferred
-                // Whitelist unavailable: keep only the primary entry (smallest
-                // catnum — ISS ZARYA=25544 is the smallest of its five module
-                // entries) instead of admitting every alias (DESTINY etc.).
-                return setOf(all.minOrNull() ?: all.first())
-            }
-            // A failed FM/Linear page fetch yields an empty list here; do NOT
-            // keep the stale list verbatim (it may predate the whitelist and
-            // still contain ISS module aliases like DESTINY). Instead re-run
-            // the multi-match disambiguation on the previous catnums via their
-            // local names, so the whitelist / smallest-catnum rules clean it.
-            fun cleanStaleList(previous: Set<Int>): Set<Int> =
-                previous.mapNotNull { catnum ->
-                    nameToCatnum.entries.firstOrNull { it.value == catnum }?.key
-                }.flatMap { resolvePerName(it) }.toSet()
-            // Last-resort fallback when the AMSAT page is down AND there is no
-            // previous list to clean (e.g. right after clearing data): derive
-            // the FM/Linear sets from the local transceivers intersected with
-            // the amateur whitelist, so a network timeout never wipes the
-            // filters to empty.
-            val fmFallback = localSource.getIdsWithModes(listOf("FM")).toSet().intersect(activeCatnums)
-            val linearFallback = localSource
-                .getIdsWithModes(listOf("SSB", "CW", "USB", "LSB")).toSet().intersect(activeCatnums)
-            val fmCatnums = fmNames.flatMap { resolvePerName(it) }.toSet()
-                .ifEmpty { cleanStaleList(settingsRepo.getAmSatFmCatnums()) }
-                .ifEmpty { fmFallback }
-            val linearCatnums = linearNames.flatMap { resolvePerName(it) }.toSet()
-                .ifEmpty { cleanStaleList(settingsRepo.getAmSatLinearCatnums()) }
-                .ifEmpty { linearFallback }
-            settingsRepo.setAmSatCatnums(fmCatnums, linearCatnums)
-            println("AMSAT live lists updated: FM=${fmCatnums.size}, Linear=${linearCatnums.size}, Active=${activeCatnums.size}")
-        }.onFailure {
-            // Keep the previous lists; the mutual filter stays on the last good snapshot.
-            println("AMSAT live lists update failed: $it")
-        }
-    }
-
-    /** Try the amateur-whitelist sources in order and return the first
-     *  NetworkResult that carried a stream (or null if all failed). */
-    private suspend fun fetchAmSatActiveStream(): NetworkResult? {
-        for (url in Sources.amSatActiveUrls) {
-            val result = remoteSource.getNetworkStream(url)
-            if (result.stream != null) return result
-        }
-        return null
-    }
-
     override suspend fun clearAllData() = withContext(dispatcher) {
         localSource.deleteEntries()
         localSource.deleteRadios()
-        settingsRepo.setAmSatCatnums(emptySet(), emptySet())
         setUpdateSuccessful(0L)
     }
 

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SelectionRepo.kt

@@ -25,7 +25,6 @@ import com.rtbishop.look4sat.core.domain.source.Sources
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
@@ -45,22 +44,19 @@ class SelectionRepo(
     // Resolve type IDs once when types change, then filter items reactively.
     // The HashSet gives O(1) catnum lookups instead of O(n) with a List.
     // The three virtual types ("AMSAT Live FM", "AMSAT Live Linear", "Live SSTV")
-    // are resolved from live transponder data instead of SharedPreferences.
-    // The AMSAT list version counter re-triggers resolution when a background
-    // data sync rewrites the FM/Linear lists, so the UI reflects the new list
-    // without a restart or type toggle.
-    private val itemsWithTypes = combine(currentTypes, settingsRepo.amSatListsVersion) { types, _ -> types }
-        .flatMapLatest { types: List<String> ->
-            val catnumSet: Set<Int>? = if (types.isEmpty()) {
-                null // null = no filtering
-            } else {
-                val ids = resolveTypeIds(types)
-                if (ids.isEmpty()) emptySet() else ids.toHashSet()
-            }
-            currentItems.map { items ->
-                if (catnumSet == null) items else items.filter { it.catnum in catnumSet }
-            }
+    // are resolved from hardcoded FM/Linear catnum sets (Sources) or live
+    // SSTV transponder data instead of SharedPreferences.
+    private val itemsWithTypes = currentTypes.flatMapLatest { types: List<String> ->
+        val catnumSet: Set<Int>? = if (types.isEmpty()) {
+            null // null = no filtering
+        } else {
+            val ids = resolveTypeIds(types)
+            if (ids.isEmpty()) emptySet() else ids.toHashSet()
         }
+        currentItems.map { items ->
+            if (catnumSet == null) items else items.filter { it.catnum in catnumSet }
+        }
+    }
 
     private val itemsWithQuery = currentQuery.flatMapLatest { query ->
         itemsWithTypes.map { items -> filterByQuery(items, query) }
@@ -70,15 +66,17 @@ class SelectionRepo(
 
     /**
      * Resolves a list of type names to satellite catnums. The three virtual
-     * transponder/activity types are resolved from live data; all other types
-     * come from the per-type ID lists persisted by [ISettingsRepo].
+     * transponder/activity types are resolved from hardcoded FM/Linear lists
+     * (Sources.amSatFmCatnums / amSatLinearCatnums) or local SSTV transponder
+     * data; all other types come from the per-type ID lists persisted by
+     * [ISettingsRepo].
      */
     private suspend fun resolveTypeIds(types: List<String>): List<Int> {
         val idsSet = mutableSetOf<Int>()
         types.forEach { type ->
             when (type) {
-                Sources.virtualTypeNames[0] -> idsSet.addAll(settingsRepo.getAmSatFmCatnums())
-                Sources.virtualTypeNames[1] -> idsSet.addAll(settingsRepo.getAmSatLinearCatnums())
+                Sources.virtualTypeNames[0] -> idsSet.addAll(Sources.amSatFmCatnums)
+                Sources.virtualTypeNames[1] -> idsSet.addAll(Sources.amSatLinearCatnums)
                 // Live SSTV: mode=SSTV transponder records whose service class
                 // is "Amateur", excluding launcher debris / rocket bodies
                 // (names ending in "R/B" or "DEB" — e.g. Ariane 6 R/B) that

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SettingsRepo.kt

@@ -107,9 +107,6 @@ class SettingsRepo(
     private val keySatelliteEnabled = "satelliteEnabled"
     private val keyTransceiversEnabled = "transceiversEnabled"
     private val keySatnogsTleSourceMigration = "satnogsTleSourceMigration"
-    private val keyAmSatFmCatnums = "amSatFmCatnums"
-    private val keyAmSatLinearCatnums = "amSatLinearCatnums"
-    private val keyAmSatActiveCatnums = "amSatActiveCatnums"
     private val separatorComma = ","
     private val separatorUrl = "\n"
     private val legacyCelestrakSatnogsUrl =
@@ -750,40 +747,6 @@ class SettingsRepo(
     }
     //endregion
 
-    //region # AMSAT live-transponder lists
-    private val _amSatListsVersion = MutableStateFlow(0)
-    override val amSatListsVersion: StateFlow<Int> = _amSatListsVersion
-
-    override fun getAmSatFmCatnums(): Set<Int> {
-        val raw = preferences.getString(keyAmSatFmCatnums, null) ?: return emptySet()
-        return raw.split(separatorComma).mapNotNull { it.toIntOrNull() }.toSet()
-    }
-
-    override fun getAmSatLinearCatnums(): Set<Int> {
-        val raw = preferences.getString(keyAmSatLinearCatnums, null) ?: return emptySet()
-        return raw.split(separatorComma).mapNotNull { it.toIntOrNull() }.toSet()
-    }
-
-    override fun setAmSatCatnums(fmCatnums: Set<Int>, linearCatnums: Set<Int>) {
-        preferences.edit {
-            putString(keyAmSatFmCatnums, fmCatnums.sorted().joinToString(separatorComma))
-            putString(keyAmSatLinearCatnums, linearCatnums.sorted().joinToString(separatorComma))
-        }
-        _amSatListsVersion.update { it + 1 }
-    }
-
-    override fun getAmSatActiveCatnums(): Set<Int> {
-        val raw = preferences.getString(keyAmSatActiveCatnums, null) ?: return emptySet()
-        return raw.split(separatorComma).mapNotNull { it.toIntOrNull() }.toSet()
-    }
-
-    override fun setAmSatActiveCatnums(catnums: Set<Int>) {
-        preferences.edit {
-            putString(keyAmSatActiveCatnums, catnums.sorted().joinToString(separatorComma))
-        }
-    }
-    //endregion
-
     //region # Radio control settings
     private val keyRadioControlEnabled = "radioControlEnabled"
     private val keyRadioModel = "radioModel"

core/data/src/test/java/com/rtbishop/look4sat/core/data/repository/DatabaseRepoTest.kt

@@ -166,168 +166,6 @@ class DatabaseRepoTest {
         1 98248U          26237.16675926  .00015724  00000-0  97477-3 0 00013
         2 98248 097.5373 310.9694 0011309 278.1232 340.7230 15.09766181000012
     """.trimIndent().byteInputStream()
-
-    @Test
-    fun `amsat fm list disambiguates ISS modules via persisted whitelist when active csv fetch fails`() =
-        runTest(dispatcher) {
-            val satnogsUrl = Sources.satelliteDataUrls.getValue("SatNOGS")
-            val localSource = FakeLocalSource()
-            val remoteSource = FakeRemoteSource().apply {
-                networkStreams[satnogsUrl] = { issModulesCsvStream() }
-                networkStreams[Sources.amSatLiveUrls.getValue("FM")] = { amsatFmPageStream() }
-                // Amateur-whitelist URLs intentionally NOT registered -> fetch fails.
-            }
-            val settingsRepo = FakeSettingsRepo(
-                dataSources = DataSourcesSettings(
-                    satelliteUrls = listOf(satnogsUrl),
-                    transceiversUrls = emptyList()
-                )
-            ).apply { amSatActive = setOf(25544) } // whitelist persisted by an earlier good sync
-            val repository = DatabaseRepo(dispatcher, dataParser, localSource, remoteSource, settingsRepo)
-
-            repository.updateFromRemote()
-
-            // Whitelist fetch fails on both sources, but the persisted whitelist
-            // still disambiguates: only primary ISS (ZARYA) survives,
-            // ISS (DESTINY) = 26700 must NOT enter the FM list.
-            assertTrue(25544 in settingsRepo.amSatFm)
-            assertTrue(26700 !in settingsRepo.amSatFm)
-        }
-
-    @Test
-    fun `amsat fm list keeps only smallest catnum when whitelist never available`() = runTest(dispatcher) {
-        val satnogsUrl = Sources.satelliteDataUrls.getValue("SatNOGS")
-        val localSource = FakeLocalSource()
-        val remoteSource = FakeRemoteSource().apply {
-            networkStreams[satnogsUrl] = { issModulesCsvStream() }
-            networkStreams[Sources.amSatLiveUrls.getValue("FM")] = { amsatFmPageStream() }
-        }
-        val settingsRepo = FakeSettingsRepo(
-            dataSources = DataSourcesSettings(
-                satelliteUrls = listOf(satnogsUrl),
-                transceiversUrls = emptyList()
-            )
-        ) // no persisted whitelist at all
-        val repository = DatabaseRepo(dispatcher, dataParser, localSource, remoteSource, settingsRepo)
-
-        repository.updateFromRemote()
-
-        // Without any whitelist, the multi-match collapse keeps the primary
-        // entry (smallest catnum = ISS ZARYA 25544), never every module alias.
-        assertEquals(setOf(25544), settingsRepo.amSatFm)
-    }
-
-    @Test
-    fun `amsat fm list cleans stale ISS module aliases when fm page fetch fails`() = runTest(dispatcher) {
-        val satnogsUrl = Sources.satelliteDataUrls.getValue("SatNOGS")
-        val localSource = FakeLocalSource()
-        val remoteSource = FakeRemoteSource().apply {
-            networkStreams[satnogsUrl] = { issModulesCsvStream() }
-            // FM page NOT registered -> 404 -> empty parse.
-        }
-        val settingsRepo = FakeSettingsRepo(
-            dataSources = DataSourcesSettings(
-                satelliteUrls = listOf(satnogsUrl),
-                transceiversUrls = emptyList()
-            )
-        ).apply {
-            // Pre-whitelist era stale list: ALL five ISS module entries.
-            amSatFm = setOf(25544, 25575, 26400, 26700, 49044)
-        }
-        val repository = DatabaseRepo(dispatcher, dataParser, localSource, remoteSource, settingsRepo)
-
-        repository.updateFromRemote()
-
-        // The stale list is not kept verbatim: with the FM page down, the
-        // previous catnums are re-disambiguated via local names, collapsing
-        // the five ISS modules to the primary ZARYA (25544).
-        assertEquals(setOf(25544), settingsRepo.amSatFm)
-    }
-
-    @Test
-    fun `amsat fm list survives unknown satellite names and still disambiguates ISS`() = runTest(dispatcher) {
-        // Regression: AMSAT pages list satellites absent from the local TLE
-        // (TEVEL2-1..9, RS95S). resolvePerName used to crash on the empty
-        // match set (all.first()), aborting the WHOLE list update and keeping
-        // the stale pre-whitelist FM list with all five ISS modules.
-        val satnogsUrl = Sources.satelliteDataUrls.getValue("SatNOGS")
-        val localSource = FakeLocalSource()
-        val remoteSource = FakeRemoteSource().apply {
-            networkStreams[satnogsUrl] = { issModulesCsvStream() }
-            networkStreams[Sources.amSatLiveUrls.getValue("FM")] = { amsatFmPageWithUnknownStream() }
-        }
-        val settingsRepo = FakeSettingsRepo(
-            dataSources = DataSourcesSettings(
-                satelliteUrls = listOf(satnogsUrl),
-                transceiversUrls = emptyList()
-            )
-        ).apply { amSatActive = setOf(25544) }
-        val repository = DatabaseRepo(dispatcher, dataParser, localSource, remoteSource, settingsRepo)
-
-        repository.updateFromRemote()
-
-        // No crash; ISS still collapses to the primary ZARYA (25544).
-        assertEquals(setOf(25544), settingsRepo.amSatFm)
-    }
-
-    @Test
-    fun `amsat fm list falls back to local FM transceivers when page fails and no previous list`() =
-        runTest(dispatcher) {
-            // After clearing data, the previous FM list is empty AND the AMSAT
-            // page is down (timeout) -> the filter must fall back to local FM
-            // transceivers intersected with the whitelist, never stay empty.
-            val satnogsUrl = Sources.satelliteDataUrls.getValue("SatNOGS")
-            val localSource = FakeLocalSource().apply {
-                idsWithModes = listOf(25544, 26700, 39444) // local FM-transceiver sats
-            }
-            val remoteSource = FakeRemoteSource().apply {
-                networkStreams[satnogsUrl] = { issModulesCsvStream() }
-                // FM/Linear pages NOT registered -> 404 -> fetch fails.
-            }
-            val settingsRepo = FakeSettingsRepo(
-                dataSources = DataSourcesSettings(
-                    satelliteUrls = listOf(satnogsUrl),
-                    transceiversUrls = emptyList()
-                )
-            ).apply { amSatActive = setOf(25544) } // whitelist has only ZARYA
-            val repository = DatabaseRepo(dispatcher, dataParser, localSource, remoteSource, settingsRepo)
-
-            repository.updateFromRemote()
-
-            // Fallback = local FM ids ∩ whitelist = {25544}; ISS module aliases
-            // (26700) are excluded by the whitelist.
-            assertEquals(setOf(25544), settingsRepo.amSatFm)
-        }
-
-    private fun amsatFmPageWithUnknownStream(): InputStream = """
-        <table>
-        <thead><tr><th>Satellite</th><th>Uplink</th><th>Downlink</th><th>Comment</th></tr></thead>
-        <tbody>
-        <tr><td>ISS</td><td>145.990 MHz</td><td>437.800 MHz</td><td></td></tr>
-        <tr><td>TEVEL2-1 thru TEVEL2-9</td><td>145.970 MHz</td><td>436.400 MHz</td><td></td></tr>
-        <tr><td>RS95S(QMR-KWT-2)</td><td>145.920 MHz</td><td>436.950 MHz</td><td></td></tr>
-        </tbody>
-        </table>
-    """.trimIndent().byteInputStream()
-
-    private fun issModulesCsvStream(): InputStream = """
-        OBJECT_NAME,OBJECT_ID,EPOCH,MEAN_MOTION,ECCENTRICITY,INCLINATION,RA_OF_ASC_NODE,ARG_OF_PERICENTER,MEAN_ANOMALY,EPHEMERIS_TYPE,CLASSIFICATION_TYPE,NORAD_CAT_ID,ELEMENT_SET_NO,REV_AT_EPOCH,BSTAR,MEAN_MOTION_DOT,MEAN_MOTION_DDOT
-        ISS (ZARYA),1998-067A,2021-11-16T12:28:09.322176,15.48582035,.0004694,51.6447,309.4881,203.6966,299.8876,0,U,25544,999,31220,.31985E-4,.1288E-4,0
-        ISS (UNITY),1998-067B,2021-11-16T12:28:09.322176,15.48582035,.0004694,51.6447,309.4881,203.6966,299.8876,0,U,25575,999,31220,.31985E-4,.1288E-4,0
-        ISS (ZVEZDA),1998-067C,2021-11-16T12:28:09.322176,15.48582035,.0004694,51.6447,309.4881,203.6966,299.8876,0,U,26400,999,31220,.31985E-4,.1288E-4,0
-        ISS (DESTINY),1998-067D,2021-11-16T12:28:09.322176,15.48582035,.0004694,51.6447,309.4881,203.6966,299.8876,0,U,26700,999,31220,.31985E-4,.1288E-4,0
-        ISS (NAUKA),1998-067E,2021-11-16T12:28:09.322176,15.48582035,.0004694,51.6447,309.4881,203.6966,299.8876,0,U,49044,999,31220,.31985E-4,.1288E-4,0
-    """.trimIndent().byteInputStream()
-
-    private fun amsatFmPageStream(): InputStream = """
-        <table class="has-background">
-        <thead><tr><th>Satellite</th><th>Uplink</th><th>Downlink</th><th>Comment</th></tr></thead>
-        <tbody>
-        <tr><td>ISS</td><td>145.990 MHz</td><td>437.800 MHz</td><td></td></tr>
-        <tr><td>AO-91(RadFxSat / Fox-1B)</td><td>435.250 MHz</td><td>145.960 MHz</td><td></td></tr>
-        </tbody>
-        </table>
-    """.trimIndent().byteInputStream()
 }
 
 private class FakeRemoteSource : IRemoteSource {
@@ -349,7 +187,6 @@ private class FakeRemoteSource : IRemoteSource {
 private class FakeLocalSource : ILocalSource {
     val insertedEntries = mutableListOf<OrbitalData>()
     private val insertedRadios = mutableListOf<SatRadio>()
-    var idsWithModes: List<Int> = emptyList()
 
     override suspend fun getEntriesTotal(): Int = insertedEntries.size
 
@@ -366,8 +203,8 @@ private class FakeLocalSource : ILocalSource {
         insertedEntries.clear()
     }
 
-    override suspend fun getIdsWithModes(modes: List<String>): List<Int> = idsWithModes
-    override suspend fun getIdsWithModesAndUplink(modes: List<String>): List<Int> = idsWithModes
+    override suspend fun getIdsWithModes(modes: List<String>): List<Int> = emptyList()
+    override suspend fun getIdsWithModesAndUplink(modes: List<String>): List<Int> = emptyList()
     override suspend fun getIdsWithModesAndAmateur(modes: List<String>): List<Int> = emptyList()
 
     override suspend fun getRadiosTotal(): Int = insertedRadios.size
@@ -458,22 +295,6 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
         (dataSourcesStatus as? MutableStateFlow)?.value = status
     }
 
-    var amSatFm: Set<Int> = emptySet()
-    var amSatLinear: Set<Int> = emptySet()
-    var amSatActive: Set<Int> = emptySet()
-    override val amSatListsVersion: StateFlow<Int> = MutableStateFlow(0)
-
-    override fun getAmSatFmCatnums(): Set<Int> = amSatFm
-    override fun getAmSatLinearCatnums(): Set<Int> = amSatLinear
-    override fun setAmSatCatnums(fmCatnums: Set<Int>, linearCatnums: Set<Int>) {
-        amSatFm = fmCatnums
-        amSatLinear = linearCatnums
-    }
-    override fun getAmSatActiveCatnums(): Set<Int> = amSatActive
-    override fun setAmSatActiveCatnums(catnums: Set<Int>) {
-        amSatActive = catnums
-    }
-
     override fun updateRadioControlSettings(settings: RadioControlSettings) = Unit
 
     override fun getSatelliteOffset(catnum: Int): String = ""

core/data/src/test/java/com/rtbishop/look4sat/core/data/repository/SelectionRepoSearchTest.kt

@@ -113,14 +113,23 @@ class SelectionRepoSearchTest {
     }
 
     @Test
-    fun `FM virtual type shows only AMSAT FM list satellites`() = runTest {
-        val repo = createRepo(
-            items = sampleItems,
-            amSatFm = setOf(25544, 39444)
-        )
+    fun `FM virtual type shows only hardcoded FM satellites`() = runTest {
+        val repo = createRepo(sampleItems)
         repo.setTypes(listOf("AMSAT Live FM"))
         val results = repo.getEntriesFlow().first()
-        assertEquals(listOf(25544, 39444), results.map { it.catnum })
+        // Hardcoded FM list: SO-50 (27607), ISS ZARYA (25544), AO-123 (43137).
+        // Only ISS ZARYA is present in the sample DB.
+        assertEquals(listOf(25544), results.map { it.catnum })
+    }
+
+    @Test
+    fun `Linear virtual type shows only hardcoded linear satellites`() = runTest {
+        val repo = createRepo(sampleItems)
+        repo.setTypes(listOf("AMSAT Live Linear"))
+        val results = repo.getEntriesFlow().first()
+        // Hardcoded linear list: RS-44 (44909), FO-29 (24278), AO-7 (7530),
+        // AO-73 (39444), JO-97 (43803). Present in the sample DB: 7530, 39444, 43803.
+        assertEquals(setOf(7530, 39444, 43803), results.map { it.catnum }.toSet())
     }
 
     @Test
@@ -140,8 +149,7 @@ class SelectionRepoSearchTest {
         // only catnums the DAO would have filtered to Amateur service (43803).
         val repo = createRepo(
             items = sampleItems,
-            sstvIds = listOf(43803),
-            amSatActive = setOf(43803)
+            sstvIds = listOf(43803)
         )
         repo.setTypes(listOf("Live SSTV"))
         val results = repo.getEntriesFlow().first()
@@ -155,8 +163,7 @@ class SelectionRepoSearchTest {
         val items = sampleItems + SatItem(catnum = 60239, name = "ARIANE 6 R/B")
         val repo = createRepo(
             items = items,
-            sstvIds = listOf(43803, 60239),
-            amSatActive = setOf(43803, 60239)
+            sstvIds = listOf(43803, 60239)
         )
         repo.setTypes(listOf("Live SSTV"))
         val results = repo.getEntriesFlow().first()
@@ -167,8 +174,6 @@ class SelectionRepoSearchTest {
     fun `multiple virtual types union their satellites`() = runTest {
         val repo = createRepo(
             items = sampleItems,
-            amSatFm = setOf(25544),
-            amSatLinear = setOf(7530),
             sstvIds = listOf(43803)
         )
         repo.setTypes(listOf("AMSAT Live FM", "Live SSTV"))
@@ -178,7 +183,7 @@ class SelectionRepoSearchTest {
 
     @Test
     fun `clearing types restores full list`() = runTest {
-        val repo = createRepo(items = sampleItems, amSatFm = setOf(25544))
+        val repo = createRepo(sampleItems)
         repo.setTypes(listOf("AMSAT Live FM"))
         assertTrue(repo.getEntriesFlow().first().isNotEmpty())
         repo.setTypes(emptyList())
@@ -186,23 +191,24 @@ class SelectionRepoSearchTest {
     }
 
     @Test
-    fun `virtual type with empty AMSAT list shows empty not everything`() = runTest {
-        // 根因2回归: AMSAT 清单未同步(空)时, 选虚拟类型应显示空列表, 而非全部卫星.
-        val repo = createRepo(items = sampleItems, amSatFm = emptySet())
+    fun `virtual type with no matching satellites shows empty not everything`() = runTest {
+        // 硬编码 FM 列表 (27607/25544/43137) 里没有样本库中的卫星时, 选虚拟
+        // 类型应显示空列表, 而非全部卫星.
+        val items = listOf(SatItem(catnum = 7530, name = "AO-7 (AMSAT-OSCAR 7)"))
+        val repo = createRepo(items)
         repo.setTypes(listOf("AMSAT Live FM"))
         assertTrue(repo.getEntriesFlow().first().isEmpty())
     }
 
     @Test
     fun `virtual type combined with regular type unions both lists`() = runTest {
-        val repo = createRepo(
-            items = sampleItems,
-            amSatFm = setOf(25544),
-            amSatLinear = setOf(7530)
-        )
+        val repo = createRepo(items = sampleItems)
         repo.setTypes(listOf("AMSAT Live FM", "AMSAT Live Linear"))
         val results = repo.getEntriesFlow().first()
-        assertEquals(setOf(25544, 7530), results.map { it.catnum }.toSet())
+        assertEquals(
+            setOf(25544, 7530, 39444, 43803),
+            results.map { it.catnum }.toSet()
+        )
     }
 
     @Test
@@ -256,40 +262,14 @@ class SelectionRepoSearchTest {
         assertEquals(sampleItems.map { it.catnum }.toSet(), results.map { it.catnum }.toSet())
     }
 
-    @Test
-    fun `amsat list version bump re-resolves FM filter after data sync`() = runTest {
-        // ISS module aliases: dirty pre-sync FM list contains both ZARYA and DESTINY.
-        val items = listOf(
-            SatItem(25544, "ISS (ZARYA)"),
-            SatItem(26700, "ISS (DESTINY)")
-        )
-        val fake = FakeSettingsRepoForSearch(amSatFm = setOf(25544, 26700))
-        val repo = SelectionRepo(
-            dispatcher = Dispatchers.Unconfined,
-            localSource = FakeLocalSourceForSearch(items),
-            settingsRepo = fake
-        )
-        repo.setTypes(listOf("AMSAT Live FM"))
-        assertEquals(setOf(25544, 26700), repo.getEntriesFlow().first().map { it.catnum }.toSet())
-
-        // Simulate a background data sync: lists rewritten + version bumped.
-        fake.setAmSatCatnums(fmCatnums = setOf(25544), linearCatnums = emptySet())
-
-        // The FM filter must reflect the new list WITHOUT a type toggle or restart.
-        assertEquals(listOf(25544), repo.getEntriesFlow().first().map { it.catnum })
-    }
-
     private fun createRepo(
         items: List<SatItem>,
-        amSatFm: Set<Int> = emptySet(),
-        amSatLinear: Set<Int> = emptySet(),
-        sstvIds: List<Int> = emptyList(),
-        amSatActive: Set<Int> = emptySet()
+        sstvIds: List<Int> = emptyList()
     ): ISelectionRepo {
         return SelectionRepo(
             dispatcher = Dispatchers.Unconfined,
             localSource = FakeLocalSourceForSearch(items, sstvIds),
-            settingsRepo = FakeSettingsRepoForSearch(amSatFm, amSatLinear, amSatActive)
+            settingsRepo = FakeSettingsRepoForSearch()
         )
     }
 }
@@ -313,11 +293,7 @@ private class FakeLocalSourceForSearch(
     override suspend fun deleteRadios() = Unit
 }
 
-private class FakeSettingsRepoForSearch(
-    var amSatFm: Set<Int> = emptySet(),
-    var amSatLinear: Set<Int> = emptySet(),
-    private var amSatActive: Set<Int> = emptySet()
-) : ISettingsRepo {
+private class FakeSettingsRepoForSearch : ISettingsRepo {
     private val typeIds = mutableMapOf<String, List<Int>>()
     override val appVersionName: String = "test"
     override val selectedIds: StateFlow<List<Int>> = MutableStateFlow(emptyList())
@@ -364,16 +340,6 @@ private class FakeSettingsRepoForSearch(
     override fun updateOtherSettings(transform: (OtherSettings) -> OtherSettings) = Unit
     override fun updateDataSourcesSettings(settings: DataSourcesSettings) = Unit
     override fun updateDataSourcesStatus(status: Map<String, Int>) = Unit
-    override fun getAmSatFmCatnums(): Set<Int> = amSatFm
-    override fun getAmSatLinearCatnums(): Set<Int> = amSatLinear
-    override val amSatListsVersion: StateFlow<Int> = MutableStateFlow(0)
-    override fun setAmSatCatnums(fmCatnums: Set<Int>, linearCatnums: Set<Int>) {
-        amSatFm = fmCatnums
-        amSatLinear = linearCatnums
-        (amSatListsVersion as MutableStateFlow<Int>).value++
-    }
-    override fun getAmSatActiveCatnums(): Set<Int> = amSatActive
-    override fun setAmSatActiveCatnums(catnums: Set<Int>) { amSatActive = catnums }
     override fun updateRadioControlSettings(settings: RadioControlSettings) = Unit
     override fun getSatelliteOffset(catnum: Int): String = ""
     override fun setSatelliteOffset(catnum: Int, offset: String) = Unit