Merge login & defaults feature flags into one

Author: alpavanoglu

WordPress/Classes/Stores/UserPersistentStoreFactory.swift

@@ -3,12 +3,12 @@ import Foundation
 @objc
 final class UserPersistentStoreFactory: NSObject {
     static func instance() -> UserPersistentRepository {
-        FeatureFlag.sharedUserDefaults.enabled ? UserPersistentStore.standard : UserDefaults.standard
+        FeatureFlag.contentMigration.enabled ? UserPersistentStore.standard : UserDefaults.standard
     }
 
     @objc
     static func userDefaultsInstance() -> UserDefaults {
-        guard FeatureFlag.sharedUserDefaults.enabled, let defaults = UserDefaults(suiteName: WPAppGroupName) else {
+        guard FeatureFlag.contentMigration.enabled, let defaults = UserDefaults(suiteName: WPAppGroupName) else {
             return UserDefaults.standard
         }
 

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -159,7 +159,7 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     private func copyToSharedDefaultsIfNeeded() {
-        if !AppConfiguration.isJetpack && FeatureFlag.sharedUserDefaults.enabled && !UserPersistentStore.standard.isOneOffMigrationComplete {
+        if !AppConfiguration.isJetpack && FeatureFlag.contentMigration.enabled && !UserPersistentStore.standard.isOneOffMigrationComplete {
             let dict = UserDefaults.standard.dictionaryRepresentation()
             for (key, value) in dict {
                 UserPersistentStore.standard.set(value, forKey: key)

WordPress/Classes/Utility/Blogging Reminders/BloggingRemindersScheduler.swift

@@ -147,7 +147,7 @@ class BloggingRemindersScheduler {
     }
 
     static func handleRemindersMigration() {
-        guard FeatureFlag.sharedLogin.enabled else {
+        guard FeatureFlag.contentMigration.enabled else {
             return
         }
 

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -32,8 +32,7 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
     case featureHighlightTooltip
     case jetpackPowered
     case jetpackPoweredBottomSheet
-    case sharedUserDefaults
-    case sharedLogin
+    case contentMigration
     case newJetpackLandingScreen
     case newWordPressLandingScreen
     case newCoreDataContext
@@ -115,9 +114,7 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
             return true
         case .jetpackPoweredBottomSheet:
             return false
-        case .sharedUserDefaults:
-            return false
-        case .sharedLogin:
+        case .contentMigration:
             return false
         case .newJetpackLandingScreen:
             return true
@@ -239,10 +236,8 @@ extension FeatureFlag {
             return "Jetpack powered banners and badges"
         case .jetpackPoweredBottomSheet:
             return "Jetpack powered bottom sheet"
-        case .sharedUserDefaults:
-            return "Shared User Defaults"
-        case .sharedLogin:
-            return "Shared Login"
+        case .contentMigration:
+            return "Content Migration"
         case .newJetpackLandingScreen:
             return "New Jetpack landing screen"
         case .newWordPressLandingScreen:

WordPress/Classes/Utility/LegacyContextFactory.m

@@ -35,7 +35,7 @@ - (void)createWriterContext
     NSManagedObjectContext *context = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
     context.persistentStoreCoordinator = self.container.persistentStoreCoordinator;
 
-    if ([Feature enabled:FeatureFlagSharedLogin]) {
+    if ([Feature enabled:FeatureFlagContentMigration]) {
         context.mergePolicy = NSMergeByPropertyStoreTrumpMergePolicy;
     }