@mentra/bluetooth-sdk 3.2.0-dev.191 → 3.2.0-dev.195

package/android/src/main/java/com/mentra/bluetoothsdk/utils/IncidentLogBleUploadService.java

@@ -1,6 +1,6 @@
 package com.mentra.bluetoothsdk.utils;
 
-import android.util.Log;
+import com.mentra.bluetoothsdk.utils.NativeLog;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
@@ -60,16 +60,16 @@ public final class IncidentLogBleUploadService {
                         .build();
                 try (Response response = client.newCall(request).execute()) {
                     if (response.isSuccessful()) {
-                        Log.i(TAG, "Incident BLE relay upload OK: " + url);
+                        NativeLog.i(TAG, "Incident BLE relay upload OK: " + url);
                         callback.onDone(true, null);
                     } else {
                         String msg = "HTTP " + response.code();
-                        Log.e(TAG, "Incident BLE relay upload failed: " + msg + " " + url);
+                        NativeLog.e(TAG, "Incident BLE relay upload failed: " + msg + " " + url);
                         callback.onDone(false, msg);
                     }
                 }
             } catch (IOException e) {
-                Log.e(TAG, "Incident BLE relay upload IO error", e);
+                NativeLog.e(TAG, "Incident BLE relay upload IO error", e);
                 callback.onDone(false, e.getMessage());
             }
         }).start();

package/android/src/main/java/com/mentra/bluetoothsdk/utils/K900ProtocolUtils.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
-import android.util.Log;
+import com.mentra.bluetoothsdk.utils.NativeLog;
 import android.os.Build;
 
 import org.json.JSONException;
@@ -78,7 +78,7 @@ public class K900ProtocolUtils {
             return packDataCommand(jsonBytes, CMD_TYPE_STRING, endian);
 
         } catch (JSONException e) {
-            android.util.Log.e("K900ProtocolUtils", "Error creating JSON wrapper", e);
+            com.mentra.bluetoothsdk.utils.NativeLog.e("K900ProtocolUtils", "Error creating JSON wrapper", e);
             return null;
         }
     }
@@ -190,7 +190,7 @@ public class K900ProtocolUtils {
             return packDataCommand(jsonBytes, CMD_TYPE_STRING, endian);
 
         } catch (JSONException e) {
-            android.util.Log.e("K900ProtocolUtils", "Error creating JSON wrapper for K900", e);
+            com.mentra.bluetoothsdk.utils.NativeLog.e("K900ProtocolUtils", "Error creating JSON wrapper for K900", e);
             return null;
         }
     }
@@ -214,7 +214,7 @@ public class K900ProtocolUtils {
      */
     public static byte[] formatMessageForTransmission(String jsonData, K900LengthCodec.Endian endian) {
         try {
-            android.util.Log.e("K900ProtocolUtils", "🔄 Formatting message: " + jsonData);
+            com.mentra.bluetoothsdk.utils.NativeLog.e("K900ProtocolUtils", "🔄 Formatting message: " + jsonData);
 
             // Validate that input is proper JSON
             new JSONObject(jsonData);
@@ -225,7 +225,7 @@ public class K900ProtocolUtils {
             wrapper.put(FIELD_V, 1); // Optional version field
             wrapper.put(FIELD_B, new JSONObject()); // Optional body field
             String wrappedJson = wrapper.toString();
-            android.util.Log.e("K900ProtocolUtils", "🔄 After C-wrapping: " + wrappedJson);
+            com.mentra.bluetoothsdk.utils.NativeLog.e("K900ProtocolUtils", "🔄 After C-wrapping: " + wrappedJson);
 
             // Now format with BES2700 protocol
             byte[] result =
@@ -243,7 +243,7 @@ public class K900ProtocolUtils {
             return result;
 
         } catch (JSONException e) {
-            android.util.Log.e("K900ProtocolUtils", "❌ Error in formatMessageForTransmission", e);
+            com.mentra.bluetoothsdk.utils.NativeLog.e("K900ProtocolUtils", "❌ Error in formatMessageForTransmission", e);
             // Fallback: if json is invalid, still try to pack it without validation
             return packJsonCommand(jsonData, endian);
         }
@@ -262,7 +262,7 @@ public class K900ProtocolUtils {
             wrapper.put(FIELD_C, content);
             return wrapper.toString();
         } catch (JSONException e) {
-            android.util.Log.e("K900ProtocolUtils", "Error creating C-wrapped JSON", e);
+            com.mentra.bluetoothsdk.utils.NativeLog.e("K900ProtocolUtils", "Error creating C-wrapped JSON", e);
             return null;
         }
     }
@@ -374,17 +374,17 @@ public class K900ProtocolUtils {
      * @return Parsed JSON object or null if not valid protocol data or valid JSON
      */
     public static JSONObject processReceivedBytesToJson(byte[] data) {
-        android.util.Log.d("K900ProtocolUtils", "Processing received bytes for JSON extraction");
+        com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "Processing received bytes for JSON extraction");
 
         // Check for null or too small data
         if (data == null || data.length < 7) {
-            android.util.Log.d("K900ProtocolUtils", "Received data is null or too short to be valid protocol data");
+            com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "Received data is null or too short to be valid protocol data");
             return null;
         }
 
         // Verify if this is K900 protocol format (starts with ##)
         if (!isK900ProtocolFormat(data)) {
-            android.util.Log.d("K900ProtocolUtils", "Not in K900 protocol format (missing ## markers)");
+            com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "Not in K900 protocol format (missing ## markers)");
             return null;
         }
 
@@ -399,25 +399,25 @@ public class K900ProtocolUtils {
                         ? detected.length
                         : ((data[3] & 0xFF) | ((data[4] & 0xFF) << 8));
 
-        android.util.Log.d("K900ProtocolUtils", "Command type: 0x" + String.format("%02X", commandType) +
+        com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "Command type: 0x" + String.format("%02X", commandType) +
                          ", Payload length: " + payloadLength);
 
         // Verify we have enough data and the right command type
         if (commandType != CMD_TYPE_STRING) {
-            android.util.Log.d("K900ProtocolUtils", "Not a JSON/string command type (0x30), got: 0x" +
+            com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "Not a JSON/string command type (0x30), got: 0x" +
                             String.format("%02X", commandType));
             return null;
         }
 
         if (data.length < payloadLength + 7) {
-            android.util.Log.d("K900ProtocolUtils", "Received data size (" + data.length +
+            com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "Received data size (" + data.length +
                            ") is less than expected size (" + (payloadLength + 7) + ")");
             return null;
         }
 
         // Check for end markers ($$)
         if (data[5 + payloadLength] != CMD_END_CODE[0] || data[6 + payloadLength] != CMD_END_CODE[1]) {
-            android.util.Log.d("K900ProtocolUtils", "End markers ($$) not found where expected");
+            com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "End markers ($$) not found where expected");
             return null;
         }
 
@@ -429,15 +429,15 @@ public class K900ProtocolUtils {
         String payloadStr;
         try {
             payloadStr = new String(payload, StandardCharsets.UTF_8);
-            android.util.Log.d("K900ProtocolUtils", "Extracted JSON payload bytes: " + payloadLength);
+            com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "Extracted JSON payload bytes: " + payloadLength);
         } catch (Exception e) {
-            android.util.Log.e("K900ProtocolUtils", "Error converting payload to string", e);
+            com.mentra.bluetoothsdk.utils.NativeLog.e("K900ProtocolUtils", "Error converting payload to string", e);
             return null;
         }
 
         // Check if it's valid JSON
         if (!payloadStr.startsWith("{") || !payloadStr.endsWith("}")) {
-            android.util.Log.d("K900ProtocolUtils", "Payload is not valid JSON");
+            com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "Payload is not valid JSON");
             return null;
         }
 
@@ -448,14 +448,14 @@ public class K900ProtocolUtils {
             // Check if this is C-wrapped format {"C": "..."}
             if (json.has(FIELD_C)) {
                 String innerContent = json.optString(FIELD_C, "");
-                android.util.Log.d("K900ProtocolUtils", "Detected C-wrapped format");
+                com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "Detected C-wrapped format");
 
                 // Try to parse the inner content as JSON
                 try {
                     JSONObject innerJson = new JSONObject(innerContent);
                     return innerJson;
                 } catch (JSONException e) {
-                    android.util.Log.d("K900ProtocolUtils", "Inner content is not JSON, returning outer JSON object");
+                    com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "Inner content is not JSON, returning outer JSON object");
                     // If inner content is not JSON, return the outer JSON
                     return json;
                 }
@@ -464,7 +464,7 @@ public class K900ProtocolUtils {
                 return json;
             }
         } catch (JSONException e) {
-            android.util.Log.e("K900ProtocolUtils", "Error parsing JSON payload: " + e.getMessage(), e);
+            com.mentra.bluetoothsdk.utils.NativeLog.e("K900ProtocolUtils", "Error parsing JSON payload: " + e.getMessage(), e);
             return null;
         }
     }
@@ -496,29 +496,29 @@ public class K900ProtocolUtils {
 
             // If looks like JSON but not C-wrapped, use the full formatting function
             if (originalData.startsWith("{") && !isCWrappedJson(originalData)) {
-                android.util.Log.d("K900ProtocolUtils", "📦 JSON DATA BEFORE C-WRAPPING: " + originalData);
+                com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "📦 JSON DATA BEFORE C-WRAPPING: " + originalData);
                 byte[] formattedData = formatMessageForTransmission(originalData);
 
                 // Debug log the formatting results if needed
-                if (android.util.Log.isLoggable("K900ProtocolUtils", android.util.Log.DEBUG)) {
+                if (com.mentra.bluetoothsdk.utils.NativeLog.isLoggable("K900ProtocolUtils", com.mentra.bluetoothsdk.utils.NativeLog.DEBUG)) {
                     StringBuilder hexDump = new StringBuilder();
                     for (int i = 0; i < Math.min(formattedData.length, 50); i++) {
                         hexDump.append(String.format("%02X ", formattedData[i]));
                     }
-                    android.util.Log.d("K900ProtocolUtils", "📦 AFTER C-WRAPPING & PROTOCOL FORMATTING (first 50 bytes): " + hexDump.toString());
-                    android.util.Log.d("K900ProtocolUtils", "📦 Total formatted length: " + formattedData.length + " bytes");
+                    com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "📦 AFTER C-WRAPPING & PROTOCOL FORMATTING (first 50 bytes): " + hexDump.toString());
+                    com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "📦 Total formatted length: " + formattedData.length + " bytes");
                 }
 
                 return formattedData;
             } else {
                 // Otherwise just apply protocol formatting
-                android.util.Log.d("K900ProtocolUtils", "📦 Data already C-wrapped or not JSON: " + originalData);
-                android.util.Log.d("K900ProtocolUtils", "Formatting data with K900 protocol (adding ##...)");
+                com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "📦 Data already C-wrapped or not JSON: " + originalData);
+                com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "Formatting data with K900 protocol (adding ##...)");
                 return packDataCommand(data, CMD_TYPE_STRING);
             }
         } catch (Exception e) {
             // If we can't interpret as string, just apply protocol formatting to raw bytes
-            android.util.Log.d("K900ProtocolUtils", "Applying protocol format to raw bytes");
+            com.mentra.bluetoothsdk.utils.NativeLog.d("K900ProtocolUtils", "Applying protocol format to raw bytes");
             return packDataCommand(data, CMD_TYPE_STRING);
         }
     }
@@ -573,10 +573,10 @@ public class K900ProtocolUtils {
                 String model = android.os.Build.MODEL.toLowerCase();
                 return model.contains("k900") || model.contains("xyglasses");
             } catch (Exception e) {
-                Log.e("K900ProtocolUtils", "Error checking for K900 specific broadcast", e);
+                NativeLog.e("K900ProtocolUtils", "Error checking for K900 specific broadcast", e);
             }
         } catch (Exception e) {
-            Log.d("K900ProtocolUtils", "Not a K900 device: " + e.getMessage());
+            NativeLog.d("K900ProtocolUtils", "Not a K900 device: " + e.getMessage());
         }
 
         return false;
@@ -711,7 +711,7 @@ public class K900ProtocolUtils {
      */
     public static FilePacketInfo extractFilePacket(byte[] protocolData) {
         if (!isK900ProtocolFormat(protocolData) || protocolData.length < 31) {
-            Log.e("K900ProtocolUtils", "extractFilePacket: Invalid format or too short. Length=" +
+            NativeLog.e("K900ProtocolUtils", "extractFilePacket: Invalid format or too short. Length=" +
                   (protocolData != null ? protocolData.length : 0) +
                   ", isK900Format=" + isK900ProtocolFormat(protocolData));
             return null;
@@ -757,7 +757,7 @@ public class K900ProtocolUtils {
 
         // Verify packet has enough data
         if (protocolData.length < pos + info.packSize + LENGTH_FILE_VERIFY + LENGTH_FILE_END) {
-            Log.e("K900ProtocolUtils", "File packet too short for data. Need: " +
+            NativeLog.e("K900ProtocolUtils", "File packet too short for data. Need: " +
                   (pos + info.packSize + LENGTH_FILE_VERIFY + LENGTH_FILE_END) +
                   ", Have: " + protocolData.length +
                   ", packSize=" + info.packSize + ", pos=" + pos);
@@ -788,13 +788,13 @@ public class K900ProtocolUtils {
         info.isValid = (calculatedVerify == info.verifyCode);
 
         if (!info.isValid) {
-            Log.e("K900ProtocolUtils", "File packet checksum failed. Expected: " +
+            NativeLog.e("K900ProtocolUtils", "File packet checksum failed. Expected: " +
                   String.format("%02X", info.verifyCode) + ", Calculated: " +
                   String.format("%02X", calculatedVerify));
         } else if (info.packIndex == 0
                 || info.packIndex % 32 == 0
                 || info.packIndex == (info.fileSize + FILE_PACK_SIZE - 1) / FILE_PACK_SIZE - 1) {
-            Log.d("K900ProtocolUtils", "File packet extracted successfully: index=" + info.packIndex +
+            NativeLog.d("K900ProtocolUtils", "File packet extracted successfully: index=" + info.packIndex +
                   ", size=" + info.packSize + ", fileName=" + info.fileName);
         }
 
@@ -820,7 +820,7 @@ public class K900ProtocolUtils {
 
             return message.toString();
         } catch (JSONException e) {
-            Log.e("K900ProtocolUtils", "Error creating file transfer ack", e);
+            NativeLog.e("K900ProtocolUtils", "Error creating file transfer ack", e);
             return null;
         }
     }

package/android/src/main/java/com/mentra/bluetoothsdk/utils/MessageChunkReassembler.java

@@ -1,6 +1,6 @@
 package com.mentra.bluetoothsdk.utils;
 
-import android.util.Log;
+import com.mentra.bluetoothsdk.utils.NativeLog;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -21,7 +21,7 @@ public class MessageChunkReassembler {
         cleanupTimedOutSessions();
 
         if (msgId < 0 || fragCount <= 0 || fragIdx < 0 || fragIdx >= fragCount || data == null) {
-            Log.w(TAG, "Dropping invalid binary fragment: msgId=" + msgId + ", index=" + fragIdx
+            NativeLog.w(TAG, "Dropping invalid binary fragment: msgId=" + msgId + ", index=" + fragIdx
                     + ", total=" + fragCount);
             return null;
         }
@@ -36,7 +36,7 @@ public class MessageChunkReassembler {
                 return new BinarySession(msgId, fragCount);
             }
             if (existingSession.fragCount != fragCount) {
-                Log.w(TAG, "fragCount mismatch for msgId " + msgId + ", resetting session");
+                NativeLog.w(TAG, "fragCount mismatch for msgId " + msgId + ", resetting session");
                 return new BinarySession(msgId, fragCount);
             }
             return existingSession;
@@ -52,7 +52,7 @@ public class MessageChunkReassembler {
 
         byte[] reassembled = session.reassemble();
         activeBinarySessions.remove(msgId);
-        Log.d(TAG, "Reassembled binary message of " + reassembled.length + " bytes from "
+        NativeLog.d(TAG, "Reassembled binary message of " + reassembled.length + " bytes from "
                 + fragCount + " fragments");
         return reassembled;
     }
@@ -62,13 +62,13 @@ public class MessageChunkReassembler {
 
         if (chunkId == null || chunkId.isEmpty() || totalChunks <= 0 || chunkIndex < 0
                 || chunkIndex >= totalChunks || data == null) {
-            Log.w(TAG, "Dropping invalid chunk metadata: id=" + chunkId + ", index=" + chunkIndex
+            NativeLog.w(TAG, "Dropping invalid chunk metadata: id=" + chunkId + ", index=" + chunkIndex
                     + ", total=" + totalChunks);
             return null;
         }
 
         if (activeSessions.size() >= MAX_CONCURRENT_SESSIONS && !activeSessions.containsKey(chunkId)) {
-            Log.w(TAG, "Maximum concurrent chunk sessions reached, dropping oldest");
+            NativeLog.w(TAG, "Maximum concurrent chunk sessions reached, dropping oldest");
             removeOldestSession();
         }
 
@@ -77,7 +77,7 @@ public class MessageChunkReassembler {
                 return new ChunkSession(chunkId, totalChunks);
             }
             if (existingSession.totalChunks != totalChunks) {
-                Log.w(TAG, "totalChunks mismatch for " + chunkId + " (expected "
+                NativeLog.w(TAG, "totalChunks mismatch for " + chunkId + " (expected "
                         + existingSession.totalChunks + ", got " + totalChunks + "), resetting session");
                 return new ChunkSession(chunkId, totalChunks);
             }
@@ -85,11 +85,11 @@ public class MessageChunkReassembler {
         });
         boolean added = session.addChunk(chunkIndex, data);
         if (!added) {
-            Log.w(TAG, "Failed to add chunk " + chunkIndex + " to session " + chunkId);
+            NativeLog.w(TAG, "Failed to add chunk " + chunkIndex + " to session " + chunkId);
             return null;
         }
 
-        Log.d(TAG, "Added chunk " + chunkIndex + "/" + (totalChunks - 1) + " for session " + chunkId);
+        NativeLog.d(TAG, "Added chunk " + chunkIndex + "/" + (totalChunks - 1) + " for session " + chunkId);
 
         if (!session.isComplete()) {
             return null;
@@ -97,7 +97,7 @@ public class MessageChunkReassembler {
 
         String reassembled = session.reassemble();
         activeSessions.remove(chunkId);
-        Log.d(TAG, "Reassembled message of " + reassembled.length() + " bytes from " + totalChunks + " chunks");
+        NativeLog.d(TAG, "Reassembled message of " + reassembled.length() + " bytes from " + totalChunks + " chunks");
         return reassembled;
     }
 

package/android/src/main/java/com/mentra/bluetoothsdk/utils/MessageChunker.java

@@ -1,6 +1,6 @@
 package com.mentra.bluetoothsdk.utils;
 
-import android.util.Log;
+import com.mentra.bluetoothsdk.utils.NativeLog;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -52,7 +52,7 @@ public class MessageChunker {
         boolean needsChunking = messageBytes > MESSAGE_SIZE_THRESHOLD;
 
         if (needsChunking) {
-            Log.d(TAG, "Message size " + messageBytes + " exceeds threshold " + MESSAGE_SIZE_THRESHOLD + ", will chunk");
+            NativeLog.d(TAG, "Message size " + messageBytes + " exceeds threshold " + MESSAGE_SIZE_THRESHOLD + ", will chunk");
         }
 
         return needsChunking;
@@ -83,7 +83,7 @@ public class MessageChunker {
         for (int chunkSize = INITIAL_CHUNK_DATA_SIZE; chunkSize >= MIN_CHUNK_DATA_SIZE; chunkSize--) {
             List<JSONObject> chunks = buildChunks(messageBytes, chunkId, messageId, chunkSize);
             if (allChunksFit(chunks, wakeup)) {
-                Log.d(TAG, "Creating " + chunks.size() + " chunks for message of size " + totalBytes
+                NativeLog.d(TAG, "Creating " + chunks.size() + " chunks for message of size " + totalBytes
                         + " bytes using " + chunkSize + "-byte UTF-8 slices");
                 return chunks;
             }
@@ -115,7 +115,7 @@ public class MessageChunker {
 
             chunks.add(chunk);
 
-            Log.d(TAG, "Created chunk " + i + "/" + (totalChunks - 1) + " with " + chunkData.getBytes(StandardCharsets.UTF_8).length + " bytes");
+            NativeLog.d(TAG, "Created chunk " + i + "/" + (totalChunks - 1) + " with " + chunkData.getBytes(StandardCharsets.UTF_8).length + " bytes");
         }
 
         return chunks;
@@ -125,7 +125,7 @@ public class MessageChunker {
         for (int i = 0; i < chunks.size(); i++) {
             byte[] packed = K900ProtocolUtils.packJsonToK900(chunks.get(i).toString(), wakeup && i == 0);
             if (packed == null || packed.length > MAX_PACKED_CHUNK_SIZE) {
-                Log.d(TAG, "Chunk " + i + " packed to " + (packed != null ? packed.length : 0)
+                NativeLog.d(TAG, "Chunk " + i + " packed to " + (packed != null ? packed.length : 0)
                         + " bytes, exceeding " + MAX_PACKED_CHUNK_SIZE);
                 return false;
             }
@@ -261,7 +261,7 @@ public class MessageChunker {
             fragments.add(new BinaryFragment(flags, msgId, i, fragCount, fragPayload));
         }
 
-        Log.d(TAG, "Created " + fragments.size() + " binary fragments for "
+        NativeLog.d(TAG, "Created " + fragments.size() + " binary fragments for "
                 + payload.length + " byte payload");
         return fragments;
     }

package/android/src/main/java/com/mentra/bluetoothsdk/utils/NativeLog.java

@@ -0,0 +1,89 @@
+package com.mentra.bluetoothsdk.utils;
+
+import com.mentra.bluetoothsdk.Bridge;
+import java.util.HashMap;
+import java.util.Map;
+
+/** Writes SDK diagnostics to both the native console and the SDK's JavaScript log event. */
+public final class NativeLog {
+  public static final int DEBUG = android.util.Log.DEBUG;
+
+  private NativeLog() {}
+
+  /** Preserves Android's per-tag log-level check for existing SDK callers. */
+  public static boolean isLoggable(String tag, int level) {
+    return android.util.Log.isLoggable(tag, level);
+  }
+
+  /** Emits a verbose diagnostic to both sinks. */
+  public static int v(String tag, String message) {
+    return write(android.util.Log.VERBOSE, tag, message, null);
+  }
+
+  /** Emits a verbose diagnostic with its stack trace to both sinks. */
+  public static int v(String tag, String message, Throwable error) {
+    return write(android.util.Log.VERBOSE, tag, message, error);
+  }
+
+  /** Emits a debug diagnostic to both sinks. */
+  public static int d(String tag, String message) {
+    return write(DEBUG, tag, message, null);
+  }
+
+  /** Emits a debug diagnostic with its stack trace to both sinks. */
+  public static int d(String tag, String message, Throwable error) {
+    return write(DEBUG, tag, message, error);
+  }
+
+  /** Emits an informational diagnostic to both sinks. */
+  public static int i(String tag, String message) {
+    return write(android.util.Log.INFO, tag, message, null);
+  }
+
+  /** Emits an informational diagnostic with its stack trace to both sinks. */
+  public static int i(String tag, String message, Throwable error) {
+    return write(android.util.Log.INFO, tag, message, error);
+  }
+
+  /** Emits a warning to both sinks. */
+  public static int w(String tag, String message) {
+    return write(android.util.Log.WARN, tag, message, null);
+  }
+
+  /** Emits a warning with its stack trace to both sinks. */
+  public static int w(String tag, String message, Throwable error) {
+    return write(android.util.Log.WARN, tag, message, error);
+  }
+
+  /** Emits an error to both sinks. */
+  public static int e(String tag, String message) {
+    return write(android.util.Log.ERROR, tag, message, null);
+  }
+
+  /** Emits an error with its stack trace to both sinks. */
+  public static int e(String tag, String message, Throwable error) {
+    return write(android.util.Log.ERROR, tag, message, error);
+  }
+
+  private static int write(int priority, String tag, String message, Throwable error) {
+    String text = String.valueOf(message);
+    if (error != null) text += "\n" + android.util.Log.getStackTraceString(error);
+    int result = android.util.Log.println(priority, tag, text);
+    Map<String, Object> body = new HashMap<>();
+    body.put("message", "[" + priorityLabel(priority) + "/" + tag + "] " + text);
+    // Dispatch directly: Bridge.log uses this logger too. Never tail logcat here,
+    // because React Native writes console output back to it.
+    Bridge.sendTypedMessage("log", body);
+    return result;
+  }
+
+  private static String priorityLabel(int priority) {
+    switch (priority) {
+      case android.util.Log.VERBOSE: return "V";
+      case android.util.Log.DEBUG: return "D";
+      case android.util.Log.WARN: return "W";
+      case android.util.Log.ERROR: return "E";
+      default: return "I";
+    }
+  }
+}

package/android/src/main/java/com/mentra/bluetoothsdk/utils/NexSGCUtils.kt

@@ -5,7 +5,7 @@ import java.io.IOException
 import java.util.UUID
 
 import android.content.Context
-import android.util.Log
+import com.mentra.bluetoothsdk.utils.NativeLog as Log
 
 import com.mentra.bluetoothsdk.Bridge
 import com.mentra.bluetoothsdk.DeviceStore
@@ -695,4 +695,4 @@ object NexEventUtils {
             Log.e(TAG, "NOTIF: Error sending ble command received event", e)
         }
     }
-}
+}

package/android/src/main/java/com/mentra/bluetoothsdk/utils/audio/Ar99OpusPcmDecoder.java

@@ -1,6 +1,6 @@
 package com.mentra.bluetoothsdk.utils.audio;
 
-import android.util.Log;
+import com.mentra.bluetoothsdk.utils.NativeLog;
 
 import java.util.Arrays;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -76,7 +76,7 @@ public final class Ar99OpusPcmDecoder extends Thread {
     }
     byte[] payloadCopy = Arrays.copyOf(opusPayload, opusPayload.length);
     if (!taskQueue.offer(new Task(TaskType.DECODE, payloadCopy))) {
-      Log.w(TAG, "AR99 Opus task queue full, drop notify len=" + payloadCopy.length);
+      NativeLog.w(TAG, "AR99 Opus task queue full, drop notify len=" + payloadCopy.length);
     }
   }
 
@@ -123,7 +123,7 @@ public final class Ar99OpusPcmDecoder extends Thread {
       }
     } catch (InterruptedException e) {
       if (running) {
-        Log.w(TAG, "AR99 Opus worker interrupted: " + e.getMessage());
+        NativeLog.w(TAG, "AR99 Opus worker interrupted: " + e.getMessage());
       }
     } finally {
       taskQueue.clear();
@@ -150,7 +150,7 @@ public final class Ar99OpusPcmDecoder extends Thread {
     }
 
     if (buffer.length + chunk.length > MAX_BUFFER_SIZE) {
-      Log.w(
+      NativeLog.w(
           TAG,
           "AR99 Opus buffer overflow, clear"
               + ", oldBuf="
@@ -179,7 +179,7 @@ public final class Ar99OpusPcmDecoder extends Thread {
         if (drop > 0) {
           totalResyncDropBytes += drop;
           headerLooksStable = false;
-          Log.w(
+          NativeLog.w(
               TAG,
               "AR99 Opus resync drop(no header)"
                   + " notify#="
@@ -200,7 +200,7 @@ public final class Ar99OpusPcmDecoder extends Thread {
         headerLooksStable = false;
         headerMismatch++;
         totalHeaderMismatchCount++;
-        Log.w(
+        NativeLog.w(
             TAG,
             "AR99 Opus resync shift"
                 + " notify#="
@@ -234,7 +234,7 @@ public final class Ar99OpusPcmDecoder extends Thread {
         totalHeaderMismatchCount++;
         headerLooksStable = false;
         if (totalFrameCount <= MAX_DIAG_FRAMES || !headerLooksStable) {
-          Log.w(
+          NativeLog.w(
               TAG,
               "AR99 Opus frame header mismatch"
                   + " frame#="
@@ -265,7 +265,7 @@ public final class Ar99OpusPcmDecoder extends Thread {
         decodeFail++;
         totalDecodeFailCount++;
         if (totalFrameCount <= MAX_DIAG_FRAMES || !headerLooksStable) {
-          Log.w(
+          NativeLog.w(
               TAG,
               "AR99 Opus frame decode failed"
                   + " frame#="
@@ -289,7 +289,7 @@ public final class Ar99OpusPcmDecoder extends Thread {
         || skipPayload > 0
         || pcmFrames == 0
         || !headerLooksStable) {
-      Log.d(
+      NativeLog.d(
           TAG,
           "AR99 Opus decode summary"
               + " notify#="
@@ -337,7 +337,7 @@ public final class Ar99OpusPcmDecoder extends Thread {
       int bytes = samples * CHANNELS * 2;
       return Arrays.copyOf(pcm, bytes);
     } catch (OpusException | AssertionError | RuntimeException e) {
-      Log.w(
+      NativeLog.w(
           TAG,
           "AR99 Opus decode failed len="
               + opusPayload.length

package/android/src/main/java/com/mentra/bluetoothsdk/utils/audio/ByteUtilAudioPlayer.java

@@ -1,6 +1,6 @@
 package com.mentra.bluetoothsdk.utils.audio;
 
-import android.util.Log;
+import com.mentra.bluetoothsdk.utils.NativeLog;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -132,7 +132,7 @@ public class ByteUtilAudioPlayer {
 
     	if(str.length() + destoffset >  dest.length)
     	{
-    		Log.v("ByteUtilAudioPlayer","error string2Bytes src.length="+str.length()+",dest.length="+dest.length+",destoffset="+destoffset);
+            NativeLog.v("ByteUtilAudioPlayer","error string2Bytes src.length="+str.length()+",dest.length="+dest.length+",destoffset="+destoffset);
     		return false;
     	}
 
@@ -189,7 +189,7 @@ public class ByteUtilAudioPlayer {
 			body = new String(bytes,offset, len,encode);
 			body = body.trim();
 		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
+			com.mentra.bluetoothsdk.utils.NativeLog.e("ByteUtilAudioPlayer", "Native exception", e);
 		}
 		return body;
     }
@@ -204,7 +204,7 @@ public class ByteUtilAudioPlayer {
 
     	if(src.length < offset + len || dest.length < destoffset +len)
     	{
-    		Log.v("ByteUtilAudioPlayer","error copyBytes src.length="+src.length+",dest.length="+dest.length);
+            NativeLog.v("ByteUtilAudioPlayer","error copyBytes src.length="+src.length+",dest.length="+dest.length);
     		return false;
     	}
     	for(int i = 0; i<len; i++)
@@ -251,17 +251,17 @@ public class ByteUtilAudioPlayer {
 		//BLog.v(CTConst.TAG,"copyBytes src="+src+",dest="+dest+",offset="+offset+",len="+len+",destoffset="+destoffset);
     	if(src == null || dest == null)
     	{
-			Log.v("ByteUtilAudioPlayer","compareBytes error");
+			NativeLog.v("ByteUtilAudioPlayer","compareBytes error");
     		return false;
     	}
     	if(len != destlen)
     	{
-    		Log.v("ByteUtilAudioPlayer","error compareBytes len="+len+",destlen="+destlen);
+            NativeLog.v("ByteUtilAudioPlayer","error compareBytes len="+len+",destlen="+destlen);
     		return false;
     	}
     	if(src.length < offset + len || dest.length < destoffset +destlen)
     	{
-    		Log.v("ByteUtilAudioPlayer","error compareBytes src.length="+src.length+",dest.length="+dest.length);
+            NativeLog.v("ByteUtilAudioPlayer","error compareBytes src.length="+src.length+",dest.length="+dest.length);
     		return false;
     	}
     	for(int i = 0; i<len; i++)