Add all of remaining utility variables

alpavanoglu · alpavanoglu · commit 7a5cc707d704 · 2022-08-24T13:26:34.000+02:00
diff --git a/WordPress/Classes/Stores/UserPersistentRepositoryUtility.swift b/WordPress/Classes/Stores/UserPersistentRepositoryUtility.swift
@@ -10,6 +10,11 @@ private enum UPRUConstants {
     static let hasShownCustomAppIconUpgradeAlert = "custom-app-icon-upgrade-alert-shown"
     static let createButtonTooltipWasDisplayed = "CreateButtonTooltipWasDisplayed"
     static let createButtonTooltipDisplayCount = "CreateButtonTooltipDisplayCount"
+    static let savedPostsPromoWasDisplayed = "SavedPostsV1PromoWasDisplayed"
+    static let storiesIntroWasAcknowledged = "storiesIntroWasAcknowledged"
+    static let currentAnnouncementsKey = "currentAnnouncements"
+    static let currentAnnouncementsDateKey = "currentAnnouncementsDate"
+    static let announcementsVersionDisplayedKey = "announcementsVersionDisplayed"
 }
 
 protocol UserPersistentRepositoryUtility: AnyObject {
@@ -108,4 +113,55 @@ extension UserPersistentRepositoryUtility {
             UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.createButtonTooltipWasDisplayed)
         }
     }
+
+    var savedPostsPromoWasDisplayed: Bool {
+        get {
+            return UserPersistentStoreFactory.instance().bool(forKey: UPRUConstants.savedPostsPromoWasDisplayed)
+        }
+        set {
+            UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.savedPostsPromoWasDisplayed)
+        }
+    }
+
+    var storiesIntroWasAcknowledged: Bool {
+        get {
+            return UserPersistentStoreFactory.instance().bool(forKey: UPRUConstants.storiesIntroWasAcknowledged)
+        }
+        set {
+            UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.storiesIntroWasAcknowledged)
+        }
+    }
+
+    var announcements: [Announcement]? {
+        get {
+            guard let encodedAnnouncements = UserPersistentStoreFactory.instance().object(forKey: UPRUConstants.currentAnnouncementsKey) as? Data,
+                  let announcements = try? PropertyListDecoder().decode([Announcement].self, from: encodedAnnouncements) else {
+                return nil
+            }
+            return announcements
+        }
+
+        set {
+            guard let announcements = newValue, let encodedAnnouncements = try? PropertyListEncoder().encode(announcements) else {
+                UserPersistentStoreFactory.instance().removeObject(forKey: UPRUConstants.currentAnnouncementsKey)
+                UserPersistentStoreFactory.instance().removeObject(forKey: UPRUConstants.currentAnnouncementsDateKey)
+                return
+            }
+            UserPersistentStoreFactory.instance().set(encodedAnnouncements, forKey: UPRUConstants.currentAnnouncementsKey)
+            UserPersistentStoreFactory.instance().set(Date(), forKey: UPRUConstants.currentAnnouncementsDateKey)
+        }
+    }
+
+    var announcementsDate: Date? {
+        UserPersistentStoreFactory.instance().object(forKey: UPRUConstants.currentAnnouncementsDateKey) as? Date
+    }
+
+    var announcementsVersionDisplayed: String? {
+        get {
+            UserPersistentStoreFactory.instance().string(forKey: UPRUConstants.announcementsVersionDisplayedKey)
+        }
+        set {
+            UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.announcementsVersionDisplayedKey)
+        }
+    }
 }
diff --git a/WordPress/Classes/ViewRelated/Reader/Detail/WebView/ReaderCSS.swift b/WordPress/Classes/ViewRelated/Reader/Detail/WebView/ReaderCSS.swift
@@ -50,7 +50,7 @@ struct ReaderCSS {
     }
 
     init(now: Int = Int(Date().timeIntervalSince1970),
-         store: KeyValueDatabase = UserDefaults.standard,
+         store: KeyValueDatabase = UserPersistentStoreFactory.instance(),
          isInternetReachable: @escaping () -> Bool = ReachabilityUtils.isInternetReachable) {
         self.store = store
         self.now = now
diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderInterestsCoordinator.swift b/WordPress/Classes/ViewRelated/Reader/ReaderInterestsCoordinator.swift
@@ -9,7 +9,7 @@ class ReaderSelectInterestsCoordinator {
     ///   - store: An optional backing store to keep track of if the user has seen the select interests view or not
     ///   - userId: The logged in user account, this makes sure the tracking is a per-user basis
     init(service: ReaderFollowedInterestsService? = nil,
-         store: KeyValueDatabase = UserDefaults.standard,
+         store: KeyValueDatabase = UserPersistentStoreFactory.instance(),
          userId: NSNumber? = nil,
          context: NSManagedObjectContext = ContextManager.sharedInstance().mainContext) {
 
diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderWelcomeBanner.swift b/WordPress/Classes/ViewRelated/Reader/ReaderWelcomeBanner.swift
@@ -20,7 +20,7 @@ class ReaderWelcomeBanner: UIView, NibLoadable {
 
     /// Present the Welcome banner just one time
     class func displayIfNeeded(in tableView: UITableView,
-                               database: KeyValueDatabase = UserDefaults.standard) {
+                               database: KeyValueDatabase = UserPersistentStoreFactory.instance()) {
         guard !database.bool(forKey: ReaderWelcomeBanner.bannerPresentedKey) else {
             return
         }
diff --git a/WordPress/Classes/ViewRelated/Stats/Helpers/SiteStatsInformation.swift b/WordPress/Classes/ViewRelated/Stats/Helpers/SiteStatsInformation.swift
@@ -32,7 +32,7 @@ import Foundation
 
 extension SiteStatsInformation {
 
-    func getCurrentSiteInsights(_ userDefaults: UserDefaults = UserDefaults.standard) -> [InsightType] {
+    func getCurrentSiteInsights(_ userDefaults: UserPersistentRepository = UserPersistentStoreFactory.instance()) -> [InsightType] {
 
         guard let siteID = siteID?.stringValue else {
             return InsightType.defaultInsights
@@ -44,7 +44,7 @@ extension SiteStatsInformation {
         return InsightType.typesForValues(values ?? InsightType.defaultInsightsValues)
     }
 
-    func saveCurrentSiteInsights(_ insightsCards: [InsightType], _ userDefaults: UserDefaults = UserDefaults.standard) {
+    func saveCurrentSiteInsights(_ insightsCards: [InsightType], _ userDefaults: UserPersistentRepository = UserPersistentStoreFactory.instance()) {
 
         guard let siteID = siteID?.stringValue else {
             return
diff --git a/WordPress/Classes/ViewRelated/Support/SupportTableViewController.swift b/WordPress/Classes/ViewRelated/Support/SupportTableViewController.swift
@@ -12,7 +12,7 @@ class SupportTableViewController: UITableViewController {
     var showHelpFromViewController: UIViewController?
 
     private var tableHandler: ImmuTableViewHandler?
-    private let userDefaults = UserDefaults.standard
+    private let userDefaults = UserPersistentStoreFactory.instance()
 
     /// This closure is called when this VC is about to be dismissed due to the user
     /// tapping the dismiss button.
diff --git a/WordPress/Classes/ViewRelated/System/FancyAlertViewController+AppIcons.swift b/WordPress/Classes/ViewRelated/System/FancyAlertViewController+AppIcons.swift
@@ -12,11 +12,11 @@ extension FancyAlertViewController {
         guard AppConfiguration.allowsCustomAppIcons,
               AppIcon.isUsingCustomIcon,
               origin.presentedViewController == nil,
-              UserDefaults.standard.hasShownCustomAppIconUpgradeAlert == false else {
+              UserPersistentStoreFactory.instance().hasShownCustomAppIconUpgradeAlert == false else {
             return
         }
 
-        UserDefaults.standard.hasShownCustomAppIconUpgradeAlert = true
+        UserPersistentStoreFactory.instance().hasShownCustomAppIconUpgradeAlert = true
 
         let controller = FancyAlertViewController.makeCustomAppIconUpgradeAlertController(with: origin)
         controller.modalPresentationStyle = .custom
diff --git a/WordPress/Classes/ViewRelated/System/FancyAlertViewController+SavedPosts.swift b/WordPress/Classes/ViewRelated/System/FancyAlertViewController+SavedPosts.swift
@@ -11,8 +11,8 @@ extension FancyAlertViewController {
     }
 
     static func presentReaderSavedPostsAlertControllerIfNecessary(from origin: UIViewController & UIViewControllerTransitioningDelegate) {
-        if !UserDefaults.standard.savedPostsPromoWasDisplayed {
-            UserDefaults.standard.savedPostsPromoWasDisplayed = true
+        if !UserPersistentStoreFactory.instance().savedPostsPromoWasDisplayed {
+            UserPersistentStoreFactory.instance().savedPostsPromoWasDisplayed = true
 
             let controller = FancyAlertViewController.makeReaderSavedPostsAlertController()
             controller.modalPresentationStyle = .custom
@@ -41,20 +41,3 @@ extension FancyAlertViewController {
         return controller
     }
 }
-
-// MARK: - User Defaults
-
-extension UserDefaults {
-    private enum Keys: String {
-        case savedPostsPromoWasDisplayed = "SavedPostsV1PromoWasDisplayed"
-    }
-
-    var savedPostsPromoWasDisplayed: Bool {
-        get {
-            return bool(forKey: Keys.savedPostsPromoWasDisplayed.rawValue)
-        }
-        set {
-            set(newValue, forKey: Keys.savedPostsPromoWasDisplayed.rawValue)
-        }
-    }
-}
diff --git a/WordPress/Classes/ViewRelated/System/Floating Create Button/CreateButtonCoordinator.swift b/WordPress/Classes/ViewRelated/System/Floating Create Button/CreateButtonCoordinator.swift
@@ -39,20 +39,20 @@ import WordPressFlux
             if newValue >= Constants.maximumTooltipViews {
                 didDismissTooltip = true
             } else {
-                UserDefaults.standard.createButtonTooltipDisplayCount = newValue
+                UserPersistentStoreFactory.instance().createButtonTooltipDisplayCount = newValue
             }
         }
         get {
-            return UserDefaults.standard.createButtonTooltipDisplayCount
+            return UserPersistentStoreFactory.instance().createButtonTooltipDisplayCount
         }
     }
 
     private var didDismissTooltip: Bool {
         set {
-            UserDefaults.standard.createButtonTooltipWasDisplayed = newValue
+            UserPersistentStoreFactory.instance().createButtonTooltipWasDisplayed = newValue
         }
         get {
-            return UserDefaults.standard.createButtonTooltipWasDisplayed
+            return UserPersistentStoreFactory.instance().createButtonTooltipWasDisplayed
         }
     }
 
diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController+ShowTab.swift b/WordPress/Classes/ViewRelated/System/WPTabBarController+ShowTab.swift
@@ -53,10 +53,10 @@ extension WPTabBarController {
             return
         }
 
-        if UserDefaults.standard.storiesIntroWasAcknowledged == false {
+        if UserPersistentStoreFactory.instance().storiesIntroWasAcknowledged == false {
             // Show Intro screen
             let intro = StoriesIntroViewController(continueTapped: { [weak self] in
-                UserDefaults.standard.storiesIntroWasAcknowledged = true
+                UserPersistentStoreFactory.instance().storiesIntroWasAcknowledged = true
                 self?.showStoryEditor()
             }, openURL: { [weak self] url in
                 let webViewController = WebViewControllerFactory.controller(url: url, source: "show_story_example")
diff --git a/WordPress/Classes/ViewRelated/What's New/Data store/Cache/AnnouncementsCache.swift b/WordPress/Classes/ViewRelated/What's New/Data store/Cache/AnnouncementsCache.swift
@@ -12,46 +12,15 @@ struct UserDefaultsAnnouncementsCache: AnnouncementsCache {
 
     var announcements: [Announcement]? {
         get {
-            return UserDefaults.standard.announcements
+            return UserPersistentStoreFactory.instance().announcements
         }
         set {
-            UserDefaults.standard.announcements = newValue
+            UserPersistentStoreFactory.instance().announcements = newValue
         }
     }
 
     var date: Date? {
-        UserDefaults.standard.announcementsDate
+        UserPersistentStoreFactory.instance().announcementsDate
     }
 }
 
-
-// MARK: - Cache on disk
-private extension UserDefaults {
-
-    static let currentAnnouncementsKey = "currentAnnouncements"
-    static let currentAnnouncementsDateKey = "currentAnnouncementsDate"
-
-    var announcements: [Announcement]? {
-        get {
-            guard let encodedAnnouncements = value(forKey: Self.currentAnnouncementsKey) as? Data,
-                  let announcements = try? PropertyListDecoder().decode([Announcement].self, from: encodedAnnouncements) else {
-                return nil
-            }
-            return announcements
-        }
-
-        set {
-            guard let announcements = newValue, let encodedAnnouncements = try? PropertyListEncoder().encode(announcements) else {
-                removeObject(forKey: Self.currentAnnouncementsKey)
-                removeObject(forKey: Self.currentAnnouncementsDateKey)
-                return
-            }
-            set(encodedAnnouncements, forKey: Self.currentAnnouncementsKey)
-            set(Date(), forKey: Self.currentAnnouncementsDateKey)
-        }
-    }
-
-    var announcementsDate: Date? {
-        value(forKey: Self.currentAnnouncementsDateKey) as? Date
-    }
-}
diff --git a/WordPress/Classes/ViewRelated/What's New/Presenter/WhatIsNewScenePresenter.swift b/WordPress/Classes/ViewRelated/What's New/Presenter/WhatIsNewScenePresenter.swift
@@ -148,17 +148,6 @@ private extension WhatIsNewScenePresenter {
 
 
 private extension UserDefaults {
-
-    static let announcementsVersionDisplayedKey = "announcementsVersionDisplayed"
-
-    var announcementsVersionDisplayed: String? {
-        get {
-            string(forKey: UserDefaults.announcementsVersionDisplayedKey)
-        }
-        set {
-            set(newValue, forKey: UserDefaults.announcementsVersionDisplayedKey)
-        }
-    }
 }
 
 fileprivate extension String {
diff --git a/WordPress/Classes/ViewRelated/What's New/Views/StoriesIntroViewController.swift b/WordPress/Classes/ViewRelated/What's New/Views/StoriesIntroViewController.swift
@@ -86,20 +86,3 @@ class StoriesIntroViewController: WhatIsNewViewController {
         WPAnalytics.track(.storyIntroDismissed)
     }
 }
-
-// MARK: - Helpers
-
-extension UserDefaults {
-    private enum Keys: String {
-        case storiesIntroWasAcknowledged = "storiesIntroWasAcknowledged"
-    }
-
-    var storiesIntroWasAcknowledged: Bool {
-        get {
-            return bool(forKey: Keys.storiesIntroWasAcknowledged.rawValue)
-        }
-        set {
-            set(newValue, forKey: Keys.storiesIntroWasAcknowledged.rawValue)
-        }
-    }
-}

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ struct ReaderCSS {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`init(now: Int = Int(Date().timeIntervalSince1970),`
`53`		`- store: KeyValueDatabase = UserDefaults.standard,`
	`53`	`+ store: KeyValueDatabase = UserPersistentStoreFactory.instance(),`
`54`	`54`	`isInternetReachable: @escaping () -> Bool = ReachabilityUtils.isInternetReachable) {`
`55`	`55`	`self.store = store`
`56`	`56`	`self.now = now`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class ReaderWelcomeBanner: UIView, NibLoadable {`
`20`	`20`
`21`	`21`	`/// Present the Welcome banner just one time`
`22`	`22`	`class func displayIfNeeded(in tableView: UITableView,`
`23`		`- database: KeyValueDatabase = UserDefaults.standard) {`
	`23`	`+ database: KeyValueDatabase = UserPersistentStoreFactory.instance()) {`
`24`	`24`	`guard !database.bool(forKey: ReaderWelcomeBanner.bannerPresentedKey) else {`
`25`	`25`	`return`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,20 +39,20 @@ import WordPressFlux`
`39`	`39`	`if newValue >= Constants.maximumTooltipViews {`
`40`	`40`	`didDismissTooltip = true`
`41`	`41`	`} else {`
`42`		`- UserDefaults.standard.createButtonTooltipDisplayCount = newValue`
	`42`	`+ UserPersistentStoreFactory.instance().createButtonTooltipDisplayCount = newValue`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`get {`
`46`		`- return UserDefaults.standard.createButtonTooltipDisplayCount`
	`46`	`+ return UserPersistentStoreFactory.instance().createButtonTooltipDisplayCount`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`private var didDismissTooltip: Bool {`
`51`	`51`	`set {`
`52`		`- UserDefaults.standard.createButtonTooltipWasDisplayed = newValue`
	`52`	`+ UserPersistentStoreFactory.instance().createButtonTooltipWasDisplayed = newValue`
`53`	`53`	`}`
`54`	`54`	`get {`
`55`		`- return UserDefaults.standard.createButtonTooltipWasDisplayed`
	`55`	`+ return UserPersistentStoreFactory.instance().createButtonTooltipWasDisplayed`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`