ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-07-31 07:30:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed peers nearby polling logic

Browse Source
This commit is contained in:
Ilya Laktyushin 2019-06-20 14:43:17 +02:00
parent 363fa6676c
commit 963aa06b39
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ public final class PeersNearbyContext {
public init(network: Network, accountStateManager: AccountStateManager, coordinate: (latitude: Double, longitude: Double)) { public init(network: Network, accountStateManager: AccountStateManager, coordinate: (latitude: Double, longitude: Double)) {
let expiryThreshold: Double = 10.0 let expiryThreshold: Double = 10.0
self.disposable.set((network.request(Api.functions.contacts.getLocated(geoPoint: .inputGeoPoint(lat: coordinate.latitude, long: coordinate.longitude))) let poll = network.request(Api.functions.contacts.getLocated(geoPoint: .inputGeoPoint(lat: coordinate.latitude, long: coordinate.longitude)))
|> map(Optional.init) |> map(Optional.init)
|> `catch` { _ -> Signal<Api.Updates?, NoError> in |> `catch` { _ -> Signal<Api.Updates?, NoError> in
return .single(nil) return .single(nil)
@ -58,6 +58,8 @@ public final class PeersNearbyContext {
return .single(peersNearby) return .single(peersNearby)
|> then(accountStateManager.updatedPeersNearby()) |> then(accountStateManager.updatedPeersNearby())
} }
self.disposable.set((((poll |> then(.complete() |> suspendAwareDelay(25.0, queue: self.queue))) |> restart)
|> deliverOn(self.queue)).start(next: { [weak self] updatedEntries in |> deliverOn(self.queue)).start(next: { [weak self] updatedEntries in
guard let strongSelf = self else { guard let strongSelf = self else {
return return

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

@ -305,9 +305,8 @@ public func peersNearbyController(context: AccountContext) -> ViewController {
pushControllerImpl?(controller) pushControllerImpl?(controller)
}) })
let dataSignal: Signal<PeersNearbyData?, Void> = currentLocationManagerCoordinate(manager: context.sharedContext.locationManager!, timeout: 5.0) let dataSignal: Signal<PeersNearbyData?, NoError> = currentLocationManagerCoordinate(manager: context.sharedContext.locationManager!, timeout: 5.0)
|> introduceError(Void.self) |> mapToSignal { coordinate -> Signal<PeersNearbyData?, NoError> in
|> mapToSignal { coordinate -> Signal<PeersNearbyData?, Void> in
guard let coordinate = coordinate else { guard let coordinate = coordinate else {
return .single(nil) return .single(nil)
} }
@ -315,20 +314,18 @@ public func peersNearbyController(context: AccountContext) -> ViewController {
return Signal { subscriber in return Signal { subscriber in
let peersNearbyContext = PeersNearbyContext(network: context.account.network, accountStateManager: context.account.stateManager, coordinate: (latitude: coordinate.latitude, longitude: coordinate.longitude)) let peersNearbyContext = PeersNearbyContext(network: context.account.network, accountStateManager: context.account.stateManager, coordinate: (latitude: coordinate.latitude, longitude: coordinate.longitude))
let peersNearby: Signal<PeersNearbyData?, Void> = combineLatest(peersNearbyContext.get(), addressPromise.get()) let peersNearby: Signal<PeersNearbyData?, NoError> = combineLatest(peersNearbyContext.get(), addressPromise.get())
|> introduceError(Void.self) |> mapToSignal { peersNearby, address -> Signal<([PeerNearby]?, String?), NoError> in
|> mapToSignal { peersNearby, address -> Signal<([PeerNearby]?, String?), Void> in
if let address = address { if let address = address {
return .single((peersNearby, address)) return .single((peersNearby, address))
} else { } else {
return reverseGeocodeLocation(latitude: coordinate.latitude, longitude: coordinate.longitude) return reverseGeocodeLocation(latitude: coordinate.latitude, longitude: coordinate.longitude)
|> introduceError(Void.self)
|> map { placemark in |> map { placemark in
return (peersNearby, placemark?.fullAddress) return (peersNearby, placemark?.fullAddress)
} }
} }
} }
|> mapToSignal { peersNearby, address -> Signal<PeersNearbyData?, Void> in |> mapToSignal { peersNearby, address -> Signal<PeersNearbyData?, NoError> in
guard let peersNearby = peersNearby else { guard let peersNearby = peersNearby else {
return .single(nil) return .single(nil)
} }
@ -347,7 +344,6 @@ public func peersNearbyController(context: AccountContext) -> ViewController {
} }
return PeersNearbyData(latitude: coordinate.latitude, longitude: coordinate.longitude, address: address, users: users, groups: groups, channels: []) return PeersNearbyData(latitude: coordinate.latitude, longitude: coordinate.longitude, address: address, users: users, groups: groups, channels: [])
} }
|> introduceError(Void.self)
} }
let disposable = peersNearby.start(next: { data in let disposable = peersNearby.start(next: { data in
@ -361,18 +357,19 @@ public func peersNearbyController(context: AccountContext) -> ViewController {
} }
} }
let errorSignal: Signal<Void, Void> = .single(Void()) |> then( Signal.fail(Void()) |> suspendAwareDelay(25.0, queue: Queue.concurrentDefaultQueue()) ) // 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 // let combinedSignal = combineLatest(dataSignal, errorSignal) |> map { data, _ -> PeersNearbyData? in
return data // return data
} // }
|> restartIfError // |> restartIfError
|> `catch` { _ -> Signal<PeersNearbyData?, NoError> in // |> `catch` { _ -> Signal<PeersNearbyData?, NoError> in
return .single(nil) // return .single(nil)
} |> filter { value in // } |> filter { value in
return value != nil // return value != nil
} // }
dataPromise.set(.single(nil) |> then(combinedSignal)) // dataPromise.set(.single(nil) |> then(combinedSignal))
dataPromise.set(dataSignal)
let previousData = Atomic<PeersNearbyData?>(value: nil) let previousData = Atomic<PeersNearbyData?>(value: nil)