From eddff07eb81868d39740763c41af0873ddc49776 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 24 Jul 2019 11:22:19 -0400
Subject: [PATCH] Fix TimedEventManager crash in a sane way.

Follow up on acb48752c.

Just have the subclass call that method to guarantee that everything is
initialized.
---
 .../securesms/revealable/RevealableMessageManager.java        | 2 ++
 src/org/thoughtcrime/securesms/service/TimedEventManager.java | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/revealable/RevealableMessageManager.java b/src/org/thoughtcrime/securesms/revealable/RevealableMessageManager.java
index 9d7df2f8ba..9d6ec868a2 100644
--- a/src/org/thoughtcrime/securesms/revealable/RevealableMessageManager.java
+++ b/src/org/thoughtcrime/securesms/revealable/RevealableMessageManager.java
@@ -32,6 +32,8 @@ public class RevealableMessageManager extends TimedEventManager<RevealExpiration
 
     this.mmsDatabase        = DatabaseFactory.getMmsDatabase(application);
     this.attachmentDatabase = DatabaseFactory.getAttachmentDatabase(application);
+    
+    scheduleIfNecessary();
   }
 
   @WorkerThread
diff --git a/src/org/thoughtcrime/securesms/service/TimedEventManager.java b/src/org/thoughtcrime/securesms/service/TimedEventManager.java
index 9778ecab4e..ab7bbc31b0 100644
--- a/src/org/thoughtcrime/securesms/service/TimedEventManager.java
+++ b/src/org/thoughtcrime/securesms/service/TimedEventManager.java
@@ -29,10 +29,6 @@ public abstract class TimedEventManager<E> {
 
     this.application = application;
     this.handler     = new Handler(handlerThread.getLooper());
-
-    // XXX Have to delay it because some devices will run the resulting handler#post synchronously,
-    //     triggering a method call to an uninitialized child class.
-    handler.postDelayed(this::scheduleIfNecessary, 5);
   }
 
   /**