From 24d70341ed8e9d6212939f0dc8c85b16c1d2b5bd Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Tue, 5 May 2020 10:32:26 +1000 Subject: [PATCH] Clean --- SignalServiceKit/src/Contacts/TSThread.h | 3 +-- .../src/Messages/Interactions/TSMessage.m | 16 ---------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/SignalServiceKit/src/Contacts/TSThread.h b/SignalServiceKit/src/Contacts/TSThread.h index 468031a0d..dcc4d2fa0 100644 --- a/SignalServiceKit/src/Contacts/TSThread.h +++ b/SignalServiceKit/src/Contacts/TSThread.h @@ -148,6 +148,7 @@ extern ConversationColorName const kConversationColorName_Default; - (void)removeAllThreadInteractionsWithTransaction:(YapDatabaseReadWriteTransaction *)transaction; +- (TSInteraction *)getLastInteractionWithTransaction:(YapDatabaseReadTransaction *)transaction; #pragma mark Disappearing Messages @@ -193,8 +194,6 @@ extern ConversationColorName const kConversationColorName_Default; */ - (void)removeOldIncomingFriendRequestMessagesIfNeededWithTransaction:(YapDatabaseReadWriteTransaction *)transaction; -- (TSInteraction *)getLastInteractionWithTransaction:(YapDatabaseReadTransaction *)transaction; - @end NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.m b/SignalServiceKit/src/Messages/Interactions/TSMessage.m index 86a2a182f..0ca0ac5b9 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m @@ -447,22 +447,6 @@ static const NSUInteger OWSMessageSchemaVersion = 4; #pragma mark - Loki Friend Request Handling -// Left here for migration purposes -- (void)saveFriendRequestStatus:(LKMessageFriendRequestStatus)friendRequestStatus withTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction -{ - self.friendRequestStatus = friendRequestStatus; - void (^postNotification)() = ^() { - [NSNotificationCenter.defaultCenter postNotificationName:NSNotification.messageFriendRequestStatusChanged object:self.uniqueId]; - }; - if (transaction == nil) { - [self save]; - [self.dbReadWriteConnection flushTransactionsWithCompletionQueue:dispatch_get_main_queue() completionBlock:^{ postNotification(); }]; - } else { - [self saveWithTransaction:transaction]; - [transaction.connection flushTransactionsWithCompletionQueue:dispatch_get_main_queue() completionBlock:^{ postNotification(); }]; - } -} - - (void)saveFriendRequestExpiresAt:(u_int64_t)expiresAt withTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction { self.friendRequestExpiresAt = expiresAt;