From 7e4c39c79d1adb58f3181c9674309b1faaecc864 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 2 Mar 2015 18:44:09 +0100 Subject: rescale qr code bitmap in background --- .../org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 0be6c26f6..83e928ec6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -633,16 +633,15 @@ public class ViewKeyActivity extends BaseActivity implements protected Bitmap doInBackground(Void... unused) { String qrCodeContent = Constants.FINGERPRINT_SCHEME + ":" + fingerprint; // render with minimal size - return QrCodeUtils.getQRCodeBitmap(qrCodeContent, 0); + Bitmap qrCode = QrCodeUtils.getQRCodeBitmap(qrCodeContent, 0); + // scale the image up to our actual size. we do this in code rather + // than let the ImageView do this because we don't require filtering. + return Bitmap.createScaledBitmap(qrCode, mQrCode.getHeight(), + mQrCode.getHeight(), false); } protected void onPostExecute(Bitmap qrCode) { - // scale the image up to our actual size. we do this in code rather - // than let the ImageView do this because we don't require filtering. - Bitmap scaled = Bitmap.createScaledBitmap(qrCode, - mQrCode.getHeight(), mQrCode.getHeight(), - false); - mQrCode.setImageBitmap(scaled); + mQrCode.setImageBitmap(qrCode); // simple fade-in animation AlphaAnimation anim = new AlphaAnimation(0.0f, 1.0f); -- cgit v1.2.3