oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Clean

Browse source
This commit is contained in:
nielsandriesse 2020-05-26 14:20:07 +10:00
parent 6d7f32a1e5
commit ff13f15dfc
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View file

@ -1056,7 +1056,7 @@ typedef enum : NSUInteger {
BOOL shouldDetachBanner = !isContactThread; BOOL shouldDetachBanner = !isContactThread;
if (isContactThread) { if (isContactThread) {
TSContactThread *thread = (TSContactThread *)self.thread; TSContactThread *thread = (TSContactThread *)self.thread;
if (thread.sessionRestoreDevices.count > 0) { // if (thread.sessionRestoreDevices.count > 0) {
if (self.restoreSessionBannerView == nil) { if (self.restoreSessionBannerView == nil) {
LKSessionRestorationView *bannerView = [[LKSessionRestorationView alloc] initWithThread:thread]; LKSessionRestorationView *bannerView = [[LKSessionRestorationView alloc] initWithThread:thread];
[self.view addSubview:bannerView]; [self.view addSubview:bannerView];
@ -1072,9 +1072,9 @@ typedef enum : NSUInteger {
[thread removeAllSessionRestoreDevicesWithTransaction:nil]; [thread removeAllSessionRestoreDevicesWithTransaction:nil];
}]; }];
} }
} else { // } else {
shouldDetachBanner = true; // shouldDetachBanner = true;
} // }
} }
if (shouldDetachBanner && self.restoreSessionBannerView != nil) { if (shouldDetachBanner && self.restoreSessionBannerView != nil) {
[self.restoreSessionBannerView removeFromSuperview]; [self.restoreSessionBannerView removeFromSuperview];

2
SignalServiceKit/src/Messages/OWSMessageDecrypter.m
View file

@ -580,8 +580,6 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
return; 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); OWSFailDebug(@"Could not decrypt UD message: %@.", underlyingError);
failureBlock(underlyingError); failureBlock(underlyingError);
return; return;