From ae638054790703ab943f02c98e10843f1dcc6355 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 27 Apr 2019 16:16:46 -0500 Subject: [PATCH] Change property to have correct swift naming convention name --- Frameworks/Account/Account.swift | 6 +++--- Frameworks/Account/AccountManager.swift | 4 ++-- iOS/AppDelegate.swift | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift index dbf851cb1..312d1f763 100644 --- a/Frameworks/Account/Account.swift +++ b/Frameworks/Account/Account.swift @@ -83,7 +83,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, } private var fetchingAllUnreadCounts = false - var unreadCountsInitialized = false + var isUnreadCountsInitialized = false let dataFolder: String let database: ArticlesDatabase @@ -887,7 +887,7 @@ private extension Account { if unreadCountDictionary.isEmpty { self.fetchingAllUnreadCounts = false self.updateUnreadCount() - self.unreadCountsInitialized = true + self.isUnreadCountsInitialized = true return } @@ -904,7 +904,7 @@ private extension Account { } self.fetchingAllUnreadCounts = false self.updateUnreadCount() - self.unreadCountsInitialized = true + self.isUnreadCountsInitialized = true } } } diff --git a/Frameworks/Account/AccountManager.swift b/Frameworks/Account/AccountManager.swift index c63fd79c6..bd54f041f 100644 --- a/Frameworks/Account/AccountManager.swift +++ b/Frameworks/Account/AccountManager.swift @@ -22,9 +22,9 @@ public final class AccountManager: UnreadCountProvider { private let accountsFolder = RSDataSubfolder(nil, "Accounts")! private var accountsDictionary = [String: Account]() - public var unreadCountsInitialized: Bool { + public var isUnreadCountsInitialized: Bool { for account in accounts { - if !account.unreadCountsInitialized { + if !account.isUnreadCountsInitialized { return false } } diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift index d586b218e..3c704d9f3 100644 --- a/iOS/AppDelegate.swift +++ b/iOS/AppDelegate.swift @@ -175,7 +175,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele os_log("Accounts refresh processing terminated for running too long.", log: self.log, type: .info) } - while(!AccountManager.shared.unreadCountsInitialized) { + while(!AccountManager.shared.isUnreadCountsInitialized) { os_log("Waiting for unread counts to be initialized...", log: self.log, type: .debug) sleep(1) }