@mentra/bluetooth-sdk 0.1.8 → 0.1.10

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

@@ -132,7 +132,7 @@ public class Mach1 extends SGCManager {
     }
 
     @Override
-    public void requestPhoto(@NonNull String requestId, @NonNull String appId, @NonNull String size, @Nullable String webhookUrl, @Nullable String authToken, @Nullable String compress, boolean flash, boolean sound, @Nullable Long exposureTimeNs, @Nullable Integer iso) {
+    public void requestPhoto(@NonNull String requestId, @NonNull String appId, @NonNull String size, @Nullable String webhookUrl, @Nullable String authToken, @Nullable String compress, boolean flash, boolean save, boolean sound, @Nullable Long exposureTimeNs, @Nullable Integer iso) {
 
     }
 
@@ -211,7 +211,7 @@ public class Mach1 extends SGCManager {
     }
 
     @Override
-    public boolean displayBitmap(@NonNull String base64ImageData) {
+    public boolean displayBitmap(@NonNull String base64ImageData, Integer x, Integer y, Integer width, Integer height) {
         try {
             Bridge.log("Mach1: displayBitmap() - decoding base64");
             // Decode base64 to byte array

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

@@ -32,10 +32,11 @@ import androidx.core.app.ActivityCompat;
 // import androidx.preference.PreferenceManager;
 
 // Mentra
-import com.mentra.bluetoothsdk.sgcs.SGCManager;
-import com.mentra.bluetoothsdk.DeviceManager;
+import com.mentra.bluetoothsdk.BluetoothSdkDefaults;
 import com.mentra.bluetoothsdk.Bridge;
+import com.mentra.bluetoothsdk.DeviceManager;
 import com.mentra.bluetoothsdk.debug.BleTraceLogger;
+import com.mentra.bluetoothsdk.sgcs.SGCManager;
 import com.mentra.bluetoothsdk.utils.DeviceTypes;
 import com.mentra.bluetoothsdk.utils.ConnTypes;
 import com.mentra.bluetoothsdk.utils.BitmapJavaUtils;
@@ -684,6 +685,9 @@ public class MentraLive extends SGCManager {
     private void updateConnectionState(String state) {
         boolean isEqual = state.equals(getConnectionState());
         if (isEqual) {
+            if (state.equals(ConnTypes.DISCONNECTED)) {
+                incomingChunkReassembler.clear();
+            }
             return;
         }
 
@@ -710,6 +714,7 @@ public class MentraLive extends SGCManager {
             DeviceStore.INSTANCE.apply("glasses", "connected", false);
             DeviceStore.INSTANCE.apply("glasses", "signalStrength", -1);
             DeviceStore.INSTANCE.apply("glasses", "signalStrengthUpdatedAt", 0L);
+            incomingChunkReassembler.clear();
             // Drop OTA caches when fully disconnected — avoids leaking session/step state
             // from a previous pairing into the next one.
             resetOtaCache();
@@ -2262,14 +2267,13 @@ public class MentraLive extends SGCManager {
         if (Log.isLoggable(TAG, Log.DEBUG)) {
             Log.d(TAG, "LIVE: Got some JSON from glasses: " + json.toString());
         }
+        BleTraceLogger.logJson("glasses_to_phone", "sdk_ble_event", json, null);
 
         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)) {
@@ -2346,9 +2350,15 @@ public class MentraLive extends SGCManager {
                 }
                 break;
 
+            case "video_recording_status":
+                emitVideoRecordingStatus(json);
+                break;
+
             case "voice_activity_detection_status":
                 handleVoiceActivityDetectionStatus(
-                        json.optBoolean("voiceActivityDetectionEnabled", true));
+                        json.optBoolean(
+                                "voiceActivityDetectionEnabled",
+                                BluetoothSdkDefaults.VOICE_ACTIVITY_DETECTION_ENABLED));
                 break;
 
             case "speaking_status":
@@ -2411,6 +2421,12 @@ public class MentraLive extends SGCManager {
                 String photoState = json.optString("state", "");
                 boolean photoSuccess = "success".equals(photoState) || json.optBoolean("success", false);
 
+                try {
+                    Bridge.sendPhotoResponse(jsonObjectToMap(json));
+                } catch (JSONException e) {
+                    Log.e(TAG, "Error converting photo response to Map", e);
+                }
+
                 if (!photoSuccess) {
                     // Handle failed photo response
                     String errorMsg = json.optString("errorMessage", json.optString("error", "Unknown error"));
@@ -2469,7 +2485,8 @@ public class MentraLive extends SGCManager {
                         }
                 }
                 
-                Bridge.updateWifiScanResults(networks);
+                boolean scanComplete = json.optBoolean("scan_complete", json.optBoolean("scanComplete", false));
+                Bridge.updateWifiScanResults(networks, scanComplete);
                 break;
 
             case "token_status":
@@ -2545,8 +2562,10 @@ public class MentraLive extends SGCManager {
                 Bridge.log("LIVE: 📱 OTA status - step " + osCurrentStep + "/" + osTotalSteps +
                       " " + osPhase + " " + osStatus + " " + osOverallPercent + "%");
 
+                long glassesTimeMs = json.optLong("glasses_time_ms", 0);
                 Bridge.sendOtaStatus(osSessionId, osTotalSteps, osCurrentStep, osStepType,
-                    osPhase, osStepPercent, osOverallPercent, osStatus, osErrorMessage);
+                    osPhase, osStepPercent, osOverallPercent, osStatus, osErrorMessage,
+                    glassesTimeMs > 0 ? glassesTimeMs : null);
                 break;
 
             case "ota_progress":
@@ -2593,12 +2612,29 @@ public class MentraLive extends SGCManager {
                 int totalCount = json.optInt("total", 0);
                 long totalSize = json.optLong("total_size", 0);
                 boolean hasContent = json.optBoolean("has_content", false);
+                Object cameraBusyValue = json.opt("camera_busy");
+                boolean cameraBusy = json.optBoolean("cameraBusy", false);
+                String cameraBusyReason = json.optString("cameraBusyReason", null);
+                if (cameraBusyValue instanceof Boolean) {
+                    cameraBusy = cameraBusy || (Boolean) cameraBusyValue;
+                } else if (cameraBusyValue instanceof String) {
+                    String busyReason = ((String) cameraBusyValue).trim();
+                    if (!busyReason.isEmpty() && !"false".equalsIgnoreCase(busyReason)) {
+                        cameraBusy = true;
+                        cameraBusyReason = busyReason;
+                    }
+                }
 
                 Bridge.log("LIVE: 📸 Received gallery status: " + photoCount + " photos, " +
                       videoCount + " videos, total size: " + totalSize + " bytes");
 
                 // Send gallery status to React Native frontend (matches iOS pattern)
-                Bridge.sendGalleryStatus(photoCount, videoCount, totalCount, totalSize, hasContent);
+                Bridge.sendGalleryStatus(photoCount, videoCount, totalCount, totalSize, hasContent,
+                        cameraBusy, cameraBusyReason);
+                break;
+
+            case "settings_ack":
+                emitSettingsAck(json);
                 break;
 
             // case "touch_event":
@@ -2769,13 +2805,7 @@ public class MentraLive extends SGCManager {
 
                 // Forward to websocket system via Bridge (matches iOS emitKeepAliveAck)
                 try {
-                    Map<String, Object> ackMap = new HashMap<>();
-                    Iterator<String> keys = json.keys();
-                    while (keys.hasNext()) {
-                        String key = keys.next();
-                        ackMap.put(key, json.get(key));
-                    }
-                    Bridge.sendKeepAliveAck(ackMap);
+                    Bridge.sendKeepAliveAck(jsonObjectToMap(json));
                 } catch (JSONException e) {
                     Log.e(TAG, "Error converting keep_alive_ack to Map", e);
                 }
@@ -2806,6 +2836,15 @@ public class MentraLive extends SGCManager {
                 DeviceStore.INSTANCE.apply("glasses", "firmwareVersion", firmwareVersionLegacy);
                 DeviceStore.INSTANCE.apply("glasses", "bluetoothMacAddress", btMacAddressLegacy);
 
+                Map<String, Object> versionInfoLegacy = new HashMap<>();
+                versionInfoLegacy.put("appVersion", appVersionLegacy);
+                versionInfoLegacy.put("buildNumber", buildNumberLegacy);
+                versionInfoLegacy.put("deviceModel", deviceModelLegacy);
+                versionInfoLegacy.put("androidVersion", androidVersionLegacy);
+                versionInfoLegacy.put("otaVersionUrl", otaVersionUrlLegacy != null ? otaVersionUrlLegacy : "");
+                versionInfoLegacy.put("firmwareVersion", firmwareVersionLegacy);
+                Bridge.sendVersionInfo(versionInfoLegacy);
+
                 // Parse build number as integer for version checks (local field)
                 try {
                     buildNumberInt = Integer.parseInt(buildNumberLegacy);
@@ -2997,9 +3036,15 @@ public class MentraLive extends SGCManager {
                     if (fields.containsKey("bt_mac_address")) {
                         DeviceStore.INSTANCE.apply("glasses", "bluetoothMacAddress", (String) fields.get("bt_mac_address"));
                     }
-
+                    if (fields.containsKey("system_time_ms")) {
+                        Object v = fields.get("system_time_ms");
+                        if (v instanceof Number) {
+                            DeviceStore.INSTANCE.apply("glasses", "systemTimeMs", ((Number) v).longValue());
+                        }
+                    }
 
                     Bridge.log("LIVE: Processed version_info fields and sent to RN");
+                    Bridge.sendVersionInfo(fields);
                 } else {
                     Log.d(TAG, "📦 Unknown message type: " + type);
                 }
@@ -3007,6 +3052,58 @@ public class MentraLive extends SGCManager {
         }
     }
 
+    private void emitSettingsAck(JSONObject json) {
+        try {
+            Map<String, Object> body = jsonObjectToMap(json);
+            if (body.containsKey("request_id") && !body.containsKey("requestId")) {
+                body.put("requestId", body.get("request_id"));
+            }
+            if (body.containsKey("roi_position") && !body.containsKey("roiPosition")) {
+                body.put("roiPosition", body.get("roi_position"));
+            }
+            if (body.containsKey("error_code") && !body.containsKey("errorCode")) {
+                body.put("errorCode", body.get("error_code"));
+            }
+            if (body.containsKey("error_message") && !body.containsKey("errorMessage")) {
+                body.put("errorMessage", body.get("error_message"));
+            }
+            if (body.containsKey("hardware_applied") && !body.containsKey("hardwareApplied")) {
+                body.put("hardwareApplied", body.get("hardware_applied"));
+            }
+            body.remove("request_id");
+            body.remove("roi_position");
+            body.remove("error_code");
+            body.remove("error_message");
+            body.remove("hardware_applied");
+            if (!body.containsKey("timestamp")) {
+                body.put("timestamp", System.currentTimeMillis());
+            }
+            Bridge.sendSettingsAck(body);
+        } catch (JSONException e) {
+            Log.e(TAG, "Error converting settings_ack to Map", e);
+        }
+    }
+
+    private void emitVideoRecordingStatus(JSONObject json) {
+        try {
+            Map<String, Object> body = jsonObjectToMap(json);
+            if (body.containsKey("request_id") && !body.containsKey("requestId")) {
+                body.put("requestId", body.get("request_id"));
+            }
+            if (body.containsKey("error_details") && !body.containsKey("details")) {
+                body.put("details", body.get("error_details"));
+            }
+            body.remove("request_id");
+            body.remove("error_details");
+            if (!body.containsKey("timestamp")) {
+                body.put("timestamp", System.currentTimeMillis());
+            }
+            Bridge.sendVideoRecordingStatus(body);
+        } catch (JSONException e) {
+            Log.e(TAG, "Error converting video_recording_status to Map", e);
+        }
+    }
+
     private Map<String, Object> jsonObjectToMap(JSONObject json) throws JSONException {
         Map<String, Object> map = new HashMap<>();
         Iterator<String> keys = json.keys();
@@ -3046,6 +3143,14 @@ public class MentraLive extends SGCManager {
                 Log.w(TAG, "LIVE: Received malformed chunked message: " + json);
                 return;
             }
+            if (chunkInfo.chunkId == null || chunkInfo.chunkId.isEmpty()
+                    || chunkInfo.totalChunks <= 0
+                    || chunkInfo.chunkIndex < 0
+                    || chunkInfo.chunkIndex >= chunkInfo.totalChunks
+                    || chunkInfo.data == null) {
+                Log.w(TAG, "LIVE: Received invalid chunk metadata: " + json);
+                return;
+            }
 
             String reassembled = incomingChunkReassembler.addChunk(
                     chunkInfo.chunkId,
@@ -3062,7 +3167,6 @@ public class MentraLive extends SGCManager {
             Log.e(TAG, "Error processing chunked JSON message", e);
         }
     }
-
     /**
      * Process K900 command format JSON messages (messages with "C" field)
      */
@@ -3751,6 +3855,18 @@ public class MentraLive extends SGCManager {
         }
     }
 
+    public void sendOtaRetryVersionCheck() {
+        try {
+            JSONObject json = new JSONObject();
+            json.put("type", "ota_retry_version_check");
+            json.put("timestamp", System.currentTimeMillis());
+            sendJson(json, true);
+            Bridge.log("LIVE: ⏰ Sending ota_retry_version_check command to glasses");
+        } catch (JSONException e) {
+            Log.e(TAG, "⏰ Error creating ota_retry_version_check command", e);
+        }
+    }
+
     /**
      * Request version info from glasses.
      * Glasses will respond with version_info message containing build number, firmware version, etc.
@@ -3770,10 +3886,17 @@ public class MentraLive extends SGCManager {
     @Override
     public void sendGalleryMode() {
         boolean active = (Boolean) DeviceStore.INSTANCE.get("bluetooth", "gallery_mode");
+        sendGalleryMode(null, active);
+    }
+
+    public void sendGalleryMode(String requestId, boolean active) {
         Bridge.log("LIVE: 📸 Sending gallery mode active to glasses: " + active);
         try {
             JSONObject json = new JSONObject();
             json.put("type", "save_in_gallery_mode");
+            if (requestId != null && !requestId.isEmpty()) {
+                json.put("request_id", requestId);
+            }
             json.put("active", active);
             json.put("timestamp", System.currentTimeMillis());
             sendJson(json, true);
@@ -4113,7 +4236,8 @@ public class MentraLive extends SGCManager {
     public void dbg1() {}
     public void dbg2() {}
 
-    public boolean displayBitmap(String base64) {
+    @Override
+    public boolean displayBitmap(String base64, Integer x, Integer y, Integer width, Integer height) {
         return false;
     }
 
@@ -4236,9 +4360,9 @@ public class MentraLive extends SGCManager {
         }
     }
 
-    public void requestPhoto(String requestId, String appId, String size, String webhookUrl, String authToken, String compress, boolean flash, boolean sound, Long exposureTimeNs, Integer iso) {
+    public void requestPhoto(String requestId, String appId, String size, String webhookUrl, String authToken, String compress, boolean flash, boolean save, 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 + ", exposureTimeNs=" + exposureTimeNs + ", iso=" + iso);
+        Bridge.log("LIVE: Requesting photo: " + requestId + " for app: " + appId + " with size: " + size + ", webhookUrl: " + webhookUrl + ", authToken: " + (hasAuthToken ? "***" : "none") + ", compress=" + compress + ", flash=" + flash + ", save=" + save + ", sound=" + sound + ", exposureTimeNs=" + exposureTimeNs + ", iso=" + iso);
         Bridge.log("LIVE: PHOTO PIPELINE [5/6] requestPhoto() entry — requestId=" + requestId + ", appId=" + appId);
 
         try {
@@ -4261,6 +4385,7 @@ public class MentraLive extends SGCManager {
                 json.put("compress", "none");
             }
             json.put("flash", flash);
+            json.put("save", save);
             json.put("sound", sound);
             if (exposureTimeNs != null && exposureTimeNs > 0L) {
                 Bridge.log("LIVE: Using manual exposure time for photo request " + requestId + ": " + exposureTimeNs + " ns");
@@ -4836,6 +4961,7 @@ public class MentraLive extends SGCManager {
 
         // Clean up message tracking
         pendingMessages.clear();
+        incomingChunkReassembler.clear();
         Bridge.log("LIVE: Cleared pending message tracking");
 
         // Release RGB LED control authority before disconnecting
@@ -4891,10 +5017,17 @@ public class MentraLive extends SGCManager {
     // }
 
     public void sendButtonPhotoSettings(String size) {
+        sendButtonPhotoSettings(null, size);
+    }
+
+    public void sendButtonPhotoSettings(String requestId, String size) {
         // Send photo size settings to glasses
         JSONObject command = new JSONObject();
         try {
             command.put("type", "button_photo_setting");
+            if (requestId != null && !requestId.isEmpty()) {
+                command.put("request_id", requestId);
+            }
             command.put("size", size);
             sendJson(command, true);
         } catch (Exception e) {
@@ -4929,11 +5062,21 @@ public class MentraLive extends SGCManager {
                     videoFps = ((Number) fps).intValue();
                 }
             }
-            
+            sendButtonVideoRecordingSettings(null, videoWidth, videoHeight, videoFps);
+        } catch (Exception e) {
+            Log.e(TAG, "❌ [SETTINGS_SYNC] Error sending button video recording settings", e);
+        }
+    }
+
+    public void sendButtonVideoRecordingSettings(String requestId, int videoWidth, int videoHeight, int videoFps) {
+        try {
             Bridge.log("LIVE: 🎥 [SETTINGS_SYNC] Sending button video recording settings: " + videoWidth + "x" + videoHeight + "@" + videoFps + "fps");
 
             JSONObject json = new JSONObject();
             json.put("type", "button_video_recording_setting");
+            if (requestId != null && !requestId.isEmpty()) {
+                json.put("request_id", requestId);
+            }
             JSONObject settings = new JSONObject();
             settings.put("width", videoWidth);
             settings.put("height", videoHeight);
@@ -4948,10 +5091,17 @@ public class MentraLive extends SGCManager {
     }
 
     public void sendButtonCameraLedSetting(boolean enabled) {
+        sendButtonCameraLedSetting(null, enabled);
+    }
+
+    public void sendButtonCameraLedSetting(String requestId, boolean enabled) {
         // Send LED setting to glasses
         JSONObject command = new JSONObject();
         try {
             command.put("type", "button_camera_led");
+            if (requestId != null && !requestId.isEmpty()) {
+                command.put("request_id", requestId);
+            }
             command.put("enabled", enabled);
             sendJson(command, true);
         } catch (Exception e) {
@@ -5678,6 +5828,18 @@ public class MentraLive extends SGCManager {
         }
     }
 
+    private double[] jsonArrayToDoubleArray(JSONArray source, int expectedLength) {
+        if (source == null) {
+            return new double[0];
+        }
+        int length = Math.min(expectedLength, source.length());
+        double[] out = new double[length];
+        for (int i = 0; i < length; i++) {
+            out[i] = source.optDouble(i, 0.0);
+        }
+        return out;
+    }
+
     private void handleStreamImuData(JSONObject json) {
         try {
             JSONArray readings = json.getJSONArray("readings");
@@ -5751,7 +5913,7 @@ public class MentraLive extends SGCManager {
                 }
 
                 // Create chunks
-                List<JSONObject> chunks = MessageChunker.createChunks(data, messageId);
+                List<JSONObject> chunks = MessageChunker.createChunks(data, messageId, wakeup);
                 Bridge.log("LIVE: Sending " + chunks.size() + " chunks");
                 if (isPhotoRequest) {
                     Bridge.log("LIVE: PHOTO PIPELINE BLE handoff — created " + chunks.size() + " chunks for transmission");
@@ -5923,6 +6085,19 @@ public class MentraLive extends SGCManager {
         }
     }
 
+    @Override
+    public void sendSetSystemTime(long timestampMs) {
+        Bridge.log("LIVE: ⏰ Sending set_system_time to glasses: " + timestampMs);
+        try {
+            JSONObject command = new JSONObject();
+            command.put("type", "set_system_time");
+            command.put("timestamp_ms", timestampMs);
+            sendJson(command, true);
+        } catch (JSONException e) {
+            Log.e(TAG, "⏰ Error creating set_system_time JSON", e);
+        }
+    }
+
     /**
      * Sends user email to glasses for crash reporting identification
      *
@@ -6506,14 +6681,14 @@ public class MentraLive extends SGCManager {
             transfer.authToken,
             new BlePhotoUploadService.UploadCallback() {
                 @Override
-                public void onSuccess(String requestId) {
+                public void onSuccess(String requestId, String responseBody) {
                     long uploadDuration = System.currentTimeMillis() - uploadStartTime;
                     long totalDuration = System.currentTimeMillis() - transfer.phoneStartTime;
 
                     Bridge.log("LIVE: ✅ BLE photo uploaded successfully via phone relay for requestId: " + requestId);
                     Bridge.log("LIVE: ⏱️ Upload duration: " + uploadDuration + "ms");
                     Bridge.log("LIVE: ⏱️ Total end-to-end duration: " + totalDuration + "ms");
-                    //sendPhotoUploadSuccess(requestId);
+                    sendPhotoTerminalSuccessResponse(requestId, transfer.webhookUrl, responseBody);
                 }
 
                 @Override
@@ -6521,12 +6696,52 @@ public class MentraLive extends SGCManager {
                     long uploadDuration = System.currentTimeMillis() - uploadStartTime;
                     Log.e(TAG, "❌ BLE photo upload failed for requestId: " + requestId + ", error: " + error);
                     Log.e(TAG, "⏱️ Failed after: " + uploadDuration + "ms");
-                    //sendPhotoUploadError(requestId, error);
+                    Bridge.sendPhotoError(
+                            requestId,
+                            "PHONE_UPLOAD_FAILED",
+                            "BLE photo upload failed: " + error);
                 }
             }
         );
     }
 
+    private void sendPhotoTerminalSuccessResponse(
+            String requestId, String uploadUrl, String responseBody) {
+        Map<String, Object> event = new HashMap<>();
+        event.put("type", "photo_response");
+        event.put("state", "success");
+        event.put("success", true);
+        event.put("requestId", requestId);
+        event.put("uploadUrl", uploadUrl != null ? uploadUrl : "");
+        event.put("timestamp", System.currentTimeMillis());
+        copyPhotoUploadResponseMetadata(event, responseBody);
+        Bridge.sendPhotoResponse(event);
+    }
+
+    private void copyPhotoUploadResponseMetadata(Map<String, Object> event, String responseBody) {
+        if (responseBody == null || responseBody.trim().isEmpty()) {
+            return;
+        }
+        try {
+            JSONObject response = new JSONObject(responseBody);
+            copyJsonField(event, response, "photoUrl");
+            copyJsonField(event, response, "statusUrl");
+            copyJsonField(event, response, "mimeType");
+            copyJsonField(event, response, "contentType");
+            copyJsonField(event, response, "bytes");
+            copyJsonField(event, response, "size");
+        } catch (JSONException e) {
+            Bridge.log("LIVE: BLE upload response body was not JSON metadata");
+        }
+    }
+
+    private void copyJsonField(Map<String, Object> event, JSONObject response, String key)
+            throws JSONException {
+        if (response.has(key) && !response.isNull(key)) {
+            event.put(key, response.get(key));
+        }
+    }
+
     /**
      * Send photo upload success notification to glasses
      */
@@ -6646,7 +6861,10 @@ public class MentraLive extends SGCManager {
     @Override
     public void sendVoiceActivityDetectionSetting() {
         Object value = DeviceStore.INSTANCE.get("bluetooth", "voice_activity_detection_enabled");
-        boolean enabled = value instanceof Boolean ? (Boolean) value : true;
+        boolean enabled =
+                value instanceof Boolean
+                        ? (Boolean) value
+                        : BluetoothSdkDefaults.VOICE_ACTIVITY_DETECTION_ENABLED;
 
         Bridge.log("LIVE: 🎤 Sending Voice Activity Detection setting to glasses: " + enabled);
 
@@ -6685,22 +6903,7 @@ public class MentraLive extends SGCManager {
      */
     public void sendButtonPhotoSettings() {
         String size = (String) DeviceStore.INSTANCE.get("bluetooth", "button_photo_size");
-
-        Bridge.log("LIVE: Sending button photo setting: " + size);
-
-        if (!isConnected) {
-            Log.w(TAG, "Cannot send button photo settings - not connected");
-            return;
-        }
-
-        try {
-            JSONObject json = new JSONObject();
-            json.put("type", "button_photo_setting");
-            json.put("size", size);
-            sendJson(json);
-        } catch (JSONException e) {
-            Log.e(TAG, "Error creating button photo settings message", e);
-        }
+        sendButtonPhotoSettings(null, size);
     }
 
     /**
@@ -6709,22 +6912,7 @@ public class MentraLive extends SGCManager {
     @Override
     public void sendButtonCameraLedSetting() {
         boolean enabled = (Boolean) DeviceStore.INSTANCE.get("bluetooth", "button_camera_led");
-
-        Bridge.log("LIVE: Sending button camera LED setting: " + enabled);
-
-        if (!isConnected) {
-            Log.w(TAG, "Cannot send button camera LED setting - not connected");
-            return;
-        }
-
-        try {
-            JSONObject json = new JSONObject();
-            json.put("type", "button_camera_led");
-            json.put("enabled", enabled);
-            sendJson(json, true);
-        } catch (JSONException e) {
-            Log.e(TAG, "Error creating button camera LED setting message", e);
-        }
+        sendButtonCameraLedSetting(null, enabled);
     }
 
     /**
@@ -6748,6 +6936,10 @@ public class MentraLive extends SGCManager {
             Log.w(TAG, "Could not read camera_fov from store, using defaults", e);
         }
 
+        sendCameraFovSetting(null, fov, roiPosition);
+    }
+
+    public void sendCameraFovSetting(String requestId, int fov, int roiPosition) {
         Bridge.log("LIVE: Sending camera FOV setting: fov=" + fov + ", roiPosition=" + roiPosition);
 
         if (!isConnected) {
@@ -6758,6 +6950,9 @@ public class MentraLive extends SGCManager {
         try {
             JSONObject json = new JSONObject();
             json.put("type", "camera_fov_setting");
+            if (requestId != null && !requestId.isEmpty()) {
+                json.put("request_id", requestId);
+            }
             JSONObject params = new JSONObject();
             params.put("fov", fov);
             params.put("roi_position", roiPosition);
@@ -6774,6 +6969,12 @@ public class MentraLive extends SGCManager {
      */
     @Override
     public void sendButtonMaxRecordingTime() {
+        Object rawMinutes = DeviceStore.INSTANCE.get("bluetooth", "button_max_recording_time");
+        int minutes = (rawMinutes instanceof Number) ? ((Number) rawMinutes).intValue() : 10;
+        sendButtonMaxRecordingTime(null, minutes);
+    }
+
+    public void sendButtonMaxRecordingTime(String requestId, int minutes) {
         Bridge.log("LIVE: Sending button max recording time");
 
         if (!isConnected) {
@@ -6781,12 +6982,12 @@ public class MentraLive extends SGCManager {
             return;
         }
 
-        Object rawMinutes = DeviceStore.INSTANCE.get("bluetooth", "button_max_recording_time");
-        int minutes = (rawMinutes instanceof Number) ? ((Number) rawMinutes).intValue() : 10;
-
         try {
             JSONObject json = new JSONObject();
             json.put("type", "button_max_recording_time");
+            if (requestId != null && !requestId.isEmpty()) {
+                json.put("request_id", requestId);
+            }
             json.put("minutes", minutes);
             sendJson(json, true);
         } catch (JSONException e) {
@@ -6809,6 +7010,7 @@ public class MentraLive extends SGCManager {
      * @param height Video height (0 for default)
      * @param fps Video frame rate (0 for default)
      */
+    @Override
     public void startVideoRecording(String requestId, boolean save, boolean flash, boolean sound, int width, int height, int fps) {
         Bridge.log("LIVE: Starting video recording: requestId=" + requestId + ", save=" + save +
                    ", flash=" + flash + ", sound=" + sound + ", resolution=" + width + "x" + height + "@" + fps + "fps");
@@ -6826,12 +7028,15 @@ public class MentraLive extends SGCManager {
             json.put("flash", flash);
             json.put("sound", sound);
 
-            // Add video settings if provided
-            if (width > 0 && height > 0) {
+            // Add video settings when any field is overridden. Each field is sent
+            // only when > 0; the glasses merge the missing fields onto their saved
+            // button-video defaults, so a partial override (e.g. fps-only) still
+            // takes effect instead of being dropped here.
+            if (width > 0 || height > 0 || fps > 0) {
                 JSONObject settings = new JSONObject();
-                settings.put("width", width);
-                settings.put("height", height);
-                settings.put("fps", fps > 0 ? fps : 30);
+                if (width > 0) settings.put("width", width);
+                if (height > 0) settings.put("height", height);
+                if (fps > 0) settings.put("fps", fps);
                 json.put("settings", settings);
             }