Don't show error messages before restoration

src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java

@@ -1072,7 +1072,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
                                     @NonNull Optional<Long> smsMessageId)
   {
     SmsDatabase smsDatabase = DatabaseFactory.getSmsDatabase(context);
-
+    if (SessionMetaProtocol.shouldErrorMessageShow(context, timestamp)) {
       if (!smsMessageId.isPresent()) {
         Optional<InsertResult> insertResult = insertPlaceholder(sender, senderDevice, timestamp);
 
@@ -1083,14 +1083,15 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
       } else {
         smsDatabase.markAsDecryptFailed(smsMessageId.get());
       }
-    SessionManagementProtocol.triggerSessionRestorationUI(context, sender);
+    }
+    SessionManagementProtocol.triggerSessionRestorationUI(context, sender, timestamp);
   }
 
   private void handleNoSessionMessage(@NonNull String sender, int senderDevice, long timestamp,
                                       @NonNull Optional<Long> smsMessageId)
   {
     SmsDatabase smsDatabase = DatabaseFactory.getSmsDatabase(context);
-
+    if (SessionMetaProtocol.shouldErrorMessageShow(context, timestamp)) {
       if (!smsMessageId.isPresent()) {
         Optional<InsertResult> insertResult = insertPlaceholder(sender, senderDevice, timestamp);
 
@@ -1101,7 +1102,8 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
       } else {
         smsDatabase.markAsNoSession(smsMessageId.get());
       }
-    SessionManagementProtocol.triggerSessionRestorationUI(context, sender);
+    }
+    SessionManagementProtocol.triggerSessionRestorationUI(context, sender, timestamp);
   }
 
   private void handleLegacyMessage(@NonNull String sender, int senderDevice, long timestamp,

src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt

@@ -30,6 +30,12 @@ object SessionMetaProtocol {
         return shouldIgnoreMessage
     }
 
+    @JvmStatic
+    fun shouldErrorMessageShow(context: Context, timestamp: Long): Boolean {
+        val restorationTimestamp = TextSecurePreferences.getRestorationTime(context)
+        return timestamp > restorationTimestamp
+    }
+
     @JvmStatic
     fun handleProfileUpdateIfNeeded(context: Context, content: SignalServiceContent) {
         val rawDisplayName = content.senderDisplayName.orNull() ?: return