diff --git a/submodules/LocalAuth/Sources/LocalAuth.swift b/submodules/LocalAuth/Sources/LocalAuth.swift index da84d38257..3fc554f761 100644 --- a/submodules/LocalAuth/Sources/LocalAuth.swift +++ b/submodules/LocalAuth/Sources/LocalAuth.swift @@ -13,7 +13,7 @@ public struct LocalAuth { if context.canEvaluatePolicy(LAPolicy(rawValue: Int(kLAPolicyDeviceOwnerAuthenticationWithBiometrics))!, error: nil) { if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { switch context.biometryType { - case .faceID: + case .faceID://, .opticID: return .faceId case .touchID: return .touchId diff --git a/submodules/Postbox/Sources/MessageHistoryTable.swift b/submodules/Postbox/Sources/MessageHistoryTable.swift index 017907b553..73a9659ef4 100644 --- a/submodules/Postbox/Sources/MessageHistoryTable.swift +++ b/submodules/Postbox/Sources/MessageHistoryTable.swift @@ -924,7 +924,7 @@ final class MessageHistoryTable: Table { operationsByPeerId[message.id.peerId]!.append(contentsOf: operations) } } else { - assertionFailure() + //assertionFailure() } } } diff --git a/submodules/TelegramUI/Sources/AccountContext.swift b/submodules/TelegramUI/Sources/AccountContext.swift index 751d5d04c2..e73db9d68b 100644 --- a/submodules/TelegramUI/Sources/AccountContext.swift +++ b/submodules/TelegramUI/Sources/AccountContext.swift @@ -21,6 +21,7 @@ import InAppPurchaseManager import AnimationCache import MultiAnimationRenderer import AppBundle +import DirectMediaImageCache private final class DeviceSpecificContactImportContext { let disposable = MetaDisposable() @@ -243,12 +244,16 @@ public final class AccountContextImpl: AccountContext { private var userLimitsConfigurationDisposable: Disposable? public private(set) var userLimits: EngineConfiguration.UserLimits + public let imageCache: AnyObject? + public init(sharedContext: SharedAccountContextImpl, account: Account, limitsConfiguration: LimitsConfiguration, contentSettings: ContentSettings, appConfiguration: AppConfiguration, temp: Bool = false) { self.sharedContextImpl = sharedContext self.account = account self.engine = TelegramEngine(account: account) + self.imageCache = DirectMediaImageCache(account: account) + self.userLimits = EngineConfiguration.UserLimits(UserLimitsConfiguration.defaultValue) self.downloadedMediaStoreManager = DownloadedMediaStoreManagerImpl(postbox: account.postbox, accountManager: sharedContext.accountManager) diff --git a/submodules/lottie-ios/Sources/Private/CoreAnimation/Extensions/Keyframes+combinedIfPossible.swift b/submodules/lottie-ios/Sources/Private/CoreAnimation/Extensions/Keyframes+combinedIfPossible.swift index 04237b5a28..02a24d57bb 100644 --- a/submodules/lottie-ios/Sources/Private/CoreAnimation/Extensions/Keyframes+combinedIfPossible.swift +++ b/submodules/lottie-ios/Sources/Private/CoreAnimation/Extensions/Keyframes+combinedIfPossible.swift @@ -37,7 +37,7 @@ enum Keyframes { extension KeyframeGroup { /// Whether or not all of the keyframes in this `KeyframeGroup` have the same /// timing parameters as the corresponding keyframe in the other given `KeyframeGroup` - func hasSameTimingParameters(as other: KeyframeGroup) -> Bool { + func hasSameTimingParameters(as other: KeyframeGroup) -> Bool { guard keyframes.count == other.keyframes.count else { return false } @@ -50,7 +50,7 @@ extension KeyframeGroup { extension Keyframe { /// Whether or not this keyframe has the same timing parameters as the given keyframe - func hasSameTimingParameters(as other: Keyframe) -> Bool { + func hasSameTimingParameters(as other: Keyframe) -> Bool { time == other.time && isHold == other.isHold && inTangent == other.inTangent diff --git a/third-party/boringssl/src/crypto/fipsmodule/bn/internal.h b/third-party/boringssl/src/crypto/fipsmodule/bn/internal.h index d58a2acce7..6842990614 100644 --- a/third-party/boringssl/src/crypto/fipsmodule/bn/internal.h +++ b/third-party/boringssl/src/crypto/fipsmodule/bn/internal.h @@ -289,7 +289,7 @@ void bn_mul_comba4(BN_ULONG r[8], const BN_ULONG a[4], const BN_ULONG b[4]); void bn_mul_comba8(BN_ULONG r[16], const BN_ULONG a[8], const BN_ULONG b[8]); // bn_sqr_comba8 sets |r| to |a|^2. -void bn_sqr_comba8(BN_ULONG r[16], const BN_ULONG a[4]); +void bn_sqr_comba8(BN_ULONG r[16], const BN_ULONG a[8]); // bn_sqr_comba4 sets |r| to |a|^2. void bn_sqr_comba4(BN_ULONG r[8], const BN_ULONG a[4]); diff --git a/versions.json b/versions.json index 8425173024..5ae6a613f3 100644 --- a/versions.json +++ b/versions.json @@ -1,5 +1,5 @@ { "app": "10.0.2", "bazel": "6.3.2", - "xcode": "14.3" + "xcode": "14.2.1" }