mirror of
https://github.com/TelegramMessenger/Telegram-iOS.git
synced 2026-07-05 19:28:46 +02:00
Squash of 63 commits spanning waves 46-93 (plus interspersed docs commits) of the gradual Postbox->TelegramEngine consumer-side migration. Scope: 139 files changed, 2123 insertions(+), 452 deletions(-). ## Themes by wave-block **Waves 46-58 — Peer field migrations + facade additions** Foundational EnginePeer convenience init additions (PeerReference, RenderedPeer, SelectivePrivacyPeer). Multiple `peer: Peer` field migrations across PeerInfo, ChatList, and SettingsUI components. **Waves 59-73 — peer field cascade + EnginePeer wrap drops** Series of single- to two-file peer-field migrations; consumer-side wrap removal (`EnginePeer(peer)` -> direct EnginePeer use); `as? TelegramUser` cast conversion to `case let .user(...)` enum match. Wave 64: RenderedPeer convenience init. Wave 68: SelectivePrivacyPeer convenience init. **Waves 74-83 — controller-Node bridge cleanup + small migrations** Wave-71 shadow-pattern cleanup at controller->Node bridges. Migrations of ChatRecentActionsController.peer (74), PeerInfoMember (75), MentionChatInputPanelItem (76), PassportUI SecureIdAuthController (77), AccountWithInfo + ShareController (78), peerInputActivitiesPromise (79), InactiveChannel (80), BlockedPeers (81), openHashtag resolveSignal (82), NotificationExceptionsList (83). **Waves 84-90 — TelegramEngine.Resources facade migrations** Per-method Shape-A/B sweeps converting `<ctx>.account.postbox.mediaBox.X(...)` to `<ctx>.engine.resources.X(...)`. Wave 90 was a single-commit big sweep: 40 fetchedMediaResource sites in 25 files migrated to engine.resources.fetch facade in one atomic pass with first-pass-clean build. Methods covered: storeResourceData, completedResourcePath, cancelInteractiveResourceFetch, resourceRangesStatus, resourceStatus, fetch (fetchedMediaResource). **Waves 91-92 — additional type migrations** Wave 91: ItemListWebsiteItem.peer + RecentSessionsController enum-case payload + openWebSession callback Peer? -> EnginePeer?. Wave 92: ChatListController StateHolder.EntryContext status type MediaResourceStatus -> EngineMediaResource.FetchStatus. **Wave 93 — speculative `import Postbox` drop sweep** Drop import from 7 wave-touched files where it became unused; restore in 5 files where bare PeerId/Message/MediaId/StoryId references escaped the pre-flight regex. Includes one MediaId(...) -> EngineMedia.Id(...) swap in InAppPurchaseManager to unlock its import drop. ## Build state Final state at squash: clean Telegram/Telegram build at debug_sim_arm64. ## Persistent-state notes - Pre-existing WIP unchanged across the squashed range: - build-system/bazel-rules/sourcekit-bazel-bsp submodule marker - Untracked: build-system/tulsi/, submodules/TgVoip/, third-party/libx264/ Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
155 lines
4.9 KiB
Swift
155 lines
4.9 KiB
Swift
import Foundation
|
|
import UIKit
|
|
import Postbox
|
|
import TelegramCore
|
|
|
|
struct SecureIdEncryptedFormData {
|
|
let form: EncryptedSecureIdForm
|
|
let primaryLanguageByCountry: [String: String]
|
|
let accountPeer: EnginePeer
|
|
let servicePeer: EnginePeer
|
|
}
|
|
|
|
enum SecureIdAuthPasswordChallengeState {
|
|
case none
|
|
case checking
|
|
case invalid
|
|
}
|
|
|
|
enum SecureIdAuthControllerVerificationNoChallengeState: Equatable {
|
|
case notSet
|
|
case awaitingConfirmation(password: String?, emailPattern: String, codeLength: Int32?)
|
|
}
|
|
|
|
enum SecureIdAuthControllerVerificationState: Equatable {
|
|
case noChallenge(SecureIdAuthControllerVerificationNoChallengeState)
|
|
case passwordChallenge(hint: String, state: SecureIdAuthPasswordChallengeState, hasRecoveryEmail: Bool)
|
|
case verified(SecureIdAccessContext)
|
|
}
|
|
|
|
struct SecureIdAuthControllerFormState: Equatable {
|
|
var twoStepEmail: String?
|
|
var encryptedFormData: SecureIdEncryptedFormData?
|
|
var formData: SecureIdForm?
|
|
var verificationState: SecureIdAuthControllerVerificationState?
|
|
var removingValues: Bool = false
|
|
|
|
static func ==(lhs: SecureIdAuthControllerFormState, rhs: SecureIdAuthControllerFormState) -> Bool {
|
|
if let lhsTwoStepEmail = lhs.twoStepEmail, let rhsTwoStepEmail = rhs.twoStepEmail, lhsTwoStepEmail != rhsTwoStepEmail {
|
|
return false
|
|
} else if (lhs.twoStepEmail != nil) != (rhs.twoStepEmail != nil) {
|
|
return false
|
|
}
|
|
if (lhs.encryptedFormData != nil) != (rhs.encryptedFormData != nil) {
|
|
return false
|
|
}
|
|
if (lhs.formData != nil) != (rhs.formData != nil) {
|
|
return false
|
|
}
|
|
if let lhsFormData = lhs.formData, let rhsFormData = rhs.formData {
|
|
if lhsFormData != rhsFormData {
|
|
return false
|
|
}
|
|
} else if (lhs.formData != nil) != (rhs.formData != nil) {
|
|
return false
|
|
}
|
|
if lhs.verificationState != rhs.verificationState {
|
|
return false
|
|
}
|
|
if lhs.removingValues != rhs.removingValues {
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
}
|
|
|
|
struct SecureIdAuthControllerListState: Equatable {
|
|
var accountPeer: EnginePeer?
|
|
var twoStepEmail: String?
|
|
var verificationState: SecureIdAuthControllerVerificationState?
|
|
var encryptedValues: EncryptedAllSecureIdValues?
|
|
var primaryLanguageByCountry: [String: String]?
|
|
var values: [SecureIdValueWithContext]?
|
|
var removingValues: Bool = false
|
|
|
|
static func ==(lhs: SecureIdAuthControllerListState, rhs: SecureIdAuthControllerListState) -> Bool {
|
|
if lhs.accountPeer != rhs.accountPeer {
|
|
return false
|
|
}
|
|
if let lhsTwoStepEmail = lhs.twoStepEmail, let rhsTwoStepEmail = rhs.twoStepEmail, lhsTwoStepEmail != rhsTwoStepEmail {
|
|
return false
|
|
} else if (lhs.twoStepEmail != nil) != (rhs.twoStepEmail != nil) {
|
|
return false
|
|
}
|
|
if lhs.verificationState != rhs.verificationState {
|
|
return false
|
|
}
|
|
if (lhs.encryptedValues != nil) != (rhs.encryptedValues != nil) {
|
|
return false
|
|
}
|
|
if lhs.primaryLanguageByCountry != rhs.primaryLanguageByCountry {
|
|
return false
|
|
}
|
|
if lhs.values != rhs.values {
|
|
return false
|
|
}
|
|
if lhs.removingValues != rhs.removingValues {
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
}
|
|
|
|
enum SecureIdAuthControllerState: Equatable {
|
|
case form(SecureIdAuthControllerFormState)
|
|
case list(SecureIdAuthControllerListState)
|
|
|
|
var twoStepEmail: String? {
|
|
get {
|
|
switch self {
|
|
case let .form(form):
|
|
return form.twoStepEmail
|
|
case let .list(list):
|
|
return list.twoStepEmail
|
|
}
|
|
} set(value) {
|
|
switch self {
|
|
case var .form(form):
|
|
form.twoStepEmail = value
|
|
self = .form(form)
|
|
case var .list(list):
|
|
list.twoStepEmail = value
|
|
self = .list(list)
|
|
}
|
|
}
|
|
}
|
|
|
|
var verificationState: SecureIdAuthControllerVerificationState? {
|
|
get {
|
|
switch self {
|
|
case let .form(form):
|
|
return form.verificationState
|
|
case let .list(list):
|
|
return list.verificationState
|
|
}
|
|
} set(value) {
|
|
switch self {
|
|
case var .form(form):
|
|
form.verificationState = value
|
|
self = .form(form)
|
|
case var .list(list):
|
|
list.verificationState = value
|
|
self = .list(list)
|
|
}
|
|
}
|
|
}
|
|
|
|
var removingValues: Bool {
|
|
switch self {
|
|
case let .form(form):
|
|
return form.removingValues
|
|
case let .list(list):
|
|
return list.removingValues
|
|
}
|
|
}
|
|
}
|