From 0ee6197d7ff4fb81caa22f681dbc4bb28d8f1327 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 1 Aug 2017 10:21:02 -0300
Subject: [PATCH] Catch IllegalArgumentException when decoding QrCode
---
.../briar/android/keyagreement/ShowQrCodeFragment.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java
index 29a249d60e..ddb452e35a 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java
@@ -218,7 +218,7 @@ public class ShowQrCodeFragment extends BaseEventFragment
statusView.setVisibility(VISIBLE);
status.setText(R.string.connecting_to_device);
task.connectAndRunProtocol(remotePayload);
- } catch (IOException e) {
+ } catch (IOException | IllegalArgumentException e) {
// TODO show failure
Toast.makeText(getActivity(), R.string.qr_code_invalid,
LENGTH_LONG).show();
--
GitLab