From 859d9fc97225097948cbc7bac8259eb923677f19 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 18 Jul 2020 21:33:24 -0500 Subject: [PATCH] Change to use the standard cancellables set --- Multiplatform/Shared/SceneModel.swift | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Multiplatform/Shared/SceneModel.swift b/Multiplatform/Shared/SceneModel.swift index 478763ec5..4b84dfe40 100644 --- a/Multiplatform/Shared/SceneModel.swift +++ b/Multiplatform/Shared/SceneModel.swift @@ -35,8 +35,7 @@ final class SceneModel: ObservableObject { private(set) var sidebarModel = SidebarModel() private(set) var timelineModel = TimelineModel() - private var articlesCancellable: AnyCancellable? - private var selectedArticlesCancellable: AnyCancellable? + private var cancellables = Set() // MARK: Initialization API @@ -51,13 +50,13 @@ final class SceneModel: ObservableObject { NotificationCenter.default.addObserver(self, selector: #selector(statusesDidChange(_:)), name: .StatusesDidChange, object: nil) - articlesCancellable = timelineModel.$articles.sink { [weak self] articles in + timelineModel.$articles.sink { [weak self] articles in self?.updateMarkAllAsReadButtonsState(articles: articles) - } + }.store(in: &cancellables) - selectedArticlesCancellable = timelineModel.$selectedArticles.sink { [weak self] articles in + timelineModel.$selectedArticles.sink { [weak self] articles in self?.updateArticleButtonsState(selectedArticles: articles) - } + }.store(in: &cancellables) } // MARK: Article Management API