Fix threading

pull/84/head
Niels Andriesse 6 years ago
parent 0ef4998b17
commit b5dcf4b78e

@ -19,6 +19,7 @@ class AppUpdateNag: NSObject {
@objc @objc
public func showAppUpgradeNagIfNecessary() { public func showAppUpgradeNagIfNecessary() {
return
guard let currentVersion = self.currentVersion else { guard let currentVersion = self.currentVersion else {
owsFailDebug("currentVersion was unexpectedly nil") owsFailDebug("currentVersion was unexpectedly nil")

@ -1788,10 +1788,12 @@ NS_ASSUME_NONNULL_BEGIN
if (thread.friendRequestStatus == LKThreadFriendRequestStatusNone) { return; } if (thread.friendRequestStatus == LKThreadFriendRequestStatusNone) { return; }
// Become happy friends and go on great adventures // Become happy friends and go on great adventures
[thread saveFriendRequestStatus:LKThreadFriendRequestStatusFriends withTransaction:transaction]; [thread saveFriendRequestStatus:LKThreadFriendRequestStatusFriends withTransaction:transaction];
dispatch_async(dispatch_get_main_queue(), ^{
TSOutgoingMessage *existingFriendRequestMessage = [thread.lastInteraction as:TSOutgoingMessage.class]; TSOutgoingMessage *existingFriendRequestMessage = [thread.lastInteraction as:TSOutgoingMessage.class];
if (existingFriendRequestMessage != nil && existingFriendRequestMessage.isFriendRequest) { if (existingFriendRequestMessage != nil && existingFriendRequestMessage.isFriendRequest) {
[existingFriendRequestMessage saveFriendRequestStatus:LKMessageFriendRequestStatusAccepted withTransaction:transaction]; [existingFriendRequestMessage saveFriendRequestStatus:LKMessageFriendRequestStatusAccepted withTransaction:transaction];
} }
});
// Send our P2P details // Send our P2P details
LKAddressMessage *_Nullable onlineMessage = [LKP2PAPI onlineBroadcastMessageForThread:thread]; LKAddressMessage *_Nullable onlineMessage = [LKP2PAPI onlineBroadcastMessageForThread:thread];
if (onlineMessage != nil) { if (onlineMessage != nil) {

Loading…
Cancel
Save