diff --git a/Kiwix-OSX/Controllers/LibraryController.swift b/Kiwix-OSX/Controllers/LibraryController.swift index f4ef2583..a57898e1 100644 --- a/Kiwix-OSX/Controllers/LibraryController.swift +++ b/Kiwix-OSX/Controllers/LibraryController.swift @@ -14,7 +14,7 @@ class LibraryController: NSViewController { @IBOutlet weak var refresh: NSButton! @IBAction func refresh(sender: NSButton) { let operation = RefreshLibraryOperation(invokedAutomatically: false, completionHandler: nil) - GlobalOperationQueue.sharedInstance.addOperation(operation) + GlobalQueue.shared.addOperation(operation) } let managedObjectContext = NSApplication.appDelegate.managedObjectContext diff --git a/Kiwix-iOS/AppDelegate.swift b/Kiwix-iOS/AppDelegate.swift index c0db8be7..4c8f4df8 100644 --- a/Kiwix-iOS/AppDelegate.swift +++ b/Kiwix-iOS/AppDelegate.swift @@ -157,7 +157,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { completionHandler(operation.hasUpdate ? .NewData : .NoData) }) - GlobalOperationQueue.sharedInstance.addOperation(operation) + GlobalQueue.shared.addOperation(operation) } // MARK: - Core Data stack diff --git a/Kiwix-iOS/Controller/BookmarkTBVC.swift b/Kiwix-iOS/Controller/BookmarkTBVC.swift index 4d6dc861..53e78af5 100644 --- a/Kiwix-iOS/Controller/BookmarkTBVC.swift +++ b/Kiwix-iOS/Controller/BookmarkTBVC.swift @@ -32,7 +32,7 @@ class BookmarkTBVC: UITableViewController, NSFetchedResultsControllerDelegate, D func updateWidgetData() { let operation = UpdateWidgetDataSourceOperation() - GlobalOperationQueue.sharedInstance.addOperation(operation) + GlobalQueue.shared.addOperation(operation) } // MARK: - Empty table datasource & delegate diff --git a/Kiwix-iOS/Controller/Library/CloudBooksController.swift b/Kiwix-iOS/Controller/Library/CloudBooksController.swift index c3402be3..ba253501 100644 --- a/Kiwix-iOS/Controller/Library/CloudBooksController.swift +++ b/Kiwix-iOS/Controller/Library/CloudBooksController.swift @@ -96,7 +96,7 @@ class CloudBooksController: UITableViewController, NSFetchedResultsControllerDel // guard error == ReachabilityCondition.Error.NotReachable else {return} // } }) - GlobalOperationQueue.sharedInstance.addOperation(operation) + GlobalQueue.shared.addOperation(operation) } // MARK: - LanguageFilterUpdating diff --git a/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift b/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift index d6274b12..a8c289a3 100644 --- a/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift +++ b/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift @@ -30,7 +30,7 @@ extension MainController: LPTBarButtonItemDelegate, TableOfContentsDelegate, Zim if article.snippet == nil {article.snippet = getSnippet(webView)} let operation = UpdateWidgetDataSourceOperation() - GlobalOperationQueue.sharedInstance.addOperation(operation) + GlobalQueue.shared.addOperation(operation) guard let controller = bookmarkController ?? UIStoryboard.main.initViewController("BookmarkController", type: BookmarkController.self) else {return} bookmarkController = controller diff --git a/Kiwix-iOS/Controller/Main/MainControllerShowHide.swift b/Kiwix-iOS/Controller/Main/MainControllerShowHide.swift index e1f816ac..1582f706 100644 --- a/Kiwix-iOS/Controller/Main/MainControllerShowHide.swift +++ b/Kiwix-iOS/Controller/Main/MainControllerShowHide.swift @@ -190,7 +190,7 @@ extension MainController { func showGetStartedAlert() { guard !Preference.hasShowGetStartedAlert else {return} let operation = GetStartedAlert(presentationContext: self) - GlobalOperationQueue.sharedInstance.addOperation(operation) + GlobalQueue.shared.addOperation(operation) Preference.hasShowGetStartedAlert = true } } diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist index 3c94c13e..f3c48671 100644 --- a/Kiwix-iOSWidgets/Bookmarks/Info.plist +++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.7.2140 + 1.7.2141 NSExtension NSExtensionMainStoryboard diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj index 2c0e5c50..6b825def 100644 --- a/Kiwix.xcodeproj/project.pbxproj +++ b/Kiwix.xcodeproj/project.pbxproj @@ -113,7 +113,7 @@ 97D452BE1D1723FF0033666F /* CollectionViewCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D452BD1D1723FF0033666F /* CollectionViewCells.swift */; }; 97D55EF61D2075180081B523 /* TableOfContentsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D55EF51D2075180081B523 /* TableOfContentsController.swift */; }; 97D6811B1D6E2A7100E5FA99 /* DownloadTasksController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811A1D6E2A7100E5FA99 /* DownloadTasksController.swift */; }; - 97D681231D6F70AC00E5FA99 /* GlobalOperationQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811C1D6F70AC00E5FA99 /* GlobalOperationQueue.swift */; }; + 97D681231D6F70AC00E5FA99 /* GlobalQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811C1D6F70AC00E5FA99 /* GlobalQueue.swift */; }; 97D681241D6F70AC00E5FA99 /* RefreshLibraryOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811D1D6F70AC00E5FA99 /* RefreshLibraryOperation.swift */; }; 97D681251D6F70AC00E5FA99 /* ScanLocalBookOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811E1D6F70AC00E5FA99 /* ScanLocalBookOperation.swift */; }; 97D681261D6F70AC00E5FA99 /* SearchOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811F1D6F70AC00E5FA99 /* SearchOperation.swift */; }; @@ -337,7 +337,7 @@ 97D452C11D1871E70033666F /* SearchTabController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SearchTabController.swift; path = "Kiwix-iOS/Controller/Search/SearchTabController.swift"; sourceTree = SOURCE_ROOT; }; 97D55EF51D2075180081B523 /* TableOfContentsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TableOfContentsController.swift; path = "Kiwix-iOS/Controller/TableOfContentsController.swift"; sourceTree = SOURCE_ROOT; }; 97D6811A1D6E2A7100E5FA99 /* DownloadTasksController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadTasksController.swift; sourceTree = ""; }; - 97D6811C1D6F70AC00E5FA99 /* GlobalOperationQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalOperationQueue.swift; sourceTree = ""; }; + 97D6811C1D6F70AC00E5FA99 /* GlobalQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalQueue.swift; sourceTree = ""; }; 97D6811D1D6F70AC00E5FA99 /* RefreshLibraryOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RefreshLibraryOperation.swift; sourceTree = ""; }; 97D6811E1D6F70AC00E5FA99 /* ScanLocalBookOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScanLocalBookOperation.swift; sourceTree = ""; }; 97D6811F1D6F70AC00E5FA99 /* SearchOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchOperation.swift; sourceTree = ""; }; @@ -973,7 +973,7 @@ isa = PBXGroup; children = ( 97DF259B1D6F7612001648A3 /* BookOperation.swift */, - 97D6811C1D6F70AC00E5FA99 /* GlobalOperationQueue.swift */, + 97D6811C1D6F70AC00E5FA99 /* GlobalQueue.swift */, 97D6811D1D6F70AC00E5FA99 /* RefreshLibraryOperation.swift */, 97D6811E1D6F70AC00E5FA99 /* ScanLocalBookOperation.swift */, 97D6811F1D6F70AC00E5FA99 /* SearchOperation.swift */, @@ -1519,7 +1519,7 @@ 97D681421D6F712800E5FA99 /* Language+CoreDataProperties.swift in Sources */, 97D681371D6F711A00E5FA99 /* Article.swift in Sources */, 971A104A1D022CBE007FC62C /* SearchResultTBVC.swift in Sources */, - 97D681231D6F70AC00E5FA99 /* GlobalOperationQueue.swift in Sources */, + 97D681231D6F70AC00E5FA99 /* GlobalQueue.swift in Sources */, 97A1FD3B1D6F724E00A80EE2 /* stringTools.cpp in Sources */, 97A1FD321D6F723D00A80EE2 /* resourceTools.cpp in Sources */, 971A10321D022AD5007FC62C /* SearchBar.swift in Sources */, diff --git a/Kiwix/Operations/GlobalOperationQueue.swift b/Kiwix/Operations/GlobalQueue.swift similarity index 86% rename from Kiwix/Operations/GlobalOperationQueue.swift rename to Kiwix/Operations/GlobalQueue.swift index 81659cd6..c00d201a 100644 --- a/Kiwix/Operations/GlobalOperationQueue.swift +++ b/Kiwix/Operations/GlobalQueue.swift @@ -1,5 +1,5 @@ // -// GlobalOperationQueue.swift +// GlobalQueue.swift // Kiwix // // Created by Chris Li on 5/14/16. @@ -8,8 +8,8 @@ import Operations -class GlobalOperationQueue: OperationQueue { - static let sharedInstance = GlobalOperationQueue() +class GlobalQueue: OperationQueue { + static let shared = GlobalQueue() } public enum OperationErrorCode: Int { diff --git a/Kiwix/Operations/UIOperations.swift b/Kiwix/Operations/UIOperations.swift index 79d95721..4f58c460 100644 --- a/Kiwix/Operations/UIOperations.swift +++ b/Kiwix/Operations/UIOperations.swift @@ -90,7 +90,7 @@ class GetStartedAlert: AlertOperation { } addActionWithTitle(NSLocalizedString("Import", comment: comment), style: .Default) { (alert) in let operation = ShowHelpPageOperation(type: .ImportBookLearnMore, presentationContext: mainController) - GlobalOperationQueue.sharedInstance.addOperation(operation) + GlobalQueue.shared.addOperation(operation) } addActionWithTitle(NSLocalizedString("Dismiss", comment: comment)) } diff --git a/Kiwix/ZimMultiReader/ZimMultiReader.swift b/Kiwix/ZimMultiReader/ZimMultiReader.swift index 175d7a15..31e15962 100644 --- a/Kiwix/ZimMultiReader/ZimMultiReader.swift +++ b/Kiwix/ZimMultiReader/ZimMultiReader.swift @@ -45,7 +45,7 @@ class ZimMultiReader: NSObject, DirectoryMonitorDelegate { self.delegate?.firstBookAdded() } } - GlobalOperationQueue.sharedInstance.addOperation(scanOperation) + GlobalQueue.shared.addOperation(scanOperation) self.scanOperation = scanOperation }