ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 22:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add logic to back actions in login sequence

Browse Source
This commit is contained in:
Peter
2018-12-30 22:53:19 +04:00
parent bae003d3f2
commit 65c57fad4a
10 changed files with 108 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
TelegramUI/ChatController.swift
View File

@@ -4548,7 +4548,7 @@ public final class ChatController: TelegramController, KeyShortcutResponder, Gal
guard let strongSelf = self else {
return
}
let complete = results.count >= Int(totalCount)
let complete = results.count == 0
var navigateIndex: MessageIndex?
strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { current in
if let data = current.search {
@@ -4563,7 +4563,7 @@ public final class ChatController: TelegramController, KeyShortcutResponder, Gal
}
}
navigateIndex = currentIndex
return current.updatedSearch(data.withUpdatedResultsState(ChatSearchResultsState(messageIndices: messageIndices, currentId: currentIndex?.id, totalCount: totalCount, complete: complete)))
return current.updatedSearch(data.withUpdatedResultsState(ChatSearchResultsState(messageIndices: messageIndices, currentId: currentIndex?.id, totalCount: max(Int32(messageIndices.count), totalCount), complete: complete)))
} else {
return current
}
@@ -4599,7 +4599,7 @@ public final class ChatController: TelegramController, KeyShortcutResponder, Gal
guard let strongSelf = self else {
return
}
let complete = results.count != 0
let complete = results.count == 0
strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { current in
if let data = current.search, let previousResultsState = data.resultsState {
let previousSet = Set(previousResultsState.messageIndices)
@@ -4607,7 +4607,7 @@ public final class ChatController: TelegramController, KeyShortcutResponder, Gal
var mergedIndices = messageIndices.filter({ !previousSet.contains($0) })
mergedIndices.append(contentsOf: previousResultsState.messageIndices)
return current.updatedSearch(data.withUpdatedResultsState(ChatSearchResultsState(messageIndices: mergedIndices, currentId: previousResultsState.currentId, totalCount: totalCount, complete: complete)))
return current.updatedSearch(data.withUpdatedResultsState(ChatSearchResultsState(messageIndices: mergedIndices, currentId: previousResultsState.currentId, totalCount: max(totalCount, Int32(mergedIndices.count)), complete: complete)))
} else {
return current
}