Merge branch 'dev' of https://github.com/loki-project/loki-messenger-ios into sync-closed-group

SignalServiceKit/src/Contacts/TSThread.h

@@ -216,6 +216,8 @@ typedef NS_ENUM(NSInteger, LKThreadFriendRequestStatus) {
  */
 - (void)removeOldIncomingFriendRequestMessagesIfNeededWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;
 
+- (TSInteraction *)getLastInteractionWithTransaction:(YapDatabaseReadTransaction *)transaction;
+
 @end
 
 NS_ASSUME_NONNULL_END

SignalServiceKit/src/Contacts/TSThread.m

@@ -292,12 +292,17 @@ ConversationColorName const kConversationColorName_Default = ConversationColorNa
 {
     __block TSInteraction *interaction;
     [self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
-        YapDatabaseViewTransaction *interactions = [transaction ext:TSMessageDatabaseViewExtensionName];
+        interaction = [self getLastInteractionWithTransaction:transaction];
-        interaction = [interactions lastObjectInGroup:self.uniqueId];
     }];
     return interaction;
 }
 
+- (TSInteraction *)getLastInteractionWithTransaction:(YapDatabaseReadTransaction *)transaction
+{
+    YapDatabaseViewTransaction *interactions = [transaction ext:TSMessageDatabaseViewExtensionName];
+    return [interactions lastObjectInGroup:self.uniqueId];
+}
+
 /**
  * Useful for tests and debugging. In production use an enumeration method.
  */

SignalServiceKit/src/Messages/OWSMessageManager.m

@@ -1800,7 +1800,7 @@ 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];
+    TSOutgoingMessage *existingFriendRequestMessage = [[thread getLastInteractionWithTransaction:transaction] as:TSOutgoingMessage.class];
     if (existingFriendRequestMessage != nil && existingFriendRequestMessage.isFriendRequest) {
         [existingFriendRequestMessage saveFriendRequestStatus:LKMessageFriendRequestStatusAccepted withTransaction:transaction];
     }