Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 03:39:05 +01:00
Code Issues Projects Releases Wiki Activity

Fix one crash when showing QR Code

Browse Source
This commit is contained in:
Torsten Grote
2016-08-09 13:05:53 -03:00
parent cb9a85eb88
commit 739e8b4511
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java
View File

@@ -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);

7
briar-android/src/org/briarproject/android/util/QrCodeUtils.java
View File

@@ -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