Home Verkennen Help
Registreren Inloggen
chenwenyi
/
firebase-ios-sdk
1
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

[Performance] Migrate to GoogleUtilities's storage container (#12759)

Nick Cooke 1 jaar geleden
bovenliggende
1cde471f52
commit
3211a7f34c
6 gewijzigde bestanden met toevoegingen van 59 en 49 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 4 3
      FirebasePerformance.podspec
  2. 3 1
      FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h
  3. 11 9
      FirebasePerformance/Sources/Configurations/FPRConfigurations.m
  4. 3 1
      FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags+Private.h
  5. 3 1
      FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m
  6. 35 34
      FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m

+ 4 - 3
FirebasePerformance.podspec
Bestand weergeven 

@@ -64,9 +64,10 @@ Firebase Performance library to measure performance of Mobile and Web Apps.
 
   s.dependency 'FirebaseRemoteConfig', '~> 10.0'
 
   s.dependency 'FirebaseSessions', '~> 10.5'
 
   s.dependency 'GoogleDataTransport', '~> 9.2'
 
-  s.dependency 'GoogleUtilities/Environment', '~> 7.8'
 
-  s.dependency 'GoogleUtilities/ISASwizzler', '~> 7.8'
 
-  s.dependency 'GoogleUtilities/MethodSwizzler', '~> 7.8'
 
+  s.dependency 'GoogleUtilities/Environment', '~> 7.13'
 
+  s.dependency 'GoogleUtilities/ISASwizzler', '~> 7.13'
 
+  s.dependency 'GoogleUtilities/MethodSwizzler', '~> 7.13'
 
+  s.dependency 'GoogleUtilities/UserDefaults', '~> 7.13'
 
   s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0'
 
 
   s.test_spec 'unit' do |unit_tests|

+ 3 - 1
FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h
Bestand weergeven 

@@ -17,6 +17,8 @@
 
 
 NS_ASSUME_NONNULL_BEGIN
 
 
+@class GULUserDefaults;
 
+
 
 /** List of gauges the gauge manager controls. */
 
 typedef NS_OPTIONS(NSUInteger, FPRConfigurationSource) {
 
   FPRConfigurationSourceNone = 0,
 
@@ -36,7 +38,7 @@ typedef NS_OPTIONS(NSUInteger, FPRConfigurationSource) {
 
 @property(nonatomic) Class FIRAppClass;
 
 
 /** @brief User defaults used for user preference config fetches . */
 
-@property(nonatomic) NSUserDefaults *userDefaults;
 
+@property(nonatomic) GULUserDefaults *userDefaults;
 
 
 /** @brief The main bundle identifier used by config system. */
 
 @property(nonatomic) NSString *mainBundleIdentifier;

+ 11 - 9
FirebasePerformance/Sources/Configurations/FPRConfigurations.m
Bestand weergeven 

@@ -14,6 +14,8 @@
 
 
 #import <UIKit/UIKit.h>
 
 
+#import <GoogleUtilities/GULUserDefaults.h>
 
+
 
 #import "FirebasePerformance/Sources/Common/FPRConstants.h"
 
 #import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h"
 
 #import "FirebasePerformance/Sources/Configurations/FPRConfigurations.h"
 
@@ -58,9 +60,9 @@ static dispatch_once_t gSharedInstanceToken;
 
 + (void)reset {
 
   // TODO(b/120032990): Reset the singletons that this singleton uses.
 
   gSharedInstanceToken = 0;
 
-  [[NSUserDefaults standardUserDefaults]
 
+  [[GULUserDefaults standardUserDefaults]
 
       removeObjectForKey:kFPRConfigInstrumentationUserPreference];
 
-  [[NSUserDefaults standardUserDefaults] removeObjectForKey:kFPRConfigCollectionUserPreference];
 
+  [[GULUserDefaults standardUserDefaults] removeObjectForKey:kFPRConfigCollectionUserPreference];
 
 }
 
 
 - (instancetype)initWithSources:(FPRConfigurationSource)source {
 
@@ -73,7 +75,7 @@ static dispatch_once_t gSharedInstanceToken;
 
     [self registerForNotifications];
 
 
     self.FIRAppClass = [FIRApp class];
 
-    self.userDefaults = [NSUserDefaults standardUserDefaults];
 
+    self.userDefaults = [GULUserDefaults standardUserDefaults];
 
     self.infoDictionary = [NSBundle mainBundle].infoDictionary;
 
     self.mainBundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
 
     self.updateQueue = dispatch_queue_create("com.google.perf.configUpdate", DISPATCH_QUEUE_SERIAL);
 
@@ -141,7 +143,7 @@ static dispatch_once_t gSharedInstanceToken;
 
 
 // The data collection flag is determined by this order:
 
 //   1. A plist flag for permanently disabling data collection
 
-//   2. The runtime flag (NSUserDefaults)
 
+//   2. The runtime flag (GULUserDefaults)
 
 //   3. A plist flag for enabling/disabling (overrideable)
 
 //   4. The global data collection switch from Core.
 
 - (BOOL)isDataCollectionEnabled {
 
@@ -165,7 +167,7 @@ static dispatch_once_t gSharedInstanceToken;
 
     }
 
   }
 
   /**
 
-   * Check if the performance collection preference key is available in NSUserDefaults.
 
+   * Check if the performance collection preference key is available in GULUserDefaults.
 
    * If it exists - Just honor that and return that value.
 
    * If it does not exist - Check if firebase_performance_collection_enabled exists in Info.plist.
 
    * If it exists - honor that and return that value.
 
@@ -196,7 +198,7 @@ static dispatch_once_t gSharedInstanceToken;
 
       [self.userDefaults objectForKey:kFPRConfigInstrumentationUserPreference];
 
 
   /**
 
-   * Check if the performance instrumentation preference key is available in NSUserDefaults.
 
+   * Check if the performance instrumentation preference key is available in GULUserDefaults.
 
    * If it exists - Just honor that and return that value.
 
    * If not - Check if firebase_performance_instrumentation_enabled exists in Info.plist.
 
    * If it exists - honor that and return that value.
 
@@ -242,7 +244,7 @@ static dispatch_once_t gSharedInstanceToken;
 
   BOOL enabled = NO;
 
 
   /**
 
-   * Check if the diagnostics preference key is available in NSUserDefaults.
 
+   * Check if the diagnostics preference key is available in GULUserDefaults.
 
    * If it exists - Just honor that and return that value.
 
    * If not - Check if firebase_performance_instrumentation_enabled exists in Info.plist.
 
    * If it exists - honor that and return that value.
 
@@ -282,8 +284,8 @@ static dispatch_once_t gSharedInstanceToken;
 
    * Order of preference of returning the log source.
 
    * If it is an autopush build (based on environment variable), always return
 
    * LogRequest_LogSource_FireperfAutopush (461). If there is a recent value of remote config fetch,
 
-   * honor that value. If logSource cached value (NSUserDefaults value) exists, honor that. Fallback
 
-   * to the default value LogRequest_LogSource_Fireperf (462).
 
+   * honor that value. If logSource cached value (GULUserDefaults value) exists, honor that.
 
+   * Fallback to the default value LogRequest_LogSource_Fireperf (462).
 
    */
 
   int logSource = 462;

+ 3 - 1
FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags+Private.h
Bestand weergeven 

@@ -18,6 +18,8 @@
 
 
 NS_ASSUME_NONNULL_BEGIN
 
 
+@class GULUserDefaults;
 
+
 
 static NSString *const kFPRConfigPrefix = @"com.fireperf";
 
 
 /** Interval at which the configurations can be fetched. Specified in seconds. */
 
@@ -36,7 +38,7 @@ static NSInteger const kFPRMinAppStartConfigFetchDelayInSeconds = 5;
 
 @property(atomic, nullable) NSDate *lastFetchedTime;
 
 
 /** @brief User defaults used for caching. */
 
-@property(nonatomic) NSUserDefaults *userDefaults;
 
+@property(nonatomic) GULUserDefaults *userDefaults;
 
 
 /** @brief Last activated time of the configurations. */
 
 @property(nonatomic) NSDate *applicationStartTime;

+ 3 - 1
FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m
Bestand weergeven 

@@ -12,10 +12,12 @@
 
 // See the License for the specific language governing permissions and
 
 // limitations under the License.
 
 
-#import "FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.h"
 
+#import <GoogleUtilities/GULUserDefaults.h>
 
+
 
 #import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h"
 
 #import "FirebasePerformance/Sources/Configurations/FPRConfigurations.h"
 
 #import "FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags+Private.h"
 
+#import "FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.h"
 
 
 #import "FirebasePerformance/Sources/FPRConsoleLogger.h"

+ 35 - 34
FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m
Bestand weergeven 

@@ -12,6 +12,7 @@
 
 // See the License for the specific language governing permissions and
 
 // limitations under the License.
 
 
+#import <GoogleUtilities/GULUserDefaults.h>
 
 #import <XCTest/XCTest.h>
 
 
 #import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h"
 
@@ -49,7 +50,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRFakeRemoteConfig *remoteConfig = [[FPRFakeRemoteConfig alloc] init];
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  configFlags.userDefaults = [[NSUserDefaults alloc] init];
 
+  configFlags.userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
 
   // Provide expected remote config values
 
   FIRRemoteConfigValue *boolRCValueFromRemote =
 
@@ -264,7 +265,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"];
 
@@ -281,7 +282,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -316,7 +317,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_log_source"];
 
@@ -333,7 +334,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -370,7 +371,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey =
 
@@ -388,7 +389,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -423,7 +424,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey =
 
@@ -441,7 +442,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -476,7 +477,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey =
 
@@ -494,7 +495,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -529,7 +530,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey = [NSString
 
@@ -547,7 +548,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -582,7 +583,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey = [NSString
 
@@ -600,7 +601,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -637,7 +638,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey =
 
@@ -655,7 +656,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -690,7 +691,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey = [NSString
 
@@ -708,7 +709,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -745,7 +746,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey =
 
@@ -763,7 +764,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -798,7 +799,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey =
 
@@ -818,7 +819,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -858,7 +859,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey =
 
@@ -878,7 +879,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -918,7 +919,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey =
 
@@ -939,7 +940,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -980,7 +981,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey =
 
@@ -1001,7 +1002,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -1042,7 +1043,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *configKey =
 
@@ -1060,7 +1061,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   [configFlags resetCache];
 
@@ -1095,7 +1096,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSSet<NSString *> *versionSet =
 
@@ -1117,7 +1118,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *sdkVersions = @"1.0.2;1.0.3";
 
@@ -1154,7 +1155,7 @@ static NSInteger const kLogSource = 462;  // LogRequest_LogSource_Fireperf
 
 
   FPRRemoteConfigFlags *configFlags =
 
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
 
+  GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil];
 
   configFlags.userDefaults = userDefaults;
 
 
   NSString *sdkVersions = @" 1.0.2 ; 1.0.3 ";