@mentra/bluetooth-sdk 0.1.2 → 0.1.3

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

@@ -52,10 +52,10 @@ data class Device(
 
     companion object {
         internal fun fromMap(values: Map<String, Any>): Device? {
-            val model = stringValue(values, "model", "deviceModel", "device_model") ?: return null
-            val name = stringValue(values, "name", "deviceName", "device_name") ?: return null
-            val address = stringValue(values, "address", "deviceAddress", "device_address")?.takeIf { it.isNotBlank() }
-            val rssi = numberValue(values, "rssi", "signalStrength", "signal_strength")
+            val model = stringValue(values, "model") ?: return null
+            val name = stringValue(values, "name") ?: return null
+            val address = stringValue(values, "address")?.takeIf { it.isNotBlank() }
+            val rssi = numberValue(values, "rssi")
             val id = stringValue(values, "id")?.takeIf { it.isNotBlank() } ?: address ?: "${model}:$name"
             return Device(
                 model = DeviceModel.fromDeviceType(model),
@@ -94,9 +94,8 @@ data class WifiScanResult(
         internal fun fromMap(values: Map<String, Any>): WifiScanResult =
             WifiScanResult(
                 ssid = stringValue(values, "ssid") ?: "",
-                requiresPassword =
-                    boolValue(values, "requiresPassword", "requires_password", "auth_required") ?: false,
-                signalStrength = numberValue(values, "signalStrength", "signal_strength", "rssi") ?: -1,
+                requiresPassword = boolValue(values, "requiresPassword") ?: false,
+                signalStrength = numberValue(values, "signalStrength") ?: -1,
                 frequency = numberValue(values, "frequency"),
             )
     }
@@ -107,7 +106,7 @@ data class GlassesStatus(
     val connected: Boolean,
     val micEnabled: Boolean,
     val connectionState: GlassesConnectionState,
-    val btcConnected: Boolean,
+    val bluetoothClassicConnected: Boolean,
     val signalStrength: Int,
     val signalStrengthUpdatedAt: Long,
     val deviceModel: String,
@@ -115,7 +114,7 @@ data class GlassesStatus(
     val firmwareVersion: String,
     val besFirmwareVersion: String,
     val mtkFirmwareVersion: String,
-    val btMacAddress: String,
+    val bluetoothMacAddress: String,
     val leftMacAddress: String,
     val rightMacAddress: String,
     val macAddress: String,
@@ -146,15 +145,15 @@ data class GlassesStatus(
         mapOf(
             "connection" to connectionState.toStatusMap(connected, fullyBooted),
             "micEnabled" to micEnabled,
-            "btcConnected" to btcConnected,
+            "bluetoothClassicConnected" to bluetoothClassicConnected,
             "signalStrength" to signalStrength,
             "signalStrengthUpdatedAt" to signalStrengthUpdatedAt,
             "deviceModel" to deviceModel,
             "androidVersion" to androidVersion,
-            "fwVersion" to firmwareVersion,
-            "besFwVersion" to besFirmwareVersion,
-            "mtkFwVersion" to mtkFirmwareVersion,
-            "btMacAddress" to btMacAddress,
+            "firmwareVersion" to firmwareVersion,
+            "besFirmwareVersion" to besFirmwareVersion,
+            "mtkFirmwareVersion" to mtkFirmwareVersion,
+            "bluetoothMacAddress" to bluetoothMacAddress,
             "leftMacAddress" to leftMacAddress,
             "rightMacAddress" to rightMacAddress,
             "macAddress" to macAddress,
@@ -189,15 +188,15 @@ data class GlassesStatus(
                 connected = boolValue(values, "connected") ?: false,
                 micEnabled = boolValue(values, "micEnabled") ?: false,
                 connectionState = GlassesConnectionState.fromValue(stringValue(values, "connectionState")),
-                btcConnected = boolValue(values, "btcConnected") ?: false,
+                bluetoothClassicConnected = boolValue(values, "bluetoothClassicConnected") ?: false,
                 signalStrength = numberValue(values, "signalStrength") ?: -1,
                 signalStrengthUpdatedAt = longValue(values, "signalStrengthUpdatedAt") ?: 0L,
                 deviceModel = stringValue(values, "deviceModel") ?: "",
                 androidVersion = stringValue(values, "androidVersion") ?: "",
-                firmwareVersion = stringValue(values, "firmwareVersion", "fwVersion") ?: "",
-                besFirmwareVersion = stringValue(values, "besFwVersion", "besFirmwareVersion") ?: "",
-                mtkFirmwareVersion = stringValue(values, "mtkFwVersion", "mtkFirmwareVersion") ?: "",
-                btMacAddress = stringValue(values, "btMacAddress") ?: "",
+                firmwareVersion = stringValue(values, "firmwareVersion") ?: "",
+                besFirmwareVersion = stringValue(values, "besFirmwareVersion") ?: "",
+                mtkFirmwareVersion = stringValue(values, "mtkFirmwareVersion") ?: "",
+                bluetoothMacAddress = stringValue(values, "bluetoothMacAddress") ?: "",
                 leftMacAddress = stringValue(values, "leftMacAddress") ?: "",
                 rightMacAddress = stringValue(values, "rightMacAddress") ?: "",
                 macAddress = stringValue(values, "macAddress") ?: "",
@@ -234,6 +233,11 @@ data class BluetoothStatus(
     val micEnabled: Boolean,
     val currentMic: String,
     val micRanking: List<String>,
+    /**
+     * Nearby glasses in stable discovery order. Existing entries keep their array position as
+     * details refresh; new glasses append at the end, and removals should not reorder remaining
+     * entries.
+     */
     val searchResults: List<Device>,
     val wifiScanResults: List<WifiScanResult>,
     val lastLog: List<String>,
@@ -261,7 +265,7 @@ data class BluetoothStatus(
     val buttonMaxRecordingTime: Int,
     val buttonVideoWidth: Int,
     val buttonVideoHeight: Int,
-    val buttonVideoFps: Int,
+    val buttonVideoFrameRate: Int,
     val shouldSendPcm: Boolean,
     val shouldSendLc3: Boolean,
     val shouldSendTranscript: Boolean,
@@ -309,13 +313,13 @@ data class BluetoothStatus(
             "dashboard_depth" to dashboardDepth,
             "head_up_angle" to headUpAngle,
             "contextual_dashboard" to contextualDashboard,
-            "gallery_mode" to galleryModeAuto,
+            "galleryModeAuto" to galleryModeAuto,
             "button_photo_size" to buttonPhotoSize.value,
             "button_camera_led" to buttonCameraLed,
             "button_max_recording_time" to buttonMaxRecordingTime,
             "button_video_width" to buttonVideoWidth,
             "button_video_height" to buttonVideoHeight,
-            "button_video_fps" to buttonVideoFps,
+            "button_video_fps" to buttonVideoFrameRate,
             "should_send_pcm" to shouldSendPcm,
             "should_send_lc3" to shouldSendLc3,
             "should_send_transcript" to shouldSendTranscript,
@@ -357,13 +361,13 @@ data class BluetoothStatus(
                 dashboardDepth = numberValue(values, "dashboard_depth") ?: 2,
                 headUpAngle = numberValue(values, "head_up_angle") ?: 30,
                 contextualDashboard = boolValue(values, "contextual_dashboard") ?: true,
-                galleryModeAuto = boolValue(values, "gallery_mode") ?: true,
+                galleryModeAuto = boolValue(values, "galleryModeAuto") ?: true,
                 buttonPhotoSize = ButtonPhotoSize.fromValue(stringValue(values, "button_photo_size")),
                 buttonCameraLed = boolValue(values, "button_camera_led") ?: true,
                 buttonMaxRecordingTime = numberValue(values, "button_max_recording_time") ?: 10,
                 buttonVideoWidth = numberValue(values, "button_video_width") ?: 1280,
                 buttonVideoHeight = numberValue(values, "button_video_height") ?: 720,
-                buttonVideoFps = numberValue(values, "button_video_fps") ?: 30,
+                buttonVideoFrameRate = numberValue(values, "button_video_fps") ?: 30,
                 shouldSendPcm = boolValue(values, "should_send_pcm") ?: false,
                 shouldSendLc3 = boolValue(values, "should_send_lc3") ?: false,
                 shouldSendTranscript = boolValue(values, "should_send_transcript") ?: false,
@@ -380,7 +384,7 @@ data class GlassesStatusUpdate(
     val connected: Boolean? = null,
     val micEnabled: Boolean? = null,
     val connectionState: GlassesConnectionState? = null,
-    val btcConnected: Boolean? = null,
+    val bluetoothClassicConnected: Boolean? = null,
     val signalStrength: Int? = null,
     val signalStrengthUpdatedAt: Long? = null,
     val deviceModel: String? = null,
@@ -388,7 +392,7 @@ data class GlassesStatusUpdate(
     val firmwareVersion: String? = null,
     val besFirmwareVersion: String? = null,
     val mtkFirmwareVersion: String? = null,
-    val btMacAddress: String? = null,
+    val bluetoothMacAddress: String? = null,
     val leftMacAddress: String? = null,
     val rightMacAddress: String? = null,
     val macAddress: String? = null,
@@ -428,15 +432,15 @@ data class GlassesStatusUpdate(
                 put("connection", state.toStatusMap(connected == true, fullyBooted == true))
             }
             putIfNotNull("micEnabled", micEnabled)
-            putIfNotNull("btcConnected", btcConnected)
+            putIfNotNull("bluetoothClassicConnected", bluetoothClassicConnected)
             putIfNotNull("signalStrength", signalStrength)
             putIfNotNull("signalStrengthUpdatedAt", signalStrengthUpdatedAt)
             putIfNotNull("deviceModel", deviceModel)
             putIfNotNull("androidVersion", androidVersion)
-            putIfNotNull("fwVersion", firmwareVersion)
-            putIfNotNull("besFwVersion", besFirmwareVersion)
-            putIfNotNull("mtkFwVersion", mtkFirmwareVersion)
-            putIfNotNull("btMacAddress", btMacAddress)
+            putIfNotNull("firmwareVersion", firmwareVersion)
+            putIfNotNull("besFirmwareVersion", besFirmwareVersion)
+            putIfNotNull("mtkFirmwareVersion", mtkFirmwareVersion)
+            putIfNotNull("bluetoothMacAddress", bluetoothMacAddress)
             putIfNotNull("leftMacAddress", leftMacAddress)
             putIfNotNull("rightMacAddress", rightMacAddress)
             putIfNotNull("macAddress", macAddress)
@@ -475,15 +479,15 @@ data class GlassesStatusUpdate(
                 connected = optionalBoolValue(values, "connected"),
                 micEnabled = optionalBoolValue(values, "micEnabled"),
                 connectionState = GlassesConnectionState.optionalFromValue(optionalStringValue(values, "connectionState")),
-                btcConnected = optionalBoolValue(values, "btcConnected"),
+                bluetoothClassicConnected = optionalBoolValue(values, "bluetoothClassicConnected"),
                 signalStrength = optionalNumberValue(values, "signalStrength"),
                 signalStrengthUpdatedAt = optionalLongValue(values, "signalStrengthUpdatedAt"),
                 deviceModel = optionalStringValue(values, "deviceModel"),
                 androidVersion = optionalStringValue(values, "androidVersion"),
-                firmwareVersion = optionalStringValue(values, "firmwareVersion", "fwVersion"),
-                besFirmwareVersion = optionalStringValue(values, "besFwVersion", "besFirmwareVersion"),
-                mtkFirmwareVersion = optionalStringValue(values, "mtkFwVersion", "mtkFirmwareVersion"),
-                btMacAddress = optionalStringValue(values, "btMacAddress"),
+                firmwareVersion = optionalStringValue(values, "firmwareVersion"),
+                besFirmwareVersion = optionalStringValue(values, "besFirmwareVersion"),
+                mtkFirmwareVersion = optionalStringValue(values, "mtkFirmwareVersion"),
+                bluetoothMacAddress = optionalStringValue(values, "bluetoothMacAddress"),
                 leftMacAddress = optionalStringValue(values, "leftMacAddress"),
                 rightMacAddress = optionalStringValue(values, "rightMacAddress"),
                 macAddress = optionalStringValue(values, "macAddress"),
@@ -511,7 +515,7 @@ data class GlassesStatusUpdate(
                 hotspot =
                     if (hasAnyKey(values, "hotspot")) {
                         HotspotStatus.fromMap(values)
-                    } else if (hasAnyKey(values, "hotspotEnabled", "hotspotSsid", "hotspotPassword", "hotspotGatewayIp", "hotspotLocalIp")) {
+                    } else if (hasAnyKey(values, "hotspotEnabled", "hotspotSsid", "hotspotPassword", "hotspotGatewayIp")) {
                         HotspotStatus.fromStoreMap(values)
                     } else {
                         null
@@ -534,6 +538,11 @@ data class BluetoothStatusUpdate(
     val micEnabled: Boolean? = null,
     val currentMic: String? = null,
     val micRanking: List<String>? = null,
+    /**
+     * Nearby glasses in stable discovery order when included in an update. Existing entries keep
+     * their array position as details refresh; new glasses append at the end, and removals should
+     * not reorder remaining entries.
+     */
     val searchResults: List<Device>? = null,
     val wifiScanResults: List<WifiScanResult>? = null,
     val lastLog: List<String>? = null,
@@ -561,7 +570,7 @@ data class BluetoothStatusUpdate(
     val buttonMaxRecordingTime: Int? = null,
     val buttonVideoWidth: Int? = null,
     val buttonVideoHeight: Int? = null,
-    val buttonVideoFps: Int? = null,
+    val buttonVideoFrameRate: Int? = null,
     val shouldSendPcm: Boolean? = null,
     val shouldSendLc3: Boolean? = null,
     val shouldSendTranscript: Boolean? = null,
@@ -599,13 +608,13 @@ data class BluetoothStatusUpdate(
             putIfNotNull("dashboard_depth", dashboardDepth)
             putIfNotNull("head_up_angle", headUpAngle)
             putIfNotNull("contextual_dashboard", contextualDashboard)
-            putIfNotNull("gallery_mode", galleryModeAuto)
+            putIfNotNull("galleryModeAuto", galleryModeAuto)
             buttonPhotoSize?.let { put("button_photo_size", it.value) }
             putIfNotNull("button_camera_led", buttonCameraLed)
             putIfNotNull("button_max_recording_time", buttonMaxRecordingTime)
             putIfNotNull("button_video_width", buttonVideoWidth)
             putIfNotNull("button_video_height", buttonVideoHeight)
-            putIfNotNull("button_video_fps", buttonVideoFps)
+            putIfNotNull("button_video_fps", buttonVideoFrameRate)
             putIfNotNull("should_send_pcm", shouldSendPcm)
             putIfNotNull("should_send_lc3", shouldSendLc3)
             putIfNotNull("should_send_transcript", shouldSendTranscript)
@@ -649,14 +658,14 @@ data class BluetoothStatusUpdate(
                 dashboardDepth = optionalNumberValue(values, "dashboard_depth"),
                 headUpAngle = optionalNumberValue(values, "head_up_angle"),
                 contextualDashboard = optionalBoolValue(values, "contextual_dashboard"),
-                galleryModeAuto = optionalBoolValue(values, "gallery_mode"),
+                galleryModeAuto = optionalBoolValue(values, "galleryModeAuto"),
                 buttonPhotoSize =
                     optionalStringValue(values, "button_photo_size")?.let(ButtonPhotoSize::fromValue),
                 buttonCameraLed = optionalBoolValue(values, "button_camera_led"),
                 buttonMaxRecordingTime = optionalNumberValue(values, "button_max_recording_time"),
                 buttonVideoWidth = optionalNumberValue(values, "button_video_width"),
                 buttonVideoHeight = optionalNumberValue(values, "button_video_height"),
-                buttonVideoFps = optionalNumberValue(values, "button_video_fps"),
+                buttonVideoFrameRate = optionalNumberValue(values, "button_video_fps"),
                 shouldSendPcm = optionalBoolValue(values, "should_send_pcm"),
                 shouldSendLc3 = optionalBoolValue(values, "should_send_lc3"),
                 shouldSendTranscript = optionalBoolValue(values, "should_send_transcript"),
@@ -683,7 +692,7 @@ data class DisplayTextRequest(
         )
 }
 
-data class DisplayEventRequest(
+internal data class DisplayEventRequest(
     val values: Map<String, Any>,
 ) {
     fun toMap(): Map<String, Any> = values
@@ -694,7 +703,7 @@ data class DashboardPositionRequest(
     val depth: Int,
 )
 
-data class DashboardMenuItem(
+internal data class DashboardMenuItem(
     val title: String,
     val packageName: String,
     val values: Map<String, Any> = emptyMap(),
@@ -755,7 +764,7 @@ data class ButtonPhotoSettings(
 data class ButtonVideoRecordingSettings(
     val width: Int,
     val height: Int,
-    val fps: Int,
+    val frameRate: Int,
 )
 
 enum class CameraFov(val fov: Int, val roiPosition: Int) {
@@ -763,19 +772,11 @@ enum class CameraFov(val fov: Int, val roiPosition: Int) {
     WIDE(118, 0),
 }
 
-data class MicConfig(
-    val sendPcmData: Boolean,
-    val sendTranscript: Boolean,
-    val bypassVad: Boolean,
-    val sendLc3Data: Boolean = false,
-)
-
 enum class MicPreference(val value: String) {
     AUTO("auto"),
     PHONE("phone"),
     GLASSES("glasses"),
-    BT_CLASSIC("btclassic"),
-    BT("bt"),
+    BLUETOOTH("bluetooth"),
 }
 
 data class PhotoRequest @JvmOverloads constructor(
@@ -785,7 +786,6 @@ data class PhotoRequest @JvmOverloads constructor(
     val webhookUrl: String,
     val authToken: String? = null,
     val compress: PhotoCompression = PhotoCompression.MEDIUM,
-    val flash: Boolean = false,
     val sound: Boolean = true,
 )
 
@@ -805,13 +805,13 @@ data class StreamVideoConfig @JvmOverloads constructor(
 
     companion object {
         @JvmStatic
-        fun fromMap(values: Map<*, *>?): StreamVideoConfig? {
+        fun fromMap(values: Map<String, Any>?): StreamVideoConfig? {
             values ?: return null
             return StreamVideoConfig(
-                width = numberValue(values, "width", "w"),
-                height = numberValue(values, "height", "h"),
-                bitrate = numberValue(values, "bitrate", "br"),
-                frameRate = numberValue(values, "frameRate", "fr"),
+                width = numberValue(values, "width"),
+                height = numberValue(values, "height"),
+                bitrate = numberValue(values, "bitrate"),
+                frameRate = numberValue(values, "frameRate"),
             )
         }
     }
@@ -833,13 +833,13 @@ data class StreamAudioConfig @JvmOverloads constructor(
 
     companion object {
         @JvmStatic
-        fun fromMap(values: Map<*, *>?): StreamAudioConfig? {
+        fun fromMap(values: Map<String, Any>?): StreamAudioConfig? {
             values ?: return null
             return StreamAudioConfig(
-                bitrate = numberValue(values, "bitrate", "br"),
-                sampleRate = numberValue(values, "sampleRate", "sr"),
-                echoCancellation = values["echoCancellation"] as? Boolean ?: values["ec"] as? Boolean,
-                noiseSuppression = values["noiseSuppression"] as? Boolean ?: values["ns"] as? Boolean,
+                bitrate = numberValue(values, "bitrate"),
+                sampleRate = numberValue(values, "sampleRate"),
+                echoCancellation = values["echoCancellation"] as? Boolean,
+                noiseSuppression = values["noiseSuppression"] as? Boolean,
             )
         }
     }
@@ -850,7 +850,6 @@ data class StreamRequest @JvmOverloads constructor(
     val streamId: String = "",
     val keepAlive: Boolean = true,
     val keepAliveIntervalSeconds: Int = 15,
-    val flash: Boolean = true,
     val sound: Boolean = true,
     val video: StreamVideoConfig? = null,
     val audio: StreamAudioConfig? = null,
@@ -863,7 +862,8 @@ data class StreamRequest @JvmOverloads constructor(
         values["streamId"] = streamId
         values["keepAlive"] = keepAlive
         values["keepAliveIntervalSeconds"] = keepAliveIntervalSeconds
-        values["flash"] = flash
+        // The camera light is a privacy indicator and cannot be disabled by SDK callers.
+        values["flash"] = true
         values["sound"] = sound
         video?.toMap()?.takeIf { it.isNotEmpty() }?.let { values["video"] = it }
         audio?.toMap()?.takeIf { it.isNotEmpty() }?.let { values["audio"] = it }
@@ -880,10 +880,9 @@ data class StreamRequest @JvmOverloads constructor(
                 streamId = values["streamId"] as? String ?: "",
                 keepAlive = values["keepAlive"] as? Boolean ?: true,
                 keepAliveIntervalSeconds = (values["keepAliveIntervalSeconds"] as? Number)?.toInt() ?: 15,
-                flash = values["flash"] as? Boolean ?: true,
                 sound = values["sound"] as? Boolean ?: true,
-                video = StreamVideoConfig.fromMap((values["video"] ?: values["v"]) as? Map<*, *>),
-                audio = StreamAudioConfig.fromMap((values["audio"] ?: values["a"]) as? Map<*, *>),
+                video = StreamVideoConfig.fromMap(stringMapValue(values["video"])),
+                audio = StreamAudioConfig.fromMap(stringMapValue(values["audio"])),
                 extraValues = values,
             )
     }
@@ -943,15 +942,14 @@ data class RgbLedRequest @JvmOverloads constructor(
     val packageName: String?,
     val action: RgbLedAction,
     val color: RgbLedColor?,
-    val ontime: Int,
-    val offtime: Int,
+    val onDurationMs: Int,
+    val offDurationMs: Int,
     val count: Int,
 )
 
 data class VideoRecordingRequest(
     val requestId: String,
     val save: Boolean,
-    val flash: Boolean,
     val sound: Boolean,
 )
 
@@ -964,8 +962,8 @@ data class ButtonPressEvent(
 data class TouchEvent(
     val values: Map<String, Any>,
 ) {
-    val deviceModel: String? get() = stringValue(values, "device_model", "deviceModel")
-    val gestureName: String? get() = stringValue(values, "gesture_name", "gestureName")
+    val deviceModel: String? get() = stringValue(values, "deviceModel")
+    val gestureName: String? get() = stringValue(values, "gestureName")
     val timestamp: Long? get() = longValue(values, "timestamp")
     val isSwipe: Boolean get() = gestureName?.contains("swipe", ignoreCase = true) == true
 }
@@ -973,8 +971,8 @@ data class TouchEvent(
 data class SwipeEvent(
     val values: Map<String, Any>,
 ) {
-    val deviceModel: String? get() = stringValue(values, "device_model", "deviceModel")
-    val gestureName: String? get() = stringValue(values, "gesture_name", "gestureName")
+    val deviceModel: String? get() = stringValue(values, "deviceModel")
+    val gestureName: String? get() = stringValue(values, "gestureName")
     val timestamp: Long? get() = longValue(values, "timestamp")
 }
 
@@ -1107,7 +1105,7 @@ sealed interface HotspotStatus {
                 enabled = enabled,
                 ssid = stringValue(values, "hotspotSsid"),
                 password = stringValue(values, "hotspotPassword"),
-                localIp = stringValue(values, "hotspotGatewayIp", "hotspotLocalIp"),
+                localIp = stringValue(values, "hotspotGatewayIp"),
             )
         }
 
@@ -1152,7 +1150,7 @@ data class HotspotStatusEvent(
 data class HotspotErrorEvent(
     val values: Map<String, Any>,
 ) {
-    val message: String? get() = stringValue(values, "error_message", "message", "error")
+    val message: String? get() = stringValue(values, "errorMessage")
     val timestamp: Long? get() = longValue(values, "timestamp")
 }
 
@@ -1170,7 +1168,7 @@ sealed interface PhotoResponse {
             is Success -> mapOf(
                 "state" to state,
                 "requestId" to requestId,
-                "photoUrl" to photoUrl,
+                "uploadUrl" to uploadUrl,
                 "timestamp" to timestamp,
             )
 
@@ -1190,7 +1188,7 @@ sealed interface PhotoResponse {
 
     data class Success(
         override val requestId: String,
-        val photoUrl: String,
+        val uploadUrl: String,
         override val timestamp: Long,
     ) : PhotoResponse {
         override val state: String = "success"
@@ -1207,19 +1205,17 @@ sealed interface PhotoResponse {
 
     companion object {
         fun fromMap(values: Map<String, Any>): PhotoResponse {
-            val requestId = stringValue(values, "requestId", "request_id").orEmpty()
+            val requestId = stringValue(values, "requestId").orEmpty()
             val timestamp = longValue(values, "timestamp") ?: System.currentTimeMillis()
-            val state = stringValue(values, "state", "status")?.lowercase()
-            val success = boolValue(values, "success")
-            return if (state == "success" || success == true) {
-                val photoUrl = stringValue(values, "photoUrl", "photo_url").orEmpty()
-                Success(requestId = requestId, photoUrl = photoUrl, timestamp = timestamp)
+            val state = stringValue(values, "state")?.lowercase()
+            return if (state == "success") {
+                val uploadUrl = stringValue(values, "uploadUrl").orEmpty()
+                Success(requestId = requestId, uploadUrl = uploadUrl, timestamp = timestamp)
             } else {
                 Error(
                     requestId = requestId,
-                    errorCode = stringValue(values, "errorCode", "error_code"),
-                    errorMessage = stringValue(values, "errorMessage", "error_message", "error")
-                        ?: "Unknown photo error",
+                    errorCode = stringValue(values, "errorCode"),
+                    errorMessage = stringValue(values, "errorMessage") ?: "Unknown photo error",
                     timestamp = timestamp,
                 )
             }
@@ -1369,10 +1365,10 @@ sealed interface StreamStatus {
             val rawState = stringValue(values, "status")
             val streaming = boolValue(values, "streaming")
             val reconnecting = boolValue(values, "reconnecting") ?: false
-            val streamId = stringValue(values, "streamId", "stream_id")
+            val streamId = stringValue(values, "streamId")
             val timestamp = longValue(values, "timestamp")
             val attempt = numberValue(values, "attempt")
-            val maxAttempts = numberValue(values, "maxAttempts", "max_attempts") ?: 0
+            val maxAttempts = numberValue(values, "maxAttempts") ?: 0
 
             if (streaming != null || hasAnyKey(values, "reconnecting")) {
                 return Snapshot(
@@ -1416,7 +1412,7 @@ sealed interface StreamStatus {
                 )
                 StreamState.ERROR -> Error(
                     streamId = streamId,
-                    errorDetails = stringValue(values, "errorDetails", "error_details", "details", "error", "errorMessage")
+                    errorDetails = stringValue(values, "errorDetails")
                         ?: if (rawState == "error_not_streaming") "not_streaming" else "Unknown stream error",
                     timestamp = timestamp,
                 )
@@ -1446,8 +1442,8 @@ data class KeepAliveAckEvent(
     val timestamp: Long?,
 ) {
     constructor(values: Map<String, Any>) : this(
-        streamId = stringValue(values, "streamId", "stream_id").orEmpty(),
-        ackId = stringValue(values, "ackId", "ack_id").orEmpty(),
+        streamId = stringValue(values, "streamId").orEmpty(),
+        ackId = stringValue(values, "ackId").orEmpty(),
         timestamp = longValue(values, "timestamp"),
     )
 
@@ -1467,14 +1463,14 @@ data class LocalTranscriptionEvent(
 )
 
 data class GlassesMediaVolumeGetResult(
-    val volume: Int?,
+    val level: Int?,
     val statusCode: Int?,
     val values: Map<String, Any>,
 ) {
     companion object {
         fun fromMap(values: Map<String, Any>): GlassesMediaVolumeGetResult =
             GlassesMediaVolumeGetResult(
-                volume = numberValue(values, "vol", "volume"),
+                level = numberValue(values, "level"),
                 statusCode = (values["statusCode"] as? Number)?.toInt(),
                 values = values,
             )
@@ -1544,6 +1540,31 @@ enum class ScanStopReason {
     ERROR,
 }
 
+interface ScanCallback {
+    fun onResults(devices: List<Device>) {}
+    fun onComplete(devices: List<Device>) {}
+    fun onError(error: BluetoothError) {}
+}
+
+abstract class MentraBluetoothScanCallback : ScanCallback
+
+class ScanSession internal constructor(
+    private val stopAction: () -> Unit,
+) {
+    @Volatile
+    private var stopped = false
+
+    fun stop() {
+        if (stopped) return
+        stopped = true
+        stopAction()
+    }
+
+    internal fun markStopped() {
+        stopped = true
+    }
+}
+
 interface MentraBluetoothSdkListener {
     fun onGlassesStatusChanged(status: GlassesStatusUpdate) {}
     fun onBluetoothStatusChanged(status: BluetoothStatusUpdate) {}
@@ -1572,12 +1593,6 @@ interface MentraBluetoothSdkListener {
 
 abstract class MentraBluetoothSdkCallback : MentraBluetoothSdkListener
 
-private fun numberValue(
-    values: Map<*, *>,
-    fullKey: String,
-    compactKey: String,
-): Int? = ((values[fullKey] ?: values[compactKey]) as? Number)?.toInt()
-
 private fun numberValue(
     values: Map<String, Any>,
     vararg keys: String,