From 0ac56ca571571113afcce3a22053d0893973aa04 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sat, 9 Jan 2021 23:36:09 -0500
Subject: [PATCH] Fix crash with ExpiringMessageManager.

---
 .../java/org/thoughtcrime/securesms/ApplicationContext.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index c75b5203d4..3ab6f494af 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -199,6 +199,9 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
   }
 
   public ExpiringMessageManager getExpiringMessageManager() {
+    if (expiringMessageManager == null) {
+      initializeExpiringMessageManager();
+    }
     return expiringMessageManager;
   }