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

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

@@ -10,27 +10,19 @@ import android.media.AudioAttributes;
 import android.media.AudioDeviceInfo;
 import android.media.AudioFocusRequest;
 import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.media.ToneGenerator;
-import android.net.Uri;
 import android.os.PowerManager;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.provider.Settings;
 import androidx.annotation.Nullable;
 import android.util.Log;
-import android.util.SparseArray;
 import android.view.Display;
 import android.view.KeyEvent;
 import android.view.Window;
 import android.view.WindowManager;
-import android.media.AudioDeviceInfo;
-import android.media.MediaPlayer;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.LifecycleEventListener;
-import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
@@ -40,16 +32,11 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
-import java.lang.Runnable;
-import java.io.File;
 import java.util.Collections;
-import java.util.Map;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Random;
 import java.util.Set;
-import java.util.List;
 
+import com.cloudflare.realtimekit.RTKLogger;
 import com.cloudflare.realtimekit.incallmanager.AppRTCBluetoothManager;
 import com.cloudflare.realtimekit.incallmanager.InCallManagerModule.AudioDevice;
 
@@ -72,7 +59,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
     private boolean origIsSpeakerPhoneOn = false;
     private boolean origIsMicrophoneMute = false;
     private int origAudioMode = AudioManager.MODE_INVALID;
-    private boolean defaultSpeakerOn = false;
+    private boolean defaultSpeakerOn = true; // Default to video call mode (speaker on)
     private int defaultAudioMode = AudioManager.MODE_IN_COMMUNICATION;
     private int forceSpeakerOn = 0;
     private boolean automatic = true;
@@ -85,25 +72,6 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
     private AudioAttributes mAudioAttributes;
     private AudioFocusRequest mAudioFocusRequest;
 
-    // --- same as: RingtoneManager.getActualDefaultRingtoneUri(reactContext, RingtoneManager.TYPE_RINGTONE);
-    private Uri defaultRingtoneUri = Settings.System.DEFAULT_RINGTONE_URI;
-    private Uri defaultRingbackUri = Settings.System.DEFAULT_RINGTONE_URI;
-    private Uri defaultBusytoneUri = Settings.System.DEFAULT_NOTIFICATION_URI;
-    //private Uri defaultAlarmAlertUri = Settings.System.DEFAULT_ALARM_ALERT_URI; // --- too annoying
-    private Uri bundleRingtoneUri;
-    private Uri bundleRingbackUri;
-    private Uri bundleBusytoneUri;
-    private Map<String, Uri> audioUriMap;
-    private MyPlayerInterface mRingtone;
-    private MyPlayerInterface mRingback;
-    private MyPlayerInterface mBusytone;
-    private Handler mRingtoneCountDownHandler;
-    private String media = "audio";
-
-    private static final String SPEAKERPHONE_AUTO = "auto";
-    private static final String SPEAKERPHONE_TRUE = "true";
-    private static final String SPEAKERPHONE_FALSE = "false";
-
     /**
      * AudioDevice is the names of possible audio devices that we currently
      * support.
@@ -140,7 +108,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
     private AudioDevice userSelectedAudioDevice;
 
     // Contains speakerphone setting: auto, true or false
-    private final String useSpeakerphone = SPEAKERPHONE_AUTO;
+    private final String useSpeakerphone = "SPEAKERPHONE_AUTO";
 
     // Handles all tasks related to Bluetooth headset devices.
     private AppRTCBluetoothManager bluetoothManager = null;
@@ -153,12 +121,6 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
     // avoid duplicate elements.
     private Set<AudioDevice> audioDevices = new HashSet<>();
 
-    interface MyPlayerInterface {
-        public boolean isPlaying();
-        public void startPlay(Map<String, Object> data);
-        public void stopPlay();
-    }
-
     @Override
     public String getName() {
         return REACT_NATIVE_MODULE_NAME;
@@ -171,13 +133,6 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
         mWindowManager = (WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE);
         mPowerManager = (PowerManager) reactContext.getSystemService(Context.POWER_SERVICE);
         audioManager = ((AudioManager) reactContext.getSystemService(Context.AUDIO_SERVICE));
-        audioUriMap = new HashMap<String, Uri>();
-        audioUriMap.put("defaultRingtoneUri", defaultRingtoneUri);
-        audioUriMap.put("defaultRingbackUri", defaultRingbackUri);
-        audioUriMap.put("defaultBusytoneUri", defaultBusytoneUri);
-        audioUriMap.put("bundleRingtoneUri", bundleRingtoneUri);
-        audioUriMap.put("bundleRingbackUri", bundleRingbackUri);
-        audioUriMap.put("bundleBusytoneUri", bundleBusytoneUri);
         wakeLockUtils = new InCallWakeLockUtils(reactContext);
         proximityManager = InCallProximityManager.create(reactContext, this);
 
@@ -185,16 +140,16 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
             bluetoothManager = AppRTCBluetoothManager.create(reactContext, this);
         });
 
-        // Log.d(TAG, "InCallManager initialized");
+        RTKLogger.d("InCallManager", "InCallManager initialized");
     }
 
     private void manualTurnScreenOff() {
-        // Log.d(TAG, "manualTurnScreenOff()");
+        RTKLogger.d("InCallManager", "manualTurnScreenOff()");
         UiThreadUtil.runOnUiThread(new Runnable() {
             public void run() {
                 Activity mCurrentActivity = getCurrentActivity();
                 if (mCurrentActivity == null) {
-                    // Log.d(TAG, "ReactContext doesn't hava any Activity attached.");
+                    RTKLogger.d("InCallManager", "ReactContext doesn't have any Activity attached.");
                     return;
                 }
                 Window window = mCurrentActivity.getWindow();
@@ -208,12 +163,12 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
     }
 
     private void manualTurnScreenOn() {
-        // Log.d(TAG, "manualTurnScreenOn()");
+        RTKLogger.d("InCallManager", "manualTurnScreenOn()");
         UiThreadUtil.runOnUiThread(new Runnable() {
             public void run() {
                 Activity mCurrentActivity = getCurrentActivity();
                 if (mCurrentActivity == null) {
-                    // Log.d(TAG, "ReactContext doesn't hava any Activity attached.");
+                    RTKLogger.d("InCallManager", "ReactContext doesn't have any Activity attached.");
                     return;
                 }
                 Window window = mCurrentActivity.getWindow();
@@ -230,7 +185,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
     }
 
     private void storeOriginalAudioSetup() {
-        // Log.d(TAG, "storeOriginalAudioSetup()");
+        RTKLogger.d("InCallManager", "storeOriginalAudioSetup()");
         if (!isOrigAudioSetupStored) {
             origAudioMode = audioManager.getMode();
             origIsSpeakerPhoneOn = audioManager.isSpeakerphoneOn();
@@ -240,7 +195,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
     }
 
     private void restoreOriginalAudioSetup() {
-        // Log.d(TAG, "restoreOriginalAudioSetup()");
+        RTKLogger.d("InCallManager", "restoreOriginalAudioSetup()");
         if (isOrigAudioSetupStored) {
             setSpeakerphoneOn(origIsSpeakerPhoneOn);
             setMicrophoneMute(origIsMicrophoneMute);
@@ -254,7 +209,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
 
     private void startWiredHeadsetEvent() {
         if (wiredHeadsetReceiver == null) {
-            // Log.d(TAG, "startWiredHeadsetEvent()");
+            RTKLogger.d("InCallManager", "startWiredHeadsetEvent()");
             IntentFilter filter = new IntentFilter(ACTION_HEADSET_PLUG);
             wiredHeadsetReceiver = new BroadcastReceiver() {
                 @Override
@@ -270,7 +225,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
                         data.putBoolean("isPlugged", (intent.getIntExtra("state", 0) == 1) ? true : false);
                         data.putBoolean("hasMic", (intent.getIntExtra("microphone", 0) == 1) ? true : false);
                         data.putString("deviceName", deviceName);
-                        sendEvent("WiredHeadset", data);
+                        sendEvent("onAudioDeviceChanged", null);
                     } else {
                         hasWiredHeadset = false;
                     }
@@ -280,14 +235,14 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
             if (reactContext != null) {
                 this.registerReceiver(wiredHeadsetReceiver, filter);
             } else {
-                // Log.d(TAG, "startWiredHeadsetEvent() reactContext is null");
+                RTKLogger.w("InCallManager", "startWiredHeadsetEvent() reactContext is null");
             }
         }
     }
 
     private void stopWiredHeadsetEvent() {
         if (wiredHeadsetReceiver != null) {
-            // Log.d(TAG, "stopWiredHeadsetEvent()");
+            RTKLogger.d("InCallManager", "stopWiredHeadsetEvent()");
             this.unregisterReceiver(this.wiredHeadsetReceiver);
             wiredHeadsetReceiver = null;
         }
@@ -295,7 +250,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
 
     private void startNoisyAudioEvent() {
         if (noisyAudioReceiver == null) {
-            // Log.d(TAG, "startNoisyAudioEvent()");
+            RTKLogger.d("InCallManager", "startNoisyAudioEvent()");
             IntentFilter filter = new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
             noisyAudioReceiver = new BroadcastReceiver() {
                 @Override
@@ -310,87 +265,22 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
             if (reactContext != null) {
                 this.registerReceiver(noisyAudioReceiver, filter);
             } else {
-                // Log.d(TAG, "startNoisyAudioEvent() reactContext is null");
+                RTKLogger.w("InCallManager", "startNoisyAudioEvent() reactContext is null");
             }
         }
     }
 
     private void stopNoisyAudioEvent() {
         if (noisyAudioReceiver != null) {
-            // Log.d(TAG, "stopNoisyAudioEvent()");
+            RTKLogger.d("InCallManager", "stopNoisyAudioEvent()");
             this.unregisterReceiver(this.noisyAudioReceiver);
             noisyAudioReceiver = null;
         }
     }
 
-    private void startMediaButtonEvent() {
-        if (mediaButtonReceiver == null) {
-            // Log.d(TAG, "startMediaButtonEvent()");
-            IntentFilter filter = new IntentFilter(Intent.ACTION_MEDIA_BUTTON);
-            mediaButtonReceiver = new BroadcastReceiver() {
-                @Override
-                public void onReceive(Context context, Intent intent) {
-                    if (Intent.ACTION_MEDIA_BUTTON.equals(intent.getAction())) {
-                        KeyEvent event = (KeyEvent)intent.getParcelableExtra(Intent.EXTRA_KEY_EVENT);
-                        int keyCode = event.getKeyCode();
-                        String keyText = "";
-                        switch (keyCode) {
-                            case KeyEvent.KEYCODE_MEDIA_PLAY:
-                                keyText = "KEYCODE_MEDIA_PLAY";
-                                break;
-                            case KeyEvent.KEYCODE_MEDIA_PAUSE:
-                                keyText = "KEYCODE_MEDIA_PAUSE";
-                                break;
-                            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
-                                keyText = "KEYCODE_MEDIA_PLAY_PAUSE";
-                                break;
-                            case KeyEvent.KEYCODE_MEDIA_NEXT:
-                                keyText = "KEYCODE_MEDIA_NEXT";
-                                break;
-                            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
-                                keyText = "KEYCODE_MEDIA_PREVIOUS";
-                                break;
-                            case KeyEvent.KEYCODE_MEDIA_CLOSE:
-                                keyText = "KEYCODE_MEDIA_CLOSE";
-                                break;
-                            case KeyEvent.KEYCODE_MEDIA_EJECT:
-                                keyText = "KEYCODE_MEDIA_EJECT";
-                                break;
-                            case KeyEvent.KEYCODE_MEDIA_RECORD:
-                                keyText = "KEYCODE_MEDIA_RECORD";
-                                break;
-                            case KeyEvent.KEYCODE_MEDIA_STOP:
-                                keyText = "KEYCODE_MEDIA_STOP";
-                                break;
-                            default:
-                                keyText = "KEYCODE_UNKNOW";
-                                break;
-                        }
-                        WritableMap data = Arguments.createMap();
-                        data.putString("eventText", keyText);
-                        data.putInt("eventCode", keyCode);
-                        sendEvent("MediaButton", data);
-                    }
-                }
-            };
-            ReactContext reactContext = getReactApplicationContext();
-            if (reactContext != null) {
-                this.registerReceiver(mediaButtonReceiver, filter);
-            } else {
-                // Log.d(TAG, "startMediaButtonEvent() reactContext is null");
-            }
-        }
-    }
-
-    private void stopMediaButtonEvent() {
-        if (mediaButtonReceiver != null) {
-            // Log.d(TAG, "stopMediaButtonEvent()");
-            this.unregisterReceiver(this.mediaButtonReceiver);
-            mediaButtonReceiver = null;
-        }
-    }
-
     public void onProximitySensorChangedState(boolean isNear) {
+        RTKLogger.d("InCallManager", "onProximitySensorChangedState() isNear=" + isNear + ", selectedAudioDevice=" + getSelectedAudioDevice());
+        
         if (automatic && getSelectedAudioDevice() == AudioDevice.EARPIECE) {
             if (isNear) {
                 turnScreenOff();
@@ -407,33 +297,33 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
     @ReactMethod
     public void startProximitySensor() {
         if (!proximityManager.isProximitySupported()) {
-            // Log.d(TAG, "Proximity Sensor is not supported.");
+            RTKLogger.d("InCallManager", "Proximity Sensor is not supported.");
             return;
         }
         if (isProximityRegistered) {
-            // Log.d(TAG, "Proximity Sensor is already registered.");
+            RTKLogger.d("InCallManager", "Proximity Sensor is already registered.");
             return;
         }
         // --- SENSOR_DELAY_FASTEST(0 milisecs), SENSOR_DELAY_GAME(20 milisecs), SENSOR_DELAY_UI(60 milisecs), SENSOR_DELAY_NORMAL(200 milisecs)
         if (!proximityManager.start()) {
-            // Log.d(TAG, "proximityManager.start() failed. return false");
+            RTKLogger.d("InCallManager", "proximityManager.start() failed. return false");
             return;
         }
-        // Log.d(TAG, "startProximitySensor()");
+        RTKLogger.d("InCallManager", "startProximitySensor()");
         isProximityRegistered = true;
     }
 
     @ReactMethod
     public void stopProximitySensor() {
         if (!proximityManager.isProximitySupported()) {
-            // Log.d(TAG, "Proximity Sensor is not supported.");
+            RTKLogger.d("InCallManager", "Proximity Sensor is not supported.");
             return;
         }
         if (!isProximityRegistered) {
-            // Log.d(TAG, "Proximity Sensor is not registered.");
+            RTKLogger.d("InCallManager", "Proximity Sensor is not registered.");
             return;
         }
-        // Log.d(TAG, "stopProximitySensor()");
+        RTKLogger.d("InCallManager", "stopProximitySensor()");
         proximityManager.stop();
         isProximityRegistered = false;
     }
@@ -472,7 +362,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
                 break;
         }
 
-        // Log.d(TAG, "onAudioFocusChange(): " + focusChange + " - " + focusChangeStr);
+        RTKLogger.d("InCallManager", "onAudioFocusChange(): " + focusChange + " - " + focusChangeStr);
 
         WritableMap data = Arguments.createMap();
         data.putString("eventText", focusChangeStr);
@@ -484,36 +374,29 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
         try {
             ReactContext reactContext = getReactApplicationContext();
             if (reactContext != null && reactContext.hasActiveCatalystInstance()) {
-                // Log.i(TAG, "Sending event");
+                RTKLogger.d("InCallManager", "Sending event: " + eventName);
                 reactContext
                         .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                         .emit(eventName, params);
             } else {
-                Log.e(TAG, "sendEvent(): reactContext is null or not having CatalystInstance yet.");
+                RTKLogger.e("InCallManager", "sendEvent(): reactContext is null or not having CatalystInstance yet.");
             }
         } catch (RuntimeException e) {
-            Log.e(TAG, "sendEvent(): java.lang.RuntimeException: Trying to invoke JS before CatalystInstance has been set!");
+            RTKLogger.e("InCallManager", "sendEvent(): java.lang.RuntimeException: Trying to invoke JS before CatalystInstance has been set!");
         }
     }
 
+    /**
+     * Starts the audio manager. Default mode is video call (speaker on).
+     * Use setVoiceCallMode() to switch to voice call mode (earpiece with proximity sensor).
+     */
     @ReactMethod
-    public void start(final String _media, final boolean auto, final String ringbackUriType) {
-        media = _media;
-        if (media.equals("video")) {
-            defaultSpeakerOn = true;
-        } else {
-            defaultSpeakerOn = false;
-        }
-        automatic = auto;
+    public void start() {
         if (!audioManagerActivated) {
             audioManagerActivated = true;
 
-            // Log.d(TAG, "start audioRouteManager");
+            RTKLogger.d("InCallManager", "start audioRouteManager");
             wakeLockUtils.acquirePartialWakeLock();
-            if (mRingtone != null && mRingtone.isPlaying()) {
-                // Log.d(TAG, "stop ringtone");
-                stopRingtone(); // --- use brandnew instance
-            }
             storeOriginalAudioSetup();
             requestAudioFocus();
             startEvents();
@@ -530,47 +413,93 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
             selectedAudioDevice = AudioDevice.NONE;
             audioDevices.clear();
             updateAudioRoute();
-
-            if (!ringbackUriType.isEmpty()) {
-                startRingback(ringbackUriType);
-            }
         }
     }
 
+    /**
+     * Stops the audio manager and releases all resources.
+     */
+    @ReactMethod
     public void stop() {
-        stop("");
+        if (audioManagerActivated) {
+            RTKLogger.d("InCallManager", "stop() InCallManager");
+            stopEvents();
+            setSpeakerphoneOn(false);
+            setMicrophoneMute(false);
+            forceSpeakerOn = 0;
+            UiThreadUtil.runOnUiThread(() -> {
+                bluetoothManager.stop();
+            });
+            restoreOriginalAudioSetup();
+            abandonAudioFocus();
+            audioManagerActivated = false;
+            wakeLockUtils.releasePartialWakeLock();
+        }
     }
 
+    /**
+     * Switches to voice call mode (earpiece with proximity sensor enabled).
+     * Call this after start() to enable proximity sensor for voice calls.
+     */
     @ReactMethod
-    public void stop(final String busytoneUriType) {
-        if (audioManagerActivated) {
-            stopRingback();
-            if (!busytoneUriType.isEmpty() && startBusytone(busytoneUriType)) {
-                // play busytone first, and call this func again when finish
-                // Log.d(TAG, "play busytone before stop InCallManager");
-                return;
-            } else {
-                // Log.d(TAG, "stop() InCallManager");
-                stopBusytone();
-                stopEvents();
-                setSpeakerphoneOn(false);
-                setMicrophoneMute(false);
-                forceSpeakerOn = 0;
-                UiThreadUtil.runOnUiThread(() -> {
-                    bluetoothManager.stop();
-                });
-                restoreOriginalAudioSetup();
-                abandonAudioFocus();
-                audioManagerActivated = false;
+    public void setVoiceCallMode() {
+        defaultSpeakerOn = false;
+        defaultAudioDevice = hasEarpiece() ? AudioDevice.EARPIECE : AudioDevice.SPEAKER_PHONE;
+        userSelectedAudioDevice = AudioDevice.NONE;
+        updateAudioRoute();
+    }
+
+    /**
+     * Get all available audio output devices.
+     * Returns array of device names: ["SPEAKER_PHONE", "BLUETOOTH", "WIRED_HEADSET", "EARPIECE"]
+     */
+    @ReactMethod
+    public void getAudioDevices(Promise promise) {
+        try {
+            WritableMap result = Arguments.createMap();
+            String devicesJson = "[";
+            for (AudioDevice device : audioDevices) {
+                devicesJson += "\"" + device.name() + "\",";
             }
-            wakeLockUtils.releasePartialWakeLock();
+            // Strip the last comma
+            if (devicesJson.length() > 1) {
+                devicesJson = devicesJson.substring(0, devicesJson.length() - 1);
+            }
+            devicesJson += "]";
+            
+            result.putString("availableDevices", devicesJson);
+            promise.resolve(result);
+        } catch (Exception e) {
+            promise.reject("ERROR", "Failed to get audio devices", e);
+        }
+    }
+
+    /**
+     * Get the currently active audio output device.
+     * Returns device name: "SPEAKER_PHONE", "BLUETOOTH", "WIRED_HEADSET", "EARPIECE", or "NONE"
+     */
+    @ReactMethod
+    public void getCurrentAudioDevice(Promise promise) {
+        try {
+            WritableMap result = Arguments.createMap();
+            result.putString("currentDevice", selectedAudioDevice != null ? selectedAudioDevice.name() : "NONE");
+            
+            // Also include Bluetooth SCO state for better debugging
+            if (bluetoothManager != null) {
+                result.putString("bluetoothState", bluetoothManager.getState().toString());
+                result.putBoolean("bluetoothScoConnected", 
+                    bluetoothManager.getState() == AppRTCBluetoothManager.State.SCO_CONNECTED);
+            }
+            
+            promise.resolve(result);
+        } catch (Exception e) {
+            promise.reject("ERROR", "Failed to get current audio device", e);
         }
     }
 
     private void startEvents() {
         startWiredHeadsetEvent();
         startNoisyAudioEvent();
-        startMediaButtonEvent();
         startProximitySensor(); // --- proximity event always enable, but only turn screen off when audio is routing to earpiece.
         setKeepScreenOn(true);
     }
@@ -578,7 +507,6 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
     private void stopEvents() {
         stopWiredHeadsetEvent();
         stopNoisyAudioEvent();
-        stopMediaButtonEvent();
         stopProximitySensor();
         setKeepScreenOn(false);
         turnScreenOn();
@@ -593,7 +521,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
         String requestAudioFocusResStr = (android.os.Build.VERSION.SDK_INT >= 26)
                 ? requestAudioFocusV26()
                 : requestAudioFocusOld();
-        // Log.d(TAG, "requestAudioFocus(): res = " + requestAudioFocusResStr);
+        RTKLogger.d("InCallManager", "requestAudioFocus(): res = " + requestAudioFocusResStr);
         return requestAudioFocusResStr;
     }
 
@@ -673,7 +601,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
         String abandonAudioFocusResStr = (android.os.Build.VERSION.SDK_INT >= 26)
                 ? abandonAudioFocusV26()
                 : abandonAudioFocusOld();
-        // Log.d(TAG, "abandonAudioFocus(): res = " + abandonAudioFocusResStr);
+        RTKLogger.d("InCallManager", "abandonAudioFocus(): res = " + abandonAudioFocusResStr);
         return abandonAudioFocusResStr;
     }
 
@@ -726,7 +654,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
 
     @ReactMethod
     public void pokeScreen(int timeout) {
-        // Log.d(TAG, "pokeScreen()");
+        RTKLogger.d("InCallManager", "pokeScreen()");
         wakeLockUtils.acquirePokeFullWakeLockReleaseAfter(timeout); // --- default 3000 ms
     }
 
@@ -766,16 +694,16 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
         } else {
             isInteractive = String.format("%s", mPowerManager.isScreenOn());
         }
-        // Log.d(TAG, String.format("debugScreenPowerState(): screenState='%s', isInteractive='%s', isPowerSaveMode='%s', isDeviceIdleMode='%s', isIgnoringBatteryOptimizations='%s'", screenState, isInteractive, isPowerSaveMode, isDeviceIdleMode, isIgnoringBatteryOptimizations));
+        RTKLogger.d("InCallManager", String.format("debugScreenPowerState(): screenState='%s', isInteractive='%s', isPowerSaveMode='%s', isDeviceIdleMode='%s', isIgnoringBatteryOptimizations='%s'", screenState, isInteractive, isPowerSaveMode, isDeviceIdleMode, isIgnoringBatteryOptimizations));
     }
 
     @ReactMethod
     public void turnScreenOn() {
         if (proximityManager.isProximityWakeLockSupported()) {
-            // Log.d(TAG, "turnScreenOn(): use proximity lock.");
+            RTKLogger.d("InCallManager", "turnScreenOn(): use proximity lock.");
             proximityManager.releaseProximityWakeLock(true);
         } else {
-            // Log.d(TAG, "turnScreenOn(): proximity lock is not supported. try manually.");
+            RTKLogger.d("InCallManager", "turnScreenOn(): proximity lock is not supported. try manually.");
             manualTurnScreenOn();
         }
     }
@@ -783,22 +711,22 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
     @ReactMethod
     public void turnScreenOff() {
         if (proximityManager.isProximityWakeLockSupported()) {
-            // Log.d(TAG, "turnScreenOff(): use proximity lock.");
+            RTKLogger.d("InCallManager", "turnScreenOff(): use proximity lock.");
             proximityManager.acquireProximityWakeLock();
         } else {
-            // Log.d(TAG, "turnScreenOff(): proximity lock is not supported. try manually.");
+            RTKLogger.d("InCallManager", "turnScreenOff(): proximity lock is not supported. try manually.");
             manualTurnScreenOff();
         }
     }
 
     @ReactMethod
     public void setKeepScreenOn(final boolean enable) {
-        // Log.d(TAG, "setKeepScreenOn() " + enable);
+        RTKLogger.d("InCallManager", "setKeepScreenOn() " + enable);
         UiThreadUtil.runOnUiThread(new Runnable() {
             public void run() {
                 Activity mCurrentActivity = getCurrentActivity();
                 if (mCurrentActivity == null) {
-                    // Log.d(TAG, "ReactContext doesn't hava any Activity attached.");
+                    RTKLogger.d("InCallManager", "ReactContext doesn't have any Activity attached.");
                     return;
                 }
                 Window window = mCurrentActivity.getWindow();
@@ -814,7 +742,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
     @ReactMethod
     public void setSpeakerphoneOn(final boolean enable) {
         if (enable != audioManager.isSpeakerphoneOn())  {
-            // Log.d(TAG, "setSpeakerphoneOn(): " + enable);
+            RTKLogger.d("InCallManager", "setSpeakerphoneOn(): " + enable);
             audioManager.setSpeakerphoneOn(enable);
         }
     }
@@ -831,7 +759,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
         if (flag < -1 || flag > 1) {
             return;
         }
-        // Log.d(TAG, "setForceSpeakerphoneOn() flag: " + flag);
+        RTKLogger.d("InCallManager", "setForceSpeakerphoneOn() flag: " + flag);
         forceSpeakerOn = flag;
 
         // --- will call updateAudioDeviceState()
@@ -850,622 +778,14 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
     @ReactMethod
     public void setMicrophoneMute(final boolean enable) {
         if (enable != audioManager.isMicrophoneMute())  {
-            // Log.d(TAG, "setMicrophoneMute(): " + enable);
+            RTKLogger.d("InCallManager", "setMicrophoneMute(): " + enable);
             audioManager.setMicrophoneMute(enable);
         }
     }
 
-    /** 
-     * This is part of start() process. 
-     * ringbackUriType must not empty. empty means do not play.
-     */
-    @ReactMethod
-    public void startRingback(final String ringbackUriType) {
-        if (ringbackUriType.isEmpty()) {
-            return;
-        }
-        try {
-            // Log.d(TAG, "startRingback(): UriType=" + ringbackUriType);
-
-            if (mRingback != null) {
-                if (mRingback.isPlaying()) {
-                    // Log.d(TAG, "startRingback(): is already playing");
-                    return;
-                }
-
-                stopRingback(); // --- use brandnew instance
-            }
-
-            Uri ringbackUri;
-            Map data = new HashMap<String, Object>();
-            data.put("name", "mRingback");
-
-            // --- use ToneGenerator instead file uri
-            if (ringbackUriType.equals("_DTMF_")) {
-                mRingback = new myToneGenerator(myToneGenerator.RINGBACK);
-                mRingback.startPlay(data);
-                return;
-            }
-
-            ringbackUri = getRingbackUri(ringbackUriType);
-            if (ringbackUri == null) {
-                // Log.d(TAG, "startRingback(): no available media");
-                return;    
-            }
-
-            mRingback = new myMediaPlayer();
-            data.put("sourceUri", ringbackUri);
-            data.put("setLooping", true);
-
-            //data.put("audioStream", AudioManager.STREAM_VOICE_CALL); // --- lagacy
-            // --- The ringback doesn't have to be a DTMF.
-            // --- Should use VOICE_COMMUNICATION for sound during call or it may be silenced.
-            data.put("audioUsage", AudioAttributes.USAGE_VOICE_COMMUNICATION);
-            data.put("audioContentType", AudioAttributes.CONTENT_TYPE_MUSIC);
-
-            setMediaPlayerEvents((MediaPlayer)mRingback, "mRingback");
-
-            mRingback.startPlay(data);
-        } catch(Exception e) {
-            // Log.d(TAG, "startRingback() failed", e);
-        }   
-    }
-
-    @ReactMethod
-    public void stopRingback() {
-        try {
-            if (mRingback != null) {
-                mRingback.stopPlay();
-                mRingback = null;
-            }
-        } catch(Exception e) {
-            // Log.d(TAG, "stopRingback() failed");
-        }   
-    }
-
-    /** 
-     * This is part of start() process. 
-     * busytoneUriType must not empty. empty means do not play.
-     * return false to indicate play tone failed and should be stop() immediately
-     * otherwise, it will stop() after a tone completed.
-     */
-    public boolean startBusytone(final String busytoneUriType) {
-        if (busytoneUriType.isEmpty()) {
-            return false;
-        }
-        try {
-            // Log.d(TAG, "startBusytone(): UriType=" + busytoneUriType);
-            if (mBusytone != null) {
-                if (mBusytone.isPlaying()) {
-                    // Log.d(TAG, "startBusytone(): is already playing");
-                    return false;
-                }
-
-                stopBusytone(); // --- use brandnew instance
-            }
-
-            Uri busytoneUri;
-            Map data = new HashMap<String, Object>();
-            data.put("name", "mBusytone");
-
-            // --- use ToneGenerator instead file uri
-            if (busytoneUriType.equals("_DTMF_")) {
-                mBusytone = new myToneGenerator(myToneGenerator.BUSY);
-                mBusytone.startPlay(data);
-                return true;
-            }
-
-            busytoneUri = getBusytoneUri(busytoneUriType);
-            if (busytoneUri == null) {
-                // Log.d(TAG, "startBusytone(): no available media");
-                return false;    
-            }
-
-            mBusytone = new myMediaPlayer();
-
-            data.put("sourceUri", busytoneUri);
-            data.put("setLooping", false);
-            //data.put("audioStream", AudioManager.STREAM_VOICE_CALL); // --- lagacy
-            // --- Should use VOICE_COMMUNICATION for sound during a call or it may be silenced.
-            data.put("audioUsage", AudioAttributes.USAGE_VOICE_COMMUNICATION);
-            data.put("audioContentType", AudioAttributes.CONTENT_TYPE_SONIFICATION); // --- CONTENT_TYPE_MUSIC?
-
-            setMediaPlayerEvents((MediaPlayer)mBusytone, "mBusytone");
-            mBusytone.startPlay(data);
-            return true;
-        } catch(Exception e) {
-            // Log.d(TAG, "startBusytone() failed", e);
-            return false;
-        }   
-    }
-
-    public void stopBusytone() {
-        try {
-            if (mBusytone != null) {
-                mBusytone.stopPlay();
-                mBusytone = null;
-            }
-        } catch(Exception e) {
-            // Log.d(TAG, "stopBusytone() failed");
-        }   
-    }
-
-    @ReactMethod
-    public void startRingtone(final String ringtoneUriType, final int seconds) {
-        Thread thread = new Thread() {
-            @Override
-            public void run() {
-                try {
-                    Looper.prepare();
-
-                    // Log.d(TAG, "startRingtone(): UriType=" + ringtoneUriType);
-                    if (mRingtone != null) {
-                        if (mRingtone.isPlaying()) {
-                            // Log.d(TAG, "startRingtone(): is already playing");
-                            return;
-                        } else {
-                            stopRingtone(); // --- use brandnew instance
-                        }
-                    }
-
-                    //if (!audioManager.isStreamMute(AudioManager.STREAM_RING)) {
-                    //if (origRingerMode == AudioManager.RINGER_MODE_NORMAL) {
-                    if (audioManager.getStreamVolume(AudioManager.STREAM_RING) == 0) {
-                        // Log.d(TAG, "startRingtone(): ringer is silent. leave without play.");
-                        return;
-                    }
-
-                    // --- there is no _DTMF_ option in startRingtone()
-                    Uri ringtoneUri = getRingtoneUri(ringtoneUriType);
-                    if (ringtoneUri == null) {
-                        // Log.d(TAG, "startRingtone(): no available media");
-                        return;
-                    }
-
-                    if (audioManagerActivated) {
-                        InCallManagerModule.this.stop();
-                    }
-
-                    wakeLockUtils.acquirePartialWakeLock();
-
-                    storeOriginalAudioSetup();
-                    Map data = new HashMap<String, Object>();
-                    mRingtone = new myMediaPlayer();
-
-                    data.put("name", "mRingtone");
-                    data.put("sourceUri", ringtoneUri);
-                    data.put("setLooping", true);
-
-                    //data.put("audioStream", AudioManager.STREAM_RING); // --- lagacy
-                    data.put("audioUsage", AudioAttributes.USAGE_NOTIFICATION_RINGTONE); // --- USAGE_NOTIFICATION_COMMUNICATION_REQUEST?
-                    data.put("audioContentType", AudioAttributes.CONTENT_TYPE_MUSIC);
-
-                    setMediaPlayerEvents((MediaPlayer) mRingtone, "mRingtone");
-
-                    mRingtone.startPlay(data);
-
-                    if (seconds > 0) {
-                        mRingtoneCountDownHandler = new Handler();
-                        mRingtoneCountDownHandler.postDelayed(new Runnable() {
-                            public void run() {
-                                try {
-                                    // Log.d(TAG, String.format("mRingtoneCountDownHandler.stopRingtone() timeout after %d seconds", seconds));
-                                    stopRingtone();
-                                } catch(Exception e) {
-                                    // Log.d(TAG, "mRingtoneCountDownHandler.stopRingtone() failed.");
-                                }
-                            }
-                        }, seconds * 1000);
-                    }
-
-                    Looper.loop();
-                } catch(Exception e) {
-                    wakeLockUtils.releasePartialWakeLock();
-                    // Log.e(TAG, "startRingtone() failed", e);
-                }
-            }
-        };
-
-        thread.start();
-    }
-
-    @ReactMethod
-    public void stopRingtone() {
-        Thread thread = new Thread() {
-            @Override
-            public void run() {
-                try {
-                    if (mRingtone != null) {
-                        mRingtone.stopPlay();
-                        mRingtone = null;
-                        restoreOriginalAudioSetup();
-                    }
-                    if (mRingtoneCountDownHandler != null) {
-                        mRingtoneCountDownHandler.removeCallbacksAndMessages(null);
-                        mRingtoneCountDownHandler = null;
-                    }
-                } catch (Exception e) {
-                    // Log.d(TAG, "stopRingtone() failed");
-                }
-                wakeLockUtils.releasePartialWakeLock();
-            }
-        };
-
-        thread.start();
-    }
-
-    private void setMediaPlayerEvents(MediaPlayer mp, final String name) {
-
-        mp.setOnErrorListener(new MediaPlayer.OnErrorListener() {
-            //http://developer.android.com/reference/android/media/MediaPlayer.OnErrorListener.html
-            @Override
-            public boolean onError(MediaPlayer mp, int what, int extra) {
-                // Log.d(TAG, String.format("MediaPlayer %s onError(). what: %d, extra: %d", name, what, extra));
-                //return True if the method handled the error
-                //return False, or not having an OnErrorListener at all, will cause the OnCompletionListener to be called. Get news & tips 
-                return true;
-            }
-        });
-
-        mp.setOnInfoListener(new MediaPlayer.OnInfoListener() {
-            //http://developer.android.com/reference/android/media/MediaPlayer.OnInfoListener.html
-            @Override
-            public boolean onInfo(MediaPlayer mp, int what, int extra) {
-                // Log.d(TAG, String.format("MediaPlayer %s onInfo(). what: %d, extra: %d", name, what, extra));
-                //return True if the method handled the info
-                //return False, or not having an OnInfoListener at all, will cause the info to be discarded.
-                return true;
-            }
-        });
-
-        mp.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
-            @Override
-            public void onPrepared(MediaPlayer mp) {
-                // Log.d(TAG, String.format("MediaPlayer %s onPrepared(), start play, isSpeakerPhoneOn %b", name, audioManager.isSpeakerphoneOn()));
-                if (name.equals("mBusytone")) {
-                    audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-                } else if (name.equals("mRingback")) {
-                    audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-                } else if (name.equals("mRingtone")) {
-                    audioManager.setMode(AudioManager.MODE_RINGTONE);
-                } 
-                updateAudioRoute();
-                mp.start();
-            }
-        });
-
-        mp.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
-            @Override
-            public void onCompletion(MediaPlayer mp) {
-                // Log.d(TAG, String.format("MediaPlayer %s onCompletion()", name));
-                if (name.equals("mBusytone")) {
-                    // Log.d(TAG, "MyMediaPlayer(): invoke stop()");
-                    stop();
-                }
-            }
-        });
-
-    }
-
-
-// ===== File Uri Start =====
-    @ReactMethod
-    public void getAudioUriJS(String audioType, String fileType, Promise promise) {
-        Uri result = null;
-        if (audioType.equals("ringback")) {
-            result = getRingbackUri(fileType);
-        } else if (audioType.equals("busytone")) {
-            result = getBusytoneUri(fileType);
-        } else if (audioType.equals("ringtone")) {
-            result = getRingtoneUri(fileType);
-        }
-        try {
-            if (result != null) {
-                promise.resolve(result.toString());
-            } else {
-                promise.reject("failed");
-            }
-        } catch (Exception e) {
-            promise.reject("failed");
-        }
-    }
-
-    private Uri getRingtoneUri(final String _type) {
-        final String fileBundle = "incallmanager_ringtone";
-        final String fileBundleExt = "mp3";
-        final String fileSysWithExt = "media_volume.ogg";
-        final String fileSysPath = "/system/media/audio/ui"; // --- every devices all ships with different in ringtone. maybe ui sounds are more "stock"
-        String type;
-        // --- _type MAY be empty
-        if (_type.equals("_DEFAULT_") ||  _type.isEmpty()) {
-            //type = fileSysWithExt;
-            return getDefaultUserUri("defaultRingtoneUri");
-        } else {
-            type = _type;
-        }
-        return getAudioUri(type, fileBundle, fileBundleExt, fileSysWithExt, fileSysPath, "bundleRingtoneUri", "defaultRingtoneUri");
-    }
-
-    private Uri getRingbackUri(final String _type) {
-        final String fileBundle = "incallmanager_ringback";
-        final String fileBundleExt = "mp3";
-        final String fileSysWithExt = "media_volume.ogg";
-        final String fileSysPath = "/system/media/audio/ui"; // --- every devices all ships with different in ringtone. maybe ui sounds are more "stock"
-        String type;
-        // --- _type would never be empty here. just in case.
-        if (_type.equals("_DEFAULT_") ||  _type.isEmpty()) {
-            //type = fileSysWithExt;
-            return getDefaultUserUri("defaultRingbackUri");
-        } else {
-            type = _type;
-        }
-        return getAudioUri(type, fileBundle, fileBundleExt, fileSysWithExt, fileSysPath, "bundleRingbackUri", "defaultRingbackUri");
-    }
-
-    private Uri getBusytoneUri(final String _type) {
-        final String fileBundle = "incallmanager_busytone";
-        final String fileBundleExt = "mp3";
-        final String fileSysWithExt = "LowBattery.ogg";
-        final String fileSysPath = "/system/media/audio/ui"; // --- every devices all ships with different in ringtone. maybe ui sounds are more "stock"
-        String type;
-        // --- _type would never be empty here. just in case.
-        if (_type.equals("_DEFAULT_") ||  _type.isEmpty()) {
-            //type = fileSysWithExt; // --- 
-            return getDefaultUserUri("defaultBusytoneUri");
-        } else {
-            type = _type;
-        }
-        return getAudioUri(type, fileBundle, fileBundleExt, fileSysWithExt, fileSysPath, "bundleBusytoneUri", "defaultBusytoneUri");
-    }
-
-    private Uri getAudioUri(final String _type, final String fileBundle, final String fileBundleExt, final String fileSysWithExt, final String fileSysPath, final String uriBundle, final String uriDefault) {
-        String type = _type;
-        if (type.equals("_BUNDLE_")) {
-            if (audioUriMap.get(uriBundle) == null) {
-                int res = 0;
-                ReactContext reactContext = getReactApplicationContext();
-                if (reactContext != null) {
-                    res = reactContext.getResources().getIdentifier(fileBundle, "raw", mPackageName);
-                } else {
-                    // Log.d(TAG, "getAudioUri() reactContext is null");
-                }
-                if (res <= 0) {
-                    // Log.d(TAG, String.format("getAudioUri() %s.%s not found in bundle.", fileBundle, fileBundleExt));
-                    audioUriMap.put(uriBundle, null);
-                    //type = fileSysWithExt;
-                    return getDefaultUserUri(uriDefault); // --- if specified bundle but not found, use default directlly
-                } else {
-                    audioUriMap.put(uriBundle, Uri.parse("android.resource://" + mPackageName + "/" + Integer.toString(res)));
-                    //bundleRingtoneUri = Uri.parse("android.resource://" + reactContext.getPackageName() + "/" + R.raw.incallmanager_ringtone);
-                    //bundleRingtoneUri = Uri.parse("android.resource://" + reactContext.getPackageName() + "/raw/incallmanager_ringtone");
-                    // Log.d(TAG, "getAudioUri() using: " + type);
-                    return audioUriMap.get(uriBundle);
-                }
-            } else {
-                // Log.d(TAG, "getAudioUri() using: " + type);
-                return audioUriMap.get(uriBundle);
-            }
-        }
-
-        // --- Check file every time in case user deleted.
-        final String target = fileSysPath + "/" + type;
-        Uri _uri = getSysFileUri(target);
-        if (_uri == null) {
-            // Log.d(TAG, "getAudioUri() using user default");
-            return getDefaultUserUri(uriDefault);
-        } else {
-            // Log.d(TAG, "getAudioUri() using internal: " + target);
-            audioUriMap.put(uriDefault, _uri);
-            return _uri;
-        }
-    }
-
-    private Uri getSysFileUri(final String target) {
-        File file = new File(target);
-        if (file.isFile()) {
-            return Uri.fromFile(file);
-        }
-        return null;
-    }
-
-    private Uri getDefaultUserUri(final String type) {
-        // except ringtone, it doesn't suppose to be go here. and every android has different files unlike apple;
-        if (type.equals("defaultRingtoneUri")) {
-            return Settings.System.DEFAULT_RINGTONE_URI;
-        } else if (type.equals("defaultRingbackUri")) {
-            return Settings.System.DEFAULT_RINGTONE_URI;
-        } else if (type.equals("defaultBusytoneUri")) {
-            return Settings.System.DEFAULT_NOTIFICATION_URI; // --- DEFAULT_ALARM_ALERT_URI
-        } else {
-            return Settings.System.DEFAULT_NOTIFICATION_URI;
-        }
-    }
-// ===== File Uri End =====
-
-
-// ===== Internal Classes Start =====
-    private class myToneGenerator extends Thread implements MyPlayerInterface {
-        private int toneType;
-        private int toneCategory;
-        private boolean playing = false;
-        private static final int maxWaitTimeMs = 3600000; // 1 hour fairly enough
-        private static final int loadBufferWaitTimeMs = 20;
-        private static final int toneVolume = 100; // The volume of the tone, given in percentage of maximum volume (from 0-100).
-        // --- constant in ToneGenerator all below 100
-        public static final int BEEP = 101;
-        public static final int BUSY = 102;
-        public static final int CALLEND = 103;
-        public static final int CALLWAITING = 104;
-        public static final int RINGBACK = 105;
-        public static final int SILENT = 106;
-        public int customWaitTimeMs = maxWaitTimeMs;
-        public String caller;
-
-        myToneGenerator(final int t) {
-            super();
-            toneCategory = t;
-        }
-
-        public void setCustomWaitTime(final int ms) {
-            customWaitTimeMs = ms;
-        }
-
-        @Override
-        public void startPlay(final Map data) {
-            String name = (String) data.get("name");
-            caller = name;
-            start();
-        }
-
-        @Override
-        public boolean isPlaying() {
-            return playing;
-        }
-
-        @Override
-        public void stopPlay() {
-            synchronized (this) {
-                if (playing) {
-                    notify();
-                }
-                playing = false;
-            }
-        }
-
-        @Override
-        public void run() {
-            int toneWaitTimeMs;
-            switch (toneCategory) {
-                case SILENT:
-                    //toneType = ToneGenerator.TONE_CDMA_SIGNAL_OFF;
-                    toneType = ToneGenerator.TONE_CDMA_ANSWER;
-                    toneWaitTimeMs = 1000;
-                    break;
-                case BUSY:
-                    //toneType = ToneGenerator.TONE_SUP_BUSY;
-                    //toneType = ToneGenerator.TONE_SUP_CONGESTION;
-                    //toneType = ToneGenerator.TONE_SUP_CONGESTION_ABBREV;
-                    //toneType = ToneGenerator.TONE_CDMA_NETWORK_BUSY;
-                    //toneType = ToneGenerator.TONE_CDMA_NETWORK_BUSY_ONE_SHOT;
-                    toneType = ToneGenerator.TONE_SUP_RADIO_NOTAVAIL;
-                    toneWaitTimeMs = 4000;
-                    break;
-                case RINGBACK:
-                    //toneType = ToneGenerator.TONE_SUP_RINGTONE;
-                    toneType = ToneGenerator.TONE_CDMA_NETWORK_USA_RINGBACK;
-                    toneWaitTimeMs = maxWaitTimeMs; // [STOP MANUALLY]
-                    break;
-                case CALLEND:
-                    toneType = ToneGenerator.TONE_PROP_PROMPT;
-                    toneWaitTimeMs = 200; // plays when call ended
-                    break;
-                case CALLWAITING:
-                    //toneType = ToneGenerator.TONE_CDMA_NETWORK_CALLWAITING;
-                    toneType = ToneGenerator.TONE_SUP_CALL_WAITING;
-                    toneWaitTimeMs = maxWaitTimeMs; // [STOP MANUALLY]
-                    break;
-                case BEEP:
-                    //toneType = ToneGenerator.TONE_SUP_PIP;
-                    //toneType = ToneGenerator.TONE_CDMA_PIP;
-                    //toneType = ToneGenerator.TONE_SUP_RADIO_ACK;
-                    //toneType = ToneGenerator.TONE_PROP_BEEP;
-                    toneType = ToneGenerator.TONE_PROP_BEEP2;
-                    toneWaitTimeMs = 1000; // plays when call ended
-                    break;
-                default:
-                    // --- use ToneGenerator internal type.
-                    // Log.d(TAG, "myToneGenerator: use internal tone type: " + toneCategory);
-                    toneType = toneCategory;
-                    toneWaitTimeMs = customWaitTimeMs;
-            }
-            // Log.d(TAG, String.format("myToneGenerator: toneCategory: %d ,toneType: %d, toneWaitTimeMs: %d", toneCategory, toneType, toneWaitTimeMs));
-
-            ToneGenerator tg;
-            try {
-                tg = new ToneGenerator(AudioManager.STREAM_VOICE_CALL, toneVolume);
-            } catch (RuntimeException e) {
-                // Log.d(TAG, "myToneGenerator: Exception caught while creating ToneGenerator: " + e);
-                tg = null;
-            }
-
-            if (tg != null) {
-                synchronized (this) {
-                    if (!playing) {
-                        playing = true;
-
-                        // --- make sure audio routing, or it will be wired when switch suddenly
-                        if (caller.equals("mBusytone")) {
-                            audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-                        } else if (caller.equals("mRingback")) {
-                            audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-                        } else if (caller.equals("mRingtone")) {
-                            audioManager.setMode(AudioManager.MODE_RINGTONE);
-                        } 
-                        InCallManagerModule.this.updateAudioRoute();
-
-                        tg.startTone(toneType);
-                        try {
-                            wait(toneWaitTimeMs + loadBufferWaitTimeMs);
-                        } catch  (InterruptedException e) {
-                            // Log.d(TAG, "myToneGenerator stopped. toneType: " + toneType);
-                        }
-                        tg.stopTone();
-                    }
-                    playing = false;
-                    tg.release();
-                }
-            }
-            // Log.d(TAG, "MyToneGenerator(): play finished. caller=" + caller);
-            if (caller.equals("mBusytone")) {
-                // Log.d(TAG, "MyToneGenerator(): invoke stop()");
-                InCallManagerModule.this.stop();
-            }
-        }
-    }
-
-    private class myMediaPlayer extends MediaPlayer implements MyPlayerInterface {
-
-        @Override
-        public void stopPlay() {
-            stop();
-            reset();
-            release();
-        }
-
-        @Override
-        public void startPlay(final Map data) {
-            try {
-                ReactContext reactContext = getReactApplicationContext();
-
-                setDataSource(reactContext, (Uri) data.get("sourceUri"));
-                setLooping((Boolean) data.get("setLooping"));
-
-                // --- the `minSdkVersion` is 21 since RN 64,
-                // --- if you want to suuport api < 21, comment out `setAudioAttributes` and use `setAudioStreamType((Integer) data.get("audioStream"))` instead
-                setAudioAttributes(
-                    new AudioAttributes.Builder()
-                        .setUsage((Integer) data.get("audioUsage"))
-                        .setContentType((Integer) data.get("audioContentType"))
-                        .build()
-                );
-
-                // -- will start at onPrepared() event
-                prepareAsync();
-            } catch (Exception e) {
-                // Log.d(TAG, "startPlay() failed", e);
-            }
-        }
-
-        @Override
-        public boolean isPlaying() {
-            return super.isPlaying();
-        }
-    }
-// ===== Internal Classes End =====
-
     @ReactMethod
     public void chooseAudioRoute(String audioRoute, Promise promise) {
-        // Log.e(TAG, "RNInCallManager.chooseAudioRoute(): user choose audioDevice = " + audioRoute);
+        RTKLogger.d("InCallManager", "chooseAudioRoute(): user choose audioDevice = " + audioRoute);
         
         if (audioRoute.equals(AudioDevice.EARPIECE.name()) || audioRoute.equals("earpiece")) {
             selectAudioDevice(AudioDevice.EARPIECE);
@@ -1479,46 +799,35 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
         promise.resolve(getAudioDeviceStatusMap());
     }
 
-    private static int getRandomInteger(int min, int max) {
-        if (min >= max) {
-            throw new IllegalArgumentException("max must be greater than min");
-        }
-        Random random = new Random();
-        return random.nextInt((max - min) + 1) + min;
-    }
-
     private void pause() {
         if (audioManagerActivated) {
-            // Log.d(TAG, "pause audioRouteManager");
+            RTKLogger.d("InCallManager", "pause audioRouteManager");
             stopEvents();
         }
     }
 
     private void resume() {
         if (audioManagerActivated) {
-            // Log.d(TAG, "resume audioRouteManager");
+            RTKLogger.d("InCallManager", "resume audioRouteManager");
             startEvents();
         }
     }
 
     @Override
     public void onHostResume() {
-        // Log.d(TAG, "onResume()");
+        RTKLogger.d("InCallManager", "onResume()");
         //resume();
     }
 
     @Override
     public void onHostPause() {
-        // Log.d(TAG, "onPause()");
+        RTKLogger.d("InCallManager", "onPause()");
         //pause();
     }
 
     @Override
     public void onHostDestroy() {
-        // Log.d(TAG, "onDestroy()");
-        stopRingtone();
-        stopRingback();
-        stopBusytone();
+        RTKLogger.d("InCallManager", "onDestroy()");
         stop();
     }
 
@@ -1532,9 +841,9 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
 // ===== NOTE: below functions is based on appRTC DEMO M64 ===== //
   /** Changes selection of the currently active audio device. */
     private void setAudioDeviceInternal(AudioDevice device) {
-        // Log.d(TAG, "setAudioDeviceInternal(device=" + device + ")");
+        RTKLogger.d("InCallManager", "setAudioDeviceInternal(device=" + device + ")");
         if (!audioDevices.contains(device)) {
-            // Log.e(TAG, "specified audio device does not exist");
+            RTKLogger.e("InCallManager", "specified audio device does not exist");
             return;
         }
         switch (device) {
@@ -1544,10 +853,19 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
                 stopProximitySensor();
                 break;
             case EARPIECE:
+                RTKLogger.d("InCallManager", "Routing to EARPIECE");
                 audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
                 setSpeakerphoneOn(false);
-                startProximitySensor();
                 audioManager.setWiredHeadsetOn(false);
+                // Ensure audio is routed to earpiece by stopping any Bluetooth SCO
+                if (bluetoothManager.getState() == AppRTCBluetoothManager.State.SCO_CONNECTED
+                        || bluetoothManager.getState() == AppRTCBluetoothManager.State.SCO_CONNECTING) {
+                    RTKLogger.d("InCallManager", "Stopping Bluetooth SCO for earpiece");
+                    bluetoothManager.stopScoAudio();
+                }
+                startProximitySensor();
+                RTKLogger.d("InCallManager", "Earpiece routing complete. Mode: " + audioManager.getMode() 
+                    + ", Speaker: " + audioManager.isSpeakerphoneOn());
                 break;
             case WIRED_HEADSET:
                 audioManager.setWiredHeadsetOn(true);
@@ -1560,7 +878,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
                 stopProximitySensor();
                 break;
             default:
-                // Log.e(TAG, "Invalid audio device selection");
+                RTKLogger.e("InCallManager", "Invalid audio device selection");
                 break;
         }
         selectedAudioDevice = device;
@@ -1585,20 +903,20 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
                 }
                 break;
             default:
-                // Log.e(TAG, "Invalid default audio device selection");
+                RTKLogger.e("InCallManager", "Invalid default audio device selection");
                 break;
         }
-        // Log.d(TAG, "setDefaultAudioDevice(device=" + defaultAudioDevice + ")");
+        RTKLogger.d("InCallManager", "setDefaultAudioDevice(device=" + defaultAudioDevice + ")");
         updateAudioDeviceState();
     }
 
     /** Changes selection of the currently active audio device. */
     public void selectAudioDevice(AudioDevice device) {
-        // Log.e(TAG,"Selecting "+device.name());
+        RTKLogger.d("InCallManager", "Selecting " + device.name());
         userSelectedAudioDevice = device;
         updateAudioDeviceState();
         if (device != AudioDevice.NONE && !audioDevices.contains(device)) {
-            // Log.e(TAG, "selectAudioDevice() Can not select " + device + " from available " + audioDevices);
+            RTKLogger.e("InCallManager", "selectAudioDevice() Can not select " + device + " from available " + audioDevices);
             return;
         }
     }
@@ -1632,34 +950,12 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
             try {
                 reactContext.unregisterReceiver(receiver);
             } catch (final Exception e) {
-                // Log.d(TAG, "unregisterReceiver() failed");
+                RTKLogger.d("InCallManager", "unregisterReceiver() failed");
             }
         } else {
-            // Log.d(TAG, "unregisterReceiver() reactContext is null");
-        }
-    }
-
-    /** Sets the speaker phone mode. */
-    /*
-    private void setSpeakerphoneOn(boolean on) {
-        boolean wasOn = audioManager.isSpeakerphoneOn();
-        if (wasOn == on) {
-            return;
-        }
-        audioManager.setSpeakerphoneOn(on);
-    }
-    */
-
-    /** Sets the microphone mute state. */
-    /*
-    private void setMicrophoneMute(boolean on) {
-        boolean wasMuted = audioManager.isMicrophoneMute();
-        if (wasMuted == on) {
-            return;
+            RTKLogger.d("InCallManager", "unregisterReceiver() reactContext is null");
         }
-        audioManager.setMicrophoneMute(on);
     }
-    */
 
     /** Gets the current earpiece state. */
     private boolean hasEarpiece() {
@@ -1682,13 +978,13 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
             for (AudioDeviceInfo device : devices) {
                 final int type = device.getType();
                 if (type == AudioDeviceInfo.TYPE_WIRED_HEADSET) {
-                    // Log.d(TAG, "hasWiredHeadset: found wired headset");
+                    RTKLogger.d("InCallManager", "hasWiredHeadset: found wired headset");
                     return true;
                 } else if (type == AudioDeviceInfo.TYPE_USB_DEVICE) {
-                    // Log.d(TAG, "hasWiredHeadset: found USB audio device");
+                    RTKLogger.d("InCallManager", "hasWiredHeadset: found USB audio device");
                     return true;
                 } else if (type == AudioDeviceInfo.TYPE_WIRED_HEADPHONES) {
-                    // Log.d(TAG, "hasWiredHeadset: found wired headphones");
+                    RTKLogger.d("InCallManager", "hasWiredHeadset: found wired headphones");
                     return true;
                 }
             }
@@ -1709,14 +1005,14 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
                         || bluetoothManager.getState() == AppRTCBluetoothManager.State.SCO_CONNECTING
                         || bluetoothManager.getState() == AppRTCBluetoothManager.State.HEADSET_AVAILABLE) {
                     promise.resolve(true);
-                    // Log.i("Bluetooth State:", "isBluetoothHeadsetConnected: true");
+                    RTKLogger.i("InCallManager", "isBluetoothHeadsetConnected: true");
                 } else {
                     promise.resolve(false);
-                    // Log.i("Bluetooth State:", "isBluetoothHeadsetConnected: false");
+                    RTKLogger.i("InCallManager", "isBluetoothHeadsetConnected: false");
                 }
             } catch (Exception e) {
                 promise.resolve(false);
-                Log.e("Bluetooth State:", "isBluetoothHeadsetConnected: false due to: ", e);
+                RTKLogger.e("InCallManager", "isBluetoothHeadsetConnected: false due to: " + e.getMessage(), e);
             }
         });
     }
@@ -1727,17 +1023,17 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
      */
     public void updateAudioDeviceState() {
         UiThreadUtil.runOnUiThread(() -> {
-            // Log.e("Bluetooth State: ",bluetoothManager.getState().toString());
+            RTKLogger.d("InCallManager", "Bluetooth State: " + bluetoothManager.getState().toString());
             if(bluetoothManager.getState().toString().equals("UNINITIALIZED"))
             bluetoothManager.start();
             hasWiredHeadset= this.hasWiredHeadset();
-            // Log.d(TAG, "--- updateAudioDeviceState: "
-            //                 + "wired headset=" + hasWiredHeadset + ", "
-            //                 + "BT state=" + bluetoothManager.getState());
-            // Log.d(TAG, "Device status: "
-            //                 + "available=" + audioDevices + ", "
-            //                 + "selected=" + selectedAudioDevice + ", "
-            //                 + "user selected=" + userSelectedAudioDevice);
+            RTKLogger.d("InCallManager", "--- updateAudioDeviceState: "
+                            + "wired headset=" + hasWiredHeadset + ", "
+                            + "BT state=" + bluetoothManager.getState());
+            RTKLogger.d("InCallManager", "Device status: "
+                            + "available=" + audioDevices + ", "
+                            + "selected=" + selectedAudioDevice + ", "
+                            + "user selected=" + userSelectedAudioDevice);
 
             // Check if any Bluetooth headset is connected. The internal BT state will
             // change accordingly.
@@ -1792,23 +1088,30 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
             }
 
             // --- start bluetooth if needed
-            if (selectedAudioDevice != AudioDevice.BLUETOOTH
-                    && newAudioDevice == AudioDevice.BLUETOOTH
+            // Start SCO if: switching to Bluetooth OR already on Bluetooth but SCO not connected yet
+            if (newAudioDevice == AudioDevice.BLUETOOTH
                     && bluetoothManager.getState() == AppRTCBluetoothManager.State.HEADSET_AVAILABLE) {
                 // Attempt to start Bluetooth SCO audio (takes a few second to start).
+                RTKLogger.d("InCallManager", "Starting Bluetooth SCO audio...");
                 if (!bluetoothManager.startScoAudio()) {
                     // Remove BLUETOOTH from list of available devices since SCO failed.
+                    RTKLogger.e("InCallManager", "Failed to start Bluetooth SCO audio");
                     audioDevices.remove(AudioDevice.BLUETOOTH);
                     audioDeviceSetUpdated = true;
                     if (userSelectedAudioDevice == AudioDevice.BLUETOOTH) {
                         userSelectedAudioDevice = AudioDevice.NONE;
                     }
                     newAudioDevice = getPreferredAudioDevice();
+                } else {
+                    RTKLogger.d("InCallManager", "Bluetooth SCO audio start initiated");
                 }
             }
             
+            // Only fall back from Bluetooth if user didn't explicitly select it
+            // If user selected Bluetooth, wait for SCO connection instead of falling back
             if (newAudioDevice == AudioDevice.BLUETOOTH
-                    && bluetoothManager.getState() != AppRTCBluetoothManager.State.SCO_CONNECTED) {
+                    && bluetoothManager.getState() != AppRTCBluetoothManager.State.SCO_CONNECTED
+                    && userSelectedAudioDevice != AudioDevice.BLUETOOTH) {
                 newAudioDevice = getPreferredAudioDevice(true); // --- skip bluetooth
             }
 
@@ -1817,9 +1120,9 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
 
                 // Do the required device switch.
                 setAudioDeviceInternal(newAudioDevice);
-                // Log.d(TAG, "New device status: "
-                //                 + "available=" + audioDevices + ", "
-                //                 + "selected=" + newAudioDevice);
+                RTKLogger.d("InCallManager", "New device status: "
+                                + "available=" + audioDevices + ", "
+                                + "selected=" + newAudioDevice);
                 /*
                 if (audioManagerEvents != null) {
                     // Notify a listening client that audio device has been changed.
@@ -1828,7 +1131,7 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
                 */
                 sendEvent("onAudioDeviceChanged", getAudioDeviceStatusMap());
             }
-            // Log.d(TAG, "--- updateAudioDeviceState done");
+            RTKLogger.d("InCallManager", "--- updateAudioDeviceState done");
         });
     }