Skip to content

Commit 937eae7

Browse files
laktyushinlaktyushin
committed
Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios
2 parents ec53c5d + 1425fd8 commit 937eae7

34 files changed

+250
-154
lines changed

‎.bazelrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ build:swift_profile --local_cpu_resources=1
2727
build:swift_profile --features=-swift.enable_batch_mode
2828
build:swift_profile --experimental_ui_max_stdouterr_bytes=104857600
2929
build:swift_profile --@build_bazel_rules_swift//swift:copt=-Xfrontend
30-
build:swift_profile --@build_bazel_rules_swift//swift:copt=-debug-time-function-bodies
30+
build:swift_profile --@build_bazel_rules_swift//swift:copt=-warn-long-function-bodies=350
3131
build:swift_profile --@build_bazel_rules_swift//swift:copt=-Xfrontend
32-
build:swift_profile --@build_bazel_rules_swift//swift:copt=-debug-time-expression-type-checking
32+
build:swift_profile --@build_bazel_rules_swift//swift:copt=-warn-long-expression-type-checking=350
3333

3434
common:index_build --experimental_convenience_symlinks=ignore
3535
common:index_build --bes_backend= --bes_results_url=

‎build-system/Make/TartBuild.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ def remote_build_tart(macos_version, bazel_cache_host, configuration, build_inpu
604604
else:
605605
guest_build_sh += '--cacheHost="$CACHE_HOST" \\'
606606
guest_build_sh += 'build \\'
607-
guest_build_sh += '--lock \\'
607+
#guest_build_sh += '--lock \\'
608608
guest_build_sh += '--buildNumber={} \\'.format(build_number)
609609
guest_build_sh += '--configuration={} \\'.format(configuration)
610610
guest_build_sh += '--configurationPath=$HOME/telegram-build-input/configuration.json \\'

‎submodules/ChatListUI/Sources/ChatListController.swift‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2545,13 +2545,25 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
25452545
guard let strongSelf, currentValues.contains(.setupPasskey) else {
25462546
return
25472547
}
2548-
if let navigationController = strongSelf.navigationController as? NavigationController {
2549-
let controller = strongSelf.context.sharedContext.makePasskeySetupController(context: strongSelf.context, displaySkip: true, navigationController: navigationController, completion: {
2550-
let _ = context.engine.notices.dismissServerProvidedSuggestion(suggestion: ServerProvidedSuggestion.setupPasskey.id).startStandalone()
2551-
}, dismiss: {
2552-
let _ = context.engine.notices.dismissServerProvidedSuggestion(suggestion: ServerProvidedSuggestion.setupPasskey.id).startStandalone()
2553-
})
2554-
navigationController.pushViewController(controller)
2548+
2549+
Task { @MainActor [weak strongSelf] in
2550+
guard let strongSelf else {
2551+
return
2552+
}
2553+
2554+
let passkeysData = await strongSelf.context.engine.auth.passkeysData().get()
2555+
if !passkeysData.isEmpty {
2556+
return
2557+
}
2558+
2559+
if let navigationController = strongSelf.navigationController as? NavigationController {
2560+
let controller = strongSelf.context.sharedContext.makePasskeySetupController(context: strongSelf.context, displaySkip: true, navigationController: navigationController, completion: {
2561+
let _ = context.engine.notices.dismissServerProvidedSuggestion(suggestion: ServerProvidedSuggestion.setupPasskey.id).startStandalone()
2562+
}, dismiss: {
2563+
let _ = context.engine.notices.dismissServerProvidedSuggestion(suggestion: ServerProvidedSuggestion.setupPasskey.id).startStandalone()
2564+
})
2565+
navigationController.pushViewController(controller)
2566+
}
25552567
}
25562568
})
25572569

‎submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -788,6 +788,9 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
788788
let topInset = navigationBarHeight
789789

790790
var filtersInsets = UIEdgeInsets(top: 0.0, left: 12.0, bottom: layout.insets(options: [.input]).bottom, right: 12.0)
791+
if filtersInsets.bottom == 84.0 {
792+
filtersInsets.bottom -= 6.0
793+
}
791794
if layout.insets(options: [.input]).bottom <= 30.0 {
792795
filtersInsets = ContainerViewLayout.concentricInsets(bottomInset: layout.insets(options: [.input]).bottom, innerDiameter: 40.0, sideInset: 32.0)
793796
} else if layout.insets(options: [.input]).bottom <= 84.0 {

‎submodules/Postbox/Sources/DeletedMessagesView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ final class MutableDeletedMessagesView: MutablePostboxView {
1515
for operation in operations {
1616
switch operation {
1717
case let .Remove(indices):
18-
for (index, _) in indices {
18+
for (index, _, _) in indices {
1919
testMessageIds.append(index.id)
2020
}
2121
default:

‎submodules/Postbox/Sources/HistoryTagInfoView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ final class MutableHistoryTagInfoView: MutablePostboxView {
3232
}
3333
case let .Remove(indicesAndTags):
3434
if self.currentIndex != nil {
35-
for (index, tags) in indicesAndTags {
35+
for (index, tags, _) in indicesAndTags {
3636
if tags.contains(self.tag) {
3737
if index == self.currentIndex {
3838
self.currentIndex = nil

‎submodules/Postbox/Sources/MessageHistoryOperation.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Foundation
22

33
enum MessageHistoryOperation {
44
case InsertMessage(IntermediateMessage)
5-
case Remove([(MessageIndex, MessageTags)])
5+
case Remove([(MessageIndex, MessageTags, Int64?)])
66
case UpdateReadState(PeerId, CombinedPeerReadState)
77
case UpdateEmbeddedMedia(MessageIndex, ReadBuffer)
88
case UpdateTimestamp(MessageIndex, Int32)

‎submodules/Postbox/Sources/MessageHistoryTable.swift‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -197,19 +197,19 @@ final class MessageHistoryTable: Table {
197197

198198
let buckets = self.continuousIndexIntervalsForRemoving(accumulatedRemoveIndices)
199199
for bucket in buckets {
200-
var indicesWithMetadata: [(MessageIndex, MessageTags)] = []
200+
var indicesWithMetadata: [(MessageIndex, MessageTags, Int64?)] = []
201201
var globalIndicesWithMetadata: [(GlobalMessageTags, MessageIndex)] = []
202202

203203
for index in bucket {
204204
let tagsAndGlobalTags = self.justRemove(index, unsentMessageOperations: &unsentMessageOperations, pendingActionsOperations: &pendingActionsOperations, updatedMessageActionsSummaries: &updatedMessageActionsSummaries, updatedMessageTagSummaries: &updatedMessageTagSummaries, invalidateMessageTagSummaries: &invalidateMessageTagSummaries, localTagsOperations: &localTagsOperations, timestampBasedMessageAttributesOperations: &timestampBasedMessageAttributesOperations)
205-
if let (tags, globalTags) = tagsAndGlobalTags {
206-
indicesWithMetadata.append((index, tags))
205+
if let (tags, globalTags, threadId) = tagsAndGlobalTags {
206+
indicesWithMetadata.append((index, tags, threadId))
207207

208208
if !globalTags.isEmpty {
209209
globalIndicesWithMetadata.append((globalTags, index))
210210
}
211211
} else {
212-
indicesWithMetadata.append((index, MessageTags()))
212+
indicesWithMetadata.append((index, MessageTags(), nil))
213213
}
214214
}
215215
assert(bucket.count == indicesWithMetadata.count)
@@ -352,8 +352,8 @@ final class MessageHistoryTable: Table {
352352
processIndexOperationsCommitAccumulatedRemoveIndices(peerId: peerId, accumulatedRemoveIndices: &accumulatedRemoveIndices, updatedCombinedState: &updatedCombinedState, invalidateReadState: &invalidateReadState, unsentMessageOperations: &unsentMessageOperations, outputOperations: &outputOperations, globalTagsOperations: &globalTagsOperations, pendingActionsOperations: &pendingActionsOperations, updatedMessageActionsSummaries: &updatedMessageActionsSummaries, updatedMessageTagSummaries: &updatedMessageTagSummaries, invalidateMessageTagSummaries: &invalidateMessageTagSummaries, localTagsOperations: &localTagsOperations, timestampBasedMessageAttributesOperations: &timestampBasedMessageAttributesOperations)
353353

354354
var updatedGroupInfos: [MessageId: MessageGroupInfo] = [:]
355-
if let (message, previousTags) = self.justUpdate(storeMessage.index, message: storeMessage, keepLocalTags: true, sharedKey: sharedKey, sharedBuffer: sharedBuffer, sharedEncoder: sharedEncoder, unsentMessageOperations: &unsentMessageOperations, updatedMessageTagSummaries: &updatedMessageTagSummaries, invalidateMessageTagSummaries: &invalidateMessageTagSummaries, updatedGroupInfos: &updatedGroupInfos, localTagsOperations: &localTagsOperations, timestampBasedMessageAttributesOperations: &timestampBasedMessageAttributesOperations, updatedMedia: &updatedMedia) {
356-
outputOperations.append(.Remove([(storeMessage.index, previousTags)]))
355+
if let (message, previousTags, previousThreadId) = self.justUpdate(storeMessage.index, message: storeMessage, keepLocalTags: true, sharedKey: sharedKey, sharedBuffer: sharedBuffer, sharedEncoder: sharedEncoder, unsentMessageOperations: &unsentMessageOperations, updatedMessageTagSummaries: &updatedMessageTagSummaries, invalidateMessageTagSummaries: &invalidateMessageTagSummaries, updatedGroupInfos: &updatedGroupInfos, localTagsOperations: &localTagsOperations, timestampBasedMessageAttributesOperations: &timestampBasedMessageAttributesOperations, updatedMedia: &updatedMedia) {
356+
outputOperations.append(.Remove([(storeMessage.index, previousTags, previousThreadId)]))
357357
outputOperations.append(.InsertMessage(message))
358358
if !updatedGroupInfos.isEmpty {
359359
outputOperations.append(.UpdateGroupInfos(updatedGroupInfos))
@@ -367,8 +367,8 @@ final class MessageHistoryTable: Table {
367367
processIndexOperationsCommitAccumulatedRemoveIndices(peerId: peerId, accumulatedRemoveIndices: &accumulatedRemoveIndices, updatedCombinedState: &updatedCombinedState, invalidateReadState: &invalidateReadState, unsentMessageOperations: &unsentMessageOperations, outputOperations: &outputOperations, globalTagsOperations: &globalTagsOperations, pendingActionsOperations: &pendingActionsOperations, updatedMessageActionsSummaries: &updatedMessageActionsSummaries, updatedMessageTagSummaries: &updatedMessageTagSummaries, invalidateMessageTagSummaries: &invalidateMessageTagSummaries, localTagsOperations: &localTagsOperations, timestampBasedMessageAttributesOperations: &timestampBasedMessageAttributesOperations)
368368

369369
var updatedGroupInfos: [MessageId: MessageGroupInfo] = [:]
370-
if let (message, previousTags) = self.justUpdate(index, message: storeMessage, keepLocalTags: false, sharedKey: sharedKey, sharedBuffer: sharedBuffer, sharedEncoder: sharedEncoder, unsentMessageOperations: &unsentMessageOperations, updatedMessageTagSummaries: &updatedMessageTagSummaries, invalidateMessageTagSummaries: &invalidateMessageTagSummaries, updatedGroupInfos: &updatedGroupInfos, localTagsOperations: &localTagsOperations, timestampBasedMessageAttributesOperations: &timestampBasedMessageAttributesOperations, updatedMedia: &updatedMedia) {
371-
outputOperations.append(.Remove([(index, previousTags)]))
370+
if let (message, previousTags, previousThreadId) = self.justUpdate(index, message: storeMessage, keepLocalTags: false, sharedKey: sharedKey, sharedBuffer: sharedBuffer, sharedEncoder: sharedEncoder, unsentMessageOperations: &unsentMessageOperations, updatedMessageTagSummaries: &updatedMessageTagSummaries, invalidateMessageTagSummaries: &invalidateMessageTagSummaries, updatedGroupInfos: &updatedGroupInfos, localTagsOperations: &localTagsOperations, timestampBasedMessageAttributesOperations: &timestampBasedMessageAttributesOperations, updatedMedia: &updatedMedia) {
371+
outputOperations.append(.Remove([(index, previousTags, previousThreadId)]))
372372
outputOperations.append(.InsertMessage(message))
373373
if !updatedGroupInfos.isEmpty {
374374
outputOperations.append(.UpdateGroupInfos(updatedGroupInfos))
@@ -944,7 +944,7 @@ final class MessageHistoryTable: Table {
944944
self.storeIntermediateMessage(updatedMessage, sharedKey: self.key(MessageIndex.absoluteLowerBound()))
945945

946946
let operations: [MessageHistoryOperation] = [
947-
.Remove([(index, message.tags)]),
947+
.Remove([(index, message.tags, message.threadId)]),
948948
.InsertMessage(updatedMessage)
949949
]
950950
if operationsByPeerId[message.id.peerId] == nil {
@@ -1352,7 +1352,7 @@ final class MessageHistoryTable: Table {
13521352
return result
13531353
}
13541354

1355-
private func justRemove(_ index: MessageIndex, unsentMessageOperations: inout [IntermediateMessageHistoryUnsentOperation], pendingActionsOperations: inout [PendingMessageActionsOperation], updatedMessageActionsSummaries: inout [PendingMessageActionsSummaryKey: Int32], updatedMessageTagSummaries: inout [MessageHistoryTagsSummaryKey: MessageHistoryTagNamespaceSummary], invalidateMessageTagSummaries: inout [InvalidatedMessageHistoryTagsSummaryEntryOperation], localTagsOperations: inout [IntermediateMessageHistoryLocalTagsOperation], timestampBasedMessageAttributesOperations: inout [TimestampBasedMessageAttributesOperation]) -> (MessageTags, GlobalMessageTags)? {
1355+
private func justRemove(_ index: MessageIndex, unsentMessageOperations: inout [IntermediateMessageHistoryUnsentOperation], pendingActionsOperations: inout [PendingMessageActionsOperation], updatedMessageActionsSummaries: inout [PendingMessageActionsSummaryKey: Int32], updatedMessageTagSummaries: inout [MessageHistoryTagsSummaryKey: MessageHistoryTagNamespaceSummary], invalidateMessageTagSummaries: inout [InvalidatedMessageHistoryTagsSummaryEntryOperation], localTagsOperations: inout [IntermediateMessageHistoryLocalTagsOperation], timestampBasedMessageAttributesOperations: inout [TimestampBasedMessageAttributesOperation]) -> (MessageTags, GlobalMessageTags, Int64?)? {
13561356
let key = self.key(index)
13571357
if let value = self.valueBox.get(self.table, key: key) {
13581358
let resultTags: MessageTags
@@ -1440,7 +1440,7 @@ final class MessageHistoryTable: Table {
14401440
resultGlobalTags = message.globalTags
14411441

14421442
self.valueBox.remove(self.table, key: key, secure: true)
1443-
return (resultTags, resultGlobalTags)
1443+
return (resultTags, resultGlobalTags, message.threadId)
14441444
} else {
14451445
return nil
14461446
}
@@ -1544,7 +1544,7 @@ final class MessageHistoryTable: Table {
15441544
})
15451545
}
15461546

1547-
private func justUpdate(_ index: MessageIndex, message: InternalStoreMessage, keepLocalTags: Bool, sharedKey: ValueBoxKey, sharedBuffer: WriteBuffer, sharedEncoder: PostboxEncoder, unsentMessageOperations: inout [IntermediateMessageHistoryUnsentOperation], updatedMessageTagSummaries: inout [MessageHistoryTagsSummaryKey: MessageHistoryTagNamespaceSummary], invalidateMessageTagSummaries: inout [InvalidatedMessageHistoryTagsSummaryEntryOperation], updatedGroupInfos: inout [MessageId: MessageGroupInfo], localTagsOperations: inout [IntermediateMessageHistoryLocalTagsOperation], timestampBasedMessageAttributesOperations: inout [TimestampBasedMessageAttributesOperation], updatedMedia: inout [MediaId: Media?]) -> (IntermediateMessage, MessageTags)? {
1547+
private func justUpdate(_ index: MessageIndex, message: InternalStoreMessage, keepLocalTags: Bool, sharedKey: ValueBoxKey, sharedBuffer: WriteBuffer, sharedEncoder: PostboxEncoder, unsentMessageOperations: inout [IntermediateMessageHistoryUnsentOperation], updatedMessageTagSummaries: inout [MessageHistoryTagsSummaryKey: MessageHistoryTagNamespaceSummary], invalidateMessageTagSummaries: inout [InvalidatedMessageHistoryTagsSummaryEntryOperation], updatedGroupInfos: inout [MessageId: MessageGroupInfo], localTagsOperations: inout [IntermediateMessageHistoryLocalTagsOperation], timestampBasedMessageAttributesOperations: inout [TimestampBasedMessageAttributesOperation], updatedMedia: inout [MediaId: Media?]) -> (IntermediateMessage, MessageTags, Int64?)? {
15481548
if let previousMessage = self.getMessage(index) {
15491549
var mediaToUpdate: [Media] = []
15501550

@@ -2037,7 +2037,7 @@ final class MessageHistoryTable: Table {
20372037

20382038
self.valueBox.set(self.table, key: self.key(message.index, key: sharedKey), value: sharedBuffer)
20392039

2040-
let result = (IntermediateMessage(stableId: stableId, stableVersion: stableVersion, id: message.id, globallyUniqueId: message.globallyUniqueId, groupingKey: message.groupingKey, groupInfo: groupInfo, threadId: message.threadId, timestamp: message.timestamp, flags: flags, tags: tags, globalTags: message.globalTags, localTags: updatedLocalTags, customTags: message.customTags, forwardInfo: intermediateForwardInfo, authorId: message.authorId, text: message.text, attributesData: attributesBuffer.makeReadBufferAndReset(), embeddedMediaData: embeddedMediaBuffer.makeReadBufferAndReset(), referencedMedia: referencedMedia), previousMessage.tags)
2040+
let result = (IntermediateMessage(stableId: stableId, stableVersion: stableVersion, id: message.id, globallyUniqueId: message.globallyUniqueId, groupingKey: message.groupingKey, groupInfo: groupInfo, threadId: message.threadId, timestamp: message.timestamp, flags: flags, tags: tags, globalTags: message.globalTags, localTags: updatedLocalTags, customTags: message.customTags, forwardInfo: intermediateForwardInfo, authorId: message.authorId, text: message.text, attributesData: attributesBuffer.makeReadBufferAndReset(), embeddedMediaData: embeddedMediaBuffer.makeReadBufferAndReset(), referencedMedia: referencedMedia), previousMessage.tags, previousMessage.threadId)
20412041

20422042
for media in mediaToUpdate {
20432043
if let id = media.id {

0 commit comments

Comments
 (0)