1 files changed, 9 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java
index b24ee84a4..d3c1d971a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java
@@ -21,6 +21,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
+import android.support.v7.widget.CardView;
 import android.view.View;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.widget.ImageView;
@@ -37,7 +38,8 @@ import org.sufficientlysecure.keychain.util.Log;
 
 public class QrCodeViewActivity extends BaseActivity {
 
-    private ImageView mFingerprintQrCode;
+    private ImageView mQrCode;
+    private CardView mQrCodeLayout;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -61,9 +63,10 @@ public class QrCodeViewActivity extends BaseActivity {
             return;
         }
 
-        mFingerprintQrCode = (ImageView) findViewById(R.id.qr_code_image);
+        mQrCode = (ImageView) findViewById(R.id.qr_code_image);
+        mQrCodeLayout = (CardView) findViewById(R.id.qr_code_image_layout);
 
-        mFingerprintQrCode.setOnClickListener(new View.OnClickListener() {
+        mQrCodeLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 ActivityCompat.finishAfterTransition(QrCodeViewActivity.this);
@@ -87,14 +90,14 @@ public class QrCodeViewActivity extends BaseActivity {
             // create a minimal size qr code, we can keep this in ram no problem
             final Bitmap qrCode = QrCodeUtils.getQRCodeBitmap(qrCodeContent, 0);
 
-            mFingerprintQrCode.getViewTreeObserver().addOnGlobalLayoutListener(
+            mQrCode.getViewTreeObserver().addOnGlobalLayoutListener(
                     new OnGlobalLayoutListener() {
                         @Override
                         public void onGlobalLayout() {
                             // create actual bitmap in display dimensions
                             Bitmap scaled = Bitmap.createScaledBitmap(qrCode,
-                                    mFingerprintQrCode.getWidth(), mFingerprintQrCode.getWidth(), false);
-                            mFingerprintQrCode.setImageBitmap(scaled);
+                                    mQrCode.getWidth(), mQrCode.getWidth(), false);
+                            mQrCode.setImageBitmap(scaled);
                         }
                     });
         } catch (ProviderHelper.NotFoundException e) {