From 739e8b45115080128262d7914b997a0327728e55 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 9 Aug 2016 13:05:53 -0300
Subject: [PATCH] Fix one crash when showing QR Code
---
.../android/keyagreement/ShowQrCodeFragment.java | 2 +-
.../src/org/briarproject/android/util/QrCodeUtils.java | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java b/briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java
index 8f508b33c5..36d8e305b0 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 ef8ff6ec67..8a09d2cd85 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
--
GitLab