Merge commit '0efbccc78cc68c963f9dfa8c19428dc20d0a5ab2'

This commit is contained in:
Peter
2018-09-03 01:09:22 +03:00
3 changed files with 47 additions and 6 deletions

View File

@@ -300,6 +300,12 @@ public final class PendingMessageManager {
} else {
messageContext.state = .waitingForUploadToStart(groupId: message.groupingKey, upload: contentUploadSignal)
}
if let _ = currentGroupId, message.groupingKey != currentGroupId {
currentGroupId = nil
} else {
currentGroupId = message.groupingKey
}
}
if let currentGroupId = currentGroupId {
@@ -469,9 +475,9 @@ public final class PendingMessageManager {
if let current = strongSelf.messageContexts[id] {
strongSelf.beginSendingMessage(messageContext: current, messageId: id, groupId: groupId, content: content)
strongSelf.updateWaitingUploads(peerId: id.peerId)
if let groupId = groupId {
strongSelf.beginSendingGroupIfPossible(groupId: groupId)
}
//if let groupId = groupId {
// strongSelf.beginSendingGroupIfPossible(groupId: groupId)
// }
}
}
}