gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Safeguard against crashes on devices with no camera

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-14 22:40:29 +01:00
parent 8df1cdf964
commit a3c54fd854
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -504,6 +504,10 @@ public class CallActivity extends AppCompatActivity {
onMicrophoneClick(); onMicrophoneClick();
} }
if (cameraEnumerator.getDeviceNames().length == 0) {
cameraControlButton.setVisibility(View.GONE);
}
if (cameraSwitchButton != null && cameraEnumerator.getDeviceNames().length > 1) { if (cameraSwitchButton != null && cameraEnumerator.getDeviceNames().length > 1) {
cameraSwitchButton.setVisibility(View.VISIBLE); cameraSwitchButton.setVisibility(View.VISIBLE);
} }
@ -518,6 +522,10 @@ public class CallActivity extends AppCompatActivity {
onCameraClick(); onCameraClick();
} }
if (cameraEnumerator.getDeviceNames().length == 0) {
cameraControlButton.setVisibility(View.GONE);
}
if (cameraSwitchButton != null && cameraEnumerator.getDeviceNames().length > 1) { if (cameraSwitchButton != null && cameraEnumerator.getDeviceNames().length > 1) {
cameraSwitchButton.setVisibility(View.VISIBLE); cameraSwitchButton.setVisibility(View.VISIBLE);
} }
@ -606,16 +614,19 @@ public class CallActivity extends AppCompatActivity {
videoCapturer = createCameraCapturer(cameraEnumerator); videoCapturer = createCameraCapturer(cameraEnumerator);
//Create a VideoSource instance //Create a VideoSource instance
videoSource = peerConnectionFactory.createVideoSource(videoCapturer); if (videoCapturer != null) {
localVideoTrack = peerConnectionFactory.createVideoTrack("NCv0", videoSource); videoSource = peerConnectionFactory.createVideoSource(videoCapturer);
localMediaStream.addTrack(localVideoTrack); localVideoTrack = peerConnectionFactory.createVideoTrack("NCv0", videoSource);
localVideoTrack.setEnabled(false); localMediaStream.addTrack(localVideoTrack);
localVideoTrack.setEnabled(false);
//create a videoRenderer based on SurfaceViewRenderer instance
localRenderer = new VideoRenderer(pipVideoView);
// And finally, with our VideoRenderer ready, we
// can add our renderer to the VideoTrack.
localVideoTrack.addRenderer(localRenderer);
}
//create a videoRenderer based on SurfaceViewRenderer instance
localRenderer = new VideoRenderer(pipVideoView);
// And finally, with our VideoRenderer ready, we
// can add our renderer to the VideoTrack.
localVideoTrack.addRenderer(localRenderer);
} }
private void microphoneInitialization() { private void microphoneInitialization() {