Skip to content

Commit d892e03

Browse files
author
Ali
committed
Debugging
1 parent bdf1909 commit d892e03

18 files changed

Lines changed: 110 additions & 102 deletions

File tree

‎submodules/AnimatedAvatarSetNode/Sources/AnimatedAvatarSetNode.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private final class ContentNode: ASDisplayNode {
100100
self.updateImage(image: image, size: size, spacing: spacing)
101101

102102
let disposable = (signal
103-
|> deliverOnMainQueue).start(next: { [weak self] imageVersions in
103+
|> deliverOnMainQueue).startStrict(next: { [weak self] imageVersions in
104104
guard let strongSelf = self else {
105105
return
106106
}
@@ -109,7 +109,7 @@ private final class ContentNode: ASDisplayNode {
109109
strongSelf.updateImage(image: image, size: size, spacing: spacing)
110110
}
111111
})
112-
self.disposable = disposable.strict()
112+
self.disposable = disposable
113113
} else {
114114
let image = generateImage(size, rotatedContext: { size, context in
115115
context.clear(CGRect(origin: CGPoint(), size: size))
@@ -333,7 +333,7 @@ public final class AnimatedAvatarSetView: UIView {
333333
self.updateImage(image: image, size: size, spacing: spacing)
334334

335335
let disposable = (signal
336-
|> deliverOnMainQueue).start(next: { [weak self] imageVersions in
336+
|> deliverOnMainQueue).startStrict(next: { [weak self] imageVersions in
337337
guard let strongSelf = self else {
338338
return
339339
}
@@ -342,7 +342,7 @@ public final class AnimatedAvatarSetView: UIView {
342342
strongSelf.updateImage(image: image, size: size, spacing: spacing)
343343
}
344344
})
345-
self.disposable = disposable.strict()
345+
self.disposable = disposable
346346
} else {
347347
let image = generateImage(size, rotatedContext: { size, context in
348348
context.clear(CGRect(origin: CGPoint(), size: size))

‎submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,12 +368,12 @@ public final class DefaultAnimatedStickerNodeImpl: ASDisplayNode, AnimatedSticke
368368
}
369369
self.disposable.set((source.directDataPath(attemptSynchronously: false)
370370
|> filter { $0 != nil }
371-
|> deliverOnMainQueue).start(next: { path in
371+
|> deliverOnMainQueue).startStrict(next: { path in
372372
f(path!)
373373
}))
374374
case .cached:
375375
self.disposable.set((source.cachedDataPath(width: width, height: height)
376-
|> deliverOnMainQueue).start(next: { [weak self] path, complete in
376+
|> deliverOnMainQueue).startStrict(next: { [weak self] path, complete in
377377
guard let strongSelf = self else {
378378
return
379379
}

‎submodules/AnimatedStickerNode/Sources/DirectAnimatedStickerNode.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public final class DirectAnimatedStickerNode: ASDisplayNode, AnimatedStickerNode
106106
self.sourceDisposable = (source.directDataPath(attemptSynchronously: false)
107107
|> filter { $0 != nil }
108108
|> take(1)
109-
|> deliverOnMainQueue).start(next: { [weak self] path in
109+
|> deliverOnMainQueue).startStrict(next: { [weak self] path in
110110
guard let strongSelf = self, let path = path else {
111111
return
112112
}

‎submodules/AppLock/Sources/AppLock.swift‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ public final class AppLockContextImpl: AppLockContext {
6969
private let rootPath: String
7070
private let syncQueue = Queue()
7171

72+
private var disposable: Disposable?
73+
private var autolockTimeoutDisposable: Disposable?
74+
7275
private let applicationBindings: TelegramApplicationBindings
7376
private let accountManager: AccountManager<TelegramAccountManagerTypes>
7477
private let presentationDataSignal: Signal<PresentationData, NoError>
@@ -112,14 +115,14 @@ public final class AppLockContextImpl: AppLockContext {
112115
}
113116
self.autolockTimeout.set(self.currentStateValue.autolockTimeout)
114117

115-
let _ = (combineLatest(queue: .mainQueue(),
118+
self.disposable = (combineLatest(queue: .mainQueue(),
116119
accountManager.accessChallengeData(),
117120
accountManager.sharedData(keys: Set([ApplicationSpecificSharedDataKeys.presentationPasscodeSettings])),
118121
presentationDataSignal,
119122
applicationBindings.applicationIsActive,
120123
self.currentState.get()
121124
)
122-
|> deliverOnMainQueue).start(next: { [weak self] accessChallengeData, sharedData, presentationData, appInForeground, state in
125+
|> deliverOnMainQueue).startStrict(next: { [weak self] accessChallengeData, sharedData, presentationData, appInForeground, state in
123126
guard let strongSelf = self else {
124127
return
125128
}
@@ -254,8 +257,8 @@ public final class AppLockContextImpl: AppLockContext {
254257

255258
self.currentState.set(.single(self.currentStateValue))
256259

257-
let _ = (self.autolockTimeout.get()
258-
|> deliverOnMainQueue).start(next: { [weak self] autolockTimeout in
260+
self.autolockTimeoutDisposable = (self.autolockTimeout.get()
261+
|> deliverOnMainQueue).startStrict(next: { [weak self] autolockTimeout in
259262
self?.updateLockState { state in
260263
var state = state
261264
state.autolockTimeout = autolockTimeout
@@ -264,6 +267,11 @@ public final class AppLockContextImpl: AppLockContext {
264267
})
265268
}
266269

270+
deinit {
271+
self.disposable?.dispose()
272+
self.autolockTimeoutDisposable?.dispose()
273+
}
274+
267275
private func updateTimestampRenewTimer(shouldRun: Bool) {
268276
if shouldRun {
269277
if self.timestampRenewTimer == nil {

‎submodules/AttachmentTextInputPanelNode/Sources/AttachmentTextInputPanelNode.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ public class AttachmentTextInputPanelNode: ASDisplayNode, TGCaptionPanelView, AS
442442
return .complete()
443443
}
444444
}
445-
|> deliverOnMainQueue).start(next: { [weak self] maxCaptionLength in
445+
|> deliverOnMainQueue).startStandalone(next: { [weak self] maxCaptionLength in
446446
self?.maxCaptionLength = maxCaptionLength
447447
})
448448
}

‎submodules/AttachmentUI/Sources/AttachmentController.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,19 +231,19 @@ public class AttachmentController: ViewController {
231231
didSet {
232232
if let mediaPickerContext = self.mediaPickerContext {
233233
self.captionDisposable.set((mediaPickerContext.caption
234-
|> deliverOnMainQueue).start(next: { [weak self] caption in
234+
|> deliverOnMainQueue).startStrict(next: { [weak self] caption in
235235
if let strongSelf = self {
236236
strongSelf.panel.updateCaption(caption ?? NSAttributedString())
237237
}
238238
}))
239239
self.mediaSelectionCountDisposable.set((mediaPickerContext.selectionCount
240-
|> deliverOnMainQueue).start(next: { [weak self] count in
240+
|> deliverOnMainQueue).startStrict(next: { [weak self] count in
241241
if let strongSelf = self {
242242
strongSelf.updateSelectionCount(count)
243243
}
244244
}))
245245
self.loadingProgressDisposable.set((mediaPickerContext.loadingProgress
246-
|> deliverOnMainQueue).start(next: { [weak self] progress in
246+
|> deliverOnMainQueue).startStrict(next: { [weak self] progress in
247247
if let strongSelf = self {
248248
strongSelf.panel.updateLoadingProgress(progress)
249249
if let layout = strongSelf.validLayout {
@@ -252,13 +252,13 @@ public class AttachmentController: ViewController {
252252
}
253253
}))
254254
self.mainButtonStateDisposable.set((mediaPickerContext.mainButtonState
255-
|> deliverOnMainQueue).start(next: { [weak self] mainButtonState in
255+
|> deliverOnMainQueue).startStrict(next: { [weak self] mainButtonState in
256256
if let strongSelf = self {
257257
let _ = (strongSelf.panel.animatingTransitionPromise.get()
258258
|> filter { value in
259259
return !value
260260
}
261-
|> take(1)).start(next: { [weak self] _ in
261+
|> take(1)).startStandalone(next: { [weak self] _ in
262262
if let strongSelf = self {
263263
strongSelf.panel.updateMainButtonState(mainButtonState)
264264
if let layout = strongSelf.validLayout {
@@ -591,7 +591,7 @@ public class AttachmentController: ViewController {
591591
$0
592592
}
593593
|> take(1)
594-
|> deliverOnMainQueue).start(next: { [weak self, weak snapshotView] _ in
594+
|> deliverOnMainQueue).startStandalone(next: { [weak self, weak snapshotView] _ in
595595
guard let strongSelf = self, let layout = strongSelf.validLayout else {
596596
return
597597
}
@@ -1039,7 +1039,7 @@ public class AttachmentController: ViewController {
10391039
let disposableSet = DisposableSet()
10401040
let _ = (context.engine.messages.attachMenuBots()
10411041
|> take(1)
1042-
|> deliverOnMainQueue).start(next: { bots in
1042+
|> deliverOnMainQueue).startStandalone(next: { bots in
10431043
for bot in bots {
10441044
for (name, file) in bot.icons {
10451045
if [.iOSAnimated, .placeholder].contains(name), let peer = PeerReference(bot.peer._asPeer()) {

‎submodules/AttachmentUI/Sources/AttachmentPanel.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private final class IconComponent: Component {
8585

8686
self.disposable = (svgIconImageFile(account: component.account, fileReference: fileReference)
8787
|> runOn(Queue.concurrentDefaultQueue())
88-
|> deliverOnMainQueue).start(next: { [weak self] transform in
88+
|> deliverOnMainQueue).startStrict(next: { [weak self] transform in
8989
let arguments = TransformImageArguments(corners: ImageCorners(), imageSize: availableSize, boundingSize: availableSize, intrinsicInsets: UIEdgeInsets())
9090
let drawingContext = transform(arguments)
9191
let image = drawingContext?.generateImage()?.withRenderingMode(.alwaysTemplate)
@@ -965,7 +965,7 @@ final class AttachmentPanel: ASDisplayNode, UIScrollViewDelegate {
965965
}
966966
let _ = (strongSelf.context.account.viewTracker.peerView(peerId)
967967
|> take(1)
968-
|> deliverOnMainQueue).start(next: { [weak self] peerView in
968+
|> deliverOnMainQueue).startStandalone(next: { [weak self] peerView in
969969
guard let strongSelf = self, let peer = peerViewMainPeer(peerView) else {
970970
return
971971
}
@@ -1029,7 +1029,7 @@ final class AttachmentPanel: ASDisplayNode, UIScrollViewDelegate {
10291029
}, statuses: nil)
10301030

10311031
self.presentationDataDisposable = ((updatedPresentationData?.signal ?? context.sharedContext.presentationData)
1032-
|> deliverOnMainQueue).start(next: { [weak self] presentationData in
1032+
|> deliverOnMainQueue).startStrict(next: { [weak self] presentationData in
10331033
if let strongSelf = self {
10341034
strongSelf.presentationData = presentationData
10351035

@@ -1165,7 +1165,7 @@ final class AttachmentPanel: ASDisplayNode, UIScrollViewDelegate {
11651165
self.iconDisposables[file.fileId] = accountFullSizeData.start()
11661166
}
11671167
} else {
1168-
self.iconDisposables[file.fileId] = freeMediaFileInteractiveFetched(account: self.context.account, userLocation: .other, fileReference: .attachBot(peer: peer, media: file)).start()
1168+
self.iconDisposables[file.fileId] = freeMediaFileInteractiveFetched(account: self.context.account, userLocation: .other, fileReference: .attachBot(peer: peer, media: file)).startStrict()
11691169
}
11701170
}
11711171
}

‎submodules/AuthorizationUI/Sources/AuthorizationSequenceCodeEntryControllerNode.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ final class AuthorizationSequenceCodeEntryControllerNode: ASDisplayNode, UITextF
324324
let timeout = min(timeout, 5)
325325
#endif
326326
self.currentTimeoutTime = timeout
327-
let disposable = ((Signal<Int, NoError>.single(1) |> delay(1.0, queue: Queue.mainQueue())) |> restart).start(next: { [weak self] _ in
327+
let disposable = ((Signal<Int, NoError>.single(1) |> delay(1.0, queue: Queue.mainQueue())) |> restart).startStrict(next: { [weak self] _ in
328328
if let strongSelf = self {
329329
if let currentTimeoutTime = strongSelf.currentTimeoutTime, currentTimeoutTime > 0 {
330330
strongSelf.currentTimeoutTime = currentTimeoutTime - 1
@@ -348,7 +348,7 @@ final class AuthorizationSequenceCodeEntryControllerNode: ASDisplayNode, UITextF
348348
})
349349
self.countdownDisposable.set(disposable)
350350
} else if case let .email(_, _, _, pendingDate, _, _) = codeType, let pendingDate {
351-
let disposable = ((Signal<Int, NoError>.single(1) |> delay(1.0, queue: Queue.mainQueue())) |> restart).start(next: { [weak self] _ in
351+
let disposable = ((Signal<Int, NoError>.single(1) |> delay(1.0, queue: Queue.mainQueue())) |> restart).startStrict(next: { [weak self] _ in
352352
if let strongSelf = self {
353353
let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
354354
let interval = pendingDate - currentTime

0 commit comments

Comments
 (0)