@mentra/bluetooth-sdk 0.1.21-beta.0 → 0.1.21-beta.2

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

@@ -70,8 +70,13 @@ internal object OtaManifestChecker {
         currentMtkVersion: String,
         currentBesVersion: String,
         manifest: JSONObject,
+        // Downgrade floor: a non-positive value (the default) disables downgrades entirely,
+        // matching ASG's fail-closed DowngradeGate and the engine. OEM SDK consumers that do
+        // not set a floor therefore get upgrade-only behavior and are never told a downgrade is
+        // available that the glasses would refuse.
+        downgradeFloorVersionCode: Long = 0L,
     ): Boolean =
-        hasApkUpdate(currentBuildNumber, manifest) ||
+        hasApkUpdate(currentBuildNumber, manifest, downgradeFloorVersionCode) ||
             hasMtkUpdate(manifest.optJSONArray("mtk_patches"), currentMtkVersion) ||
             hasBesUpdate(manifest.optJSONObject("bes_firmware"), currentBesVersion)
 
@@ -95,15 +100,50 @@ internal object OtaManifestChecker {
         throw BluetoothSdkException("invalid_ota_manifest", "OTA manifest is missing ASG app versionCode.")
     }
 
-    private fun hasApkUpdate(currentBuildNumber: String, manifest: JSONObject): Boolean {
+    private fun hasApkUpdate(
+        currentBuildNumber: String,
+        manifest: JSONObject,
+        downgradeFloorVersionCode: Long,
+    ): Boolean {
         val currentVersion =
             currentBuildNumber.toLongOrNull()
                 ?: throw BluetoothSdkException(
                     "invalid_glasses_version",
                     "Cannot check OTA update because glasses build number is invalid.",
                 )
+        // Only apps-shaped manifests are exact pins. A legacy top-level manifest (versionCode at
+        // the root, no apps entry) is NOT a pin and stays strictly upgrade-only, matching the
+        // engine TS checker — otherwise a build newer than such a manifest would report a false
+        // downgrade the JS path ignores.
+        val isExactPin = manifest.optJSONObject("apps")?.optJSONObject(ASG_CLIENT_PACKAGE)?.hasNumber("versionCode") == true
         val serverVersion = latestAppInfo(manifest).requiredLong("versionCode")
-        return serverVersion > currentVersion
+        if (!isExactPin) {
+            return serverVersion > currentVersion
+        }
+        // Exact pin: any mismatch is an update in either direction (downgrades take the
+        // uninstall-then-reinstall detour on the glasses). A non-positive pin is only legitimate
+        // in the frozen legacy rescue manifests that pre-39 glasses are checked against; for
+        // modern glasses it means the manifest cannot verify anything, and that must surface as an
+        // error — never as "no update".
+        if (serverVersion <= 0) {
+            if (currentVersion >= 39) {
+                throw BluetoothSdkException(
+                    "invalid_ota_manifest",
+                    "OTA manifest ASG pin is missing or zero; cannot verify update state.",
+                )
+            }
+            return false
+        }
+        if (serverVersion > currentVersion) {
+            return true
+        }
+        // Exact match: already on the pin, no update.
+        if (serverVersion == currentVersion) {
+            return false
+        }
+        // Downgrade: only actionable at/above the enabled floor; a non-positive floor disables
+        // downgrades (fail closed, matching ASG and the engine).
+        return downgradeFloorVersionCode > 0 && serverVersion >= downgradeFloorVersionCode
     }
 
     private fun hasMtkUpdate(patches: JSONArray?, currentVersion: String): Boolean {

package/android/src/main/java/com/mentra/bluetoothsdk/camera/CameraModels.kt

@@ -110,14 +110,15 @@ class CameraFov @JvmOverloads constructor(
     companion object {
         const val MIN_FOV = 62
         const val MAX_FOV = 118
-        const val DEFAULT_FOV = 102
+        const val DEFAULT_FOV = 118
         const val NARROW_FOV = 82
+        const val STANDARD_FOV = 102
         @JvmField
         val DEFAULT_ROI_POSITION = CameraRoiPosition.CENTER
         @JvmField
         val NARROW = CameraFov(NARROW_FOV, DEFAULT_ROI_POSITION)
         @JvmField
-        val STANDARD = CameraFov(DEFAULT_FOV, DEFAULT_ROI_POSITION)
+        val STANDARD = CameraFov(STANDARD_FOV, DEFAULT_ROI_POSITION)
         @JvmField
         val WIDE = CameraFov(MAX_FOV, DEFAULT_ROI_POSITION)
     }
@@ -200,10 +201,22 @@ data class PhotoRequest @JvmOverloads constructor(
     val ispAnalogGain: String? = null,
     val resetCaptureTuning: Boolean? = null,
     val mode: PhotoMode = PhotoMode.PHOTO,
-    /** `ble` skips direct upload; `auto` tries Wi-Fi with BLE fallback. */
+    /** `direct` disables BLE fallback; `ble` skips direct upload; `auto` tries both. */
     val transferMethod: String = "auto",
 ) {
     companion object {
+        private fun transferMethodFromValue(value: Any?): String {
+            if (value == null) return "auto"
+            val raw = value as? String
+                ?: throw IllegalArgumentException(
+                    "Invalid transferMethod ${value::class.java.simpleName}. Expected auto, direct, or ble."
+                )
+            return raw.takeIf { it == "auto" || it == "direct" || it == "ble" }
+                ?: throw IllegalArgumentException(
+                    "Invalid transferMethod \"$raw\". Expected auto, direct, or ble."
+                )
+        }
+
         /** Mirrors iOS `BluetoothSdkModule` defaults for keys omitted from the JS bridge. */
         @JvmStatic
         fun fromMap(values: Map<String, Any>): PhotoRequest {
@@ -240,7 +253,7 @@ data class PhotoRequest @JvmOverloads constructor(
                 save = boolValue(values, "save", "saveToGallery") ?: false,
                 sound = boolValue(values, "sound") ?: true,
                 mode = PhotoMode.fromValue(stringValue(values, "mode")),
-                transferMethod = if (stringValue(values, "transferMethod") == "ble") "ble" else "auto",
+                transferMethod = transferMethodFromValue(values["transferMethod"]),
                 exposureTimeNs = exposureTimeNs,
                 iso = iso,
                 aeExposureDivisor = aeDivisor,

package/android/src/main/java/com/mentra/bluetoothsdk/debug/BleTraceLogger.kt

@@ -12,7 +12,7 @@ object BleTraceLogger {
     private const val MAX_PAYLOAD_CHARS = 3000
     private const val K900_TYPE = "k900"
     private val sensitiveKeyParts =
-        listOf("password", "pass", "token", "secret", "authorization", "auth", "email")
+        listOf("password", "pass", "token", "secret", "authorization", "auth", "email", "serial")
 
     @JvmStatic
     fun logJson(direction: String, layer: String, payload: JSONObject?, bytes: Int? = null) {

package/android/src/main/java/com/mentra/bluetoothsdk/services/Foreground.kt

@@ -6,6 +6,7 @@ import android.app.Service
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.pm.ServiceInfo
+import android.location.LocationManager
 import android.os.Build
 import android.os.IBinder
 import androidx.core.app.NotificationCompat
@@ -17,8 +18,12 @@ class ForegroundService : Service() {
     companion object {
         const val CHANNEL_ID = "MentraServiceChannel"
         const val NOTIFICATION_ID = 1001
+        const val ACTION_REFRESH_TYPES =
+                "com.mentra.bluetoothsdk.services.action.REFRESH_FOREGROUND_SERVICE_TYPES"
     }
 
+    private var locationTypeRequested = false
+
     override fun onCreate() {
         super.onCreate()
         Bridge.log("ForegroundService: onCreate() called")
@@ -34,6 +39,11 @@ class ForegroundService : Service() {
                 "service_start_command",
                 mapOf("action" to intent?.action, "flags" to flags, "startId" to startId)
         )
+        if (intent?.action == ACTION_REFRESH_TYPES) {
+            // This action is only sent while the host Activity is foregrounded. Android 14+
+            // rejects adding a while-in-use location type from the background.
+            locationTypeRequested = true
+        }
         // Re-check permissions in case they changed
         startForegroundWithAutoDetectedType()
         return START_STICKY
@@ -71,6 +81,14 @@ class ForegroundService : Service() {
 
         var serviceType = 0
 
+        // Audio prompts can be initiated by glasses while the host Activity is
+        // backgrounded. mediaPlayback has no runtime prerequisite, so keep it
+        // active on the existing Mentra service for the entire connected
+        // session rather than trying to launch a second service after a wake
+        // phrase arrives.
+        serviceType = serviceType or ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK
+        Bridge.log("ForegroundService: Added mediaPlayback (supports background audio)")
+
         // Check Bluetooth permissions
         val hasBluetoothPermission =
                 when {
@@ -124,6 +142,28 @@ class ForegroundService : Service() {
             Bridge.log("ForegroundService: No microphone permission")
         }
 
+        val hasLocationPermission =
+                ContextCompat.checkSelfPermission(
+                        this,
+                        android.Manifest.permission.ACCESS_FINE_LOCATION
+                ) == PackageManager.PERMISSION_GRANTED ||
+                        ContextCompat.checkSelfPermission(
+                                this,
+                                android.Manifest.permission.ACCESS_COARSE_LOCATION
+                        ) == PackageManager.PERMISSION_GRANTED
+        val locationManager = getSystemService(LocationManager::class.java)
+        val isLocationEnabled = locationManager?.isLocationEnabled == true
+
+        if (locationTypeRequested && hasLocationPermission && isLocationEnabled) {
+            serviceType = serviceType or ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION
+            Bridge.log("ForegroundService: Added location (has foreground location permission)")
+        } else {
+            Bridge.log(
+                    "ForegroundService: No location type " +
+                            "(requested=$locationTypeRequested, permission=$hasLocationPermission, enabled=$isLocationEnabled)"
+            )
+        }
+
         // Only use dataSync as absolute last resort fallback if no other types were added.
         // WARNING: dataSync has a 6-hour timeout on Android 14+ which will crash the app.
         // This should rarely happen since CHANGE_NETWORK_STATE is a normal permission.
@@ -141,11 +181,20 @@ class ForegroundService : Service() {
         val hasConnectedDevice =
                 (serviceType and ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE) != 0
         val hasMicrophone = (serviceType and ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE) != 0
+        val hasLocation = (serviceType and ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION) != 0
+        val hasMediaPlayback =
+                (serviceType and ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK) != 0
 
         return when {
+            hasConnectedDevice && hasMicrophone && hasLocation ->
+                    "Glasses, microphone & location active"
+            hasConnectedDevice && hasLocation -> "Smart glasses & location active"
+            hasMicrophone && hasLocation -> "Microphone & location active"
+            hasLocation -> "Location active"
             hasConnectedDevice && hasMicrophone -> "Glasses & microphone active"
             hasConnectedDevice -> "Smart glasses connected"
             hasMicrophone -> "Microphone active"
+            hasMediaPlayback -> "Audio playback active"
             else -> "Syncing data"
         }
     }
@@ -160,6 +209,10 @@ class ForegroundService : Service() {
                 types.add("connectedDevice")
         if (serviceType and ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE != 0)
                 types.add("microphone")
+        if (serviceType and ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION != 0)
+                types.add("location")
+        if (serviceType and ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK != 0)
+                types.add("mediaPlayback")
 
         return types.joinToString("|")
     }