TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 14:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE on call initalization

Browse Source
This commit is contained in:
Alex Hart 2019-12-16 11:01:32 -04:00
parent 8121c8bd41
commit 4173efbe5a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
View File

@ -205,6 +205,8 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientForeverObs
localRenderer.setMirror(cameraState.getActiveDirection() == CameraState.Direction.FRONT); localRenderer.setMirror(cameraState.getActiveDirection() == CameraState.Direction.FRONT);
this.localRenderer = localRenderer;
if (localRenderLayout.getChildCount() != 0) { if (localRenderLayout.getChildCount() != 0) {
displayLocalRendererInSmallLayout(!cameraState.isEnabled()); displayLocalRendererInSmallLayout(!cameraState.isEnabled());
} else { } else {
@ -238,8 +240,11 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientForeverObs
private void displayLocalRendererInLargeLayout(boolean hide) { private void displayLocalRendererInLargeLayout(boolean hide) {
if (localLargeRenderLayout.getChildCount() == 0) { if (localLargeRenderLayout.getChildCount() == 0) {
localRenderLayout.removeAllViews(); localRenderLayout.removeAllViews();
if (localRenderer != null) {
localLargeRenderLayout.addView(localRenderer); localLargeRenderLayout.addView(localRenderer);
} }
}
localRenderLayout.setHidden(true); localRenderLayout.setHidden(true);
localRenderLayout.requestLayout(); localRenderLayout.requestLayout();
@ -257,8 +262,11 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientForeverObs
private void displayLocalRendererInSmallLayout(boolean hide) { private void displayLocalRendererInSmallLayout(boolean hide) {
if (localRenderLayout.getChildCount() == 0) { if (localRenderLayout.getChildCount() == 0) {
localLargeRenderLayout.removeAllViews(); localLargeRenderLayout.removeAllViews();
if (localRenderer != null) {
localRenderLayout.addView(localRenderer); localRenderLayout.addView(localRenderer);
} }
}
localLargeRenderLayout.setHidden(true); localLargeRenderLayout.setHidden(true);
localLargeRenderLayout.requestLayout(); localLargeRenderLayout.requestLayout();