ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-03-28 01:28:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed peers nearby updating

Browse Source
This commit is contained in:
Ilya Laktyushin
2019-06-20 16:04:16 +02:00
parent 91c7d145ff
commit e2ff848937
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
submodules/TelegramCore/TelegramCore/PeersNearby.swift
View File

@@ -31,14 +31,15 @@ public final class PeersNearbyContext {
private var entries: [PeerNearby]?
public init(network: Network, accountStateManager: AccountStateManager, coordinate: (latitude: Double, longitude: Double)) {
let expiryThreshold: Double = 10.0
let expiryExtension: Double = 10.0
let poll = network.request(Api.functions.contacts.getLocated(geoPoint: .inputGeoPoint(lat: coordinate.latitude, long: coordinate.longitude)))
|> map(Optional.init)
|> `catch` { _ -> Signal<Api.Updates?, NoError> in
return .single(nil)
}
|> mapToSignal { updates -> Signal<[PeerNearby], NoError> in
|> introduceError(Void.self)
|> mapToSignal { updates -> Signal<[PeerNearby], Void> in
var peersNearby: [PeerNearby] = []
if let updates = updates {
switch updates {
@@ -56,18 +57,31 @@ public final class PeersNearbyContext {
accountStateManager.addUpdates(updates)
}
return .single(peersNearby)
|> then(accountStateManager.updatedPeersNearby())
|> then(
accountStateManager.updatedPeersNearby()
|> introduceError(Void.self)
)
}
self.disposable.set((((poll |> then(.complete() |> suspendAwareDelay(25.0, queue: self.queue))) |> restart)
let error: Signal<Void, Void> = .single(Void()) |> then(Signal.fail(Void()) |> suspendAwareDelay(25.0, queue: self.queue))
let combined = combineLatest(poll, error)
|> map { data, _ -> [PeerNearby] in
return data
}
|> restartIfError
|> `catch` { _ -> Signal<[PeerNearby], NoError> in
return .single([])
}
self.disposable.set((combined
|> deliverOn(self.queue)).start(next: { [weak self] updatedEntries in
guard let strongSelf = self else {
return
}
let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970
var entries = strongSelf.entries?.filter { Double($0.expires) + expiryThreshold > timestamp } ?? []
let updatedEntries = updatedEntries.filter { Double($0.expires) + expiryThreshold > timestamp }
var entries = strongSelf.entries?.filter { Double($0.expires) + expiryExtension > timestamp } ?? []
let updatedEntries = updatedEntries.filter { Double($0.expires) + expiryExtension > timestamp }
var existingPeerIds: [PeerId: Int] = [:]
for i in 0 ..< entries.count {
@@ -83,7 +97,6 @@ public final class PeersNearbyContext {
}
strongSelf.entries = entries
for subscriber in strongSelf.subscribers.copyItems() {
subscriber(strongSelf.entries)
}
@@ -95,7 +108,10 @@ public final class PeersNearbyContext {
}
let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970
strongSelf.entries = strongSelf.entries?.filter { Double($0.expires) + expiryThreshold > timestamp }
strongSelf.entries = strongSelf.entries?.filter { Double($0.expires) + expiryExtension > timestamp }
for subscriber in strongSelf.subscribers.copyItems() {
subscriber(strongSelf.entries)
}
}, queue: self.queue)
self.timer?.start()
}

14
submodules/TelegramUI/TelegramUI/PeersNearbyController.swift
View File

@@ -356,23 +356,9 @@ public func peersNearbyController(context: AccountContext) -> ViewController {
}
}
}
// let errorSignal: Signal<Void, Void> = .single(Void()) |> then( Signal.fail(Void()) |> suspendAwareDelay(25.0, queue: Queue.concurrentDefaultQueue()) )
// let combinedSignal = combineLatest(dataSignal, errorSignal) |> map { data, _ -> PeersNearbyData? in
// return data
// }
// |> restartIfError
// |> `catch` { _ -> Signal<PeersNearbyData?, NoError> in
// return .single(nil)
// } |> filter { value in
// return value != nil
// }
// dataPromise.set(.single(nil) |> then(combinedSignal))
dataPromise.set(dataSignal)
let previousData = Atomic<PeersNearbyData?>(value: nil)
let displayLoading: Signal<Bool, NoError> = .single(false) |> then(.single(true) |> delay(1.0, queue: Queue.mainQueue()))
let signal = combineLatest(context.sharedContext.presentationData, dataPromise.get(), displayLoading)