github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'dd7e404f6e'

Browse source
This commit is contained in:
Ali 2021-01-29 18:11:37 +05:00
commit f990f19eb8
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
submodules/Reachability/Sources/Reachability.swift
View file

@ -84,7 +84,7 @@ private final class WrappedLegacyReachability: NSObject {
}
}
@available(iOSApplicationExtension 12.0, iOS 12.0, *)
@available(iOSApplicationExtension 12.0, iOS 12.0, OSX 10.14, *)
private final class PathMonitor {
private let queue: Queue
private let monitor: NWPathMonitor
@ -133,7 +133,7 @@ private final class PathMonitor {
}
}
@available(iOSApplicationExtension 12.0, iOS 12.0, *)
@available(iOSApplicationExtension 12.0, iOS 12.0, OSX 10.14, *)
private final class SharedPathMonitor {
static let queue = Queue()
static let impl = QueueLocalObject<PathMonitor>(queue: queue, generate: {
@ -149,7 +149,7 @@ public enum Reachability {
}
public static var networkType: Signal<NetworkType, NoError> {
if #available(iOSApplicationExtension 12.0, iOS 12.0, *) {
if #available(iOSApplicationExtension 12.0, iOS 12.0, OSX 10.14, *) {
return Signal { subscriber in
let disposable = MetaDisposable()

8
submodules/TelegramCore/Sources/ApiGroupOrChannel.swift
View file

@ -71,6 +71,9 @@ func parseTelegramGroupOrChannel(chat: Api.Chat) -> Peer? {
var infoFlags = TelegramChannelGroupFlags()
if (flags & Int32(1 << 22)) != 0 {
infoFlags.insert(.slowModeEnabled)
} else if id == 1061639060 {
var bp:Int = 0
bp += 1
}
info = .group(TelegramChannelGroupInfo(flags: infoFlags))
} else {
@ -165,7 +168,10 @@ func mergeGroupOrChannel(lhs: Peer?, rhs: Api.Chat) -> Peer? {
case .broadcast:
break
case .group:
let infoFlags = TelegramChannelGroupFlags()
var infoFlags = TelegramChannelGroupFlags()
if (flags & Int32(1 << 22)) != 0 {
infoFlags.insert(.slowModeEnabled)
}
info = .group(TelegramChannelGroupInfo(flags: infoFlags))
}