diff --git a/briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java b/briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java index 8f508b33c59783244e8bd45df4e11f04186d1e07..36d8e305b0423d072e349382e9d9a3c580cefb4f 100644 --- a/briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java +++ b/briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java @@ -295,7 +295,7 @@ public class ShowQrCodeFragment extends BaseEventFragment String input = Base64.encodeToString( payloadEncoder.encode(localPayload), 0); qrCode.setImageBitmap( - QrCodeUtils.createQrCode(getActivity(), input)); + QrCodeUtils.createQrCode((Context) listener, input)); // Simple fade-in animation AlphaAnimation anim = new AlphaAnimation(0.0f, 1.0f); anim.setDuration(200); diff --git a/briar-android/src/org/briarproject/android/util/QrCodeUtils.java b/briar-android/src/org/briarproject/android/util/QrCodeUtils.java index ef8ff6ec6714e4c6a8f444d6c26a011053a9f21d..8a09d2cd8536dcb4a82dbeb5b9f81f67968257ad 100644 --- a/briar-android/src/org/briarproject/android/util/QrCodeUtils.java +++ b/briar-android/src/org/briarproject/android/util/QrCodeUtils.java @@ -1,6 +1,6 @@ package org.briarproject.android.util; -import android.app.Activity; +import android.content.Context; import android.graphics.Bitmap; import android.graphics.Color; import android.util.DisplayMetrics; @@ -19,10 +19,9 @@ public class QrCodeUtils { private static final Logger LOG = Logger.getLogger(QrCodeUtils.class.getName()); - public static Bitmap createQrCode(Activity activity, String input) { + public static Bitmap createQrCode(Context context, String input) { // Get narrowest screen dimension - DisplayMetrics dm = new DisplayMetrics(); - activity.getWindowManager().getDefaultDisplay().getMetrics(dm); + DisplayMetrics dm = context.getResources().getDisplayMetrics(); int smallestDimen = Math.min(dm.widthPixels, dm.heightPixels); try { // Generate QR code