From 63515e967e9cde49ab39da1f7c5a6872fcfd496a Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Mon, 13 Jul 2015 11:30:39 -0700 Subject: [PATCH] skip camera layout when preview is zero-sized Closes #3648 Fixes #3624 // FREEBIE --- .../thoughtcrime/securesms/components/camera/CameraView.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraView.java b/src/org/thoughtcrime/securesms/components/camera/CameraView.java index c2b114523f..a60f4b75f7 100644 --- a/src/org/thoughtcrime/securesms/components/camera/CameraView.java +++ b/src/org/thoughtcrime/securesms/components/camera/CameraView.java @@ -224,6 +224,11 @@ public class CameraView extends FrameLayout { previewHeight = height; } + if (previewHeight == 0 || previewWidth == 0) { + Log.w(TAG, "skipping layout due to zero-width/height preview size"); + return; + } + boolean useFirstStrategy = (width * previewHeight > height * previewWidth); boolean useFullBleed = getHost().useFullBleedPreview();