@mentra/bluetooth-sdk 3.3.0-dev.418 → 3.3.0-dev.420

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

@@ -3,9 +3,9 @@ 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.3.0"
-    const val RELEASE_IDENTITY: String = "3.3.0-dev.418"
-    const val RELEASE_SET_ID: String = "mentra-3.3.0-dev.418"
-    const val SOURCE_COMMIT: String = "aa935586a3c7c6a9a4fb979fd064a07680d17ab1"
-    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-dev.418.json"
-    const val OTA_MANIFEST_SHA256: String = "f472ef80d5ff72708f6624ad660d677ca730fa115b01624775056f35266bbe6c"
+    const val RELEASE_IDENTITY: String = "3.3.0-dev.420"
+    const val RELEASE_SET_ID: String = "mentra-3.3.0-dev.420"
+    const val SOURCE_COMMIT: String = "cad421d261e3dc99f743ba902a7e0c4a0f42b095"
+    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-dev.420.json"
+    const val OTA_MANIFEST_SHA256: String = "0bff87c1bcd2f19eb90079980fc42fe2dbd787ceb0a74bea56b8948f3b4190dc"
 }

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

@@ -108,6 +108,9 @@ object BleTraceLogger {
     }
 
     private fun sanitizeValue(key: String?, value: Any?): Any? {
+        // Scan security metadata is a boolean, not a credential. Keep the exact
+        // typed field while still redacting string/unknown values under this key.
+        if (key == "requiresPassword" && value is Boolean) return value
         if (key != null && sensitiveKeyParts.any { key.contains(it, ignoreCase = true) }) {
             return "<redacted>"
         }

package/android/src/main/java/com/mentra/bluetoothsdk/sgcs/MentraLive.kt

@@ -9493,7 +9493,11 @@ class MentraLive : SGCManager() {
                 }
             } else {
                 // Normal single message transmission
-                transportLog("LIVE: Sending data to glasses: " + wireData, bridgeLogging)
+                transportLog(
+                        "LIVE: Sending data to glasses: " +
+                                loggableOutgoingPayload(wireData, commandTraceInfo.commandType),
+                        bridgeLogging
+                )
 
                 // Pack the data using the centralized utility with the negotiated endianness
                 val packedData =
@@ -9795,6 +9799,18 @@ class MentraLive : SGCManager() {
         }
     }
 
+    /**
+     * Wi-Fi credentials are sent unchanged but never logged; the BLE trace records the command
+     * with the password redacted.
+     */
+    private fun loggableOutgoingPayload(payload: String, commandType: String): String =
+            try {
+                if (JSONObject(payload).has("password")) "<$commandType with credentials omitted>"
+                else payload
+            } catch (_: JSONException) {
+                payload
+            }
+
     private fun summarizeOutgoingMessage(payload: String?): String {
         if (payload == null || payload.isEmpty()) {
             return "type=unknown, requestId=none, appId=none, mode=none, transferMethod=none, bleImgId=none, exposureTimeNs=none, iso=none, mId=none"

package/android/src/test/java/com/mentra/bluetoothsdk/debug/BleTraceLoggerTest.kt

@@ -0,0 +1,69 @@
+package com.mentra.bluetoothsdk.debug
+
+import java.util.UUID
+import org.json.JSONArray
+import org.json.JSONObject
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.robolectric.shadows.ShadowLog
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [28])
+class BleTraceLoggerTest {
+    @Test
+    fun wifiScanPreservesBooleanSecurityWhileRedactingCredentials() {
+        val secret = UUID.randomUUID().toString()
+        val networks = JSONArray()
+        for (secured in listOf(true, false)) {
+            networks.put(
+                JSONObject()
+                    .put("ssid", if (secured) "secured-fixture" else "open-fixture")
+                    .put("requiresPassword", secured)
+                    .put("signalStrength", -45)
+                    .put("password", secret)
+                    .put("token", secret)
+            )
+        }
+        ShadowLog.clear()
+        BleTraceLogger.logJson(
+            "glasses_to_phone",
+            "sdk_ble_event",
+            JSONObject().put("type", "wifi_scan_result").put("networks_neo", networks),
+        )
+        val message = ShadowLog.getLogsForTag("MentraBleTrace").single().msg
+        assertFalse(message.contains(secret))
+        val actual = JSONObject(message.substringAfter("payload=")).getJSONArray("networks_neo")
+        for ((index, secured) in listOf(true, false).withIndex()) {
+            val item = actual.getJSONObject(index)
+            assertEquals(secured, item.get("requiresPassword"))
+            assertEquals(-45, item.getInt("signalStrength"))
+            assertEquals("<redacted>", item.getString("password"))
+            assertEquals("<redacted>", item.getString("token"))
+        }
+    }
+
+    @Test
+    fun exceptionDoesNotExposeNonBooleanOrOtherPasswordFields() {
+        val secret = UUID.randomUUID().toString()
+        ShadowLog.clear()
+        BleTraceLogger.logJson(
+            "glasses_to_phone",
+            "sdk_ble_event",
+            JSONObject()
+                .put("type", "wifi_scan_result")
+                .put("requiresPassword", secret)
+                .put("password", true)
+                .put("RequiresPassword", false),
+        )
+        val message = ShadowLog.getLogsForTag("MentraBleTrace").single().msg
+        assertFalse(message.contains(secret))
+        val actual = JSONObject(message.substringAfter("payload="))
+        for (key in listOf("requiresPassword", "password", "RequiresPassword")) {
+            assertEquals("<redacted>", actual.getString(key))
+        }
+    }
+}

package/android/src/test/java/com/mentra/bluetoothsdk/sgcs/MentraLiveWifiCredentialLogTest.kt

@@ -0,0 +1,55 @@
+package com.mentra.bluetoothsdk.sgcs
+
+import android.os.Looper
+import androidx.test.core.app.ApplicationProvider
+import com.mentra.bluetoothsdk.Bridge
+import java.nio.charset.StandardCharsets
+import java.time.Duration
+import java.util.UUID
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.LooperMode
+import org.robolectric.shadows.ShadowLog
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [33], shadows = [G1PairingTest.ShadowLc3Cpp::class], instrumentedPackages = ["com.mentra.lc3Lib"])
+@LooperMode(LooperMode.Mode.PAUSED)
+class MentraLiveWifiCredentialLogTest {
+    @Test fun `wifi credentials reach the BLE queue without being logged`() {
+        Bridge.initialize(ApplicationProvider.getApplicationContext())
+        val ssid = "synthetic-${UUID.randomUUID()}"
+        val password = UUID.randomUUID().toString()
+        val events = mutableListOf<String>()
+        val sink = Bridge.addEventSink { type, body -> if (type == "log") events.add(body["message"].toString()) }
+        val live = MentraLive()
+        try {
+            ShadowLog.clear()
+            live.sendWifiCredentials(ssid, password)
+
+            val logs = events + ShadowLog.getLogs().map { it.msg }
+            assertFalse("password logged", logs.any { it.contains(password) })
+            assertTrue(events.any { it.endsWith("LIVE: Sending data to glasses: <set_wifi_credentials with credentials omitted>") })
+            // The glasses still receive the unchanged credentials.
+            val wire = queuedWrites(live).joinToString("") { String(it, StandardCharsets.UTF_8) }
+            assertTrue(wire.contains("set_wifi_credentials"))
+            assertTrue(wire.contains(ssid))
+            assertTrue(wire.contains(password))
+        } finally {
+            Bridge.removeEventSink(sink)
+            live.destroy()
+            shadowOf(Looper.getMainLooper()).idleFor(Duration.ofSeconds(2))
+        }
+    }
+
+    private fun queuedWrites(live: MentraLive): List<ByteArray> {
+        val queue = MentraLive::class.java.getDeclaredField("sendQueue").apply { isAccessible = true }.get(live)
+        return (queue as Iterable<*>).map { write ->
+            write!!.javaClass.getDeclaredField("data").apply { isAccessible = true }.get(write) as ByteArray
+        }
+    }
+}

package/build/generated/releaseMetadata.js

@@ -1,10 +1,10 @@
 export const BLUETOOTH_SDK_RELEASE_METADATA = Object.freeze({
     "schemaVersion": 1,
     "familyBaseVersion": "3.3.0",
-    "releaseIdentity": "3.3.0-dev.418",
-    "releaseSetId": "mentra-3.3.0-dev.418",
-    "sourceCommit": "aa935586a3c7c6a9a4fb979fd064a07680d17ab1",
-    "otaManifestUrl": "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.418.json",
-    "otaManifestSha256": "f472ef80d5ff72708f6624ad660d677ca730fa115b01624775056f35266bbe6c"
+    "releaseIdentity": "3.3.0-dev.420",
+    "releaseSetId": "mentra-3.3.0-dev.420",
+    "sourceCommit": "cad421d261e3dc99f743ba902a7e0c4a0f42b095",
+    "otaManifestUrl": "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.420.json",
+    "otaManifestSha256": "0bff87c1bcd2f19eb90079980fc42fe2dbd787ceb0a74bea56b8948f3b4190dc"
 });
 //# sourceMappingURL=releaseMetadata.js.map

package/build/generated/releaseMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,sBAAsB;IACtC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,iIAAiI;IACnJ,mBAAmB,EAAE,kEAAkE;CACxF,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"3.3.0\",\n  \"releaseIdentity\": \"3.3.0-dev.418\",\n  \"releaseSetId\": \"mentra-3.3.0-dev.418\",\n  \"sourceCommit\": \"aa935586a3c7c6a9a4fb979fd064a07680d17ab1\",\n  \"otaManifestUrl\": \"https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.418.json\",\n  \"otaManifestSha256\": \"f472ef80d5ff72708f6624ad660d677ca730fa115b01624775056f35266bbe6c\"\n})\n"]}
+{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,sBAAsB;IACtC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,iIAAiI;IACnJ,mBAAmB,EAAE,kEAAkE;CACxF,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"3.3.0\",\n  \"releaseIdentity\": \"3.3.0-dev.420\",\n  \"releaseSetId\": \"mentra-3.3.0-dev.420\",\n  \"sourceCommit\": \"cad421d261e3dc99f743ba902a7e0c4a0f42b095\",\n  \"otaManifestUrl\": \"https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.420.json\",\n  \"otaManifestSha256\": \"0bff87c1bcd2f19eb90079980fc42fe2dbd787ceb0a74bea56b8948f3b4190dc\"\n})\n"]}

package/ios/Source/BluetoothSdkDefaults.swift

@@ -16,7 +16,7 @@ enum BluetoothSdkDefaults {
     /// silently disable it on every pair the app touches.
     static let autoPowerOffEnabled = false
     private static let infoSdkVersionKey = "MentraBluetoothSdkVersion"
-    private static let swiftPackageSdkVersion = "3.3.0-dev.418"
+    private static let swiftPackageSdkVersion = "3.3.0-dev.420"
     private static let swiftPackageSdkVersionPlaceholder = "__MENTRA" + "_BLUETOOTH_SDK_VERSION__"
 
     private static func normalizedSdkVersion(_ value: String?) -> String? {

package/ios/Source/DeviceManager.swift

@@ -1535,7 +1535,7 @@ struct ViewState {
     }
 
     func sendWifiCredentials(_ ssid: String, _ password: String) {
-        Bridge.log("MAN: Sending wifi credentials: \(ssid) \(password)")
+        Bridge.log("MAN: Sending wifi credentials: \(ssid)")
         sgc?.sendWifiCredentials(ssid, password)
     }
 

package/ios/Source/GeneratedReleaseMetadata.swift

@@ -3,9 +3,9 @@ import Foundation
 /// Generated by release CI. Do not edit in a release checkout.
 enum GeneratedReleaseMetadata {
     static let familyBaseVersion = "3.3.0"
-    static let releaseIdentity = "3.3.0-dev.418"
-    static let releaseSetId = "mentra-3.3.0-dev.418"
-    static let sourceCommit = "aa935586a3c7c6a9a4fb979fd064a07680d17ab1"
-    static let otaManifestUrl = "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.418.json"
-    static let otaManifestSha256 = "f472ef80d5ff72708f6624ad660d677ca730fa115b01624775056f35266bbe6c"
+    static let releaseIdentity = "3.3.0-dev.420"
+    static let releaseSetId = "mentra-3.3.0-dev.420"
+    static let sourceCommit = "cad421d261e3dc99f743ba902a7e0c4a0f42b095"
+    static let otaManifestUrl = "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.420.json"
+    static let otaManifestSha256 = "0bff87c1bcd2f19eb90079980fc42fe2dbd787ceb0a74bea56b8948f3b4190dc"
 }

package/ios/Source/sgcs/MentraLive.swift

@@ -5223,7 +5223,11 @@ class MentraLive: NSObject, SGCManager {
                             bridgeLogging: bridgeLogging
                         )
                     }
-                    transportLog("LIVE: Sending data to glasses: \(jsonString)", bridgeLogging: bridgeLogging)
+                    // Wi-Fi credentials are sent unchanged but never logged; the BLE trace
+                    // above records this command with the password redacted.
+                    let loggedPayload = json["password"] == nil
+                        ? jsonString : "<\(commandInfo.commandType) with credentials omitted>"
+                    transportLog("LIVE: Sending data to glasses: \(loggedPayload)", bridgeLogging: bridgeLogging)
                     let packedData =
                         packJson(
                             jsonString,

package/ios/Tests/WifiCredentialLoggingTests.swift

@@ -0,0 +1,42 @@
+@testable import MentraBluetoothSDK
+import XCTest
+
+/// Captures packed BLE writes instead of sending them, so the real device dispatch,
+/// command serialization and transport logging run without a radio.
+@MainActor
+private final class CapturingMentraLive: MentraLive {
+    var writes: [Data] = []
+
+    override func queueSend(_ data: Data, id _: String, trace _: BleWriteTrace?) {
+        writes.append(data)
+    }
+}
+
+@MainActor
+final class WifiCredentialLoggingTests: XCTestCase {
+    func testWifiCredentialsReachTheBleQueueWithoutBeingLogged() {
+        let ssid = "synthetic-\(UUID().uuidString)"
+        let password = UUID().uuidString
+        var logs: [String] = []
+        let sink = Bridge.addEventSink { event, body in
+            if event == "log", let message = body["message"] as? String {
+                logs.append(message)
+            }
+        }
+        defer { Bridge.removeEventSink(sink) }
+        let manager = DeviceManager()
+        let live = CapturingMentraLive()
+        manager.sgc = live
+
+        manager.sendWifiCredentials(ssid, password)
+
+        XCTAssertFalse(logs.contains { $0.contains(password) }, "password logged")
+        XCTAssertTrue(logs.contains("MAN: Sending wifi credentials: \(ssid)"))
+        XCTAssertTrue(logs.contains("LIVE: Sending data to glasses: <set_wifi_credentials with credentials omitted>"))
+        // The glasses still receive the unchanged credentials.
+        let wire = live.writes.map { String(decoding: $0, as: UTF8.self) }.joined()
+        XCTAssertTrue(wire.contains("set_wifi_credentials"))
+        XCTAssertTrue(wire.contains(ssid))
+        XCTAssertTrue(wire.contains(password))
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mentra/bluetooth-sdk",
-  "version": "3.3.0-dev.418",
+  "version": "3.3.0-dev.420",
   "description": "SDK for communicating with smart glasses",
   "main": "build/index.js",
   "react-native": "src/index.ts",
@@ -114,7 +114,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@mentra/cloud-protocol": "3.3.0-dev.418"
+    "@mentra/cloud-protocol": "3.3.0-dev.420"
   },
   "devDependencies": {
     "@types/node": "^25.9.3",

package/src/generated/releaseMetadata.ts

@@ -12,9 +12,9 @@ export interface BluetoothSdkReleaseMetadata {
 export const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({
   "schemaVersion": 1,
   "familyBaseVersion": "3.3.0",
-  "releaseIdentity": "3.3.0-dev.418",
-  "releaseSetId": "mentra-3.3.0-dev.418",
-  "sourceCommit": "aa935586a3c7c6a9a4fb979fd064a07680d17ab1",
-  "otaManifestUrl": "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.418.json",
-  "otaManifestSha256": "f472ef80d5ff72708f6624ad660d677ca730fa115b01624775056f35266bbe6c"
+  "releaseIdentity": "3.3.0-dev.420",
+  "releaseSetId": "mentra-3.3.0-dev.420",
+  "sourceCommit": "cad421d261e3dc99f743ba902a7e0c4a0f42b095",
+  "otaManifestUrl": "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.420.json",
+  "otaManifestSha256": "0bff87c1bcd2f19eb90079980fc42fe2dbd787ceb0a74bea56b8948f3b4190dc"
 })