From 2be7b9bb1552ba246fbe661bf18ec16e50cbff52 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sat, 2 Feb 2019 17:18:30 +0100 Subject: [PATCH] re-add qr-code overlay logo --- src/org/thoughtcrime/securesms/QrShowActivity.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/org/thoughtcrime/securesms/QrShowActivity.java b/src/org/thoughtcrime/securesms/QrShowActivity.java index d3df26378..6091f6892 100644 --- a/src/org/thoughtcrime/securesms/QrShowActivity.java +++ b/src/org/thoughtcrime/securesms/QrShowActivity.java @@ -137,11 +137,8 @@ public class QrShowActivity extends AppCompatActivity implements DcEventCenter.D Bitmap bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888); bitmap.setPixels(pixels, 0, w, 0, 0, w, h); - int configQrOverlayLogo = DcHelper.getInt(this, DcHelper.CONFIG_QR_OVERLAY_LOGO, 1); - if (configQrOverlayLogo != 0) { - Bitmap overlay = BitmapFactory.decodeResource(this.getResources(), R.drawable.qr_overlay); - putOverlay(bitmap, overlay); - } + Bitmap overlay = BitmapFactory.decodeResource(this.getResources(), R.drawable.qr_overlay); + putOverlay(bitmap, overlay); return bitmap; }