From e5189e0c3953963bef29a12da8a22fb0f779a34c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Tue, 13 Jun 2017 11:00:47 +0200
Subject: [PATCH] tls-psk: fix bug with zero size layout

---
 .../keychain/ui/transfer/view/TransferFragment.java        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferFragment.java
index f44768132..c4c822229 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferFragment.java
@@ -249,9 +249,12 @@ public class TransferFragment extends Fragment implements TransferMvpView {
                 new OnGlobalLayoutListener() {
                     @Override
                     public void onGlobalLayout() {
+                        int viewSize = vQrCodeImage.getWidth();
+                        if (viewSize == 0) {
+                            return;
+                        }
                         // create actual bitmap in display dimensions
-                        Bitmap scaled = Bitmap.createScaledBitmap(qrCode,
-                                vQrCodeImage.getWidth(), vQrCodeImage.getWidth(), false);
+                        Bitmap scaled = Bitmap.createScaledBitmap(qrCode, viewSize, viewSize, false);
                         vQrCodeImage.setImageBitmap(scaled);
                     }
                 });