From 983b137cd65ce71eaadc352aaeda7b3ddbf60047 Mon Sep 17 00:00:00 2001
From: Mikunj Varsani <mikunj@live.com.au>
Date: Fri, 13 Mar 2020 10:49:36 +1100
Subject: [PATCH] Handle IndexOutOfBoundsError on QR Code scanning

---
 src/org/thoughtcrime/securesms/qr/ScanningThread.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/qr/ScanningThread.java b/src/org/thoughtcrime/securesms/qr/ScanningThread.java
index 0b38a6afeb..00dde4693a 100644
--- a/src/org/thoughtcrime/securesms/qr/ScanningThread.java
+++ b/src/org/thoughtcrime/securesms/qr/ScanningThread.java
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.qr;
 import android.content.res.Configuration;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import org.thoughtcrime.securesms.logging.Log;
 
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.ChecksumException;
@@ -17,6 +16,7 @@ import com.google.zxing.qrcode.QRCodeReader;
 
 import org.thoughtcrime.securesms.components.camera.CameraView;
 import org.thoughtcrime.securesms.components.camera.CameraView.PreviewFrame;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.util.HashMap;
@@ -114,7 +114,7 @@ public class ScanningThread extends Thread implements CameraView.PreviewCallback
 
       if (result != null) return result.getText();
 
-    } catch (NullPointerException | ChecksumException | FormatException e) {
+    } catch (NullPointerException | ChecksumException | FormatException | IndexOutOfBoundsException e) {
       Log.w(TAG, e);
     } catch (NotFoundException e) {
       // Thanks ZXing...