From 57db0bd2112844f0e3ed58a84aab4a6b70c9b884 Mon Sep 17 00:00:00 2001 From: Mikunj Date: Tue, 10 Dec 2019 15:59:20 +1100 Subject: [PATCH] Clean --- .../ConversationView/ConversationViewController.m | 8 ++++---- SignalServiceKit/src/Contacts/Threads/TSContactThread.h | 2 +- SignalServiceKit/src/Contacts/Threads/TSContactThread.m | 2 +- SignalServiceKit/src/Messages/OWSMessageSender.m | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index cb33c845a..e40f46059 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -980,7 +980,7 @@ typedef enum : NSUInteger { [self restoreSession]; }]; [bannerView setOnDismiss:^{ - [thread removeAllRessionRestoreDevicesWithTransaction:nil]; + [thread removeAllSessionRestoreDevicesWithTransaction:nil]; }]; } } else { @@ -1000,11 +1000,11 @@ typedef enum : NSUInteger { // rebuild the indicator view every time. [self.bannerView removeFromSuperview]; self.bannerView = nil; - + if (self.userHasScrolled) { return; } - + NSArray *noLongerVerifiedRecipientIds = [self noLongerVerifiedRecipientIds]; if (noLongerVerifiedRecipientIds.count > 0) { @@ -1182,7 +1182,7 @@ typedef enum : NSUInteger { [[[TSInfoMessage alloc] initWithTimestamp:NSDate.ows_millisecondTimeStamp inThread:thread messageType:TSInfoMessageTypeLokiSessionResetInProgress] save]; thread.sessionResetState = TSContactThreadSessionResetStateRequestReceived; [thread save]; - [thread removeAllRessionRestoreDevicesWithTransaction:nil]; + [thread removeAllSessionRestoreDevicesWithTransaction:nil]; } } diff --git a/SignalServiceKit/src/Contacts/Threads/TSContactThread.h b/SignalServiceKit/src/Contacts/Threads/TSContactThread.h index 9b62cd4d1..75ed6b416 100644 --- a/SignalServiceKit/src/Contacts/Threads/TSContactThread.h +++ b/SignalServiceKit/src/Contacts/Threads/TSContactThread.h @@ -52,7 +52,7 @@ extern NSString *const TSContactThreadPrefix; - (void)addSessionRestoreDevice:(NSString *)hexEncodedPublicKey transaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction; -- (void)removeAllRessionRestoreDevicesWithTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction; +- (void)removeAllSessionRestoreDevicesWithTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction; @end diff --git a/SignalServiceKit/src/Contacts/Threads/TSContactThread.m b/SignalServiceKit/src/Contacts/Threads/TSContactThread.m index c0ba4c804..765943100 100644 --- a/SignalServiceKit/src/Contacts/Threads/TSContactThread.m +++ b/SignalServiceKit/src/Contacts/Threads/TSContactThread.m @@ -118,7 +118,7 @@ NSString *const TSContactThreadPrefix = @"c"; [self setSessionRestoreDevices:[set allObjects] transaction:transaction]; } -- (void)removeAllRessionRestoreDevicesWithTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction +- (void)removeAllSessionRestoreDevicesWithTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction { [self setSessionRestoreDevices:@[] transaction:transaction]; } diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index 4d11a2e62..845af8bf4 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -1335,7 +1335,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; [message.thread saveFriendRequestStatus:LKThreadFriendRequestStatusRequestSent withTransaction:transaction]; [message.thread removeOldOutgoingFriendRequestMessagesIfNeededWithTransaction:transaction]; if ([message.thread isKindOfClass:[TSContactThread class]]) { - [((TSContactThread *) message.thread) removeAllRessionRestoreDevicesWithTransaction:transaction]; + [((TSContactThread *) message.thread) removeAllSessionRestoreDevicesWithTransaction:transaction]; } // Update the message [message saveFriendRequestStatus:LKMessageFriendRequestStatusPending withTransaction:transaction];