From 917744f09189747c3a4598cd30048197464ab478 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Mon, 10 Jan 2022 09:58:45 -0500
Subject: [PATCH] Fix NPE in HackyPager

---
 .../securesms/components/viewpager/HackyViewPager.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java b/app/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java
index 0042d22b2d..fbf9112cca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java
@@ -47,7 +47,7 @@ public class HackyViewPager extends ViewPager {
   public boolean onTouchEvent(MotionEvent ev) {
     try {
       return super.onTouchEvent(ev);
-    } catch (IndexOutOfBoundsException e) {
+    } catch (IndexOutOfBoundsException | NullPointerException e) {
       Log.w(TAG, e);
       return true;
     }