From 4516de4add2ad12299bbf4b78757c7ca07f53177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Tue, 22 Nov 2022 19:49:51 +0100 Subject: [PATCH] Remove no longer needed condition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that the event is posted only for proximity sensor changes the condition is no longer needed. Signed-off-by: Daniel Calviño Sánchez --- .../talk/activities/CallActivity.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java index fddc97f59..2402579e6 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java @@ -2125,19 +2125,13 @@ public class CallActivity extends CallBaseActivity { @Subscribe(threadMode = ThreadMode.MAIN) public void onMessageEvent(ProximitySensorEvent proximitySensorEvent) { - if (proximitySensorEvent.getProximitySensorEventType() == - ProximitySensorEvent.ProximitySensorEventType.SENSOR_FAR || - proximitySensorEvent.getProximitySensorEventType() == - ProximitySensorEvent.ProximitySensorEventType.SENSOR_NEAR) { - - if (!isVoiceOnlyCall) { - boolean enableVideo = proximitySensorEvent.getProximitySensorEventType() == - ProximitySensorEvent.ProximitySensorEventType.SENSOR_FAR && videoOn; - if (EffortlessPermissions.hasPermissions(this, PERMISSIONS_CAMERA) && - (currentCallStatus == CallStatus.CONNECTING || isConnectionEstablished()) && videoOn - && enableVideo != localVideoTrack.enabled()) { - toggleMedia(enableVideo, true); - } + if (!isVoiceOnlyCall) { + boolean enableVideo = proximitySensorEvent.getProximitySensorEventType() == + ProximitySensorEvent.ProximitySensorEventType.SENSOR_FAR && videoOn; + if (EffortlessPermissions.hasPermissions(this, PERMISSIONS_CAMERA) && + (currentCallStatus == CallStatus.CONNECTING || isConnectionEstablished()) && videoOn + && enableVideo != localVideoTrack.enabled()) { + toggleMedia(enableVideo, true); } } }