change default behavior: no proximity when video

Author: zxcpoiu

README.md

@@ -77,6 +77,7 @@ DeviceEventEmitter.addListener('Proximity', function (data) {
 **on start:**  
 * store current settings, set KeepScreenOn flag = true, and register some event listeners.
 * if media type is `audio`, route voice to earpiece, otherwise route to speaker.
+* audio will enable proximity sensor which is disabled by default if media=video
 * when proximity detect user closed to screen, turn off screen to avoid accident touch and route voice to earpiece.
 * when newly external device plugged, such as wired-headset, route audio to external device.
 

android/src/main/java/com/zxcpoiu/incallmanager/InCallManagerModule.java

@@ -146,7 +146,7 @@ private void acquireProximityWakeLock() {
         }
     }
 
-    private void releaseProximityWakeLock(boolean waitForNoProximity) {
+    private void releaseProximityWakeLock(final boolean waitForNoProximity) {
         if (!isProximityWakeLockSupported()) {
             return;
         }
@@ -509,7 +509,7 @@ public void test_deviceCallback() {
         // -- TODO: bluetooth support
     */
 
-    private static void sendEvent(String eventName, @Nullable WritableMap params) {
+    private static void sendEvent(final String eventName, @Nullable WritableMap params) {
         try {
             reactContext
                 .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
@@ -520,26 +520,21 @@ private static void sendEvent(String eventName, @Nullable WritableMap params) {
     }
 
     @ReactMethod
-    public void start(String media, boolean auto) {
-        if (media == "video") {
+    public void start(final String media, final boolean auto) {
+        if (media.equals("video")) {
             defaultSpeakerOn = true;
         } else {
             defaultSpeakerOn = false;
         }
         automatic = auto;
         if (!audioManagerInitialized) {
             Log.d(TAG, "start audioRouteManager");
-            requestAudioFocus();
-            // TODO: even if not acquired focus, we can still play sounds. but need figure out which is better.
             storeOriginalAudioSetup();
+            startEvents();
+            // TODO: even if not acquired focus, we can still play sounds. but need figure out which is better.
             setMicrophoneMute(false);
             audioManager.setMode(defaultAudioMode);
             updateAudioRoute();
-            startWiredHeadsetEvent();
-            startNoisyAudioEvent();
-            startMediaButtonEvent();
-            startProximitySensor();
-            setKeepScreenOn(true);
             audioManagerInitialized = true;
         }
     }
@@ -548,39 +543,45 @@ public void start(String media, boolean auto) {
     public void stop() {
         if (audioManagerInitialized) {
             Log.d(TAG, "stop audioRouteManager");
-            stopWiredHeadsetEvent();
-            stopNoisyAudioEvent();
-            stopMediaButtonEvent();
-            stopProximitySensor();
+            stopEvents();
             restoreOriginalAudioSetup();
-            releaseAudioFocus();
-            setKeepScreenOn(false);
             audioManagerInitialized = false;
         }
     }
 
     private void pause() {
         if (audioManagerInitialized) {
             Log.d(TAG, "pause audioRouteManager");
-            releaseAudioFocus();
-            stopWiredHeadsetEvent();
-            stopNoisyAudioEvent();
-            stopMediaButtonEvent();
-            stopProximitySensor();
-            setKeepScreenOn(false);
+            stopEvents();
         }
     }
 
     private void resume() {
         if (audioManagerInitialized) {
             Log.d(TAG, "resume audioRouteManager");
-            requestAudioFocus();
-            startWiredHeadsetEvent();
-            startNoisyAudioEvent();
-            startMediaButtonEvent();
+            startEvents();
+        }
+    }
+
+    private void startEvents() {
+        requestAudioFocus();
+        startWiredHeadsetEvent();
+        startNoisyAudioEvent();
+        startMediaButtonEvent();
+        if (!defaultSpeakerOn) {
+            // video, default disable proximity
             startProximitySensor();
-            setKeepScreenOn(true);
         }
+        setKeepScreenOn(true);
+    }
+
+    private void stopEvents() {
+        stopWiredHeadsetEvent();
+        stopNoisyAudioEvent();
+        stopMediaButtonEvent();
+        stopProximitySensor();
+        setKeepScreenOn(false);
+        releaseAudioFocus();
     }
 
     private void requestAudioFocus() {
@@ -664,15 +665,15 @@ public void run() {
     }
 
     @ReactMethod
-    public void setSpeakerphoneOn(boolean enable) {
+    public void setSpeakerphoneOn(final boolean enable) {
         if (enable != audioManager.isSpeakerphoneOn())  {
             Log.d(TAG, "setSpeakerphoneOn(): " + enable);
             audioManager.setSpeakerphoneOn(enable);
         }
     }
 
     @ReactMethod
-    public void setForceSpeakerphoneOn(boolean enable) {
+    public void setForceSpeakerphoneOn(final boolean enable) {
         forceSpeakerOn = enable;
         if (forceSpeakerOn) {
             Log.d(TAG, "setForceSpeakerphoneOn()");
@@ -681,7 +682,7 @@ public void setForceSpeakerphoneOn(boolean enable) {
     }
 
     @ReactMethod
-    public void setMicrophoneMute(boolean enable) {
+    public void setMicrophoneMute(final boolean enable) {
         if (enable != audioManager.isMicrophoneMute())  {
             Log.d(TAG, "setMicrophoneMute(): " + enable);
             audioManager.setMicrophoneMute(enable);

ios/RNInCallManager/RNInCallManager.swift

@@ -54,7 +54,9 @@ class RNInCallManager: NSObject {
         //self.audioSession.setCategory(defaultAudioCategory, options: [.DefaultToSpeaker, .AllowBluetooth])
         _ = try? self.audioSession.setCategory(self.defaultAudioCategory)
         _ = try? self.audioSession.setMode(self.defaultAudioMode)
-        self.startProximitySensor()
+        if media == "audio" {
+            self.startProximitySensor()
+        }
         self.setKeepScreenOn(true)
         self.audioSessionInitialized = true
     }