@mentra/bluetooth-sdk 0.1.6 → 0.1.8

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

@@ -35,12 +35,14 @@ import androidx.core.app.ActivityCompat;
 import com.mentra.bluetoothsdk.sgcs.SGCManager;
 import com.mentra.bluetoothsdk.DeviceManager;
 import com.mentra.bluetoothsdk.Bridge;
+import com.mentra.bluetoothsdk.debug.BleTraceLogger;
 import com.mentra.bluetoothsdk.utils.DeviceTypes;
 import com.mentra.bluetoothsdk.utils.ConnTypes;
 import com.mentra.bluetoothsdk.utils.BitmapJavaUtils;
 import com.mentra.bluetoothsdk.utils.SmartGlassesConnectionState;
 import com.mentra.bluetoothsdk.utils.K900ProtocolUtils;
 import com.mentra.bluetoothsdk.utils.MessageChunker;
+import com.mentra.bluetoothsdk.utils.MessageChunkReassembler;
 import com.mentra.bluetoothsdk.utils.audio.Lc3Player;
 import com.mentra.bluetoothsdk.utils.BlePhotoUploadService;
 import com.mentra.bluetoothsdk.utils.IncidentLogBleRelayNaming;
@@ -105,6 +107,7 @@ public class MentraLive extends SGCManager {
 
     // LC3 frame size for Mentra Live
     private static final int LC3_FRAME_SIZE = 40;
+    private static final int VOICE_ACTIVITY_DETECTION_SWITCH_TYPE = 8;
 
     // Local-only fields (not in parent SGCManager)
     private int buildNumberInt = 0; // Build number as integer for version checks
@@ -247,6 +250,7 @@ public class MentraLive extends SGCManager {
     private int filePacketBufferSize = 0;
     private final Object filePacketBufferLock = new Object();
     private int fileReadNotificationCount = 0; // Debug counter for FILE_READ notifications
+    private final MessageChunkReassembler incomingChunkReassembler = new MessageChunkReassembler();
 
     private final Object connectionLock = new Object();
 
@@ -1777,6 +1781,10 @@ public class MentraLive extends SGCManager {
                 if (buildNumberInt < 5) {
                     String jsonStr = json.toString();
                     // Bridge.log("LIVE: 📤 Sending JSON with esoteric message ID: " + jsonStr);
+                    if ("take_photo".equals(json.optString("type", ""))) {
+                        Bridge.log("LIVE: PHOTO PIPELINE [4/4] sendJson(build<5) -> sendDataToGlasses — " + summarizeOutgoingMessage(jsonStr));
+                    }
+                    BleTraceLogger.logJson("phone_to_glasses", "sdk_ble_command", json, jsonStr.length());
                     sendDataToGlasses(jsonStr, wakeup);
                 } else {
                     // Add esoteric message ID to the JSON
@@ -1812,6 +1820,10 @@ public class MentraLive extends SGCManager {
                     trackMessageForAck(messageId, jsonStr, ackTimeout);
 
                     // Send the data
+                    if ("take_photo".equals(json.optString("type", ""))) {
+                        Bridge.log("LIVE: PHOTO PIPELINE [4/4] sendJson -> sendDataToGlasses (mId=" + messageId + ", ackTimeoutMs=" + ackTimeout + ") — " + summarizeOutgoingMessage(jsonStr));
+                    }
+                    BleTraceLogger.logJson("phone_to_glasses", "sdk_ble_command", json, jsonStr.length());
                     sendDataToGlasses(jsonStr, wakeup);
                 }
             } catch (JSONException e) {
@@ -2251,6 +2263,13 @@ public class MentraLive extends SGCManager {
             Log.d(TAG, "LIVE: Got some JSON from glasses: " + json.toString());
         }
 
+        if (MessageChunker.isChunkedMessage(json)) {
+            processChunkedJsonMessage(json);
+            return;
+        }
+
+        BleTraceLogger.logJson("glasses_to_phone", "sdk_ble_event", json, json.toString().length());
+
         // Check if this is an ACK response
         String type = json.optString("type", "");
         if ("msg_ack".equals(type)) {
@@ -2280,6 +2299,13 @@ public class MentraLive extends SGCManager {
             case "ble_photo_ready":
                 processBlePhotoReady(json);
                 break;
+            case "photo_status":
+                try {
+                    Bridge.sendPhotoStatus(jsonObjectToMap(json));
+                } catch (JSONException e) {
+                    Log.e(TAG, "Error converting photo status to Map", e);
+                }
+                break;
             case "stream_status":
                 // Process streaming status update from ASG client
                 Bridge.log("LIVE: Received stream status update from glasses: " + json.toString());
@@ -2314,18 +2340,21 @@ public class MentraLive extends SGCManager {
 
                 // Forward to websocket system via Bridge (matches iOS emitRtmpStreamStatus)
                 try {
-                    Map<String, Object> rtmpMap = new HashMap<>();
-                    Iterator<String> keys = json.keys();
-                    while (keys.hasNext()) {
-                        String key = keys.next();
-                        rtmpMap.put(key, json.get(key));
-                    }
-                    Bridge.sendStreamStatus(rtmpMap);
+                    Bridge.sendStreamStatus(jsonObjectToMap(json));
                 } catch (JSONException e) {
                     Log.e(TAG, "Error converting RTMP status to Map", e);
                 }
                 break;
 
+            case "voice_activity_detection_status":
+                handleVoiceActivityDetectionStatus(
+                        json.optBoolean("voiceActivityDetectionEnabled", true));
+                break;
+
+            case "speaking_status":
+                handleSpeakingStatus(json.optBoolean("speaking", false));
+                break;
+
             case "battery_status":
                 // Process battery status
                 int percent = json.optInt("percent", getBatteryLevel());
@@ -2617,15 +2646,14 @@ public class MentraLive extends SGCManager {
 
             case "switch_status":
                 // Process switch status report from glasses
-                int switchType = json.optInt("switch_type", -1);
-                int switchValue = json.optInt("switch_value", -1);
+                int switchType = json.has("switch_type") ? json.optInt("switch_type", -1) : json.optInt("switchType", -1);
+                int switchValue = json.has("switch_value") ? json.optInt("switch_value", -1) : json.optInt("switchValue", -1);
                 long switchTimestamp = json.optLong("timestamp", System.currentTimeMillis());
 
                 Log.d(TAG, "🔘 Received switch status - Type: " + switchType +
                       ", Value: " + switchValue);
 
-                // Send switch status to React Native
-                Bridge.sendSwitchStatus(switchType, switchValue, switchTimestamp);
+                handleSwitchStatus(switchType, switchValue, switchTimestamp);
                 break;
 
             case "sensor_data":
@@ -2979,6 +3007,62 @@ public class MentraLive extends SGCManager {
         }
     }
 
+    private Map<String, Object> jsonObjectToMap(JSONObject json) throws JSONException {
+        Map<String, Object> map = new HashMap<>();
+        Iterator<String> keys = json.keys();
+        while (keys.hasNext()) {
+            String key = keys.next();
+            Object value = json.get(key);
+            if (value == JSONObject.NULL) {
+                continue;
+            }
+            map.put(key, jsonValueToBridgeValue(value));
+        }
+        return map;
+    }
+
+    private Object jsonValueToBridgeValue(Object value) throws JSONException {
+        if (value instanceof JSONObject) {
+            return jsonObjectToMap((JSONObject) value);
+        }
+        if (value instanceof JSONArray) {
+            JSONArray array = (JSONArray) value;
+            List<Object> list = new ArrayList<>();
+            for (int i = 0; i < array.length(); i++) {
+                Object item = array.get(i);
+                if (item != JSONObject.NULL) {
+                    list.add(jsonValueToBridgeValue(item));
+                }
+            }
+            return list;
+        }
+        return value;
+    }
+
+    private void processChunkedJsonMessage(JSONObject json) {
+        try {
+            MessageChunker.ChunkInfo chunkInfo = MessageChunker.getChunkInfo(json);
+            if (chunkInfo == null) {
+                Log.w(TAG, "LIVE: Received malformed chunked message: " + json);
+                return;
+            }
+
+            String reassembled = incomingChunkReassembler.addChunk(
+                    chunkInfo.chunkId,
+                    chunkInfo.chunkIndex,
+                    chunkInfo.totalChunks,
+                    chunkInfo.data);
+            if (reassembled == null) {
+                return;
+            }
+
+            JSONObject reassembledJson = new JSONObject(reassembled);
+            processJsonMessage(reassembledJson);
+        } catch (Exception e) {
+            Log.e(TAG, "Error processing chunked JSON message", e);
+        }
+    }
+
     /**
      * Process K900 command format JSON messages (messages with "C" field)
      */
@@ -3033,6 +3117,7 @@ public class MentraLive extends SGCManager {
                 BlePhotoTransfer photoTransfer = blePhotoTransfers.remove(bleImgId);
                 if (photoTransfer != null) {
                     Bridge.log("LIVE: 🧹 Cleaned up timed out BLE photo transfer for: " + bleImgId);
+                    Bridge.sendPhotoError(photoTransfer.requestId, "TRANSFER_TIMEOUT", "Transfer timed out for: " + fileName);
                 }
 
                 // Reset stale session on incident log relay so a retry starts fresh.
@@ -3065,8 +3150,19 @@ public class MentraLive extends SGCManager {
                 return;
             }
 
+            String bleImgId = fileName;
+            int dotIndex = bleImgId.lastIndexOf('.');
+            if (dotIndex > 0) {
+                bleImgId = bleImgId.substring(0, dotIndex);
+            }
+            BlePhotoTransfer photoTransfer = blePhotoTransfers.get(bleImgId);
+            String effectiveRequestId = requestId;
+            if (effectiveRequestId.isEmpty() && photoTransfer != null) {
+                effectiveRequestId = photoTransfer.requestId;
+            }
+
             Log.e(TAG, "❌ Transfer failed for: " + fileName + " (reason: " + reason + ")");
-            Bridge.sendPhotoError(requestId, "TRANSFER_FAILED", "Transfer failed for: " + fileName + " (reason: " + reason + ")");
+            Bridge.sendPhotoError(effectiveRequestId, "TRANSFER_FAILED", "Transfer failed for: " + fileName + " (reason: " + reason + ")");
 
             // Clean up any active transfer for this file
             FileTransferSession session = activeFileTransfers.remove(fileName);
@@ -3075,12 +3171,7 @@ public class MentraLive extends SGCManager {
             }
 
             // Clean up any BLE photo transfer
-            String bleImgId = fileName;
-            int dotIndex = bleImgId.lastIndexOf('.');
-            if (dotIndex > 0) {
-                bleImgId = bleImgId.substring(0, dotIndex);
-            }
-            BlePhotoTransfer photoTransfer = blePhotoTransfers.remove(bleImgId);
+            photoTransfer = blePhotoTransfers.remove(bleImgId);
             if (photoTransfer != null) {
                 Bridge.log("LIVE: 🧹 Cleaned up failed BLE photo transfer for: " + bleImgId + " (requestId: " + photoTransfer.requestId + ")");
             }
@@ -3203,6 +3294,33 @@ public class MentraLive extends SGCManager {
                 handleSrVol(json);
                 break;
 
+            case "sr_vad":
+                try {
+                    JSONObject bodyObj = optK900Body(json);
+                    if (bodyObj != null) {
+                        int on = bodyObj.optInt("on", -1);
+                        if (on == 0 || on == 1) {
+                            handleSpeakingStatus(on == 1);
+                        }
+                    }
+                } catch (Exception e) {
+                    Log.e(TAG, "Error parsing sr_vad response", e);
+                }
+                break;
+
+            case "sr_swit":
+                try {
+                    JSONObject bodyObj = optK900Body(json);
+                    if (bodyObj != null) {
+                        int type = bodyObj.optInt("type", -1);
+                        int value = bodyObj.optInt("switch", -1);
+                        handleSwitchStatus(type, value, System.currentTimeMillis());
+                    }
+                } catch (Exception e) {
+                    Log.e(TAG, "Error parsing sr_swit response", e);
+                }
+                break;
+
             case "sr_shut":
                 Bridge.log("LIVE: K900 shutdown command received - glasses shutting down");
                 lastShutdownTimeMs = System.currentTimeMillis();
@@ -3310,8 +3428,8 @@ public class MentraLive extends SGCManager {
                     // Try to parse the "C" field as JSON
                     JSONObject innerJson = new JSONObject(command);
 
-                    // If it has a "type" field, it's a standard message that got C-wrapped
-                    if (innerJson.has("type")) {
+                    // If it has a "type" field or chunk envelope, it's a standard message that got C-wrapped
+                    if (innerJson.has("type") || MessageChunker.isChunkedMessage(innerJson)) {
                         String messageType = innerJson.optString("type", "");
                         Log.d(TAG, "📦 Detected C-wrapped standard JSON message with type: " + messageType);
                         Log.d(TAG, "🔓 Unwrapping and processing through standard message handler");
@@ -3440,6 +3558,32 @@ public class MentraLive extends SGCManager {
         }
     }
 
+    private void handleVoiceActivityDetectionStatus(boolean enabled) {
+        Bridge.log("LIVE: Voice Activity Detection " + (enabled ? "enabled" : "disabled"));
+        Bridge.sendVoiceActivityDetectionStatus(enabled);
+    }
+
+    private void handleSpeakingStatus(boolean speaking) {
+        if (!isVoiceActivityDetectionEnabled()) {
+            Bridge.log("LIVE: Ignoring speaking status because Voice Activity Detection is disabled");
+            return;
+        }
+        Bridge.log("LIVE: Speaking status " + (speaking ? "speaking" : "not speaking"));
+        Bridge.sendSpeakingStatus(speaking);
+    }
+
+    private boolean isVoiceActivityDetectionEnabled() {
+        Object value = DeviceStore.INSTANCE.get("bluetooth", "voice_activity_detection_enabled");
+        return !(value instanceof Boolean) || (Boolean) value;
+    }
+
+    private void handleSwitchStatus(int switchType, int switchValue, long timestamp) {
+        Bridge.sendSwitchStatus(switchType, switchValue, timestamp);
+        if (switchType == VOICE_ACTIVITY_DETECTION_SWITCH_TYPE && (switchValue == 0 || switchValue == 1)) {
+            handleVoiceActivityDetectionStatus(switchValue == 1);
+        }
+    }
+
     /**
      * Update WiFi status and notify listeners
      * Matches iOS MentraLive.swift updateWifiStatus pattern
@@ -3625,7 +3769,7 @@ public class MentraLive extends SGCManager {
 
     @Override
     public void sendGalleryMode() {
-        boolean active = (Boolean) DeviceStore.INSTANCE.get("bluetooth", "galleryModeAuto");
+        boolean active = (Boolean) DeviceStore.INSTANCE.get("bluetooth", "gallery_mode");
         Bridge.log("LIVE: 📸 Sending gallery mode active to glasses: " + active);
         try {
             JSONObject json = new JSONObject();
@@ -4092,9 +4236,10 @@ public class MentraLive extends SGCManager {
         }
     }
 
-    public void requestPhoto(String requestId, String appId, String size, String webhookUrl, String authToken, String compress, boolean flash, boolean sound) {
+    public void requestPhoto(String requestId, String appId, String size, String webhookUrl, String authToken, String compress, boolean flash, boolean sound, Long exposureTimeNs, Integer iso) {
         boolean hasAuthToken = authToken != null && !authToken.isEmpty();
-        Bridge.log("LIVE: Requesting photo: " + requestId + " for app: " + appId + " with size: " + size + ", webhookUrl: " + webhookUrl + ", authToken: " + (hasAuthToken ? "***" : "none") + ", compress=" + compress + ", flash=" + flash + ", sound=" + sound);
+        Bridge.log("LIVE: Requesting photo: " + requestId + " for app: " + appId + " with size: " + size + ", webhookUrl: " + webhookUrl + ", authToken: " + (hasAuthToken ? "***" : "none") + ", compress=" + compress + ", flash=" + flash + ", sound=" + sound + ", exposureTimeNs=" + exposureTimeNs + ", iso=" + iso);
+        Bridge.log("LIVE: PHOTO PIPELINE [5/6] requestPhoto() entry — requestId=" + requestId + ", appId=" + appId);
 
         try {
             JSONObject json = new JSONObject();
@@ -4117,6 +4262,14 @@ public class MentraLive extends SGCManager {
             }
             json.put("flash", flash);
             json.put("sound", sound);
+            if (exposureTimeNs != null && exposureTimeNs > 0L) {
+                Bridge.log("LIVE: Using manual exposure time for photo request " + requestId + ": " + exposureTimeNs + " ns");
+                json.put("exposureTimeNs", exposureTimeNs);
+            }
+            if (iso != null && iso > 0) {
+                Bridge.log("LIVE: Using manual ISO for photo request " + requestId + ": ISO " + iso);
+                json.put("iso", iso);
+            }
 
             // Always generate BLE ID for potential fallback
             String bleImgId = "I" + String.format("%09d", System.currentTimeMillis() % 1000000000);
@@ -4134,6 +4287,8 @@ public class MentraLive extends SGCManager {
             }
 
             Bridge.log("LIVE: Using auto transfer mode with BLE fallback ID: " + bleImgId);
+            Bridge.log("LIVE: PHOTO PIPELINE [5b/6] JSON ready — " + summarizeOutgoingMessage(json.toString()) + ", wakeup=true");
+            Bridge.log("LIVE: PHOTO PIPELINE [6/6] Dispatching take_photo to sendJson()");
 
             sendJson(json, true);
         } catch (JSONException e) {
@@ -4759,7 +4914,7 @@ public class MentraLive extends SGCManager {
                 Map<String, Object> videoSettings = (Map<String, Object>) videoSettingsObj;
                 videoWidth = ((Number) videoSettings.getOrDefault("width", videoWidth)).intValue();
                 videoHeight = ((Number) videoSettings.getOrDefault("height", videoHeight)).intValue();
-                videoFps = ((Number) videoSettings.getOrDefault("frameRate", videoFps)).intValue();
+                videoFps = ((Number) videoSettings.getOrDefault("fps", videoFps)).intValue();
             } else {
                 Object width = DeviceStore.INSTANCE.get("bluetooth", "button_video_width");
                 Object height = DeviceStore.INSTANCE.get("bluetooth", "button_video_height");
@@ -5564,6 +5719,12 @@ public class MentraLive extends SGCManager {
         }
 
         try {
+            String outgoingSummary = summarizeOutgoingMessage(data);
+            boolean isPhotoRequest = outgoingSummary.contains("type=take_photo");
+            if (isPhotoRequest) {
+                Bridge.log("LIVE: PHOTO PIPELINE BLE handoff — sendDataToGlasses() start, wakeup=" + wakeup + ", " + outgoingSummary);
+            }
+
             // First check if the message needs chunking
             // Create a test C-wrapped version to check size
             JSONObject testWrapper = new JSONObject();
@@ -5576,6 +5737,9 @@ public class MentraLive extends SGCManager {
             // Check if chunking is needed
             if (MessageChunker.needsChunking(testWrappedJson)) {
                 Bridge.log("LIVE: Message exceeds threshold, chunking required");
+                if (isPhotoRequest) {
+                    Bridge.log("LIVE: PHOTO PIPELINE BLE handoff — chunking enabled for request payload");
+                }
 
                 // Extract message ID if present for ACK tracking
                 long messageId = -1;
@@ -5589,6 +5753,9 @@ public class MentraLive extends SGCManager {
                 // Create chunks
                 List<JSONObject> chunks = MessageChunker.createChunks(data, messageId);
                 Bridge.log("LIVE: Sending " + chunks.size() + " chunks");
+                if (isPhotoRequest) {
+                    Bridge.log("LIVE: PHOTO PIPELINE BLE handoff — created " + chunks.size() + " chunks for transmission");
+                }
 
                 // Send each chunk
                 for (int i = 0; i < chunks.size(); i++) {
@@ -5612,6 +5779,9 @@ public class MentraLive extends SGCManager {
                 }
 
                 Bridge.log("LIVE: All chunks queued for transmission");
+                if (isPhotoRequest) {
+                    Bridge.log("LIVE: PHOTO PIPELINE BLE handoff — all photo chunks queued");
+                }
             } else {
                 // Normal single message transmission
                 Bridge.log("LIVE: Sending data to glasses: " + data);
@@ -5621,6 +5791,9 @@ public class MentraLive extends SGCManager {
 
                 // Queue the data for sending
                 queueData(packedData);
+                if (isPhotoRequest) {
+                    Bridge.log("LIVE: PHOTO PIPELINE BLE handoff — packedLen=" + packedData.length + " bytes queued");
+                }
             }
 
         } catch (Exception e) {
@@ -5628,6 +5801,33 @@ public class MentraLive extends SGCManager {
         }
     }
 
+    private String summarizeOutgoingMessage(String payload) {
+        if (payload == null || payload.isEmpty()) {
+            return "type=unknown, requestId=none, appId=none, transferMethod=none, bleImgId=none, exposureTimeNs=none, iso=none, mId=none";
+        }
+        try {
+            JSONObject obj = new JSONObject(payload);
+            String type = obj.optString("type", "unknown");
+            String requestId = obj.optString("requestId", "none");
+            String appId = obj.optString("appId", "none");
+            String transferMethod = obj.optString("transferMethod", "none");
+            String bleImgId = obj.optString("bleImgId", "none");
+            String exposure = obj.has("exposureTimeNs") ? String.valueOf(obj.optLong("exposureTimeNs")) : "none";
+            String iso = obj.has("iso") ? String.valueOf(obj.optInt("iso")) : "none";
+            String mId = obj.has("mId") ? String.valueOf(obj.optLong("mId")) : "none";
+            return "type=" + type
+                    + ", requestId=" + requestId
+                    + ", appId=" + appId
+                    + ", transferMethod=" + transferMethod
+                    + ", bleImgId=" + bleImgId
+                    + ", exposureTimeNs=" + exposure
+                    + ", iso=" + iso
+                    + ", mId=" + mId;
+        } catch (JSONException ignored) {
+            return "type=non_json, payloadLen=" + payload.length();
+        }
+    }
+
     public void sendStartVideoStream(){
         try {
             JSONObject command = new JSONObject();
@@ -6034,9 +6234,10 @@ public class MentraLive extends SGCManager {
                     Log.e(TAG, "❌ BLE photo transfer incomplete after final packet. Missing " + missingPackets.size() + " packets: " + missingPackets);
                     Log.e(TAG, "❌ Telling glasses to retry entire transfer");
 
-                    // Tell glasses transfer failed, they will retry
+                    // Tell glasses transfer failed, they will retry. Keep the photo transfer
+                    // entry so the retry still maps back to the original requestId.
                     sendTransferCompleteConfirmation(packetInfo.fileName, false);
-                    blePhotoTransfers.remove(bleImgId);
+                    photoTransfer.session = null;
                 }
             }
 
@@ -6437,6 +6638,46 @@ public class MentraLive extends SGCManager {
 
         // Send gallery mode state (camera app running status)
         sendGalleryMode();
+
+        // Send glasses-side Voice Activity Detection setting.
+        sendVoiceActivityDetectionSetting();
+    }
+
+    @Override
+    public void sendVoiceActivityDetectionSetting() {
+        Object value = DeviceStore.INSTANCE.get("bluetooth", "voice_activity_detection_enabled");
+        boolean enabled = value instanceof Boolean ? (Boolean) value : true;
+
+        Bridge.log("LIVE: 🎤 Sending Voice Activity Detection setting to glasses: " + enabled);
+
+        if (!isConnected) {
+            Bridge.log("LIVE: Cannot send Voice Activity Detection setting - not connected");
+            return;
+        }
+
+        try {
+            JSONObject body = new JSONObject();
+            body.put("type", VOICE_ACTIVITY_DETECTION_SWITCH_TYPE);
+            body.put("switch", enabled ? 1 : 0);
+
+            JSONObject cmdObject = new JSONObject();
+            cmdObject.put("C", "cs_swit");
+            cmdObject.put("V", 1);
+            cmdObject.put("B", body.toString());
+
+            byte[] packedData =
+                    K900ProtocolUtils.packDataToK900(
+                            cmdObject.toString().getBytes(StandardCharsets.UTF_8),
+                            K900ProtocolUtils.CMD_TYPE_STRING);
+            if (packedData == null) {
+                Bridge.log("LIVE: Failed to pack Voice Activity Detection setting command");
+                return;
+            }
+            queueData(packedData);
+            Bridge.sendVoiceActivityDetectionStatus(enabled);
+        } catch (JSONException e) {
+            Log.e(TAG, "Error creating Voice Activity Detection setting command", e);
+        }
     }
 
     /**
@@ -6487,7 +6728,7 @@ public class MentraLive extends SGCManager {
     }
 
     /**
-     * Send camera FOV setting to glasses (K900 / Mentra Live). Reads fov and roiPosition from store.
+     * Send camera FOV setting to glasses (K900 / Mentra Live).
      */
     @Override
     public void sendCameraFovSetting() {
@@ -6499,7 +6740,7 @@ public class MentraLive extends SGCManager {
                 @SuppressWarnings("unchecked")
                 java.util.Map<String, Object> map = (java.util.Map<String, Object>) raw;
                 Object f = map.get("fov");
-                Object r = map.get("roiPosition");
+                Object r = map.get("roi_position");
                 if (f instanceof Number) fov = ((Number) f).intValue();
                 if (r instanceof Number) roiPosition = ((Number) r).intValue();
             }

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

@@ -290,7 +290,7 @@ class MentraNex : SGCManager() {
     override fun requestVersionInfo() { Bridge.log("Nex: requestVersionInfo operation not supported") }
 
     // Camera & Media: Not supported on Nex (No camera)
-    override fun requestPhoto(requestId: String, appId: String, size: String, webhookUrl: String?, authToken: String?, compress: String?, flash: Boolean, sound: Boolean) { Bridge.log("Nex: requestPhoto operation not supported") }
+    override fun requestPhoto(requestId: String, appId: String, size: String, webhookUrl: String?, authToken: String?, compress: String?, flash: Boolean, sound: Boolean, exposureTimeNs: Long?, iso: Int?) { Bridge.log("Nex: requestPhoto operation not supported") }
     override fun startStream(message: MutableMap<String, Any>) { Bridge.log("Nex: startStream operation not supported") }
     override fun stopStream() { Bridge.log("Nex: stopStream operation not supported") }
     override fun sendStreamKeepAlive(message: MutableMap<String, Any>) { Bridge.log("Nex: sendStreamKeepAlive operation not supported") }

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

@@ -21,7 +21,9 @@ abstract class SGCManager {
             authToken: String?,
             compress: String?,
             flash: Boolean,
-            sound: Boolean
+            sound: Boolean,
+            exposureTimeNs: Long?,
+            iso: Int?,
     )
     abstract fun startStream(message: MutableMap<String, Any>)
     abstract fun stopStream()
@@ -109,6 +111,9 @@ abstract class SGCManager {
     abstract fun queryGalleryStatus()
     abstract fun sendGalleryMode()
 
+    // Voice Activity Detection
+    open fun sendVoiceActivityDetectionSetting() {}
+
     // Version info
     abstract fun requestVersionInfo()
 
@@ -155,8 +160,8 @@ abstract class SGCManager {
     val micEnabled: Boolean
         get() = DeviceStore.get("glasses", "micEnabled") as? Boolean ?: false
 
-    val vadEnabled: Boolean
-        get() = DeviceStore.get("glasses", "vadEnabled") as? Boolean ?: false
+    val voiceActivityDetectionEnabled: Boolean
+        get() = DeviceStore.get("glasses", "voiceActivityDetectionEnabled") as? Boolean ?: true
 
     val batteryLevel: Int
         get() = DeviceStore.get("glasses", "batteryLevel") as? Int ?: -1

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

@@ -14,6 +14,7 @@ class Simulated : SGCManager() {
         DeviceStore.apply("glasses", "connected", true)
         DeviceStore.apply("glasses", "connectionState", ConnTypes.CONNECTED)
         DeviceStore.apply("glasses", "micEnabled", false)
+        DeviceStore.apply("glasses", "voiceActivityDetectionEnabled", true)
     }
 
     // Audio Control
@@ -34,7 +35,9 @@ class Simulated : SGCManager() {
             authToken: String?,
             compress: String?,
             flash: Boolean,
-            sound: Boolean
+            sound: Boolean,
+            exposureTimeNs: Long?,
+            iso: Int?,
     ) {
         Bridge.log("requestPhoto flash=$flash, sound=$sound")
     }