v0.3.0 — floating threat-circle overlay (chat-bubble style)

A 140dp draggable bubble shows the same map / tier scrim / user dot /
ALPR dots that the in-app circle does, on top of any other app, while
scanning is on. Tap = brings the host app forward; drag = repositions.

- Manifest: add SYSTEM_ALERT_WINDOW (special-access — granted via
  system Settings page, not the runtime prompt).
- Settings: add overlayEnabled flag (default off) + a "Display over
  other apps" section in SettingsScreen. Flipping the toggle to on
  fires Settings.ACTION_MANAGE_OVERLAY_PERMISSION so the user can
  grant via the system page; if they deny or revoke, the OverlayMgr
  re-checks canDrawOverlays() at every show() call and silently
  no-ops, no crash.
- New OverlayManager: owns the WindowManager view at
  TYPE_APPLICATION_OVERLAY with FLAG_NOT_FOCUSABLE | FLAG_NOT_TOUCH_MODAL
  so touches outside the bubble pass through and the bubble never
  steals IME focus. Custom OverlayOwner implementing LifecycleOwner +
  SavedStateRegistryOwner since LifecycleService doesn't satisfy SSR
  (Compose's ComposeView requires both via the view tree).
- Drag/tap handler at the View layer: rawX/rawY math for the drag,
  TAP_SLOP_PX guard to discriminate tap from drag, tap launches
  MainActivity (FLAG_ACTIVITY_NEW_TASK | SINGLE_TOP).
- New OverlayBubble composable: smaller (140dp) self-contained version
  of the in-app threat circle that pulls running/threat/location/
  mapPoints/proximity from the same companion StateFlows. Shared
  dot-drawable helper extracted into ui/MarkerIcons.kt.
- DetectionService observes settings.overlayEnabled in beginScanning
  and toggles the overlay; endScanning hides it.

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

README.md

@@ -4,27 +4,31 @@
 A native Android (Kotlin) **passive surveillance-detection** app. Open it, hit
 **START**, and a circle turns **green / yellow / orange / red** depending on
 how confident the engine is that there's a Flock Safety ALPR, an Axon body
-camera, or police presence near you.
+camera, or active police presence near you. With the screen locked, the
+foreground notification updates with the current tier and the phone vibrates
+on upward escalations — you don't have to be looking at the screen.
 
 > **Passive defense only.** OVERWATCH only listens — it does not transmit,
 > probe, jam, or interfere with any device or network. The Axon
 > advertise/fuzz code from one of the reference projects is intentionally
 > excluded.
 
+Latest release: [v0.1.7](https://github.com/KaraZajac/OVERWATCH/releases) (debug-signed APK, sideload).
+
 ---
 
 ## What it detects
 
 | Source | What it looks at | Where it comes from |
 |---|---|---|
-| **BLE** | Bluetooth-LE advertisements: vendor MAC OUIs (Axon, Flock Penguin / Raven, XUNTONG mfg id `0x09C8`, "TN" serial pattern), Raven service UUIDs, device-name patterns | Local radio scan (BLE callback API) |
+| **BLE** | Bluetooth-LE advertisements: vendor MAC OUIs (Axon, Flock Penguin / Raven, XUNTONG mfg id `0x09C8`, "TN" serial pattern), Raven service UUIDs, device-name patterns | Local radio scan (BLE callback API). Iterates every manufacturer-specific data entry to find XUNTONG, not just the first. |
 | **WiFi** | BSSID OUI prefixes for Flock infrastructure (31-prefix superset), `Flock-XXXX` and other generic SSID patterns | `WifiManager.getScanResults()` polled every 35 s (just under the Android 11+ 4-scans/2-min throttle) |
-| **DEFLOCK** | Crowdsourced ALPR locations within configurable proximity (default 200 m) | POST to Overpass API (`overpass.deflock.org` → fallback `overpass-api.de`) for `man_made=surveillance + surveillance:type=ALPR` in a 5 km bbox; 24 h on-disk cache by 0.05° grid cell. Refetches when the user moves > 1.5 km from the last fetch center. |
+| **DEFLOCK** | Crowdsourced ALPR locations within configurable proximity (default 200 m) | POST to Overpass API (`overpass.deflock.org` → fallback `overpass-api.de`) for `man_made=surveillance + surveillance:type=ALPR` in a 5 km bbox; 24 h on-disk cache by 0.05° grid cell. Refetches when the user moves > 1.5 km from the last fetch center. Backoffs after Overpass failures; treats `{"remark": "...timed out..."}` 200-responses as failure so timeouts don't poison the cache. |
-| **CITIZEN** | Real-time public-safety incidents (police-relevant only — fire/medical-only events filtered out) within configurable proximity, < 30 min old | `citizen.com/api/incident/trending` (bbox) polled every 60 s, then per-incident detail via `/api/incident/{id}` with an in-memory cache so each incident is fetched once per session. |
+| **CITIZEN** | Real-time public-safety incidents (police-relevant only — fire/medical-only events filtered out) within configurable proximity, < 30 min old | `citizen.com/api/incident/trending` (bbox) polled every 60 s, then per-incident detail via `/api/incident/{id}` with an in-memory cache so each incident is fetched once per session. First poll fires immediately on the first location fix. |
 
-> **Why no Waze?** Waze added reCAPTCHA gating to its `live-map/api/georss` endpoint in 2025/2026. Mobile clients receive HTTP 403, and the only known workarounds (Selenium proxy on a home server, Waze for Cities partner program) aren't viable for a phone-deployed app. Citizen replaces it.
+> **Why no Waze?** Waze added reCAPTCHA gating to its `live-map/api/georss` endpoint in 2025/2026. Mobile clients receive HTTP 403, and the only known workarounds (Selenium proxy on a home server, Waze for Cities partner program) aren't viable for a phone-deployed app. Citizen replaces it as the police-presence source.
 
-Every observation is scored 0-100 by `ConfidenceEngine`. The on-screen tier is
+Every observation is scored 0–100 by `ConfidenceEngine`. The on-screen tier is
 the maximum live score across all sources:
 
 ```
@@ -36,32 +40,55 @@ RED        85 +    certain
 
 The user-facing circle uses the full 4-tier mapping. Cross-source corroboration
 naturally pushes the global max upward (a BLE OUI hit *and* a DeFlock map
-match in the same area produce a higher tier than either alone).
+match in the same area produce a higher tier than either alone). When idle,
+the circle shows muted gray with `IDLE` text so it's distinguishable at a
+glance from "scanning, all clear."
+
+---
+
+## How alerts work
+
+- **In-app**: the threat circle pulses while scanning; tap it to open the
+  bottom-sheet drill-down with per-source rows. DEFLOCK and CITIZEN events
+  carry coordinates — each row has a tap-to-open Maps icon (`geo:` intent).
+- **Foreground notification**: rebuilt on every threat-tier change. Title
+  becomes `OVERWATCH • RED` (or whatever tier); text shows the top
+  detection's score + label. Notification priority bumps to HIGH on RED so
+  the system can surface it as a heads-up.
+- **Vibration**: on upward tier transitions only. Short pulse for YELLOW,
+  double for ORANGE, escalating triple for RED. Toggle in Settings → Alerts.
+- **Per-source health**: the drill-down sheet shows orange `Source unreachable`
+  text on a row when its scanner couldn't reach its data source — silent
+  empty results vs. real failures are distinguishable.
 
 ---
 
 ## Architecture
 
 ```
-ui/MainScreen.kt              circle + START/STOP + tap-to-open bottom sheet
+ui/MainScreen.kt                   circle + START/STOP + tap-to-open bottom sheet
-ui/SettingsScreen.kt          per-source toggles, distance sliders, theme
+ui/SettingsScreen.kt               source toggles, distance sliders, vibrate, theme
-service/DetectionService.kt   foreground service — owns scanners + store
+ui/theme/Theme.kt                  Material 3 dark/light + threat colors
-scan/BleScanner.kt            BLE callback scanner
+service/DetectionService.kt        foreground service — owns scanners, notification, vibration
-scan/WifiScanner.kt           WifiManager poller + SCAN_RESULTS receiver
+scan/BleScanner.kt                 BLE callback scanner
-scan/DeflockClient.kt         CDN tile fetch + 24h cache
+scan/WifiScanner.kt                WifiManager poller + SCAN_RESULTS receiver
-scan/DeflockScanner.kt        location-driven proximity check
+scan/DeflockClient.kt              Overpass POST (deflock.org → overpass-api.de) + 24h cache
-scan/WazeClient.kt            live-map/api/georss bbox fetch
+scan/DeflockScanner.kt             location-driven proximity check + failure backoff
-scan/WazeScanner.kt           60s poller + age/distance gate
+scan/CitizenClient.kt              GET /api/incident/trending + /api/incident/{id}
-fusion/ConfidenceEngine.kt    scoring (one place)
+scan/CitizenScanner.kt             60 s poller, fire/medical filter, per-id cache
-fusion/RssiTracker.kt         rise-peak-fall stationary-signal detector
+fusion/ConfidenceEngine.kt         scoring (one place — BLE / WiFi / DeFlock / Citizen)
-fusion/DetectionStore.kt      in-memory dedup, 5-min retention
+fusion/RssiTracker.kt              rise-peak-fall stationary-signal detector
+fusion/DetectionStore.kt           in-memory dedup, 5-min retention, max-tier flow
+fusion/SourceHealth.kt             per-source OK/FAILED registry for the drill-down
+fusion/ThreatLevel.kt              4-tier enum + DetectionSource enum
 data/location/LocationProvider.kt  FusedLocationProviderClient wrapper
-data/settings/Settings.kt     SharedPreferences-backed StateFlow settings
+data/settings/Settings.kt          SharedPreferences-backed StateFlow settings
-data/targets/                 BleOuis, WifiOuis, RavenUuids, Patterns, Manufacturers
+data/targets/                      BleOuis, WifiOuis, RavenUuids, Patterns, Manufacturers
 ```
 
 No detection-history database. All state is in-memory and clears on stop, by
-design.
+design. Service uses `START_NOT_STICKY` — system kill doesn't auto-restart
+into a stuck state.
 
 ---
 
@@ -83,7 +110,7 @@ export JAVA_HOME=/usr/local/opt/openjdk@21/libexec/openjdk.jdk/Contents/Home
 ./gradlew :app:installDebug
 ```
 
-Or download the latest signed APK from
+Or download the latest debug-signed APK from
 [Releases](https://github.com/KaraZajac/OVERWATCH/releases).
 
 ---
@@ -94,14 +121,18 @@ Or download the latest signed APK from
 |---|---|
 | `BLUETOOTH_SCAN`, `BLUETOOTH_CONNECT` (API 31+) | BLE scanning |
 | `BLUETOOTH`, `BLUETOOTH_ADMIN` (≤ API 30) | BLE scanning, legacy |
-| `ACCESS_FINE_LOCATION` | Required for BLE pre-S, WiFi pre-T, and DeFlock proximity |
+| `ACCESS_FINE_LOCATION` | Required for BLE pre-S, WiFi pre-T, and DeFlock/Citizen proximity |
 | `NEARBY_WIFI_DEVICES` (API 33+) | WiFi scan results without using location |
 | `ACCESS_WIFI_STATE`, `CHANGE_WIFI_STATE` | Trigger and read scan results |
-| `INTERNET`, `ACCESS_NETWORK_STATE` | DeFlock CDN + Waze API |
+| `INTERNET`, `ACCESS_NETWORK_STATE` | DeFlock Overpass + Citizen API |
 | `FOREGROUND_SERVICE`, `FOREGROUND_SERVICE_CONNECTED_DEVICE`, `FOREGROUND_SERVICE_LOCATION` | Keep scanning with the screen off |
 | `POST_NOTIFICATIONS` (API 33+) | Foreground-service notification |
+| `VIBRATE` | Haptic alert on threat-tier escalation |
 
-Requested at runtime when you press START for the first time.
+Requested at runtime when you press START for the first time. If you
+permanently deny a required permission ("don't ask again"), the START button
+swaps to **Open app settings** which fires the per-app system-settings page
+so you can grant manually.
 
 ---
 
@@ -109,11 +140,14 @@ Requested at runtime when you press START for the first time.
 
 Tap the gear icon in the top-right.
 
-- **Detection sources**: toggle BLE / WiFi / DeFlock / Waze independently. Takes
+- **Detection sources**: toggle BLE / WiFi / DeFlock / Citizen independently.
-  effect on next Start.
+  Changes take effect on the next Start. While scanning, a **Restart scan to
-- **Proximity thresholds**:
+  apply** button appears that does `stop()` + `start()` in one tap.
+- **Proximity thresholds** (sliders commit on release, not per-pixel):
   - DeFlock: 50 m – 1600 m (default 200 m)
-  - Waze: 100 m – 5000 m (default 500 m)
+  - Citizen: 100 m – 5000 m (default 500 m)
+- **Alerts**:
+  - Vibrate on threat escalation (default on)
 - **Appearance**: System / Dark / Light (default Dark)
 
 ---
@@ -125,15 +159,23 @@ These live under `REFERENCES/` (gitignored):
 - **AxonCadabra** — BLE scanner skeleton (scan side only; advertise/fuzz code excluded)
 - **flock-detection** — confidence-scoring algorithm (highest reusability), RSSI rise-peak-fall, OUIs + UUIDs + patterns
 - **flock-you** — 31-OUI WiFi superset (promiscuous-mode tricks not portable to Android)
-- **deflock** + **deflock-app** — CDN tile scheme, proximity-alert pattern
+- **deflock** + **deflock-app** — Overpass query format + proximity-alert pattern (the Flutter app uses Overpass directly, not the CDN tiles, which the OVERWATCH client mirrors)
-- **wazepolice** — live-map/api/georss recipe, Chrome header spoofing
+- **wazepolice** — live-map/api/georss recipe; informed v0.1.0–v0.1.5 Waze integration that has since been removed (endpoint is reCAPTCHA-gated)
 
 ---
 
 ## Status
 
-Phases 1–5 (skeleton, BLE, WiFi, DeFlock, Waze, polish) complete as of v0.1.0.
+Phases 1–5 (skeleton, BLE, WiFi, DeFlock, Citizen, polish) complete and
-Field-test-ready, not yet field-validated.
+field-tested. Current release **v0.1.7** addresses two full audit passes
+(see release notes for v0.1.2, v0.1.3, v0.1.6). Notable changes since v0.1.0:
+
+- v0.1.2 — Android 14+ foreground service type fix (location was being silently revoked); NaN-coordinate filter on map data.
+- v0.1.3 — DeFlock CDN replaced by direct Overpass calls (Cloudflare-blocked).
+- v0.1.4 — Citizen.com added as 5th source, per-source health registry.
+- v0.1.5 — Waze removed (reCAPTCHA-gated; no clean mobile workaround).
+- v0.1.6 — Dynamic notification with tier + label, haptic alerts on escalation, Open-in-Maps for geo events, idle visual differentiated from "scanning, all clear", permanent-deny recovery via Open Settings.
+- v0.1.7 — System back from Settings returns to MAIN instead of exiting.
 
 ## License
 

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "org.soulstone.overwatch"
         minSdk = 26
         targetSdk = 35
-        versionCode = 8
+        versionCode = 12
-        versionName = "0.1.7"
+        versionName = "0.3.0"
     }
 
     buildTypes {
@@ -61,6 +61,7 @@ dependencies {
     implementation(libs.androidx.compose.material.icons.extended)
 
     implementation(libs.play.services.location)
+    implementation(libs.osmdroid.android)
 
     debugImplementation(libs.androidx.compose.ui.tooling)
 }

app/src/main/AndroidManifest.xml

@@ -38,8 +38,21 @@
     <!-- Vibration on threat-tier escalation -->
     <uses-permission android:name="android.permission.VIBRATE" />
 
+    <!-- Floating threat-circle overlay (chat-bubble style). Special-access
+         permission — user grants via system Settings page, not the runtime
+         prompt. Only consumed when the user opts in to the bubble in app
+         Settings; otherwise dormant. -->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
     <uses-feature android:name="android.hardware.bluetooth_le" android:required="true" />
 
+    <!-- Allow Intent.setPackage("com.google.android.apps.maps") on Android 11+
+         (package visibility) so we can force "Open in Maps" pins to land in
+         Google Maps regardless of the user's default geo: handler. -->
+    <queries>
+        <package android:name="com.google.android.apps.maps" />
+    </queries>
+
     <application
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"

app/src/main/kotlin/org/soulstone/overwatch/MainActivity.kt

@@ -19,6 +19,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import org.osmdroid.config.Configuration
 import org.soulstone.overwatch.data.settings.Settings
 import org.soulstone.overwatch.service.DetectionService
 import org.soulstone.overwatch.ui.MainScreen
@@ -66,6 +67,14 @@ class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        // osmdroid requires a User-Agent and a writable cache before any
+        // MapView is constructed, otherwise OSM may rate-limit/IP-ban us.
+        // Set it here once per process — Configuration is a singleton.
+        Configuration.getInstance().apply {
+            userAgentValue = packageName
+            osmdroidBasePath = cacheDir
+            osmdroidTileCache = java.io.File(cacheDir, "osmdroid-tiles").apply { mkdirs() }
+        }
         permissionsGranted.value = checkAllPermissions()
         permanentlyDenied.value = false  // reset on activity create
         val settings = Settings.get(this)
@@ -81,6 +90,16 @@ class MainActivity : ComponentActivity() {
                         val events by DetectionService.store.events.collectAsState()
                         val threat by DetectionService.store.threatLevel.collectAsState()
                         val maxScore by DetectionService.store.maxScore.collectAsState()
+                        val mapPoints by DetectionService.mapPoints.collectAsState()
+                        val userLocation by DetectionService.location.collectAsState()
+                        // Visible map radius = max of the two proximity sliders
+                        // so the user sees the full area where a detection
+                        // can fire. Using the raw setting values regardless of
+                        // enabled-state keeps the visualization stable when a
+                        // source is briefly toggled.
+                        val deflockProx by settings.deflockProximityM.collectAsState()
+                        val citizenProx by settings.citizenProximityM.collectAsState()
+                        val mapRadiusM = maxOf(deflockProx, citizenProx).toFloat()
                         val granted by permissionsGranted
                         val denied by permanentlyDenied
 
@@ -95,6 +114,9 @@ class MainActivity : ComponentActivity() {
                             threat = threat,
                             score = maxScore,
                             events = events,
+                            mapPoints = mapPoints,
+                            userLocation = userLocation,
+                            mapRadiusMeters = mapRadiusM,
                             canStart = true,
                             permissionMessage = message,
                             showOpenAppSettings = denied && !granted,

app/src/main/kotlin/org/soulstone/overwatch/data/settings/Settings.kt

@@ -32,6 +32,9 @@ class Settings private constructor(private val prefs: SharedPreferences) {
     private val _citizenEnabled = MutableStateFlow(prefs.getBoolean(KEY_CITIZEN, true))
     val citizenEnabled: StateFlow<Boolean> = _citizenEnabled.asStateFlow()
 
+    private val _micEnabled = MutableStateFlow(prefs.getBoolean(KEY_MIC, true))
+    val micEnabled: StateFlow<Boolean> = _micEnabled.asStateFlow()
+
     private val _deflockProximityM = MutableStateFlow(
         prefs.getInt(KEY_DEFLOCK_PROX, DEFAULT_DEFLOCK_PROX)
     )
@@ -50,10 +53,14 @@ class Settings private constructor(private val prefs: SharedPreferences) {
     private val _vibrateOnAlert = MutableStateFlow(prefs.getBoolean(KEY_VIBRATE, true))
     val vibrateOnAlert: StateFlow<Boolean> = _vibrateOnAlert.asStateFlow()
 
+    private val _overlayEnabled = MutableStateFlow(prefs.getBoolean(KEY_OVERLAY, false))
+    val overlayEnabled: StateFlow<Boolean> = _overlayEnabled.asStateFlow()
+
     fun setBleEnabled(v: Boolean) { prefs.edit { putBoolean(KEY_BLE, v) }; _bleEnabled.value = v }
     fun setWifiEnabled(v: Boolean) { prefs.edit { putBoolean(KEY_WIFI, v) }; _wifiEnabled.value = v }
     fun setDeflockEnabled(v: Boolean) { prefs.edit { putBoolean(KEY_DEFLOCK, v) }; _deflockEnabled.value = v }
     fun setCitizenEnabled(v: Boolean) { prefs.edit { putBoolean(KEY_CITIZEN, v) }; _citizenEnabled.value = v }
+    fun setMicEnabled(v: Boolean) { prefs.edit { putBoolean(KEY_MIC, v) }; _micEnabled.value = v }
 
     fun setDeflockProximityM(v: Int) {
         val clamped = v.coerceIn(50, 1600)
@@ -77,16 +84,23 @@ class Settings private constructor(private val prefs: SharedPreferences) {
         _vibrateOnAlert.value = v
     }
 
+    fun setOverlayEnabled(v: Boolean) {
+        prefs.edit { putBoolean(KEY_OVERLAY, v) }
+        _overlayEnabled.value = v
+    }
+
     companion object {
         private const val PREFS = "overwatch_settings"
         private const val KEY_BLE = "src_ble"
         private const val KEY_WIFI = "src_wifi"
         private const val KEY_DEFLOCK = "src_deflock"
         private const val KEY_CITIZEN = "src_citizen"
+        private const val KEY_MIC = "src_mic"
         private const val KEY_DEFLOCK_PROX = "deflock_proximity_m"
         private const val KEY_CITIZEN_PROX = "citizen_proximity_m"
         private const val KEY_THEME = "theme_mode"
         private const val KEY_VIBRATE = "vibrate_on_alert"
+        private const val KEY_OVERLAY = "overlay_enabled"
 
         const val DEFAULT_DEFLOCK_PROX = 200
         const val DEFAULT_CITIZEN_PROX = 500

app/src/main/kotlin/org/soulstone/overwatch/data/targets/MicTargets.kt

@@ -0,0 +1,153 @@
+package org.soulstone.overwatch.data.targets
+
+import java.util.UUID
+
+/**
+ * Curated targets for "device with a microphone in your space" detection.
+ *
+ * Scope is intentionally narrow — only well-known smart-home OEMs whose devices
+ * stay in fixed locations and continuously listen. Apple manufacturer id 0x004C
+ * is deliberately excluded because every iPhone, AirPod, and Apple Watch
+ * advertises it; a coffee shop full of phones must not light up the alarm.
+ *
+ * Detection vectors collected from public OUI registries (Wireshark/IEEE)
+ * and device-setup advertisement docs.
+ */
+object MicTargets {
+
+    enum class Family { ECHO, RING, GOOGLE, HIDDEN_CAM }
+
+    /** Bluetooth SIG company identifiers for "voice/smart-home" device families. */
+    private val MFG_GOOGLE = 0x00E0
+    private val MFG_AMAZON = 0x0171
+    /** Yingxin / cheap-spy-cam mfg id seen in field reports. */
+    private val MFG_YINGXIN = 0x05A7
+
+    /** Echo/Alexa Voice Service GATT (FE03 — assigned to Amazon Lab126). */
+    private val UUID_AVS = UUID.fromString("0000fe03-0000-1000-8000-00805f9b34fb")
+
+    /** Lab126 (Amazon — Echo, Ring, Fire TV) WiFi/BLE OUIs. */
+    private val OUIS_AMAZON: Set<String> = setOf(
+        "0c:47:c9", "38:f7:3d", "44:65:0d", "50:dc:e7", "78:e1:03",
+        "a8:51:5b", "b0:09:da", "f0:27:2d", "f0:81:73", "f0:d2:f1",
+        "fc:65:de", "fc:a1:83", "ac:63:be", "00:bb:3a"
+    )
+
+    /** Google (Nest, Home, Chromecast) WiFi/BLE OUIs. */
+    private val OUIS_GOOGLE: Set<String> = setOf(
+        "f8:8f:ca", "f4:f5:e8", "94:eb:cd", "64:16:66", "fc:9f:e9",
+        "1c:f2:9a", "08:9e:08", "20:df:b9", "30:fd:38", "48:d6:d5",
+        "54:60:09", "6c:ad:f8", "70:3a:cb", "94:c9:60", "f4:f1:9e"
+    )
+
+    /** Generic Chinese hidden-cam / smart-mic vendor OUIs (high-noise; opt-in). */
+    private val OUIS_HIDDEN_CAM: Set<String> = setOf(
+        "fc:b4:67",   // Yingxin / SmartLife mini cams
+        "00:e0:4c",   // Realtek (used in many cheap cams)
+        "dc:4f:22",   // Tuya-affiliated module vendors
+        "a4:c1:38",   // Telink (often inside cheap BLE mics)
+        "8c:ce:4e"    // Shenzhen iComm — frequent in spy-cam BOMs
+    )
+
+    private val ALL_OUIS: Set<String> = OUIS_AMAZON + OUIS_GOOGLE + OUIS_HIDDEN_CAM
+
+    /** Case-sensitive substrings — distinct enough to avoid false positives. */
+    private val BLE_NAME_HINTS: List<Pair<String, Family>> = listOf(
+        "Echo" to Family.ECHO,
+        "echo-" to Family.ECHO,
+        "FireTV" to Family.ECHO,
+        "Amazon" to Family.ECHO,
+        "Ring-" to Family.RING,
+        "Ring " to Family.RING,
+        "Doorbell" to Family.RING,
+        "Nest" to Family.GOOGLE,
+        "GoogleHome" to Family.GOOGLE,
+        "Chromecast" to Family.GOOGLE,
+        "Google-Home" to Family.GOOGLE
+    )
+
+    private val SSID_HINTS: List<Pair<String, Family>> = listOf(
+        "Amazon-" to Family.ECHO,
+        "Echo-" to Family.ECHO,
+        "Ring-" to Family.RING,
+        "Ring_" to Family.RING,
+        "Nest_" to Family.GOOGLE,
+        "GoogleHome" to Family.GOOGLE,
+        "Chromecast" to Family.GOOGLE
+    )
+
+    data class Match(val family: Family, val reason: String)
+
+    fun matchOui(mac: String?): Family? {
+        if (mac.isNullOrBlank() || mac.length < 8) return null
+        val prefix = mac.lowercase().substring(0, 8)
+        return when (prefix) {
+            in OUIS_AMAZON -> Family.ECHO    // Amazon OUIs cover both Echo and Ring
+            in OUIS_GOOGLE -> Family.GOOGLE
+            in OUIS_HIDDEN_CAM -> Family.HIDDEN_CAM
+            else -> null
+        }
+    }
+
+    fun isMicOui(mac: String?): Boolean = matchOui(mac) != null
+
+    fun matchBleName(name: String?): Match? {
+        if (name.isNullOrBlank()) return null
+        for ((needle, family) in BLE_NAME_HINTS) {
+            if (name.contains(needle, ignoreCase = false)) {
+                return Match(family, "name:$needle")
+            }
+        }
+        return null
+    }
+
+    fun matchSsid(ssid: String?): Match? {
+        if (ssid.isNullOrBlank()) return null
+        for ((needle, family) in SSID_HINTS) {
+            if (ssid.contains(needle, ignoreCase = true)) {
+                return Match(family, "ssid:$needle")
+            }
+        }
+        return null
+    }
+
+    fun matchManufacturer(companyId: Int?): Family? = when (companyId) {
+        MFG_AMAZON -> Family.ECHO
+        MFG_GOOGLE -> Family.GOOGLE
+        MFG_YINGXIN -> Family.HIDDEN_CAM
+        else -> null
+    }
+
+    fun matchAvsService(advertisedUuids: List<UUID>?): Boolean {
+        if (advertisedUuids.isNullOrEmpty()) return false
+        return advertisedUuids.contains(UUID_AVS)
+    }
+
+    /** Cheap pre-filter for the BLE scanner — true if any mic signal could match. */
+    fun couldBeMicBle(
+        mac: String?,
+        name: String?,
+        advertisedUuids: List<UUID>?,
+        companyId: Int?
+    ): Boolean {
+        if (isMicOui(mac)) return true
+        if (matchBleName(name) != null) return true
+        if (matchManufacturer(companyId) != null) return true
+        if (matchAvsService(advertisedUuids)) return true
+        return false
+    }
+
+    /** Cheap pre-filter for the WiFi scanner. */
+    fun couldBeMicWifi(bssid: String?, ssid: String?): Boolean {
+        if (isMicOui(bssid)) return true
+        if (matchSsid(ssid) != null) return true
+        return false
+    }
+
+    fun familyLabel(f: Family): String = when (f) {
+        Family.ECHO -> "Amazon Echo / Ring"
+        Family.RING -> "Ring"
+        Family.GOOGLE -> "Google Nest / Home"
+        Family.HIDDEN_CAM -> "Possible hidden mic / cam"
+    }
+}

app/src/main/kotlin/org/soulstone/overwatch/fusion/ConfidenceEngine.kt

@@ -38,6 +38,19 @@ object ConfidenceEngine {
     const val B_STRONG_RSSI = 10   // > -50 dBm
     const val B_STATIONARY = 15    // RSSI rise-peak-fall
 
+    // MIC channel — smart-home/voice-assistant detection. Capped so a Ring or
+    // Echo cluster can't push the global tier above ORANGE; RED stays reserved
+    // for ALPR/Axon-grade evidence.
+    const val MIC_SCORE_CAP = 84
+    const val W_MIC_OUI = 30
+    const val W_MIC_NAME = 45
+    const val W_MIC_MFG = 30
+    const val W_MIC_AVS_UUID = 50
+    const val W_MIC_SSID = 45
+    const val B_MIC_MULTI = 10
+    const val B_MIC_STATIONARY = 8
+    const val B_MIC_STRONG_RSSI = 5
+
     /** What we observed about one BLE device on a single scan callback. */
     data class BleObservation(
         val mac: String,
@@ -202,6 +215,107 @@ object ConfidenceEngine {
         return Scored(score, rangeTag, label, isAxon = false)
     }
 
+    /** A BLE mic-bearing-device observation, score-capped at ORANGE. */
+    data class MicBleObservation(
+        val mac: String,
+        val rssi: Int,
+        val deviceName: String?,
+        val advertisedUuids: List<java.util.UUID>?,
+        val manufacturerCompanyId: Int?,
+        val isStationary: Boolean
+    )
+
+    /** A WiFi mic-bearing-device observation, score-capped at ORANGE. */
+    data class MicWifiObservation(
+        val bssid: String,
+        val ssid: String?,
+        val rssi: Int,
+        val isStationary: Boolean
+    )
+
+    fun scoreMicBle(obs: MicBleObservation): Scored {
+        var score = 0
+        var methodCount = 0
+        val methods = StringBuilder()
+        val ouiFamily = org.soulstone.overwatch.data.targets.MicTargets.matchOui(obs.mac)
+        if (ouiFamily != null) {
+            score += W_MIC_OUI
+            methods.append("mic_oui ")
+            methodCount++
+        }
+        val nameMatch = org.soulstone.overwatch.data.targets.MicTargets.matchBleName(obs.deviceName)
+        if (nameMatch != null) {
+            score += W_MIC_NAME
+            methods.append("mic_name ")
+            methodCount++
+        }
+        val mfgFamily = org.soulstone.overwatch.data.targets.MicTargets.matchManufacturer(obs.manufacturerCompanyId)
+        if (mfgFamily != null) {
+            score += W_MIC_MFG
+            methods.append("mic_mfg ")
+            methodCount++
+        }
+        if (org.soulstone.overwatch.data.targets.MicTargets.matchAvsService(obs.advertisedUuids)) {
+            score += W_MIC_AVS_UUID
+            methods.append("mic_avs ")
+            methodCount++
+        }
+        if (methodCount >= 2) {
+            score += B_MIC_MULTI
+            methods.append("multi ")
+        }
+        if (obs.rssi > -50) {
+            score += B_MIC_STRONG_RSSI
+            methods.append("strong_rssi ")
+        }
+        if (obs.isStationary) {
+            score += B_MIC_STATIONARY
+            methods.append("stationary ")
+        }
+        score = score.coerceAtMost(MIC_SCORE_CAP)
+        val family = nameMatch?.family ?: ouiFamily ?: mfgFamily
+            ?: org.soulstone.overwatch.data.targets.MicTargets.Family.HIDDEN_CAM
+        val familyLabel = org.soulstone.overwatch.data.targets.MicTargets.familyLabel(family)
+        val nameSuffix = if (!obs.deviceName.isNullOrBlank()) " — ${obs.deviceName}" else ""
+        return Scored(score, methods.toString().trim(), "$familyLabel$nameSuffix (${obs.mac})", isAxon = false)
+    }
+
+    fun scoreMicWifi(obs: MicWifiObservation): Scored {
+        var score = 0
+        var methodCount = 0
+        val methods = StringBuilder()
+        val ouiFamily = org.soulstone.overwatch.data.targets.MicTargets.matchOui(obs.bssid)
+        if (ouiFamily != null) {
+            score += W_MIC_OUI
+            methods.append("mic_oui ")
+            methodCount++
+        }
+        val ssidMatch = org.soulstone.overwatch.data.targets.MicTargets.matchSsid(obs.ssid)
+        if (ssidMatch != null) {
+            score += W_MIC_SSID
+            methods.append("mic_ssid ")
+            methodCount++
+        }
+        if (methodCount >= 2) {
+            score += B_MIC_MULTI
+            methods.append("multi ")
+        }
+        if (obs.rssi > -50) {
+            score += B_MIC_STRONG_RSSI
+            methods.append("strong_rssi ")
+        }
+        if (obs.isStationary) {
+            score += B_MIC_STATIONARY
+            methods.append("stationary ")
+        }
+        score = score.coerceAtMost(MIC_SCORE_CAP)
+        val family = ssidMatch?.family ?: ouiFamily
+            ?: org.soulstone.overwatch.data.targets.MicTargets.Family.HIDDEN_CAM
+        val familyLabel = org.soulstone.overwatch.data.targets.MicTargets.familyLabel(family)
+        val ssidSuffix = if (!obs.ssid.isNullOrBlank()) " — ${obs.ssid}" else ""
+        return Scored(score, methods.toString().trim(), "$familyLabel$ssidSuffix (${obs.bssid})", isAxon = false)
+    }
+
     fun scoreWifi(obs: WifiObservation): Scored {
         var score = 0
         val methods = StringBuilder()

app/src/main/kotlin/org/soulstone/overwatch/fusion/DetectionStore.kt

@@ -44,6 +44,17 @@ class DetectionStore(
         _maxScore.value = 0
     }
 
+    /** Drop every event from a single source — used when a proximity threshold
+     *  changes and the owning scanner needs to re-emit a fresh slate (events
+     *  outside the new radius would otherwise linger until their 5-min TTL). */
+    @Synchronized
+    fun clearSource(source: DetectionSource) {
+        val remaining = _events.value.filter { it.source != source }
+        if (remaining.size == _events.value.size) return
+        _events.value = remaining
+        recompute(remaining)
+    }
+
     @Synchronized
     fun pruneExpired() {
         val cutoff = nowMs() - retentionMs

app/src/main/kotlin/org/soulstone/overwatch/fusion/SourceHealth.kt

@@ -27,17 +27,20 @@ object SourceHealth {
     private val _wifi = MutableStateFlow(Health())
     private val _deflock = MutableStateFlow(Health())
     private val _citizen = MutableStateFlow(Health())
+    private val _mic = MutableStateFlow(Health())
 
     val ble: StateFlow<Health> = _ble.asStateFlow()
     val wifi: StateFlow<Health> = _wifi.asStateFlow()
     val deflock: StateFlow<Health> = _deflock.asStateFlow()
     val citizen: StateFlow<Health> = _citizen.asStateFlow()
+    val mic: StateFlow<Health> = _mic.asStateFlow()
 
     fun flowFor(source: DetectionSource): StateFlow<Health> = when (source) {
         DetectionSource.BLE -> ble
         DetectionSource.WIFI -> wifi
         DetectionSource.DEFLOCK -> deflock
         DetectionSource.CITIZEN -> citizen
+        DetectionSource.MIC -> mic
     }
 
     fun record(source: DetectionSource, ok: Boolean, message: String? = null) {
@@ -46,6 +49,7 @@ object SourceHealth {
             DetectionSource.WIFI -> _wifi
             DetectionSource.DEFLOCK -> _deflock
             DetectionSource.CITIZEN -> _citizen
+            DetectionSource.MIC -> _mic
         }
         target.value = Health(
             status = if (ok) Status.OK else Status.FAILED,
@@ -59,5 +63,6 @@ object SourceHealth {
         _wifi.value = Health()
         _deflock.value = Health()
         _citizen.value = Health()
+        _mic.value = Health()
     }
 }

app/src/main/kotlin/org/soulstone/overwatch/fusion/ThreatLevel.kt

@@ -21,4 +21,4 @@ enum class ThreatLevel(val minScore: Int) {
 }
 
 /** Logical signal channel — used in the drill-down UI. */
-enum class DetectionSource { BLE, WIFI, DEFLOCK, CITIZEN }
+enum class DetectionSource { BLE, WIFI, DEFLOCK, CITIZEN, MIC }

app/src/main/kotlin/org/soulstone/overwatch/scan/BleScanner.kt

@@ -14,6 +14,7 @@ import android.os.Build
 import android.util.Log
 import androidx.core.content.ContextCompat
 import org.soulstone.overwatch.data.targets.BleOuis
+import org.soulstone.overwatch.data.targets.MicTargets
 import org.soulstone.overwatch.data.targets.Patterns
 import org.soulstone.overwatch.data.targets.RavenUuids
 import org.soulstone.overwatch.fusion.ConfidenceEngine
@@ -38,7 +39,9 @@ import org.soulstone.overwatch.fusion.SourceHealth
 class BleScanner(
     private val context: Context,
     private val store: DetectionStore,
-    private val rssi: RssiTracker = RssiTracker()
+    private val rssi: RssiTracker = RssiTracker(),
+    /** When true, also evaluate each scan against MicTargets and submit MIC events. */
+    private val micEnabled: () -> Boolean = { false }
 ) {
 
     companion object {
@@ -170,35 +173,66 @@ class BleScanner(
         }
 
         // Cheap pre-filter — drop devices that have zero target signals.
-        val candidate = BleOuis.matches(mac) ||
+        val isSurveillance = BleOuis.matches(mac) ||
             Patterns.bleNameMatch(name) ||
             Patterns.isPenguinNumeric(name) ||
             RavenUuids.countMatches(advertisedUuids) > 0 ||
             companyId == org.soulstone.overwatch.data.targets.Manufacturers.XUNTONG_COMPANY_ID
-        if (!candidate) return
+        val isMic = micEnabled() &&
+            MicTargets.couldBeMicBle(mac, name, advertisedUuids, companyId)
+        if (!isSurveillance && !isMic) return
 
         rssi.update(mac, result.rssi)
-        val obs = ConfidenceEngine.BleObservation(
+        val stationary = rssi.isStationary(mac)
-            mac = mac,
-            rssi = result.rssi,
-            deviceName = name,
-            advertisedUuids = advertisedUuids,
-            manufacturerCompanyId = companyId,
-            manufacturerPayload = payload,
-            isStationary = rssi.isStationary(mac)
-        )
-        val scored = ConfidenceEngine.scoreBle(obs)
-        if (scored.score < ALARM_THRESHOLD) return
 
-        store.submit(
+        if (isSurveillance) {
-            DetectionEvent(
+            val obs = ConfidenceEngine.BleObservation(
-                source = DetectionSource.BLE,
+                mac = mac,
-                key = mac,
+                rssi = result.rssi,
-                label = scored.label,
+                deviceName = name,
-                score = scored.score,
+                advertisedUuids = advertisedUuids,
-                matchedMethods = scored.methods,
+                manufacturerCompanyId = companyId,
-                rssi = result.rssi
+                manufacturerPayload = payload,
+                isStationary = stationary
             )
-        )
+            val scored = ConfidenceEngine.scoreBle(obs)
+            if (scored.score >= ALARM_THRESHOLD) {
+                store.submit(
+                    DetectionEvent(
+                        source = DetectionSource.BLE,
+                        key = mac,
+                        label = scored.label,
+                        score = scored.score,
+                        matchedMethods = scored.methods,
+                        rssi = result.rssi
+                    )
+                )
+            }
+        }
+        if (isMic) {
+            val obs = ConfidenceEngine.MicBleObservation(
+                mac = mac,
+                rssi = result.rssi,
+                deviceName = name,
+                advertisedUuids = advertisedUuids,
+                manufacturerCompanyId = companyId,
+                isStationary = stationary
+            )
+            val scored = ConfidenceEngine.scoreMicBle(obs)
+            if (scored.score >= ALARM_THRESHOLD) {
+                store.submit(
+                    DetectionEvent(
+                        source = DetectionSource.MIC,
+                        // Disambiguate from any BLE event on the same MAC so the
+                        // store's (source, key) dedup doesn't collide.
+                        key = "mic:$mac",
+                        label = scored.label,
+                        score = scored.score,
+                        matchedMethods = scored.methods,
+                        rssi = result.rssi
+                    )
+                )
+            }
+        }
     }
 }

app/src/main/kotlin/org/soulstone/overwatch/scan/CitizenScanner.kt

@@ -99,15 +99,36 @@ class CitizenScanner(
         // Drop cache entries that no longer appear in the trending list (resolved).
         incidentCache.keys.retainAll(ids.toSet())
 
+        // Fetch any ids we haven't seen yet — Citizen incidents don't mutate,
+        // so a single fetch per id per session is enough.
+        for (id in ids) {
+            if (incidentCache[id] == null) {
+                client.fetchIncident(id)?.also { incidentCache[id] = it }
+            }
+        }
+
+        emitProximityEvents(fix, ids.mapNotNull { incidentCache[it] })
+    }
+
+    /**
+     * Re-evaluate the cached incident set against the current proximity + age
+     * thresholds and the latest fix, *without* a network refetch. Used when
+     * the user moves the proximity slider — events outside a tightened radius
+     * would otherwise linger and detections inside a widened radius wouldn't
+     * appear until the next poll cycle.
+     */
+    fun refresh() {
+        val fix = locationProvider.location.value ?: return
+        store.clearSource(DetectionSource.CITIZEN)
+        emitProximityEvents(fix, incidentCache.values.toList())
+    }
+
+    private fun emitProximityEvents(fix: Location, incidents: Collection<CitizenClient.Incident>) {
         val now = System.currentTimeMillis()
         val limit = proximityMeters()
         val out = FloatArray(1)
 
-        for (id in ids) {
+        for (incident in incidents) {
-            val incident = incidentCache[id] ?: client.fetchIncident(id)?.also {
-                incidentCache[id] = it
-            } ?: continue
-
             // Title-based pre-filter: drop pure fire/medical events.
             if (FIRE_MEDICAL_RX.containsMatchIn(incident.title) &&
                 !POLICE_TITLE_RX.containsMatchIn(incident.title)) {

app/src/main/kotlin/org/soulstone/overwatch/scan/DeflockScanner.kt

@@ -4,6 +4,9 @@ import android.location.Location
 import android.util.Log
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.soulstone.overwatch.data.location.LocationProvider
@@ -41,7 +44,10 @@ class DeflockScanner(
     private var lastFetchLon: Double? = null
     private var lastAttemptMs: Long = 0L
     private var lastAttemptOk: Boolean = false
-    private var cachedPoints: List<DeflockClient.AlprPoint> = emptyList()
+    private val _cachedPoints = MutableStateFlow<List<DeflockClient.AlprPoint>>(emptyList())
+    /** All ALPR points in the current cell — exposed so the UI map can render them.
+     *  Distinct from the proximity-filtered DetectionEvents on [DetectionStore]. */
+    val cachedPoints: StateFlow<List<DeflockClient.AlprPoint>> = _cachedPoints.asStateFlow()
 
     fun start(scope: CoroutineScope): Boolean {
         if (job != null) return true
@@ -61,7 +67,7 @@ class DeflockScanner(
         lastFetchLon = null
         lastAttemptMs = 0L
         lastAttemptOk = false
-        cachedPoints = emptyList()
+        _cachedPoints.value = emptyList()
         Log.i(TAG, "DeflockScanner stopped")
     }
 
@@ -74,12 +80,12 @@ class DeflockScanner(
             lastAttemptMs = System.currentTimeMillis()
             when (val result = client.fetchAround(fix.latitude, fix.longitude)) {
                 is DeflockClient.FetchResult.Success -> {
-                    cachedPoints = result.points
+                    _cachedPoints.value = result.points
                     lastAttemptOk = true
                     SourceHealth.record(DetectionSource.DEFLOCK, ok = true)
                     Log.i(
                         TAG,
-                        "Loaded ${cachedPoints.size} ALPRs around " +
+                        "Loaded ${result.points.size} ALPRs around " +
                             "(${fix.latitude}, ${fix.longitude})"
                     )
                 }
@@ -95,11 +101,33 @@ class DeflockScanner(
                 }
             }
         }
-        if (cachedPoints.isEmpty()) return
+        emitProximityEvents(fix)
+    }
+
+    /**
+     * Re-evaluate the cached ALPRs against the current proximity threshold and
+     * the latest fix, *without* a network refetch. Used when the user moves the
+     * proximity slider — the slider changes [proximityMeters], but the scanner
+     * is otherwise idle (no new location ticks while stationary), so events
+     * outside the new radius would otherwise linger and detections inside the
+     * widened radius wouldn't appear until the next handleFix cycle.
+     *
+     * Clears the DEFLOCK source from the store first so events that fall
+     * outside a tightened radius disappear immediately.
+     */
+    fun refresh() {
+        val fix = locationProvider.location.value ?: return
+        store.clearSource(DetectionSource.DEFLOCK)
+        emitProximityEvents(fix)
+    }
+
+    private fun emitProximityEvents(fix: Location) {
+        val points = _cachedPoints.value
+        if (points.isEmpty()) return
 
         val limit = proximityMeters()
         val out = FloatArray(1)
-        for (p in cachedPoints) {
+        for (p in points) {
             Location.distanceBetween(fix.latitude, fix.longitude, p.lat, p.lon, out)
             val dist = out[0]
             if (dist > limit) continue

app/src/main/kotlin/org/soulstone/overwatch/scan/WifiScanner.kt

@@ -17,6 +17,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import org.soulstone.overwatch.data.targets.MicTargets
 import org.soulstone.overwatch.data.targets.Patterns
 import org.soulstone.overwatch.data.targets.WifiOuis
 import org.soulstone.overwatch.fusion.ConfidenceEngine
@@ -40,7 +41,9 @@ import org.soulstone.overwatch.fusion.SourceHealth
 class WifiScanner(
     private val context: Context,
     private val store: DetectionStore,
-    private val rssi: RssiTracker = RssiTracker()
+    private val rssi: RssiTracker = RssiTracker(),
+    /** When true, also evaluate each scan against MicTargets and submit MIC events. */
+    private val micEnabled: () -> Boolean = { false }
 ) {
 
     companion object {
@@ -167,31 +170,51 @@ class WifiScanner(
             val bssid = r.BSSID ?: continue
             val ssid = readSsid(r)
 
-            val candidate = WifiOuis.matches(bssid) ||
+            val isSurveillance = WifiOuis.matches(bssid) ||
                 Patterns.ssidGenericMatch(ssid) ||
                 Patterns.ssidFlockFormat(ssid)
-            if (!candidate) continue
+            val isMic = micEnabled() && MicTargets.couldBeMicWifi(bssid, ssid)
+            if (!isSurveillance && !isMic) continue
 
             rssi.update(bssid, r.level)
-            val obs = ConfidenceEngine.WifiObservation(
+            val stationary = rssi.isStationary(bssid)
-                bssid = bssid,
-                ssid = ssid,
-                rssi = r.level,
-                isStationary = rssi.isStationary(bssid)
-            )
-            val scored = ConfidenceEngine.scoreWifi(obs)
-            if (scored.score < ALARM_THRESHOLD) continue
 
-            store.submit(
+            if (isSurveillance) {
-                DetectionEvent(
+                val obs = ConfidenceEngine.WifiObservation(
-                    source = DetectionSource.WIFI,
+                    bssid = bssid, ssid = ssid, rssi = r.level, isStationary = stationary
-                    key = bssid,
-                    label = scored.label,
-                    score = scored.score,
-                    matchedMethods = scored.methods,
-                    rssi = r.level
                 )
-            )
+                val scored = ConfidenceEngine.scoreWifi(obs)
+                if (scored.score >= ALARM_THRESHOLD) {
+                    store.submit(
+                        DetectionEvent(
+                            source = DetectionSource.WIFI,
+                            key = bssid,
+                            label = scored.label,
+                            score = scored.score,
+                            matchedMethods = scored.methods,
+                            rssi = r.level
+                        )
+                    )
+                }
+            }
+            if (isMic) {
+                val obs = ConfidenceEngine.MicWifiObservation(
+                    bssid = bssid, ssid = ssid, rssi = r.level, isStationary = stationary
+                )
+                val scored = ConfidenceEngine.scoreMicWifi(obs)
+                if (scored.score >= ALARM_THRESHOLD) {
+                    store.submit(
+                        DetectionEvent(
+                            source = DetectionSource.MIC,
+                            key = "mic:$bssid",
+                            label = scored.label,
+                            score = scored.score,
+                            matchedMethods = scored.methods,
+                            rssi = r.level
+                        )
+                    )
+                }
+            }
         }
     }
 

app/src/main/kotlin/org/soulstone/overwatch/service/DetectionService.kt

@@ -7,6 +7,7 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ServiceInfo
+import android.location.Location
 import android.os.Build
 import android.os.IBinder
 import android.os.VibrationEffect
@@ -22,12 +23,14 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.launch
 import org.soulstone.overwatch.MainActivity
 import org.soulstone.overwatch.R
 import org.soulstone.overwatch.data.location.LocationProvider
 import org.soulstone.overwatch.data.settings.Settings
 import org.soulstone.overwatch.fusion.DetectionEvent
+import org.soulstone.overwatch.fusion.DetectionSource
 import org.soulstone.overwatch.fusion.DetectionStore
 import org.soulstone.overwatch.fusion.SourceHealth
 import org.soulstone.overwatch.fusion.ThreatLevel
@@ -35,6 +38,7 @@ import org.soulstone.overwatch.scan.BleScanner
 import org.soulstone.overwatch.scan.CitizenScanner
 import org.soulstone.overwatch.scan.DeflockClient
 import org.soulstone.overwatch.scan.DeflockScanner
+import org.soulstone.overwatch.scan.DeflockClient.AlprPoint
 import org.soulstone.overwatch.scan.WifiScanner
 
 /**
@@ -67,6 +71,15 @@ class DetectionService : LifecycleService() {
         private val _running = MutableStateFlow(false)
         val running: StateFlow<Boolean> = _running.asStateFlow()
 
+        /** Latest ALPR cell cache — UI map renders these as pins. Mirrored from
+         *  the active DeflockScanner while the service is running; cleared on stop. */
+        private val _mapPoints = MutableStateFlow<List<AlprPoint>>(emptyList())
+        val mapPoints: StateFlow<List<AlprPoint>> = _mapPoints.asStateFlow()
+
+        /** Latest fused location fix — UI map centers on this. */
+        private val _location = MutableStateFlow<Location?>(null)
+        val location: StateFlow<Location?> = _location.asStateFlow()
+
         fun start(context: Context) {
             val intent = Intent(context, DetectionService::class.java).apply {
                 action = ACTION_START
@@ -92,8 +105,14 @@ class DetectionService : LifecycleService() {
     private lateinit var locationProvider: LocationProvider
     private lateinit var deflockScanner: DeflockScanner
     private lateinit var citizenScanner: CitizenScanner
+    private lateinit var overlayManager: OverlayManager
     private var pruneJob: Job? = null
     private var observerJob: Job? = null
+    private var mapPointsJob: Job? = null
+    private var locationJob: Job? = null
+    private var deflockProxJob: Job? = null
+    private var citizenProxJob: Job? = null
+    private var overlayJob: Job? = null
     private var bleStarted = false
     private var wifiStarted = false
     private var deflockStarted = false
@@ -104,8 +123,8 @@ class DetectionService : LifecycleService() {
     override fun onCreate() {
         super.onCreate()
         settings = Settings.get(this)
-        bleScanner = BleScanner(this, store)
+        bleScanner = BleScanner(this, store, micEnabled = { settings.micEnabled.value })
-        wifiScanner = WifiScanner(this, store)
+        wifiScanner = WifiScanner(this, store, micEnabled = { settings.micEnabled.value })
         locationProvider = LocationProvider(this)
         deflockScanner = DeflockScanner(
             store, locationProvider, DeflockClient(this),
@@ -115,6 +134,7 @@ class DetectionService : LifecycleService() {
             store, locationProvider,
             proximityMeters = { settings.citizenProximityM.value.toFloat() }
         )
+        overlayManager = OverlayManager(this)
         createNotificationChannel()
     }
 
@@ -169,6 +189,20 @@ class DetectionService : LifecycleService() {
             return
         }
 
+        // MIC piggybacks on the BLE/WiFi scanners. Surface its health so the
+        // user sees an explicit status row rather than a silent UNKNOWN.
+        if (settings.micEnabled.value) {
+            if (bleStarted || wifiStarted) {
+                SourceHealth.record(DetectionSource.MIC, ok = true)
+            } else {
+                SourceHealth.record(
+                    DetectionSource.MIC,
+                    ok = false,
+                    message = "Needs BLE or WiFi scanner enabled"
+                )
+            }
+        }
+
         _running.value = true
         pruneJob?.cancel()
         pruneJob = lifecycleScope.launch {
@@ -187,6 +221,46 @@ class DetectionService : LifecycleService() {
                 onTierChanged(tier, top)
             }
         }
+
+        // Mirror scanner state to the companion StateFlows the UI observes.
+        // These exist so the map widget doesn't need a direct handle on the
+        // scanner instances (which are private to this service).
+        mapPointsJob?.cancel()
+        if (deflockStarted) {
+            mapPointsJob = lifecycleScope.launch {
+                deflockScanner.cachedPoints.collect { _mapPoints.value = it }
+            }
+        }
+        locationJob?.cancel()
+        locationJob = lifecycleScope.launch {
+            locationProvider.location.collect { _location.value = it }
+        }
+
+        // Live re-eval when the user moves a proximity slider. drop(1) skips
+        // the StateFlow's initial replay so we don't redundantly clear+re-emit
+        // the events the scanner just produced from its first handleFix call.
+        deflockProxJob?.cancel()
+        if (deflockStarted) {
+            deflockProxJob = lifecycleScope.launch {
+                settings.deflockProximityM.drop(1).collect { deflockScanner.refresh() }
+            }
+        }
+        citizenProxJob?.cancel()
+        if (citizenStarted) {
+            citizenProxJob = lifecycleScope.launch {
+                settings.citizenProximityM.drop(1).collect { citizenScanner.refresh() }
+            }
+        }
+
+        // Floating threat-circle overlay — observe the toggle and show/hide
+        // accordingly. The OverlayManager re-checks SYSTEM_ALERT_WINDOW each
+        // show() so a denied/revoked permission silently no-ops.
+        overlayJob?.cancel()
+        overlayJob = lifecycleScope.launch {
+            settings.overlayEnabled.collect { enabled ->
+                if (enabled) overlayManager.show() else overlayManager.hide()
+            }
+        }
     }
 
     private fun endScanning() {
@@ -203,6 +277,14 @@ class DetectionService : LifecycleService() {
         SourceHealth.reset()
         pruneJob?.cancel(); pruneJob = null
         observerJob?.cancel(); observerJob = null
+        mapPointsJob?.cancel(); mapPointsJob = null
+        locationJob?.cancel(); locationJob = null
+        deflockProxJob?.cancel(); deflockProxJob = null
+        citizenProxJob?.cancel(); citizenProxJob = null
+        overlayJob?.cancel(); overlayJob = null
+        overlayManager.hide()
+        _mapPoints.value = emptyList()
+        _location.value = null
         lastNotifiedTier = ThreatLevel.GREEN
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             stopForeground(STOP_FOREGROUND_REMOVE)

app/src/main/kotlin/org/soulstone/overwatch/service/OverlayManager.kt

@@ -0,0 +1,193 @@
+package org.soulstone.overwatch.service
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.PixelFormat
+import android.provider.Settings
+import android.util.Log
+import android.view.Gravity
+import android.view.MotionEvent
+import android.view.View
+import android.view.WindowManager
+import androidx.compose.ui.platform.ComposeView
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.savedstate.SavedStateRegistry
+import androidx.savedstate.SavedStateRegistryController
+import androidx.savedstate.SavedStateRegistryOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+import kotlin.math.abs
+import org.soulstone.overwatch.MainActivity
+import org.soulstone.overwatch.ui.OverlayBubble
+
+/**
+ * Owns the floating threat-circle bubble — a [ComposeView] hosted in a
+ * [WindowManager] window at TYPE_APPLICATION_OVERLAY.
+ *
+ * Lifecycle:
+ *  - [show] is idempotent. Silently no-ops if SYSTEM_ALERT_WINDOW isn't
+ *    granted, so flipping the setting doesn't crash on a denied permission.
+ *  - [hide] removes the view and tears down the owner.
+ *  - The DetectionService calls [show] / [hide] based on the running ×
+ *    overlayEnabled product. Permission revocation between show calls is
+ *    handled silently — the bubble just doesn't appear.
+ *
+ * Touch model:
+ *  - The window flag set lets touches outside the bubble pass through to
+ *    whatever app is underneath (FLAG_NOT_TOUCH_MODAL) and never steals IME
+ *    focus (FLAG_NOT_FOCUSABLE).
+ *  - Touches *inside* the bubble are intercepted at the View layer for drag
+ *    and tap-to-open. Compose doesn't see them — the bubble is a render-only
+ *    visualization.
+ */
+class OverlayManager(private val context: Context) {
+
+    private companion object {
+        private const val TAG = "OverlayManager"
+        private const val INITIAL_X = 60
+        private const val INITIAL_Y = 240
+        private const val TAP_SLOP_PX = 12
+    }
+
+    private val wm: WindowManager =
+        context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+
+    private var view: ComposeView? = null
+    private var owner: OverlayOwner? = null
+    private var params: WindowManager.LayoutParams? = null
+
+    fun show() {
+        if (view != null) return
+        if (!Settings.canDrawOverlays(context)) {
+            Log.i(TAG, "Overlay permission not granted; skipping show()")
+            return
+        }
+
+        val newOwner = OverlayOwner()
+        val composeView = ComposeView(context).apply {
+            setViewTreeLifecycleOwner(newOwner)
+            setViewTreeSavedStateRegistryOwner(newOwner)
+            setContent { OverlayBubble() }
+        }
+
+        val lp = WindowManager.LayoutParams(
+            WindowManager.LayoutParams.WRAP_CONTENT,
+            WindowManager.LayoutParams.WRAP_CONTENT,
+            WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
+            WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
+                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL,
+            PixelFormat.TRANSLUCENT
+        ).apply {
+            gravity = Gravity.TOP or Gravity.START
+            x = INITIAL_X
+            y = INITIAL_Y
+        }
+
+        composeView.setOnTouchListener(DragHandler(lp))
+
+        try {
+            wm.addView(composeView, lp)
+            view = composeView
+            owner = newOwner
+            params = lp
+            Log.i(TAG, "Overlay bubble attached")
+        } catch (e: Exception) {
+            // Most common: WindowManager$BadTokenException if perm was revoked
+            // between the canDrawOverlays check and addView. Tear down and
+            // bail; service can retry on next state flip.
+            Log.w(TAG, "Failed to attach overlay: ${e.message}")
+            newOwner.destroy()
+        }
+    }
+
+    fun hide() {
+        val v = view ?: return
+        try {
+            wm.removeView(v)
+        } catch (e: Exception) {
+            Log.w(TAG, "removeView failed: ${e.message}")
+        }
+        owner?.destroy()
+        view = null
+        owner = null
+        params = null
+        Log.i(TAG, "Overlay bubble detached")
+    }
+
+    /** Drag with raw coords, tap if movement stayed under [TAP_SLOP_PX]. */
+    private inner class DragHandler(private val lp: WindowManager.LayoutParams) :
+        View.OnTouchListener {
+
+        private var startX = 0
+        private var startY = 0
+        private var touchDownX = 0f
+        private var touchDownY = 0f
+        private var moved = false
+
+        override fun onTouch(v: View, ev: MotionEvent): Boolean {
+            return when (ev.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    startX = lp.x
+                    startY = lp.y
+                    touchDownX = ev.rawX
+                    touchDownY = ev.rawY
+                    moved = false
+                    true
+                }
+                MotionEvent.ACTION_MOVE -> {
+                    val dx = ev.rawX - touchDownX
+                    val dy = ev.rawY - touchDownY
+                    if (abs(dx) > TAP_SLOP_PX || abs(dy) > TAP_SLOP_PX) {
+                        moved = true
+                    }
+                    if (moved) {
+                        lp.x = startX + dx.toInt()
+                        lp.y = startY + dy.toInt()
+                        try { wm.updateViewLayout(v, lp) } catch (_: Exception) {}
+                    }
+                    true
+                }
+                MotionEvent.ACTION_UP -> {
+                    if (!moved) {
+                        // Tap → bring the host app forward.
+                        val intent = Intent(context, MainActivity::class.java).apply {
+                            flags = Intent.FLAG_ACTIVITY_NEW_TASK or
+                                Intent.FLAG_ACTIVITY_SINGLE_TOP
+                        }
+                        try { context.startActivity(intent) } catch (_: Exception) {}
+                    }
+                    true
+                }
+                else -> false
+            }
+        }
+    }
+
+    /**
+     * Compose's [ComposeView] requires both a [LifecycleOwner] and a
+     * [SavedStateRegistryOwner] in its view tree. A bare [android.app.Service]
+     * isn't an SSR owner, so we synthesize one bound to the bubble's lifetime.
+     * The lifecycle is forced to RESUMED on construction (Compose only renders
+     * at STARTED+) and DESTROYED on [destroy].
+     */
+    private class OverlayOwner : SavedStateRegistryOwner {
+        private val lifecycleReg = LifecycleRegistry(this)
+        private val ssrController = SavedStateRegistryController.create(this)
+
+        init {
+            ssrController.performAttach()
+            ssrController.performRestore(null)
+            lifecycleReg.currentState = Lifecycle.State.RESUMED
+        }
+
+        override val lifecycle: Lifecycle get() = lifecycleReg
+        override val savedStateRegistry: SavedStateRegistry
+            get() = ssrController.savedStateRegistry
+
+        fun destroy() {
+            lifecycleReg.currentState = Lifecycle.State.DESTROYED
+        }
+    }
+}

app/src/main/kotlin/org/soulstone/overwatch/ui/MainScreen.kt

@@ -1,5 +1,8 @@
 package org.soulstone.overwatch.ui
 
+import android.content.Intent
+import android.location.Location
+import android.net.Uri
 import androidx.compose.animation.core.RepeatMode
 import androidx.compose.animation.core.animateFloat
 import androidx.compose.animation.core.infiniteRepeatable
@@ -19,8 +22,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import android.content.Intent
-import android.net.Uri
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Place
 import androidx.compose.material.icons.filled.Settings
@@ -40,6 +41,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -51,11 +53,18 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import kotlinx.coroutines.launch
+import androidx.compose.ui.viewinterop.AndroidView
+import kotlin.math.cos
+import org.osmdroid.tileprovider.tilesource.TileSourceFactory
+import org.osmdroid.util.BoundingBox
+import org.osmdroid.util.GeoPoint
+import org.osmdroid.views.MapView
+import org.osmdroid.views.overlay.Marker
 import org.soulstone.overwatch.fusion.DetectionEvent
 import org.soulstone.overwatch.fusion.DetectionSource
 import org.soulstone.overwatch.fusion.SourceHealth
 import org.soulstone.overwatch.fusion.ThreatLevel
+import org.soulstone.overwatch.scan.DeflockClient
 import org.soulstone.overwatch.ui.theme.ThreatColors
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -65,6 +74,12 @@ fun MainScreen(
     threat: ThreatLevel,
     score: Int,
     events: List<DetectionEvent>,
+    mapPoints: List<DeflockClient.AlprPoint>,
+    userLocation: Location?,
+    /** Visible radius of the map circle, in meters. Driven by the larger of
+     *  the DeFlock and Citizen proximity sliders so the user sees the full
+     *  area where a detection could fire. */
+    mapRadiusMeters: Float,
     onStartStop: () -> Unit,
     onOpenSettings: () -> Unit,
     canStart: Boolean,
@@ -81,30 +96,26 @@ fun MainScreen(
             .background(MaterialTheme.colorScheme.background)
             .padding(horizontal = 24.dp)
     ) {
-        Row(
+        // Box (rather than Row + SpaceBetween) so the title is truly centered
+        // regardless of the gear icon's width.
+        Box(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(top = 8.dp),
+                .padding(top = 8.dp)
-            verticalAlignment = Alignment.Top,
-            horizontalArrangement = Arrangement.SpaceBetween
         ) {
-            Column {
+            Text(
-                Text(
+                text = "OVERWATCH",
-                    text = "[DЯΣΛMMΛKΣЯ]",
+                color = MaterialTheme.colorScheme.onBackground,
-                    color = MaterialTheme.colorScheme.onBackground,
+                fontSize = 26.sp,
-                    fontSize = 22.sp,
+                fontWeight = FontWeight.Bold,
-                    fontWeight = FontWeight.Bold,
+                fontFamily = FontFamily.Monospace,
-                    fontFamily = FontFamily.Monospace
+                letterSpacing = 4.sp,
-                )
+                modifier = Modifier.align(Alignment.Center)
-                Text(
+            )
-                    text = "   . //0VΣЯW4TCH",
+            IconButton(
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                onClick = onOpenSettings,
-                    fontSize = 18.sp,
+                modifier = Modifier.align(Alignment.CenterEnd)
-                    fontWeight = FontWeight.Medium,
+            ) {
-                    fontFamily = FontFamily.Monospace
-                )
-            }
-            IconButton(onClick = onOpenSettings) {
                 Icon(
                     Icons.Filled.Settings,
                     contentDescription = "Settings",
@@ -119,7 +130,14 @@ fun MainScreen(
             modifier = Modifier.fillMaxWidth(),
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
-            ThreatCircle(level = threat, animating = running, onTap = { showSheet = true })
+            ThreatMapCircle(
+                level = threat,
+                animating = running,
+                userLocation = userLocation,
+                mapPoints = mapPoints,
+                mapRadiusMeters = mapRadiusMeters,
+                onTap = { showSheet = true }
+            )
 
             Spacer(Modifier.height(12.dp))
             Text(
@@ -207,10 +225,14 @@ fun MainScreen(
 }
 
 @Composable
-private fun ThreatCircle(level: ThreatLevel, animating: Boolean, onTap: () -> Unit) {
+private fun ThreatMapCircle(
-    // When the scanner isn't running, deliberately use a muted color and IDLE
+    level: ThreatLevel,
-    // text so the user can tell at a glance whether they're scanning. Without
+    animating: Boolean,
-    // this, idle and "scanning, all clear" both render as solid green.
+    userLocation: Location?,
+    mapPoints: List<DeflockClient.AlprPoint>,
+    mapRadiusMeters: Float,
+    onTap: () -> Unit
+) {
     val idleColor = MaterialTheme.colorScheme.surfaceVariant
     val activeColor = when (level) {
         ThreatLevel.GREEN -> ThreatColors.Green
@@ -218,13 +240,10 @@ private fun ThreatCircle(level: ThreatLevel, animating: Boolean, onTap: () -> Un
         ThreatLevel.ORANGE -> ThreatColors.Orange
         ThreatLevel.RED -> ThreatColors.Red
     }
-    val color = if (animating) activeColor else idleColor
-    val labelText = if (animating) level.name else "IDLE"
-    val labelColor = if (animating) Color.White else MaterialTheme.colorScheme.onSurfaceVariant
 
     val transition = rememberInfiniteTransition(label = "pulse")
     val pulse by transition.animateFloat(
-        initialValue = if (animating) 0.6f else 1.0f,
+        initialValue = if (animating) 0.5f else 1.0f,
         targetValue = 1.0f,
         animationSpec = infiniteRepeatable(
             animation = tween(durationMillis = 1200),
@@ -232,29 +251,129 @@ private fun ThreatCircle(level: ThreatLevel, animating: Boolean, onTap: () -> Un
         ),
         label = "pulse"
     )
-    val alpha = if (animating) pulse else 1.0f
 
     Box(
         modifier = Modifier
             .size(220.dp)
-            .clip(CircleShape)
+            .clip(CircleShape),
-            .background(
-                Brush.radialGradient(
-                    colors = listOf(
-                        color.copy(alpha = alpha),
-                        color.copy(alpha = alpha * 0.6f)
-                    )
-                )
-            )
-            .clickable(onClick = onTap),
         contentAlignment = Alignment.Center
     ) {
-        Text(
+        // While idle OR before the first location fix arrives, fall back to the
-            text = labelText,
+        // solid pulsing circle — a blank/loading map mid-tile-fetch reads as
-            color = labelColor,
+        // broken. The map only renders once we actually have something to show.
-            fontSize = 28.sp,
+        if (!animating || userLocation == null) {
-            fontWeight = FontWeight.Black,
+            val color = if (animating) activeColor else idleColor
-            fontFamily = FontFamily.Monospace
+            val alpha = if (animating) pulse else 1.0f
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(
+                        Brush.radialGradient(
+                            colors = listOf(
+                                color.copy(alpha = alpha),
+                                color.copy(alpha = alpha * 0.6f)
+                            )
+                        )
+                    ),
+                contentAlignment = Alignment.Center
+            ) {
+                val labelText = when {
+                    !animating -> "IDLE"
+                    else -> "WAITING FIX"
+                }
+                Text(
+                    text = labelText,
+                    color = if (animating) Color.White else MaterialTheme.colorScheme.onSurfaceVariant,
+                    fontSize = 22.sp,
+                    fontWeight = FontWeight.Black,
+                    fontFamily = FontFamily.Monospace
+                )
+            }
+        } else {
+            // OSM map snapshot, centered on the user, with red ALPR pins and
+            // a blue user-position dot. Non-interactive — touches are captured
+            // by the click overlay above, so a tap opens the source-details
+            // bottom sheet. Pan/zoom controls stay off.
+            // Capture into a local non-null val so the AndroidView update
+            // lambda doesn't run afoul of smart-cast-into-closure rules.
+            val fix: Location = userLocation
+            val ctx = LocalContext.current
+            // Build the marker drawables once per Composition rather than
+            // every recomposition — bitmap allocation isn't free.
+            val userDot = remember(ctx) { dotDrawable(ctx.resources, 36, DOT_USER_BLUE) }
+            val flockDot = remember(ctx) { dotDrawable(ctx.resources, 26, DOT_FLOCK_RED) }
+            AndroidView(
+                modifier = Modifier.fillMaxSize(),
+                factory = { c ->
+                    MapView(c).apply {
+                        setTileSource(TileSourceFactory.MAPNIK)
+                        setMultiTouchControls(false)
+                        setBuiltInZoomControls(false)
+                        isClickable = false
+                        isFocusable = false
+                    }
+                },
+                update = { map ->
+                    map.controller.setCenter(GeoPoint(fix.latitude, fix.longitude))
+                    map.overlays.clear()
+
+                    // ALPR dots first, user dot last so the user draws on top.
+                    for (p in mapPoints) {
+                        map.overlays.add(
+                            Marker(map).apply {
+                                position = GeoPoint(p.lat, p.lon)
+                                setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_CENTER)
+                                icon = flockDot
+                                title = p.operator ?: p.manufacturer ?: "ALPR"
+                                setInfoWindow(null)
+                            }
+                        )
+                    }
+                    map.overlays.add(
+                        Marker(map).apply {
+                            position = GeoPoint(fix.latitude, fix.longitude)
+                            setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_CENTER)
+                            icon = userDot
+                            setInfoWindow(null)
+                        }
+                    )
+
+                    // Fit the visible radius to the larger of the two proximity
+                    // settings. Defer to map.post so the call lands after layout
+                    // — zoomToBoundingBox needs measured dimensions to compute
+                    // the right zoom level. Latitude-aware longitude scaling so
+                    // the bbox stays roughly square in real meters at any lat.
+                    val r = mapRadiusMeters.toDouble().coerceAtLeast(50.0)
+                    val latDegPerMeter = 1.0 / 111_000.0
+                    val lonDegPerMeter = 1.0 /
+                        (111_000.0 * cos(Math.toRadians(fix.latitude)).coerceAtLeast(0.01))
+                    val bbox = BoundingBox(
+                        fix.latitude + r * latDegPerMeter,
+                        fix.longitude + r * lonDegPerMeter,
+                        fix.latitude - r * latDegPerMeter,
+                        fix.longitude - r * lonDegPerMeter
+                    )
+                    map.post { map.zoomToBoundingBox(bbox, false, 0) }
+                    map.invalidate()
+                },
+                onRelease = { map -> map.onDetach() }
+            )
+            // Threat-tier scrim — pulses while scanning. Heavier alpha than
+            // the first cut so the tier color reads at a glance over OSM
+            // tiles, which are themselves cream/light by default.
+            val scrimAlpha = (0.55f * pulse).coerceIn(0.40f, 0.65f)
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(activeColor.copy(alpha = scrimAlpha))
+            )
+        }
+        // Click capture sits on top so taps reach onTap regardless of which
+        // visual layer was painted underneath.
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .clickable(onClick = onTap)
         )
     }
 }
@@ -302,6 +421,14 @@ private fun SourcesPanel(events: List<DetectionEvent>) {
     }
 }
 
+/** User-facing label for a detection source. The internal enum stays MIC
+ *  (mic-bearing devices is the technical concept) while the UI shows the
+ *  friendlier "COMMERCIAL" — Nest/Ring/Echo are commercial smart-home gear. */
+private fun DetectionSource.displayLabel(): String = when (this) {
+    DetectionSource.MIC -> "COMMERCIAL"
+    else -> name
+}
+
 @Composable
 private fun SourceRow(source: DetectionSource, events: List<DetectionEvent>) {
     val health by SourceHealth.flowFor(source).collectAsState()
@@ -321,7 +448,7 @@ private fun SourceRow(source: DetectionSource, events: List<DetectionEvent>) {
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 Text(
-                    text = source.name,
+                    text = source.displayLabel(),
                     color = MaterialTheme.colorScheme.onSurface,
                     fontSize = 14.sp,
                     fontWeight = FontWeight.Bold,
@@ -390,10 +517,22 @@ private fun EventRow(e: DetectionEvent) {
         if (e.hasGeo) {
             IconButton(
                 onClick = {
-                    val uri = Uri.parse("geo:${e.lat},${e.lon}?q=${e.lat},${e.lon}(${Uri.encode(e.label)})")
+                    // Force the pin to open in Google Maps rather than whichever
-                    val intent = Intent(Intent.ACTION_VIEW, uri).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    // app holds the user's default geo: handler — Waze, etc. can
-                    if (intent.resolveActivity(ctx.packageManager) != null) {
+                    // intercept geo: intents and we don't want that here. Falls
-                        ctx.startActivity(intent)
+                    // back to a generic browser intent if Maps isn't installed.
+                    val mapsUri = Uri.parse(
+                        "https://www.google.com/maps/search/?api=1&query=${e.lat},${e.lon}"
+                    )
+                    val mapsIntent = Intent(Intent.ACTION_VIEW, mapsUri)
+                        .setPackage("com.google.android.apps.maps")
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    try {
+                        ctx.startActivity(mapsIntent)
+                    } catch (_: android.content.ActivityNotFoundException) {
+                        val fallback = Intent(Intent.ACTION_VIEW, mapsUri)
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        try { ctx.startActivity(fallback) } catch (_: android.content.ActivityNotFoundException) {}
                     }
                 },
                 modifier = Modifier.size(28.dp)

app/src/main/kotlin/org/soulstone/overwatch/ui/MarkerIcons.kt

@@ -0,0 +1,29 @@
+package org.soulstone.overwatch.ui
+
+import android.content.res.Resources
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.drawable.BitmapDrawable
+
+/** Builds a small filled-circle Marker icon. Used for both the user-position
+ *  dot (blue) and the ALPR pins (red) — osmdroid's default teardrop marker
+ *  reads as a "click me" affordance which is wrong for a non-interactive
+ *  visualization, so we use simple dots instead. Shared by the in-app and
+ *  overlay versions of the threat circle. */
+internal fun dotDrawable(
+    resources: Resources,
+    sizePx: Int,
+    coreColor: Int
+): BitmapDrawable {
+    val bitmap = Bitmap.createBitmap(sizePx, sizePx, Bitmap.Config.ARGB_8888)
+    val canvas = Canvas(bitmap)
+    val outline = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = 0xFFFFFFFF.toInt() }
+    canvas.drawCircle(sizePx / 2f, sizePx / 2f, sizePx / 2f - 1f, outline)
+    val core = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = coreColor }
+    canvas.drawCircle(sizePx / 2f, sizePx / 2f, sizePx / 2f - 4f, core)
+    return BitmapDrawable(resources, bitmap)
+}
+
+internal const val DOT_USER_BLUE = 0xFF2196F3.toInt()
+internal const val DOT_FLOCK_RED = 0xFFD7263D.toInt()

app/src/main/kotlin/org/soulstone/overwatch/ui/OverlayBubble.kt

@@ -0,0 +1,163 @@
+package org.soulstone.overwatch.ui
+
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import kotlin.math.cos
+import kotlin.math.max
+import org.osmdroid.tileprovider.tilesource.TileSourceFactory
+import org.osmdroid.util.BoundingBox
+import org.osmdroid.util.GeoPoint
+import org.osmdroid.views.MapView
+import org.osmdroid.views.overlay.Marker
+import org.soulstone.overwatch.data.settings.Settings
+import org.soulstone.overwatch.fusion.ThreatLevel
+import org.soulstone.overwatch.service.DetectionService
+import org.soulstone.overwatch.ui.theme.ThreatColors
+
+/**
+ * Smaller "chat-bubble" version of the threat-map circle, hosted in a
+ * WindowManager overlay by [org.soulstone.overwatch.service.OverlayManager].
+ *
+ * Self-contained: pulls all of its data from the same companion-level
+ * StateFlows the in-app [MainScreen] uses (DetectionService.running / store /
+ * mapPoints / location) plus the proximity sliders from [Settings]. The
+ * caller doesn't pass any state — keeps the OverlayManager dumb.
+ *
+ * Tap and drag are handled at the View layer (OverlayManager's OnTouchListener);
+ * this composable is render-only.
+ */
+@Composable
+fun OverlayBubble() {
+    val ctx = LocalContext.current
+    val settings = remember(ctx) { Settings.get(ctx) }
+
+    val running by DetectionService.running.collectAsState()
+    val threat by DetectionService.store.threatLevel.collectAsState()
+    val userLocation by DetectionService.location.collectAsState()
+    val mapPoints by DetectionService.mapPoints.collectAsState()
+    val deflockProx by settings.deflockProximityM.collectAsState()
+    val citizenProx by settings.citizenProximityM.collectAsState()
+    val radius = max(deflockProx, citizenProx).toFloat()
+
+    val activeColor = when (threat) {
+        ThreatLevel.GREEN -> ThreatColors.Green
+        ThreatLevel.YELLOW -> ThreatColors.Yellow
+        ThreatLevel.ORANGE -> ThreatColors.Orange
+        ThreatLevel.RED -> ThreatColors.Red
+    }
+
+    val transition = rememberInfiniteTransition(label = "overlay-pulse")
+    val pulse by transition.animateFloat(
+        initialValue = 0.55f,
+        targetValue = 1.0f,
+        animationSpec = infiniteRepeatable(
+            animation = tween(durationMillis = 1200),
+            repeatMode = RepeatMode.Reverse
+        ),
+        label = "overlay-pulse"
+    )
+
+    val userDot = remember(ctx) { dotDrawable(ctx.resources, 30, DOT_USER_BLUE) }
+    val flockDot = remember(ctx) { dotDrawable(ctx.resources, 22, DOT_FLOCK_RED) }
+
+    Box(
+        modifier = Modifier
+            .size(140.dp)
+            .clip(CircleShape),
+        contentAlignment = Alignment.Center
+    ) {
+        // The OverlayManager only attaches the bubble while running == true,
+        // but check anyway — paranoia keeps the bubble from rendering a stale
+        // map if a future code path lets the composition outlive the service.
+        val fix = userLocation
+        if (!running || fix == null) {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(
+                        Brush.radialGradient(
+                            colors = listOf(
+                                activeColor.copy(alpha = pulse),
+                                activeColor.copy(alpha = pulse * 0.6f)
+                            )
+                        )
+                    )
+            )
+        } else {
+            AndroidView(
+                modifier = Modifier.fillMaxSize(),
+                factory = { c ->
+                    MapView(c).apply {
+                        setTileSource(TileSourceFactory.MAPNIK)
+                        setMultiTouchControls(false)
+                        setBuiltInZoomControls(false)
+                        isClickable = false
+                        isFocusable = false
+                    }
+                },
+                update = { map ->
+                    map.controller.setCenter(GeoPoint(fix.latitude, fix.longitude))
+                    map.overlays.clear()
+                    for (p in mapPoints) {
+                        map.overlays.add(
+                            Marker(map).apply {
+                                position = GeoPoint(p.lat, p.lon)
+                                setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_CENTER)
+                                icon = flockDot
+                                title = p.operator ?: p.manufacturer ?: "ALPR"
+                                setInfoWindow(null)
+                            }
+                        )
+                    }
+                    map.overlays.add(
+                        Marker(map).apply {
+                            position = GeoPoint(fix.latitude, fix.longitude)
+                            setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_CENTER)
+                            icon = userDot
+                            setInfoWindow(null)
+                        }
+                    )
+                    val r = radius.toDouble().coerceAtLeast(50.0)
+                    val latDegPerMeter = 1.0 / 111_000.0
+                    val lonDegPerMeter = 1.0 /
+                        (111_000.0 * cos(Math.toRadians(fix.latitude)).coerceAtLeast(0.01))
+                    val bbox = BoundingBox(
+                        fix.latitude + r * latDegPerMeter,
+                        fix.longitude + r * lonDegPerMeter,
+                        fix.latitude - r * latDegPerMeter,
+                        fix.longitude - r * lonDegPerMeter
+                    )
+                    map.post { map.zoomToBoundingBox(bbox, false, 0) }
+                    map.invalidate()
+                },
+                onRelease = { map -> map.onDetach() }
+            )
+            // Tier scrim — same pulse alpha range as the in-app circle.
+            val scrimAlpha = (0.55f * pulse).coerceIn(0.40f, 0.65f)
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(activeColor.copy(alpha = scrimAlpha))
+            )
+        }
+    }
+}

app/src/main/kotlin/org/soulstone/overwatch/ui/SettingsScreen.kt

@@ -1,5 +1,8 @@
 package org.soulstone.overwatch.ui
 
+import android.content.Intent
+import android.net.Uri
+import android.provider.Settings as AndroidSettings
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -11,6 +14,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -49,10 +53,13 @@ fun SettingsScreen(
     val wifi by settings.wifiEnabled.collectAsState()
     val deflock by settings.deflockEnabled.collectAsState()
     val citizen by settings.citizenEnabled.collectAsState()
+    val mic by settings.micEnabled.collectAsState()
     val deflockProx by settings.deflockProximityM.collectAsState()
     val citizenProx by settings.citizenProximityM.collectAsState()
     val theme by settings.themeMode.collectAsState()
     val vibrate by settings.vibrateOnAlert.collectAsState()
+    val overlay by settings.overlayEnabled.collectAsState()
+    val context = LocalContext.current
 
     Column(
         modifier = Modifier
@@ -82,6 +89,7 @@ fun SettingsScreen(
         SourceToggle("WIFI  •  WiFi BSSID + SSID", wifi) { settings.setWifiEnabled(it) }
         SourceToggle("DEFLOCK  •  ALPR map (Overpass)", deflock) { settings.setDeflockEnabled(it) }
         SourceToggle("CITIZEN  •  Real-time incident feed", citizen) { settings.setCitizenEnabled(it) }
+        SourceToggle("COMMERCIAL  •  Nest, Ring, Echo", mic) { settings.setMicEnabled(it) }
         Spacer(Modifier.height(8.dp))
         if (isRunning) {
             Button(
@@ -128,6 +136,32 @@ fun SettingsScreen(
         SectionLabel("Alerts")
         SourceToggle("Vibrate on threat escalation", vibrate) { settings.setVibrateOnAlert(it) }
 
+        Spacer(Modifier.height(16.dp))
+        SectionLabel("Display over other apps")
+        SourceToggle("Floating threat circle", overlay) { enabled ->
+            settings.setOverlayEnabled(enabled)
+            // Special-access perm: can't be granted via runtime prompt. Bounce
+            // the user to the system settings page for this app so they can
+            // approve. The DetectionService re-checks canDrawOverlays at show()
+            // time so a denied/revoked perm just means the bubble silently
+            // doesn't appear — no crash.
+            if (enabled && !AndroidSettings.canDrawOverlays(context)) {
+                val intent = Intent(
+                    AndroidSettings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                    Uri.parse("package:${context.packageName}")
+                ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                try { context.startActivity(intent) } catch (_: Exception) {}
+            }
+        }
+        if (overlay && !AndroidSettings.canDrawOverlays(context)) {
+            Text(
+                "Permission needed — system page should have opened. If not, grant manually under Apps → OVERWATCH → Display over other apps.",
+                fontSize = 11.sp,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                modifier = Modifier.padding(vertical = 4.dp)
+            )
+        }
+
         Spacer(Modifier.height(16.dp))
         SectionLabel("Appearance")
         ThemeRadio("System default", theme == Settings.ThemeMode.SYSTEM) {
@@ -165,11 +199,16 @@ private fun SourceToggle(label: String, value: Boolean, onChange: (Boolean) -> U
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceBetween
     ) {
+        // weight(1f) reserves the remaining row width for the label so it
+        // wraps on narrow screens instead of clipping under the Switch.
         Text(
             text = label,
             color = MaterialTheme.colorScheme.onBackground,
             fontSize = 14.sp,
-            fontFamily = FontFamily.Monospace
+            fontFamily = FontFamily.Monospace,
+            modifier = Modifier
+                .weight(1f, fill = true)
+                .padding(end = 12.dp)
         )
         Switch(checked = value, onCheckedChange = onChange)
     }

app/src/main/res/values/strings.xml

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">[DЯΣΛMMΛKΣЯ] OVERWATCH</string>
+    <string name="app_name">OVERWATCH</string>
-    <string name="title_line1">[DЯΣΛMMΛKΣЯ]</string>
-    <string name="title_line2">   . //0VΣЯW4TCH</string>
     <string name="status_idle">Idle — press START to begin scanning</string>
     <string name="status_scanning_clear">All clear</string>
     <string name="status_scanning">Scanning…</string>
     <string name="action_start">START</string>
     <string name="action_stop">STOP</string>
-    <string name="notification_channel_name">DREAMMAKER / OVERWATCH detection</string>
+    <string name="notification_channel_name">OVERWATCH detection</string>
     <string name="notification_channel_desc">Foreground notification while scanning</string>
     <string name="notification_title">OVERWATCH active</string>
     <string name="notification_text">Scanning for nearby surveillance</string>

gradle/libs.versions.toml

@@ -7,6 +7,7 @@ activityCompose = "1.9.3"
 composeBom = "2024.12.01"
 material3 = "1.3.1"
 playServicesLocation = "21.3.0"
+osmdroid = "6.1.20"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -21,6 +22,7 @@ androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-toolin
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
 play-services-location = { group = "com.google.android.gms", name = "play-services-location", version.ref = "playServicesLocation" }
+osmdroid-android = { group = "org.osmdroid", name = "osmdroid-android", version.ref = "osmdroid" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }