Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-03-02 15:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up camera flipping, handle having missing cameras.

Browse Source 
Did a refactor to better organize the camera flipping code. Also, I
wanted to make sure we handle the cases where the user doesn't have two
cameras (or no cameras, for that matter). In these cases, we just don't
show the appropriate buttons.
This commit is contained in:
Greyson Parrelli
2018-04-25 11:00:03 -07:00
parent f1c79eaebf
commit ca8fecea9c
11 changed files with 372 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/thoughtcrime/securesms/WebRtcCallActivity.java
View File

@@ -49,6 +49,7 @@ import org.thoughtcrime.securesms.service.WebRtcCallService;
import org.thoughtcrime.securesms.util.ServiceUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.ViewUtil;
import org.thoughtcrime.securesms.webrtc.CameraState;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.SignalProtocolAddress;
@@ -160,10 +161,9 @@ public class WebRtcCallActivity extends Activity {
startService(intent);
}
private void handleSetCameraFlip(boolean isRear) {
private void handleFlipCamera() {
Intent intent = new Intent(this, WebRtcCallService.class);
intent.setAction(WebRtcCallService.ACTION_SET_CAMERA_FLIP);
intent.putExtra(WebRtcCallService.EXTRA_CAMERA_FLIP_REAR, isRear);
intent.setAction(WebRtcCallService.ACTION_FLIP_CAMERA);
startService(intent);
}
@@ -330,10 +330,10 @@ public class WebRtcCallActivity extends Activity {
case UNTRUSTED_IDENTITY: handleUntrustedIdentity(event); break;
}
callScreen.setLocalVideoEnabled(event.isLocalVideoEnabled());
callScreen.setRemoteVideoEnabled(event.isRemoteVideoEnabled());
callScreen.updateAudioState(event.isBluetoothAvailable(), event.isMicrophoneEnabled());
callScreen.setControlsEnabled(event.getState() != WebRtcViewModel.State.CALL_INCOMING);
callScreen.setLocalVideoState(event.getLocalCameraState());
}
private class HangupButtonListener implements WebRtcCallScreen.HangupButtonListener {
@@ -358,7 +358,9 @@ public class WebRtcCallActivity extends Activity {
private class CameraFlipButtonListener implements WebRtcCallControls.CameraFlipButtonListener {
@Override
public void onToggle(boolean isRear) { WebRtcCallActivity.this.handleSetCameraFlip(isRear); }
public void onToggle() {
WebRtcCallActivity.this.handleFlipCamera();
}
}
private class SpeakerButtonListener implements WebRtcCallControls.SpeakerButtonListener {