From ff13f15dfcdbfc9a0314e27b1c90beb1b51091c8 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 26 May 2020 14:20:07 +1000
Subject: [PATCH] Clean

---
 .../ConversationView/ConversationViewController.m         | 8 ++++----
 SignalServiceKit/src/Messages/OWSMessageDecrypter.m       | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index a6acb0fc5..cfffa256c 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -1056,7 +1056,7 @@ typedef enum : NSUInteger {
     BOOL shouldDetachBanner = !isContactThread;
     if (isContactThread) {
         TSContactThread *thread = (TSContactThread *)self.thread;
-        if (thread.sessionRestoreDevices.count > 0) {
+//        if (thread.sessionRestoreDevices.count > 0) {
             if (self.restoreSessionBannerView == nil) {
                 LKSessionRestorationView *bannerView = [[LKSessionRestorationView alloc] initWithThread:thread];
                 [self.view addSubview:bannerView];
@@ -1072,9 +1072,9 @@ typedef enum : NSUInteger {
                     [thread removeAllSessionRestoreDevicesWithTransaction:nil];
                 }];
             }
-        } else {
-            shouldDetachBanner = true;
-        }
+//        } else {
+//            shouldDetachBanner = true;
+//        }
     }
     if (shouldDetachBanner && self.restoreSessionBannerView != nil) {
         [self.restoreSessionBannerView removeFromSuperview];
diff --git a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m
index ff89c7adf..dbaf009cf 100644
--- a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m
+++ b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m
@@ -580,8 +580,6 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
                 return;
             }
 
-            // FIXME: This can be hit if someone sends an invalid pre key. We should probably try to recover with a session reset.
-
             OWSFailDebug(@"Could not decrypt UD message: %@.", underlyingError);
             failureBlock(underlyingError);
             return;