@cloudflare/realtimekit-react-native 0.2.1 → 0.2.2-staging.2

package/android/build.gradle

@@ -3,7 +3,6 @@ buildscript {
         repositories {
             google()
             mavenCentral()
-            jcenter()
         }
 
         dependencies {
@@ -49,7 +48,6 @@ repositories {
     }
     google()
     mavenCentral()
-    jcenter()
 }
 
 dependencies {

package/android/src/main/java/com/cloudflare/realtimekit/CoreModule.java

@@ -13,6 +13,8 @@ import com.facebook.react.module.annotations.ReactModule;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 
+import com.cloudflare.realtimekit.RTKLogger;
+
 @ReactModule(name = CoreModule.NAME)
 public class CoreModule extends ReactContextBaseJavaModule {
     public static final String NAME = "Core";
@@ -46,4 +48,21 @@ public class CoreModule extends ReactContextBaseJavaModule {
 
       return Base64.encodeToString(data, Base64.NO_WRAP);
     }
+
+    /**
+     * Enable debug logging for RealtimeKit Android module.
+     * Logs will be visible in logcat with tag "RealtimeKit".
+     */
+    @ReactMethod
+    public void enableLogging() {
+        RTKLogger.enable();
+    }
+
+    /**
+     * Disable debug logging for RealtimeKit Android module.
+     */
+    @ReactMethod
+    public void disableLogging() {
+        RTKLogger.disable();
+    }
 }

package/android/src/main/java/com/cloudflare/realtimekit/ForegroundService.java

@@ -3,11 +3,9 @@ package com.cloudflare.realtimekit;
 import android.app.Notification;
 import android.app.Service;
 import android.content.Intent;
-import android.content.Context;
-import android.content.pm.ServiceInfo;
 import android.os.Build;
 import android.os.IBinder;
-import android.util.Log;
+import android.content.pm.ServiceInfo;
 import android.app.Activity;
 import android.widget.Toast;
 import com.cloudflare.realtimekit.RTKHolder;
@@ -33,7 +31,7 @@ public class ForegroundService extends Service {
                                 startForeground(notificationHelper.NOTIFICATION_ID, notification);
                             }
                         } catch (RuntimeException e) {
-                            Log.w("ForegroundService", "Failed to start ForegroundService due to: ", e);
+                            RTKLogger.w("ForegroundService", "Failed to start ForegroundService due to: " + e.getMessage());
                         }
                     }
                 }

package/android/src/main/java/com/cloudflare/realtimekit/RTKHelperModule.java

@@ -9,7 +9,6 @@ import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.os.Handler;
 import android.os.PowerManager;
-import android.util.Log;
 import android.view.WindowManager;
 
 import com.cloudflare.realtimekit.ForegroundService;
@@ -111,7 +110,7 @@ public class RTKHelperModule extends ReactContextBaseJavaModule {
         } catch (RuntimeException e) {
             // Avoid crashing due to ForegroundServiceStartNotAllowedException (API level 31).
             // See: https://developer.android.com/guide/components/foreground-services#background-start-restrictions
-            Log.w("RTKHelperModule", "Media projection service not started", e);
+            RTKLogger.w("RTKHelper", "Media projection service not started: " + e.getMessage());
             return;
         }
         if (mediaService != null) {

package/android/src/main/java/com/cloudflare/realtimekit/RTKLogger.java

@@ -0,0 +1,116 @@
+package com.cloudflare.realtimekit;
+
+import android.util.Log;
+
+public class RTKLogger {
+    private static final String BASE_TAG = "RealtimeKit";
+    private static boolean isEnabled = false;
+
+    /**
+     * Enable logging for RealtimeKit module
+     */
+    public static void enable() {
+        isEnabled = true;
+        Log.i(BASE_TAG, "RealtimeKit logging enabled");
+    }
+
+    /**
+     * Disable logging for RealtimeKit module
+     */
+    public static void disable() {
+        isEnabled = false;
+        Log.i(BASE_TAG, "RealtimeKit logging disabled");
+    }
+
+    /**
+     * Check if logging is enabled
+     */
+    public static boolean isEnabled() {
+        return isEnabled;
+    }
+
+    /**
+     * Log debug message
+     */
+    public static void d(String message) {
+        if (isEnabled) {
+            Log.d(BASE_TAG, message);
+        }
+    }
+
+    /**
+     * Log debug message with tag suffix
+     */
+    public static void d(String tagSuffix, String message) {
+        if (isEnabled) {
+            Log.d(BASE_TAG + ":" + tagSuffix, message);
+        }
+    }
+
+    /**
+     * Log info message
+     */
+    public static void i(String message) {
+        if (isEnabled) {
+            Log.i(BASE_TAG, message);
+        }
+    }
+
+    /**
+     * Log info message with tag suffix
+     */
+    public static void i(String tagSuffix, String message) {
+        if (isEnabled) {
+            Log.i(BASE_TAG + ":" + tagSuffix, message);
+        }
+    }
+
+    /**
+     * Log warning message (always logged regardless of isEnabled)
+     */
+    public static void w(String message) {
+        Log.w(BASE_TAG, message);
+    }
+
+    /**
+     * Log warning message with tag suffix (always logged)
+     */
+    public static void w(String tagSuffix, String message) {
+        Log.w(BASE_TAG + ":" + tagSuffix, message);
+    }
+
+    /**
+     * Log error message (always logged regardless of isEnabled)
+     */
+    public static void e(String message) {
+        Log.e(BASE_TAG, message);
+    }
+
+    /**
+     * Log error message with tag suffix (always logged)
+     */
+    public static void e(String tagSuffix, String message) {
+        Log.e(BASE_TAG + ":" + tagSuffix, message);
+    }
+
+    /**
+     * Log error message with exception (always logged)
+     */
+    public static void e(String message, Throwable throwable) {
+        Log.e(BASE_TAG, message, throwable);
+    }
+
+    /**
+     * Log error message with tag suffix and exception (always logged)
+     */
+    public static void e(String tagSuffix, String message, Throwable throwable) {
+        Log.e(BASE_TAG + ":" + tagSuffix, message, throwable);
+    }
+
+    /**
+     * Format a message with arguments
+     */
+    public static String format(String format, Object... args) {
+        return String.format(format, args);
+    }
+}

package/android/src/main/java/com/cloudflare/realtimekit/incallmanager/AppRTCBluetoothManager.java

@@ -33,6 +33,7 @@ import androidx.annotation.RequiresApi;
 import java.util.List;
 import java.util.Set;
 import java.util.ArrayList;
+import com.cloudflare.realtimekit.RTKLogger;
 import com.cloudflare.realtimekit.incallmanager.AppRTCUtils;
 import com.cloudflare.realtimekit.incallmanager.ThreadUtils;
 import com.cloudflare.realtimekit.incallmanager.InCallManagerModule;
@@ -107,10 +108,10 @@ public class AppRTCBluetoothManager {
       if (profile != BluetoothProfile.HEADSET || bluetoothState == State.UNINITIALIZED) {
         return;
       }
-      // Log.d(TAG, "BluetoothServiceListener.onServiceConnected: BT state=" + bluetoothState);
+      RTKLogger.d("BluetoothManager", "BluetoothServiceListener.onServiceConnected: BT state=" + bluetoothState);
       // Android only supports one connected Bluetooth Headset at a time.
       bluetoothHeadset = (BluetoothHeadset) proxy;
-      // Log.d(TAG, "onServiceConnected done: BT state=" + bluetoothState);
+      RTKLogger.d("BluetoothManager", "onServiceConnected done: BT state=" + bluetoothState);
       updateAudioDeviceState();
     }
     @Override
@@ -119,13 +120,13 @@ public class AppRTCBluetoothManager {
       if (profile != BluetoothProfile.HEADSET || bluetoothState == State.UNINITIALIZED) {
         return;
       }
-      // Log.d(TAG, "BluetoothServiceListener.onServiceDisconnected: BT state=" + bluetoothState);
+      RTKLogger.d("BluetoothManager", "BluetoothServiceListener.onServiceDisconnected: BT state=" + bluetoothState);
       stopScoAudio();
       bluetoothHeadset = null;
       bluetoothDevice = null;
       bluetoothState = State.HEADSET_UNAVAILABLE;
       updateAudioDeviceState();
-      // Log.d(TAG, "onServiceDisconnected done: BT state=" + bluetoothState);
+      RTKLogger.d("BluetoothManager", "onServiceDisconnected done: BT state=" + bluetoothState);
     }
   }
 
@@ -165,7 +166,7 @@ public class AppRTCBluetoothManager {
         return;
       }
       final String action = intent.getAction();
-      // Log.i(TAG, "BLE Action: "+ action);
+      RTKLogger.i("BluetoothManager", "BLE Action: " + action);
       // Change in connection state of the Headset profile. Note that the
       // change does not tell us anything about whether we're streaming
       // audio to BT over SCO. Typically received when user turns on a BT
@@ -173,11 +174,11 @@ public class AppRTCBluetoothManager {
       if (action.equals(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED)) {
         final int state =
             intent.getIntExtra(BluetoothHeadset.EXTRA_STATE, BluetoothHeadset.STATE_DISCONNECTED);
-        // Log.d(TAG, "BluetoothHeadsetBroadcastReceiver.onReceive: "
-        //         + "a=ACTION_CONNECTION_STATE_CHANGED, "
-        //         + "s=" + stateToString(state) + ", "
-        //         + "sb=" + isInitialStickyBroadcast() + ", "
-        //         + "BT state: " + bluetoothState);
+        RTKLogger.d("BluetoothManager", "BluetoothHeadsetBroadcastReceiver.onReceive: "
+                + "a=ACTION_CONNECTION_STATE_CHANGED, "
+                + "s=" + stateToString(state) + ", "
+                + "sb=" + isInitialStickyBroadcast() + ", "
+                + "BT state: " + bluetoothState);
         if (state == BluetoothHeadset.STATE_CONNECTED) {
           scoConnectionAttempts = 0;
           updateAudioDeviceState();
@@ -196,42 +197,42 @@ public class AppRTCBluetoothManager {
           final int state = intent.getIntExtra(
               BluetoothHeadset.EXTRA_STATE, BluetoothHeadset.STATE_AUDIO_DISCONNECTED);
             updateAudioDeviceState();
-            // Log.d(TAG, "BluetoothHeadsetBroadcastReceiver.onReceive: "
-            //         + "a=ACTION_AUDIO_STATE_CHANGED, "
-            //         + "s=" + stateToString(state) + ", "
-            //         + "sb=" + isInitialStickyBroadcast() + ", "
-            //         + "BT state: " + bluetoothState);
+            RTKLogger.d("BluetoothManager", "BluetoothHeadsetBroadcastReceiver.onReceive: "
+                    + "a=ACTION_AUDIO_STATE_CHANGED, "
+                    + "s=" + stateToString(state) + ", "
+                    + "sb=" + isInitialStickyBroadcast() + ", "
+                    + "BT state: " + bluetoothState);
           if (state == BluetoothHeadset.STATE_AUDIO_CONNECTED) {
             cancelTimer();
             if (bluetoothState == State.SCO_CONNECTING) {
-              // Log.d(TAG, "+++ Bluetooth audio SCO is now connected");
+              RTKLogger.d("BluetoothManager", "+++ Bluetooth audio SCO is now connected");
               bluetoothState = State.SCO_CONNECTED;
               scoConnectionAttempts = 0;
               updateAudioDeviceState();
             } else {
-              Log.w(TAG, "Unexpected state BluetoothHeadset.STATE_AUDIO_CONNECTED");
+              RTKLogger.w("BluetoothManager", "Unexpected state BluetoothHeadset.STATE_AUDIO_CONNECTED");
             }
           } else if (state == BluetoothHeadset.STATE_AUDIO_CONNECTING) {
-            // Log.d(TAG, "+++ Bluetooth audio SCO is now connecting...");
+            RTKLogger.d("BluetoothManager", "+++ Bluetooth audio SCO is now connecting...");
           } else if (state == BluetoothHeadset.STATE_AUDIO_DISCONNECTED) {
-            // Log.d(TAG, "+++ Bluetooth audio SCO is now disconnected");
+            RTKLogger.d("BluetoothManager", "+++ Bluetooth audio SCO is now disconnected");
             if (isInitialStickyBroadcast()) {
-              // Log.d(TAG, "Ignore STATE_AUDIO_DISCONNECTED initial sticky broadcast.");
+              RTKLogger.d("BluetoothManager", "Ignore STATE_AUDIO_DISCONNECTED initial sticky broadcast.");
               return;
             }
             updateAudioDeviceState();
           }
         }
-      // Log.d(TAG, "onReceive done: BT state=" + bluetoothState);
+      RTKLogger.d("BluetoothManager", "onReceive done: BT state=" + bluetoothState);
     }
   }
   /** Construction. */
   public static AppRTCBluetoothManager create(Context context, InCallManagerModule audioManager) {
-    // Log.d(TAG, "create" + AppRTCUtils.getThreadInfo());
+    RTKLogger.d("BluetoothManager", "create" + AppRTCUtils.getThreadInfo());
     return new AppRTCBluetoothManager(context, audioManager);
   }
   protected AppRTCBluetoothManager(Context context, InCallManagerModule audioManager) {
-    // Log.d(TAG, "ctor");
+    RTKLogger.d("BluetoothManager", "ctor");
     ThreadUtils.checkIsOnMainThread();
     apprtcContext = context;
     apprtcAudioManager = audioManager;
@@ -265,14 +266,14 @@ public class AppRTCBluetoothManager {
   @SuppressLint("MissingPermission")
   public void start() {
     ThreadUtils.checkIsOnMainThread();
-    // Log.d(TAG, "start");
+    RTKLogger.d("BluetoothManager", "start");
     String p = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? android.Manifest.permission.BLUETOOTH_CONNECT : android.Manifest.permission.BLUETOOTH;
     if (!hasPermission(apprtcContext, p)) {
-      Log.w(TAG, "Process (pid=" + Process.myPid() + ") lacks BLUETOOTH permission");
+      RTKLogger.w("BluetoothManager", "Process (pid=" + Process.myPid() + ") lacks BLUETOOTH permission");
       return;
     }
     if (bluetoothState != State.UNINITIALIZED) {
-      Log.w(TAG, "Invalid BT state");
+      RTKLogger.w("BluetoothManager", "Invalid BT state");
       return;
     }
     bluetoothHeadset = null;
@@ -281,20 +282,20 @@ public class AppRTCBluetoothManager {
     // Get a handle to the default local Bluetooth adapter.
     bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
     if (bluetoothAdapter == null) {
-      Log.w(TAG, "Device does not support Bluetooth");
+      RTKLogger.w("BluetoothManager", "Device does not support Bluetooth");
       return;
     }
     // Ensure that the device supports use of BT SCO audio for off call use cases.
     if (!audioManager.isBluetoothScoAvailableOffCall()) {
-      Log.e(TAG, "Bluetooth SCO audio is not available off call");
+      RTKLogger.e("BluetoothManager", "Bluetooth SCO audio is not available off call");
       return;
     }
-    // logBluetoothAdapterInfo(bluetoothAdapter);
+    logBluetoothAdapterInfo(bluetoothAdapter);
     // Establish a connection to the HEADSET profile (includes both Bluetooth Headset and
     // Hands-Free) proxy object and install a listener.
     if (!getBluetoothProfileProxy(
             apprtcContext, bluetoothServiceListener, BluetoothProfile.HEADSET)) {
-      // Log.e(TAG, "BluetoothAdapter.getProfileProxy(HEADSET) failed");
+      RTKLogger.e("BluetoothManager", "BluetoothAdapter.getProfileProxy(HEADSET) failed");
       return;
     }
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
@@ -307,17 +308,17 @@ public class AppRTCBluetoothManager {
       // Register receiver for change in audio connection state of the Headset profile.
       bluetoothHeadsetFilter.addAction(BluetoothHeadset.ACTION_AUDIO_STATE_CHANGED);
       registerReceiver(bluetoothHeadsetReceiver, bluetoothHeadsetFilter);
-      // Log.d(TAG, "HEADSET profile state: "
-      //         + stateToString(bluetoothAdapter.getProfileConnectionState(BluetoothProfile.HEADSET)));
+      RTKLogger.d("BluetoothManager", "HEADSET profile state: "
+              + stateToString(bluetoothAdapter.getProfileConnectionState(BluetoothProfile.HEADSET)));
     }
-    // Log.d(TAG, "Bluetooth proxy for headset profile has started");
+    RTKLogger.d("BluetoothManager", "Bluetooth proxy for headset profile has started");
     bluetoothState = State.HEADSET_UNAVAILABLE;
-    // Log.d(TAG, "start done: BT state=" + bluetoothState);
+    RTKLogger.d("BluetoothManager", "start done: BT state=" + bluetoothState);
   }
   /** Stops and closes all components related to Bluetooth audio. */
   public void stop() {
     ThreadUtils.checkIsOnMainThread();
-    // Log.d(TAG, "stop: BT state=" + bluetoothState);
+    RTKLogger.d("BluetoothManager", "stop: BT state=" + bluetoothState);
     if (bluetoothAdapter == null) {
       return;
     }
@@ -340,7 +341,7 @@ public class AppRTCBluetoothManager {
     bluetoothAdapter = null;
     bluetoothDevice = null;
     bluetoothState = State.UNINITIALIZED;
-    // Log.d(TAG, "stop done: BT state=" + bluetoothState);
+    RTKLogger.d("BluetoothManager", "stop done: BT state=" + bluetoothState);
   }
   /**
    * Starts Bluetooth SCO connection with remote device.
@@ -357,26 +358,26 @@ public class AppRTCBluetoothManager {
    */
   public boolean startScoAudio() {
     ThreadUtils.checkIsOnMainThread();
-    // Log.d(TAG, "startSco: BT state=" + bluetoothState + ", "
-    //         + "attempts: " + scoConnectionAttempts + ", "
-    //         + "SCO is on: " + isScoOn());
+    RTKLogger.d("BluetoothManager", "startSco: BT state=" + bluetoothState + ", "
+            + "attempts: " + scoConnectionAttempts + ", "
+            + "SCO is on: " + isScoOn());
     if (scoConnectionAttempts >= MAX_SCO_CONNECTION_ATTEMPTS) {
-      // Log.e(TAG, "BT SCO connection fails - no more attempts");
+      RTKLogger.e("BluetoothManager", "BT SCO connection fails - no more attempts");
       return false;
     }
     if (bluetoothState != State.HEADSET_AVAILABLE) {
-      // Log.e(TAG, "BT SCO connection fails - no headset available");
+      RTKLogger.e("BluetoothManager", "BT SCO connection fails - no headset available");
       return false;
     }
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
       if (bluetoothAudioDevice != null) {
         audioManager.setCommunicationDevice(bluetoothAudioDevice);
         bluetoothState = State.SCO_CONNECTED;
-        // Log.d(TAG, "Set bluetooth audio device as communication device: "
-        //         + "id=" + bluetoothAudioDevice.getId());
+        RTKLogger.d("BluetoothManager", "Set bluetooth audio device as communication device: "
+                + "id=" + bluetoothAudioDevice.getId());
       } else {
         bluetoothState = State.SCO_DISCONNECTING;
-        // Log.d(TAG, "Cannot find any bluetooth SCO device to set as communication device");
+        RTKLogger.d("BluetoothManager", "Cannot find any bluetooth SCO device to set as communication device");
       }
       updateAudioDeviceState();
     } else {
@@ -384,14 +385,14 @@ public class AppRTCBluetoothManager {
       // connection to be available when the method returns but instead register to receive the
       // intent ACTION_SCO_AUDIO_STATE_UPDATED and wait for the state to be SCO_AUDIO_STATE_CONNECTED.
       // Start BT SCO channel and wait for ACTION_AUDIO_STATE_CHANGED.
-      // Log.d(TAG, "Starting Bluetooth SCO and waits for ACTION_AUDIO_STATE_CHANGED...");
+      RTKLogger.d("BluetoothManager", "Starting Bluetooth SCO and waits for ACTION_AUDIO_STATE_CHANGED...");
       bluetoothState = State.SCO_CONNECTING;
       startTimer();
       audioManager.startBluetoothSco();
       audioManager.setBluetoothScoOn(true);
       scoConnectionAttempts++;
-      // Log.d(TAG, "startScoAudio done: BT state=" + bluetoothState + ", "
-      //         + "SCO is on: " + isScoOn());
+      RTKLogger.d("BluetoothManager", "startScoAudio done: BT state=" + bluetoothState + ", "
+              + "SCO is on: " + isScoOn());
     }
     return true;
   }
@@ -411,8 +412,8 @@ public class AppRTCBluetoothManager {
   /** Stops Bluetooth SCO connection with remote device. */
   public void stopScoAudio() {
     ThreadUtils.checkIsOnMainThread();
-    // Log.d(TAG, "stopScoAudio: BT state=" + bluetoothState + ", "
-    //         + "SCO is on: " + isScoOn());
+    RTKLogger.d("BluetoothManager", "stopScoAudio: BT state=" + bluetoothState + ", "
+            + "SCO is on: " + isScoOn());
     if (bluetoothState != State.SCO_CONNECTING && bluetoothState != State.SCO_CONNECTED) {
       return;
     }
@@ -424,8 +425,8 @@ public class AppRTCBluetoothManager {
       audioManager.setBluetoothScoOn(false);
     }
     bluetoothState = State.SCO_DISCONNECTING;
-    // Log.d(TAG, "stopScoAudio done: BT state=" + bluetoothState + ", "
-    //         + "SCO is on: " + isScoOn());
+    RTKLogger.d("BluetoothManager", "stopScoAudio done: BT state=" + bluetoothState + ", "
+            + "SCO is on: " + isScoOn());
   }
   /**
    * Use the BluetoothHeadset proxy object (controls the Bluetooth Headset
@@ -439,13 +440,13 @@ public class AppRTCBluetoothManager {
     if (bluetoothState == State.UNINITIALIZED || bluetoothHeadset == null) {
       return;
     }
-    // Log.d(TAG, "updateDevice");
+    RTKLogger.d("BluetoothManager", "updateDevice");
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
       bluetoothAudioDevice = getScoDevice();
       if (bluetoothAudioDevice != null) {
         bluetoothState = State.HEADSET_AVAILABLE;
-        // Log.d(TAG, "Connected bluetooth headset: "
-        //         + "name=" + bluetoothAudioDevice.getProductName());
+        RTKLogger.d("BluetoothManager", "Connected bluetooth headset: "
+                + "name=" + bluetoothAudioDevice.getProductName());
       } else {
         bluetoothState = State.HEADSET_UNAVAILABLE;
       }
@@ -457,18 +458,18 @@ public class AppRTCBluetoothManager {
       if (devices.isEmpty()) {
         bluetoothDevice = null;
         bluetoothState = State.HEADSET_UNAVAILABLE;
-        // Log.d(TAG, "No connected bluetooth headset");
+        RTKLogger.d("BluetoothManager", "No connected bluetooth headset");
       } else {
         // Always use first device in list. Android only supports one device.
         bluetoothDevice = devices.get(0);
         bluetoothState = State.HEADSET_AVAILABLE;
-        // Log.d(TAG, "Connected bluetooth headset: "
-        //         + "name=" + bluetoothDevice.getName() + ", "
-        //         + "state=" + stateToString(bluetoothHeadset.getConnectionState(bluetoothDevice))
-        //         + ", SCO audio=" + bluetoothHeadset.isAudioConnected(bluetoothDevice));
+        RTKLogger.d("BluetoothManager", "Connected bluetooth headset: "
+                + "name=" + bluetoothDevice.getName() + ", "
+                + "state=" + stateToString(bluetoothHeadset.getConnectionState(bluetoothDevice))
+                + ", SCO audio=" + bluetoothHeadset.isAudioConnected(bluetoothDevice));
       }
     }
-    // Log.d(TAG, "updateDevice done: BT state=" + bluetoothState);
+    RTKLogger.d("BluetoothManager", "updateDevice done: BT state=" + bluetoothState);
   }
   /**
    * Stubs for test mocks.
@@ -506,7 +507,7 @@ public class AppRTCBluetoothManager {
   /** Logs the state of the local Bluetooth adapter. */
   @SuppressLint({"HardwareIds", "MissingPermission"})
   protected void logBluetoothAdapterInfo(BluetoothAdapter localAdapter) {
-    Log.d(TAG, "BluetoothAdapter: "
+    RTKLogger.d("BluetoothManager", "BluetoothAdapter: "
             + "enabled=" + localAdapter.isEnabled() + ", "
             + "state=" + stateToString(localAdapter.getState()) + ", "
             + "name=" + localAdapter.getName() + ", "
@@ -514,29 +515,29 @@ public class AppRTCBluetoothManager {
     // Log the set of BluetoothDevice objects that are bonded (paired) to the local adapter.
    Set<BluetoothDevice> pairedDevices = localAdapter.getBondedDevices();
     if (!pairedDevices.isEmpty()) {
-      Log.d(TAG, "paired devices:");
+      RTKLogger.d("BluetoothManager", "paired devices:");
       for (BluetoothDevice device : pairedDevices) {
-        Log.d(TAG, " name=" + device.getName() + ", address=" + device.getAddress() + ", deviceClass=" + String.valueOf(device.getBluetoothClass().getDeviceClass()) + ", deviceMajorClass=" + String.valueOf(device.getBluetoothClass().getMajorDeviceClass()));
+        RTKLogger.d("BluetoothManager", " name=" + device.getName() + ", address=" + device.getAddress() + ", deviceClass=" + String.valueOf(device.getBluetoothClass().getDeviceClass()) + ", deviceMajorClass=" + String.valueOf(device.getBluetoothClass().getMajorDeviceClass()));
       }
     }
   }
   /** Ensures that the audio manager updates its list of available audio devices. */
   private void updateAudioDeviceState() {
     ThreadUtils.checkIsOnMainThread();
-    // Log.d(TAG, "updateAudioDeviceState");
+    RTKLogger.d("BluetoothManager", "updateAudioDeviceState");
     updateDevice();
     apprtcAudioManager.updateAudioDeviceState();
   }
   /** Starts timer which times out after BLUETOOTH_SCO_TIMEOUT_MS milliseconds. */
   private void startTimer() {
     ThreadUtils.checkIsOnMainThread();
-    // Log.d(TAG, "startTimer");
+    RTKLogger.d("BluetoothManager", "startTimer");
     handler.postDelayed(bluetoothTimeoutRunnable, BLUETOOTH_SCO_TIMEOUT_MS);
   }
   /** Cancels any outstanding timer tasks. */
   private void cancelTimer() {
     ThreadUtils.checkIsOnMainThread();
-    // Log.d(TAG, "cancelTimer");
+    RTKLogger.d("BluetoothManager", "cancelTimer");
     handler.removeCallbacks(bluetoothTimeoutRunnable);
   }
   /**
@@ -550,11 +551,11 @@ public class AppRTCBluetoothManager {
       return;
     }
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-      // Log.w(TAG, "Invalid state, the timeout should not be running on the version: " + Build.VERSION.SDK_INT);
+      RTKLogger.w("BluetoothManager", "Invalid state, the timeout should not be running on the version: " + Build.VERSION.SDK_INT);
     } else {
-      // Log.d(TAG, "bluetoothTimeout: BT state=" + bluetoothState + ", "
-      //         + "attempts: " + scoConnectionAttempts + ", "
-      //         + "SCO is on: " + isScoOn());
+      RTKLogger.d("BluetoothManager", "bluetoothTimeout: BT state=" + bluetoothState + ", "
+              + "attempts: " + scoConnectionAttempts + ", "
+              + "SCO is on: " + isScoOn());
       if (bluetoothState != State.SCO_CONNECTING) {
         return;
       }
@@ -564,10 +565,10 @@ public class AppRTCBluetoothManager {
       if (devices.size() > 0) {
         bluetoothDevice = devices.get(0);
         if (bluetoothHeadset.isAudioConnected(bluetoothDevice)) {
-          // Log.d(TAG, "SCO connected with " + bluetoothDevice.getName());
+          RTKLogger.d("BluetoothManager", "SCO connected with " + bluetoothDevice.getName());
           scoConnected = true;
         } else {
-          // Log.d(TAG, "SCO is not connected with " + bluetoothDevice.getName());
+          RTKLogger.d("BluetoothManager", "SCO is not connected with " + bluetoothDevice.getName());
         }
       }
       if (scoConnected) {
@@ -576,12 +577,12 @@ public class AppRTCBluetoothManager {
         scoConnectionAttempts = 0;
       } else {
         // Give up and "cancel" our request by calling stopBluetoothSco().
-        Log.w(TAG, "BT failed to connect after timeout");
+        RTKLogger.w("BluetoothManager", "BT failed to connect after timeout");
         stopScoAudio();
       }
     }
     updateAudioDeviceState();
-    // Log.d(TAG, "bluetoothTimeout done: BT state=" + bluetoothState);
+    RTKLogger.d("BluetoothManager", "bluetoothTimeout done: BT state=" + bluetoothState);
   }
   /** Checks whether audio uses Bluetooth SCO. */
   private boolean isScoOn() {

package/android/src/main/java/com/cloudflare/realtimekit/incallmanager/AppRTCUtils.java

@@ -10,6 +10,7 @@
 package com.cloudflare.realtimekit.incallmanager;
 import android.os.Build;
 import android.util.Log;
+import com.cloudflare.realtimekit.RTKLogger;
 /**
  * AppRTCUtils provides helper functions for managing thread safety.
  */
@@ -28,14 +29,14 @@ public final class AppRTCUtils {
   }
   /** Information about the current build, taken from system properties. */
   public static void logDeviceInfo(String tag) {
-    // Log.d(tag, "Android SDK: " + Build.VERSION.SDK_INT + ", "
-    //         + "Release: " + Build.VERSION.RELEASE + ", "
-    //         + "Brand: " + Build.BRAND + ", "
-    //         + "Device: " + Build.DEVICE + ", "
-    //         + "Id: " + Build.ID + ", "
-    //         + "Hardware: " + Build.HARDWARE + ", "
-    //         + "Manufacturer: " + Build.MANUFACTURER + ", "
-    //         + "Model: " + Build.MODEL + ", "
-    //         + "Product: " + Build.PRODUCT);
+    RTKLogger.d(tag, "Android SDK: " + Build.VERSION.SDK_INT + ", "
+            + "Release: " + Build.VERSION.RELEASE + ", "
+            + "Brand: " + Build.BRAND + ", "
+            + "Device: " + Build.DEVICE + ", "
+            + "Id: " + Build.ID + ", "
+            + "Hardware: " + Build.HARDWARE + ", "
+            + "Manufacturer: " + Build.MANUFACTURER + ", "
+            + "Model: " + Build.MODEL + ", "
+            + "Product: " + Build.PRODUCT);
   }
 }