fix typo & ignore error messages before restoration

SignalServiceKit/src/Loki/Protocol/Meta/SessionMetaProtocol.swift

@@ -94,6 +94,12 @@ public final class SessionMetaProtocol : NSObject {
     }
 
     // MARK: - Receiving
+    
+    @objc(isErrorMessageBeforeRestoration:)
+    public static func isErrorMessageBeforeRestoration(_ errorMessage: TSErrorMessage) -> Bool {
+        let restorationTimeInMs = UInt64(storage.getRestorationTime() * 1000)
+        return errorMessage.timestamp < restorationTimeInMs
+    }
 
     @objc(shouldSkipMessageDecryptResult:wrappedIn:)
     public static func shouldSkipMessageDecryptResult(_ result: OWSMessageDecryptResult, wrappedIn envelope: SSKProtoEnvelope) -> Bool {

SignalServiceKit/src/Messages/OWSMessageDecrypter.m

@@ -526,7 +526,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
             NSError *_Nullable underlyingError;
             SSKProtoEnvelope *_Nullable identifiedEnvelope;
 
-            if (![decryptError.domain isEqualToString:@"SignalMetadataKit.SecretSessionKnownSenderError"]) {
+            if (![decryptError.domain isEqualToString:@"SessionMetadataKit.SecretSessionKnownSenderError"]) {
                 underlyingError = decryptError;
                 identifiedEnvelope = envelope;
             } else {
@@ -574,7 +574,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
                 return;
             }
 
-            if ([underlyingError.domain isEqualToString:@"SignalMetadataKit.SMKSecretSessionCipherError"]
+            if ([underlyingError.domain isEqualToString:@"SessionMetadataKit.SMKSecretSessionCipherError"]
                 && underlyingError.code == SMKSecretSessionCipherErrorSelfSentMessage) {
                 // Self-sent messages can be safely discarded.
                 failureBlock(underlyingError);
@@ -672,9 +672,17 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
 
         OWSAssertDebug(errorMessage);
         if (errorMessage != nil) {
-            [errorMessage saveWithTransaction:transaction];
             [LKSessionManagementProtocol handleDecryptionError:errorMessage.errorType forPublicKey:envelope.source transaction:transaction];
-            [self notifyUserForErrorMessage:errorMessage envelope:envelope transaction:transaction];
+            if (![LKSessionMetaProtocol isErrorMessageBeforeRestoration:errorMessage]) {
+                [errorMessage saveWithTransaction:transaction];
+                [self notifyUserForErrorMessage:errorMessage envelope:envelope transaction:transaction];
+            } else {
+                // Show the thread if it exists before restoration
+                NSString *masterPublicKey = [LKDatabaseUtilities getMasterHexEncodedPublicKeyFor:envelope.source in:transaction] ?: envelope.source;
+                TSThread *contactThread = [TSContactThread getOrCreateThreadWithContactId:masterPublicKey transaction:transaction];
+                contactThread.shouldThreadBeVisible = true;
+                [contactThread saveWithTransaction:transaction];
+            }
         }
     } error:nil];
 }