tls-psk: fix bug with zero size layout

2017-06-13 11:00:47 +02:00
parent 23b1f6d7e5
commit e5189e0c39
1 changed files with 5 additions and 2 deletions
--- 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);
                    }
                });