From b5dcf4b78ef53c391131ff354f260fac157ebfca Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 4 Feb 2020 15:48:17 +1100 Subject: [PATCH] Fix threading --- Signal/src/util/AppUpdateNag.swift | 3 ++- SignalServiceKit/src/Messages/OWSMessageManager.m | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Signal/src/util/AppUpdateNag.swift b/Signal/src/util/AppUpdateNag.swift index 4f5c9e47f..f1c3cb4e9 100644 --- a/Signal/src/util/AppUpdateNag.swift +++ b/Signal/src/util/AppUpdateNag.swift @@ -19,7 +19,8 @@ class AppUpdateNag: NSObject { @objc public func showAppUpgradeNagIfNecessary() { - + return + guard let currentVersion = self.currentVersion else { owsFailDebug("currentVersion was unexpectedly nil") return diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index ff1155cb1..618672752 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -1788,10 +1788,12 @@ NS_ASSUME_NONNULL_BEGIN if (thread.friendRequestStatus == LKThreadFriendRequestStatusNone) { return; } // Become happy friends and go on great adventures [thread saveFriendRequestStatus:LKThreadFriendRequestStatusFriends withTransaction:transaction]; - TSOutgoingMessage *existingFriendRequestMessage = [thread.lastInteraction as:TSOutgoingMessage.class]; - if (existingFriendRequestMessage != nil && existingFriendRequestMessage.isFriendRequest) { - [existingFriendRequestMessage saveFriendRequestStatus:LKMessageFriendRequestStatusAccepted withTransaction:transaction]; - } + dispatch_async(dispatch_get_main_queue(), ^{ + TSOutgoingMessage *existingFriendRequestMessage = [thread.lastInteraction as:TSOutgoingMessage.class]; + if (existingFriendRequestMessage != nil && existingFriendRequestMessage.isFriendRequest) { + [existingFriendRequestMessage saveFriendRequestStatus:LKMessageFriendRequestStatusAccepted withTransaction:transaction]; + } + }); // Send our P2P details LKAddressMessage *_Nullable onlineMessage = [LKP2PAPI onlineBroadcastMessageForThread:thread]; if (onlineMessage != nil) {