@mentra/bluetooth-sdk 3.2.1-dev.314 → 3.3.0-beta.942

package/android/src/main/java/com/mentra/bluetoothsdk/DeviceManager.kt

@@ -13,6 +13,7 @@ import androidx.core.content.ContextCompat
 import com.mentra.bluetoothsdk.controllers.ControllerManager
 import com.mentra.bluetoothsdk.controllers.R1
 import com.mentra.bluetoothsdk.services.ForegroundService
+import com.mentra.bluetoothsdk.services.G2ConnectionRecovery
 import com.mentra.bluetoothsdk.services.PhoneMic
 import com.mentra.bluetoothsdk.sgcs.Ar99
 import com.mentra.bluetoothsdk.sgcs.G1
@@ -34,7 +35,10 @@ import com.mentra.bluetoothsdk.utils.MicTypes
 import com.mentra.bluetoothsdk.utils.PhoneAudioMonitor
 import com.mentra.lc3Lib.Lc3Cpp
 import com.mentra.bluetoothsdk.stt.SherpaOnnxTranscriber
+import kotlin.coroutines.resume
+import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.withContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.text.SimpleDateFormat
@@ -45,12 +49,15 @@ import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import kotlin.jvm.JvmStatic
 
-class DeviceManager {
+class DeviceManager internal constructor(initializeHardware: Boolean) {
+    constructor() : this(initializeHardware = true)
     companion object {
 
         @Volatile
         private var _instance: DeviceManager? = null
 
+        internal fun isInitialized(): Boolean = _instance != null
+
         @JvmStatic
         fun getInstance(): DeviceManager {
             return _instance
@@ -59,6 +66,10 @@ class DeviceManager {
     }
 
     // MARK: - Unique (Android)
+    private val connectionRecovery = G2ConnectionRecovery(Bridge.getContext())
+    private val recoveryLock = Any()
+    private var recoverG2Connection = false
+    private var recoveryListenerId: String? = null
     private var serviceStarted = false
     private val mainHandler = Handler(Looper.getMainLooper())
     private val executor: ExecutorService = Executors.newSingleThreadExecutor()
@@ -79,7 +90,8 @@ class DeviceManager {
     // MARK: - End Unique
 
     // MARK: - Properties
-    var sgc: SGCManager? = null
+    // Read by the welcome executor as well as device lifecycle handlers.
+    @Volatile var sgc: SGCManager? = null
     var controller: ControllerManager? = null
 
     // settings:
@@ -283,7 +295,22 @@ class DeviceManager {
 
     init {
         Bridge.log("DeviceManager: init()")
+        recoveryListenerId = DeviceStore.store.addListener { category, changes ->
+            if (category == "bluetooth" && changes.keys.any { it in G2ConnectionRecovery.keys }) {
+                synchronized(recoveryLock) {
+                    if (recoverG2Connection) {
+                        connectionRecovery.save(DeviceStore.store.getCategory("bluetooth"))
+                    }
+                }
+            }
+        }
         initializeViewStates()
+        if (initializeHardware) initializeHardwareServices()
+    }
+
+    // Keep host routing usable without starting audio codecs, receivers or services.
+    // The public constructor always initializes the hardware environment.
+    private fun initializeHardwareServices() {
         startForegroundService()
         // setupPermissionMonitoring()
         setupBluetoothStateMonitoring()
@@ -1354,7 +1381,8 @@ class DeviceManager {
             Bridge.log("MAN: Cleaning up previous sgc type: ${sgc?.type}")
             sgc?.cleanup()
             sgc = null
-            resetSystemTimeSync()
+            DeviceStore.apply("glasses", "micEnabled", false)
+            resetConnectionReadyState()
         }
 
         if (sgc != null) {
@@ -1477,12 +1505,16 @@ class DeviceManager {
             return
         }
 
+        // A new identity must never inherit the previous glasses' address when
+        // pairing supplied only a name. Same-device reconnects retain their cache.
+        val identityChanged = pendingDeviceName.isNotEmpty() &&
+            (pendingDeviceName != deviceName || sgc?.type != defaultWearable)
+        if (identityChanged || pendingDeviceAddress.isNotEmpty()) {
+            deviceAddress = pendingDeviceAddress
+        }
         if (pendingDeviceName.isNotEmpty()) {
             deviceName = pendingDeviceName
         }
-        if (pendingDeviceAddress.isNotEmpty()) {
-            deviceAddress = pendingDeviceAddress
-        }
         clearPendingConnection()
 
         val readyKey = "${sgc?.type}:${deviceName}"
@@ -1497,6 +1529,10 @@ class DeviceManager {
         Bridge.log("MAN: handleDeviceReady() ${sgc?.type}")
         resetMicHealth()
         defaultWearable = sgc?.type ?: ""
+        synchronized(recoveryLock) {
+            recoverG2Connection = defaultWearable == DeviceTypes.G2
+            connectionRecovery.save(DeviceStore.store.getCategory("bluetooth"))
+        }
         searching = false
 
         syncSystemTimeOnceForConnection(readyKey)
@@ -1504,6 +1540,7 @@ class DeviceManager {
         // re-apply display height/depth after reconnection
         mainHandler.postDelayed(
             {
+                val device = sgc ?: return@postDelayed
                 val h =
                     (DeviceStore.store.get("bluetooth", "dashboard_height") as? Number)
                         ?.toInt()
@@ -1512,19 +1549,24 @@ class DeviceManager {
                     (DeviceStore.store.get("bluetooth", "dashboard_depth") as? Number)
                         ?.toInt()
                         ?: dashboardDepth // canonical default (2), not 1
-                val d = rawDepth.coerceIn(1, 4)
-                sgc?.setDashboardPosition(h, d)
+                val d = if (device.type == DeviceTypes.NIMO) rawDepth.coerceIn(0, 10) else rawDepth.coerceIn(1, 4)
+                device.setDashboardPosition(h, d)
             },
             2000
         )
 
-        // Show welcome message on first connect for all display glasses
+        // A full-canvas device can opt out so this temporary message does not
+        // erase the host's connected-edge scene replay.
         if (shouldSendBootingMessage) {
             shouldSendBootingMessage = false
-            executor.execute {
-                sgc?.sendTextWall("// MentraOS Connected")
-                Thread.sleep(3000)
-                sgc?.clearDisplay()
+            val device = sgc
+            if (device?.showConnectionConfirmation == true) {
+                executor.execute {
+                    if (sgc !== device) return@execute
+                    device.sendTextWall("// MentraOS Connected")
+                    Thread.sleep(3000)
+                    if (sgc === device) device.clearDisplay()
+                }
             }
         }
 
@@ -1537,10 +1579,11 @@ class DeviceManager {
             handleMach1Ready() // Z100 uses same initialization as Mach1
         }
 
-        // Re-apply microphone settings after reconnection
-        // Cache was cleared on disconnect, so this will definitely send commands
+        // Disconnect clears micEnabled but preserves the consumers' audio requests.
+        // Recompute that derived flag before selecting a microphone; replaying an
+        // unchanged should_send_* setting is deduplicated by DeviceStore.apply().
         Bridge.log("MAN: Re-applying microphone settings after reconnection")
-        updateMicState()
+        setMicState()
 
         // send to the server our battery status:
         Bridge.sendBatteryStatus(sgc?.batteryLevel ?: -1, false)
@@ -1580,7 +1623,11 @@ class DeviceManager {
         mainHandler.postDelayed(sync, 3000)
     }
 
-    private fun resetSystemTimeSync() {
+    private fun resetConnectionReadyState() {
+        // Suppress duplicate readiness only within one connection, never across
+        // a genuine disconnect/reconnect of the same glasses inside two seconds.
+        lastReadyHandledKey = ""
+        lastReadyHandledAtMs = 0L
         pendingSystemTimeSync?.let { mainHandler.removeCallbacks(it) }
         pendingSystemTimeSync = null
         lastSystemTimeSyncConnectionKey = ""
@@ -1598,7 +1645,7 @@ class DeviceManager {
 
     fun handleDeviceDisconnected() {
         Bridge.log("MAN: Device disconnected")
-        resetSystemTimeSync()
+        resetConnectionReadyState()
         resetMicHealth()
         DeviceStore.apply("glasses", "headUp", false)
         DeviceStore.apply(
@@ -1677,7 +1724,7 @@ class DeviceManager {
         dashboardSceneCleanupPending = false
         val elementIds = pendingDashboardSceneElementIds.toList()
         pendingDashboardSceneElementIds.clear()
-        if (elementIds.isNotEmpty()) {
+        if (elementIds.isNotEmpty() && sgc?.sceneHandoffRequiresClear == true) {
             sgc?.clearSceneElements(elementIds)
         }
     }
@@ -1714,7 +1761,7 @@ class DeviceManager {
             sceneStates[stateIndex] = null
             if (stateIndex == 1 && dashboardSceneCleanupPending) {
                 pendingDashboardSceneElementIds.addAll(prevFrame.elements.map { it.id })
-            } else if (layoutType != "clear_view") {
+            } else if (layoutType != "clear_view" && shouldClearSceneHandoff(stateIndex)) {
                 sgc?.clearSceneElements(prevFrame.elements.map { it.id })
             }
         }
@@ -1781,7 +1828,7 @@ class DeviceManager {
             val prevLegacyType = viewStates[stateIndex].layoutType
             val cleanupDeferred = stateIndex == 1 && dashboardSceneCleanupPending
             if (
-                !cleanupDeferred &&
+                !cleanupDeferred && shouldClearSceneHandoff(stateIndex) &&
                     prevLegacyType.isNotEmpty() &&
                     prevLegacyType != "clear_view" &&
                     prevLegacyType != "scene"
@@ -1797,7 +1844,7 @@ class DeviceManager {
             // blank.
             if (stateIndex == 1 && dashboardSceneCleanupPending) {
                 pendingDashboardSceneElementIds.addAll(prevFrame.elements.map { it.id })
-            } else {
+            } else if (shouldClearSceneHandoff(stateIndex)) {
                 sgc?.clearSceneElements(prevFrame.elements.map { it.id })
             }
             frame = frame.copy(replay = true, elements = frame.elements.map { it.copy(change = "created") })
@@ -1816,6 +1863,15 @@ class DeviceManager {
         }
     }
 
+    // Hidden-view updates only change their replay slot. They must never clear
+    // the visible view, and full-frame adapters need no separate handoff sweep.
+    private fun shouldClearSceneHandoff(stateIndex: Int): Boolean {
+        val visibleIndex = if (headUp && contextualDashboard) 1 else 0
+        val device = sgc ?: return false
+        return stateIndex == visibleIndex && !screenDisabled && device.fullyBooted &&
+            !device.type.contains(DeviceTypes.SIMULATED) && device.sceneHandoffRequiresClear
+    }
+
     /** Guarded scene dispatch — mirrors sendCurrentState's send conditions. */
     private fun dispatchSceneFrame(stateIndex: Int, frame: SceneFrame) {
         if (screenDisabled) return
@@ -1933,8 +1989,11 @@ class DeviceManager {
         sgc?.requestSavedWifiNetworks(requestId, sid) ?: false
 
     fun sendIncidentId(incidentId: String, apiBaseUrl: String? = null) {
+        val driver = sgc ?: throw BluetoothSdkException(
+            "glasses_not_connected", "Cannot request incident logs because glasses are not connected.",
+        )
         Bridge.log("MAN: Sending incidentId to glasses for log upload: $incidentId")
-        sgc?.sendIncidentId(incidentId, apiBaseUrl)
+        driver.sendIncidentId(incidentId, apiBaseUrl)
     }
 
     /** Push a notification into the glasses' own notification centre; rejects unsupported or disconnected devices. */
@@ -2389,10 +2448,20 @@ class DeviceManager {
     }
 
     fun disconnect(clearPendingIdentity: Boolean = true) {
+        synchronized(recoveryLock) {
+            recoverG2Connection = false
+            connectionRecovery.clear()
+        }
         sgc?.clearDisplay()
-        sgc?.disconnect()
+        // NIMO owns a background canvas encoder and this path discards its instance.
+        // A link-level reconnect keeps the instance (and encoder) through disconnect().
+        val device = sgc
+        if (device is Nimo) device.cleanup() else device?.disconnect()
         sgc = null // Clear the SGC reference after disconnect
-        resetSystemTimeSync()
+        // This cache belongs to the discarded connection. Keep consumer demand,
+        // but require a new mic-enable command when replacement glasses are ready.
+        DeviceStore.apply("glasses", "micEnabled", false)
+        resetConnectionReadyState()
         resetMicHealth()
         searching = false
         micEnabled = false
@@ -2439,7 +2508,42 @@ class DeviceManager {
         controller = null
     }
 
+    private var unpairInProgress = false
+
+    /** Explicit user Unpair, separate from passive pairing cleanup and logout. */
+    suspend fun unpair() = withContext(Dispatchers.Main) {
+        check(!unpairInProgress) { "Unpair already in progress" }
+        unpairInProgress = true
+        try {
+            val target = sgc
+            val nimo = target as? Nimo
+            val savedNimoAddress = when {
+                defaultWearable == DeviceTypes.NIMO -> deviceAddress
+                pendingWearable == DeviceTypes.NIMO -> pendingDeviceAddress
+                else -> null
+            }
+            if (nimo != null) {
+                suspendCancellableCoroutine<Boolean> { continuation ->
+                    nimo.resetForUnpair { if (continuation.isActive) continuation.resume(it) }
+                }
+                check(sgc === target) { "Glasses changed during Unpair" }
+                // Drop the encrypted link before removing the phone's bond.
+                nimo.disconnect()
+                nimo.removeBluetoothBond()
+            } else if (target == null && savedNimoAddress != null) {
+                Nimo.removeBluetoothBond(savedNimoAddress)
+            }
+            forget()
+        } finally {
+            unpairInProgress = false
+        }
+    }
+
     fun forget() {
+        synchronized(recoveryLock) {
+            recoverG2Connection = false
+            connectionRecovery.clear()
+        }
         Bridge.log("MAN: Forgetting smart glasses")
 
         val live = sgc as? MentraLive
@@ -2451,7 +2555,8 @@ class DeviceManager {
             // session state without calling disconnect() again (that would hit a dead instance
             // and leave a destroyed MentraLive retained for the next scan).
             sgc = null
-            resetSystemTimeSync()
+            DeviceStore.apply("glasses", "micEnabled", false)
+            resetConnectionReadyState()
             searching = false
             micEnabled = false
             updateMicState()
@@ -2554,6 +2659,8 @@ class DeviceManager {
 
     // MARK: Cleanup
     fun cleanup() {
+        recoveryListenerId?.let { DeviceStore.store.removeListener(it) }
+        recoveryListenerId = null
         stopBluetoothStateMonitoring()
 
         micReinitRunnable?.let { mainHandler.removeCallbacks(it) }

package/android/src/main/java/com/mentra/bluetoothsdk/DeviceStore.kt

@@ -142,6 +142,7 @@ object DeviceStore {
         store.set("bluetooth", "gallery_mode", true)
         store.set("bluetooth", "voice_activity_detection_enabled", BluetoothSdkDefaults.VOICE_ACTIVITY_DETECTION_ENABLED)
         store.set("bluetooth", "loudness_gate_enabled", BluetoothSdkDefaults.LOUDNESS_GATE_ENABLED)
+        store.set("bluetooth", "auto_power_off_enabled", BluetoothSdkDefaults.AUTO_POWER_OFF_ENABLED)
         store.set("bluetooth", "screen_disabled", false)
         store.set("bluetooth", "button_photo_size", "max")
         store.set("bluetooth", "button_max_recording_time", 10)
@@ -219,14 +220,30 @@ object DeviceStore {
             }
 
             // BLUETOOTH:
+            "bluetooth" to "contextual_dashboard" -> {
+                if (value is Boolean) {
+                    CoroutineScope(Dispatchers.Main.immediate).launch {
+                        // The setting changes the selected view even without a new head event.
+                        // Re-read state on Main and retain the manager's readiness/display guards.
+                        if (store.get("glasses", "headUp") == true) {
+                            DeviceManager.getInstance().sendCurrentState()
+                        }
+                    }
+                }
+            }
             "bluetooth" to "brightness" -> {
                 val b = (value as? Number)?.toInt()  ?: 50
                 val auto = (store.get("bluetooth", "auto_brightness") as? Boolean) ?: true
                 CoroutineScope(Dispatchers.Main).launch {
-                    DeviceManager.getInstance().sgc?.setBrightness(b, auto)
-                    DeviceManager.getInstance().sgc?.sendTextWall("Set brightness to $b%")
-                    delay(800) // 0.8 seconds
-                    DeviceManager.getInstance().sgc?.clearDisplay()
+                    val device = DeviceManager.getInstance().sgc ?: return@launch
+                    device.setBrightness(b, auto)
+                    if (device.showBrightnessConfirmation) {
+                        device.sendTextWall("Set brightness to $b%")
+                        delay(800) // 0.8 seconds
+                        if (DeviceManager.getInstance().sgc === device) {
+                            device.clearDisplay()
+                        }
+                    }
                 }
             }
             "bluetooth" to "auto_brightness" -> {
@@ -234,16 +251,17 @@ object DeviceStore {
                 val auto = (value as? Boolean) ?: true
                 val autoBrightnessChanged = (oldValue as? Boolean) != auto
                 CoroutineScope(Dispatchers.Main).launch {
-                    DeviceManager.getInstance().sgc?.setBrightness(b, auto)
-                    if (autoBrightnessChanged) {
-                        DeviceManager.getInstance()
-                                .sgc
-                                ?.sendTextWall(
-                                        if (auto) "Enabled auto brightness"
-                                        else "Disabled auto brightness"
-                                )
+                    val device = DeviceManager.getInstance().sgc ?: return@launch
+                    device.setBrightness(b, auto)
+                    if (autoBrightnessChanged && device.showBrightnessConfirmation) {
+                        device.sendTextWall(
+                                if (auto) "Enabled auto brightness"
+                                else "Disabled auto brightness"
+                        )
                         delay(800) // 0.8 seconds
-                        DeviceManager.getInstance().sgc?.clearDisplay()
+                        if (DeviceManager.getInstance().sgc === device) {
+                            device.clearDisplay()
+                        }
                     }
                 }
             }
@@ -291,6 +309,12 @@ object DeviceStore {
             "bluetooth" to "loudness_gate_enabled" -> {
                 DeviceManager.getInstance().sgc?.sendLoudnessGateSetting()
             }
+            "bluetooth" to "auto_power_off_enabled" -> {
+                Bridge.log(
+                        "DeviceStore: auto_power_off_enabled changed to $value — sending cs_swit type 11"
+                )
+                DeviceManager.getInstance().sgc?.sendAutoPowerOffSetting()
+            }
             // Deliberately has no seeded default above: the key starts absent so
             // that a session where the engine has not authorized tuning can only
             // ever send a reset.

package/android/src/main/java/com/mentra/bluetoothsdk/GeneratedChangelogCatalog.kt

@@ -3,8 +3,9 @@ package com.mentra.bluetoothsdk
 /** Generated from /changelogs. Do not edit directly. */
 internal val GENERATED_RELEASE_CHANGELOGS: List<ReleaseChangelog> =
     listOf(
-        ReleaseChangelog(version = "3.2.1", markdown = "This release is under active development. User-facing changes will be documented as they land."),
-        ReleaseChangelog(version = "3.2.0", markdown = "This release is under active development. User-facing changes will be documented as they land.\n\n- Breaking Bluetooth SDK change: `forgetWifiNetwork(ssid)` now returns `WifiForgetResult` instead of `WifiStatusChangeEvent`. Migrate status-only consumers to the semantic `outcome`; the requested network remains `ssid`, while optional post-command connectivity is reported by `connected`, `currentSsid`, and `localIp`."),
+        ReleaseChangelog(version = "3.3.0", markdown = "This release is under active development. User-facing changes will be documented as they land."),
+        ReleaseChangelog(version = "3.2.1", markdown = "- **Livestreamer:** \"Stream Here\" now works without a Wi-Fi network. Improved stream startup and connection reliability.\n- **Photos and gallery:** More reliable photo capture and gallery syncing.\n- **Mentra AI:** Reliability improvements and bug fixes.\n- **Miniapps:** Smoother transitions, with back buttons and gestures that take you to the previous screen inside a miniapp.\n- **Pairing and connections:** Improved G1 pairing and G2 background reconnection.\n- **Glasses updates:** Fixed repeated update checks and improved recovery after interrupted updates.\n- **Mentra Maps:** Bug fixes.\n- **NIMO:** Improved text and map layouts.\n- **Self-hosting:** Connect the Mentra App to your own self-hosted Mentra backend."),
+        ReleaseChangelog(version = "3.2.0", markdown = "- Improved glasses connectivity and Wi-Fi setup.\n\n- Breaking Bluetooth SDK change: `forgetWifiNetwork(ssid)` now returns `WifiForgetResult` instead of `WifiStatusChangeEvent`. Migrate status-only consumers to the semantic `outcome`; the requested network remains `ssid`, while optional post-command connectivity is reported by `connected`, `currentSsid`, and `localIp`."),
         ReleaseChangelog(version = "3.1.1", markdown = "- Improved Google login on iOS.\n- Pairing no longer requires phone microphone access."),
         ReleaseChangelog(version = "3.1.0", markdown = "**Mentra App and glasses**\n\n- Improved glasses pairing and reconnection, including on iPad.\n- Improved Android background reliability for captions and miniapps.\n- Added Xingyi AR99 support.\n- More reliable photo and video capture, with improved shutter sounds and privacy-light timing. Taking photos no longer interrupts your running miniapp.\n- Added video thumbnails and smoother gallery browsing.\n- Easier Mentra Live updates through your phone, with clearer progress and better recovery from interruptions.\n\n**Miniapp updates**\n\n- **Mentra AI:** Control whether photos are included with questions. Improved visual answers and connected-app follow-ups.\n- **Captions:** Added offline transcription settings and top/bottom positioning on supported displays.\n- **Translation:** Restored all 60 languages.\n- **Mentra Maps:** Clearer directions on G1/G2, less display flickering, and improved Android offline routing.\n- **Livestreamer:** More video-quality controls and custom streaming options, plus improved startup and sharing.\n- **Merge:** Tap to expand an insight; swipe down or back to dismiss it.\n- **Mentra Notes:** Smoother back navigation.\n- **Recorder:** Fixed audio sharing."),
     )

package/android/src/main/java/com/mentra/bluetoothsdk/GeneratedReleaseMetadata.kt

@@ -2,10 +2,10 @@ package com.mentra.bluetoothsdk
 
 /** Generated by release CI. Do not edit in a release checkout. */
 internal object GeneratedReleaseMetadata {
-    const val FAMILY_BASE_VERSION: String = "3.2.1"
-    const val RELEASE_IDENTITY: String = "3.2.1-dev.314"
-    const val RELEASE_SET_ID: String = "mentra-3.2.1-dev.314"
-    const val SOURCE_COMMIT: String = "00ab17c37df5902fbdb1a5824a41288b6850acc5"
-    const val OTA_MANIFEST_URL: String = "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.2.1/mentra-live-ota-3.2.1-dev.314.json"
-    const val OTA_MANIFEST_SHA256: String = "1062c560fcced026e5b43245e84cdd5febfd603f3ad19fbebef8fac455ba21d6"
+    const val FAMILY_BASE_VERSION: String = "3.3.0"
+    const val RELEASE_IDENTITY: String = "3.3.0-beta.942"
+    const val RELEASE_SET_ID: String = "mentra-3.3.0-beta.942"
+    const val SOURCE_COMMIT: String = "5c18d26dfc6feb9070d4705e36a38ae074e242b1"
+    const val OTA_MANIFEST_URL: String = "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-beta.942.json"
+    const val OTA_MANIFEST_SHA256: String = "94e1ba8266968b358748b30a6384882a6bc9df23aab38a01d786d448bdd044c9"
 }