From 4c0aa6a23549366a973b12df0f01581b5610e4b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Kr=C3=BCger?= Date: Fri, 23 Sep 2022 11:45:46 +0200 Subject: [PATCH] Clearify PTT (=push to talk) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So that my future self and other valued developrs don't must also research that the variable 'isPTTActive' is renamed to 'isPushToTalkActive'. Signed-off-by: Tim Krüger --- .../talk/activities/CallActivity.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 b7d95ec74..84f84b4bf 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java @@ -258,7 +258,7 @@ public class CallActivity extends CallBaseActivity { private Handler cameraSwitchHandler = new Handler(); // push to talk - private boolean isPTTActive = false; + private boolean isPushToTalkActive = false; private PulseAnimation pulseAnimation; private String baseUrl; @@ -401,7 +401,7 @@ public class CallActivity extends CallBaseActivity { callControlHandler.removeCallbacksAndMessages(null); callInfosHandler.removeCallbacksAndMessages(null); cameraSwitchHandler.removeCallbacksAndMessages(null); - isPTTActive = true; + isPushToTalkActive = true; binding.callControls.setVisibility(View.VISIBLE); if (!isVoiceOnlyCall) { binding.switchSelfVideoButton.setVisibility(View.VISIBLE); @@ -952,7 +952,7 @@ public class CallActivity extends CallBaseActivity { appPreferences.setPushToTalkIntroShown(true); } - if (!isPTTActive) { + if (!isPushToTalkActive) { microphoneOn = !microphoneOn; if (microphoneOn) { @@ -1107,7 +1107,7 @@ public class CallActivity extends CallBaseActivity { if (spotlightView != null && spotlightView.getVisibility() != View.GONE) { spotlightView.setVisibility(View.GONE); } - } else if (!isPTTActive) { + } else if (!isPushToTalkActive) { float alpha; long duration; @@ -1156,7 +1156,7 @@ public class CallActivity extends CallBaseActivity { callControlHandler.postDelayed(new Runnable() { @Override public void run() { - if (!isPTTActive) { + if (!isPushToTalkActive) { animateCallControls(false, 0); } } @@ -1183,7 +1183,7 @@ public class CallActivity extends CallBaseActivity { callInfosHandler.postDelayed(new Runnable() { @Override public void run() { - if (!isPTTActive) { + if (!isPushToTalkActive) { animateCallControls(false, 0); } } @@ -2523,7 +2523,7 @@ public class CallActivity extends CallBaseActivity { binding.callInfosLinearLayout.setVisibility(View.GONE); } - if (!isPTTActive) { + if (!isPushToTalkActive) { animateCallControls(false, 5000); } @@ -2642,8 +2642,8 @@ public class CallActivity extends CallBaseActivity { @Override public boolean onTouch(View v, MotionEvent event) { v.onTouchEvent(event); - if (event.getAction() == MotionEvent.ACTION_UP && isPTTActive) { - isPTTActive = false; + if (event.getAction() == MotionEvent.ACTION_UP && isPushToTalkActive) { + isPushToTalkActive = false; binding.microphoneButton.getHierarchy().setPlaceholderImage(R.drawable.ic_mic_off_white_24px); pulseAnimation.stop(); toggleMedia(false, false);