mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-12-17 21:02:17 -05:00
Revert "rescale qr code bitmap in background"
size of view may not be available in background thread.
This reverts commit 7e4c39c79d
.
This commit is contained in:
parent
363d41ed1d
commit
d3f54d3ace
@ -633,15 +633,16 @@ public class ViewKeyActivity extends BaseActivity implements
|
|||||||
protected Bitmap doInBackground(Void... unused) {
|
protected Bitmap doInBackground(Void... unused) {
|
||||||
String qrCodeContent = Constants.FINGERPRINT_SCHEME + ":" + fingerprint;
|
String qrCodeContent = Constants.FINGERPRINT_SCHEME + ":" + fingerprint;
|
||||||
// render with minimal size
|
// render with minimal size
|
||||||
Bitmap qrCode = QrCodeUtils.getQRCodeBitmap(qrCodeContent, 0);
|
return 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) {
|
protected void onPostExecute(Bitmap qrCode) {
|
||||||
mQrCode.setImageBitmap(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);
|
||||||
|
|
||||||
// simple fade-in animation
|
// simple fade-in animation
|
||||||
AlphaAnimation anim = new AlphaAnimation(0.0f, 1.0f);
|
AlphaAnimation anim = new AlphaAnimation(0.0f, 1.0f);
|
||||||
|
Loading…
Reference in New Issue
Block a user