Device

Author: paulb777

FirebaseRemoteConfig/Sources/FIRRemoteConfig.m

@@ -28,9 +28,10 @@
 #import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigRealtime.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigValue_Internal.h"
-#import "FirebaseRemoteConfig/Sources/RCNDevice.h"
 #import "FirebaseRemoteConfig/Sources/RCNPersonalization.h"
 
+#import "FirebaseRemoteConfig/FirebaseRemoteConfig-Swift.h"
+
 /// Remote Config Error Domain.
 /// TODO: Rename according to obj-c style for constants.
 NSString *const FIRRemoteConfigErrorDomain = @"com.google.remoteconfig.ErrorDomain";

FirebaseRemoteConfig/Sources/RCNConfigFetch.m

@@ -24,7 +24,9 @@
 #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigContent.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h"
-#import "FirebaseRemoteConfig/Sources/RCNDevice.h"
+
+#import "FirebaseRemoteConfig/FirebaseRemoteConfig-Swift.h"
+
 @import FirebaseRemoteConfigInterop;
 
 #ifdef RCN_STAGING_SERVER
@@ -134,8 +136,8 @@ - (void)fetchConfigWithExpirationDuration:(NSTimeInterval)expirationDuration
                         completionHandler:
                             (_Nullable FIRRemoteConfigFetchCompletion)completionHandler {
   // Note: We expect the googleAppID to always be available.
-  BOOL hasDeviceContextChanged =
-      FIRRemoteConfigHasDeviceContextChanged(_settings.deviceContext, _options.googleAppID);
+  BOOL hasDeviceContextChanged = [Device remoteConfigHasDeviceContextChanged:_settings.deviceContext
+                                                           projectIdentifier:_options.googleAppID];
 
   __weak RCNConfigFetch *weakSelf = self;
   dispatch_async(_lockQueue, ^{
@@ -201,8 +203,8 @@ - (void)fetchConfigWithExpirationDuration:(NSTimeInterval)expirationDuration
 - (void)realtimeFetchConfigWithNoExpirationDuration:(NSInteger)fetchAttemptNumber
                                   completionHandler:(RCNConfigFetchCompletion)completionHandler {
   // Note: We expect the googleAppID to always be available.
-  BOOL hasDeviceContextChanged =
-      FIRRemoteConfigHasDeviceContextChanged(_settings.deviceContext, _options.googleAppID);
+  BOOL hasDeviceContextChanged = [Device remoteConfigHasDeviceContextChanged:_settings.deviceContext
+                                                           projectIdentifier:_options.googleAppID];
 
   __weak RCNConfigFetch *weakSelf = self;
   dispatch_async(_lockQueue, ^{

FirebaseRemoteConfig/Sources/RCNConfigRealtime.m

@@ -23,7 +23,6 @@
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h"
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h"
-#import "FirebaseRemoteConfig/Sources/RCNDevice.h"
 
 /// URL params
 static NSString *const kServerURLDomain = @"https://firebaseremoteconfigrealtime.googleapis.com";
@@ -329,7 +328,7 @@ - (void)createRequestBodyWithCompletion:(void (^)(NSData *_Nonnull requestBody))
                          @"sdkVersion:'%@', appInstanceId:'%@'}",
                          [strongSelf->_options GCMSenderID], namespace,
                          strongSelf->_configFetch.templateVersionNumber,
-                         strongSelf->_options.googleAppID, FIRRemoteConfigPodVersion(),
+                         strongSelf->_options.googleAppID, Device.remoteConfigPodVersion,
                          strongSelf->_settings.configInstallationsIdentifier];
     NSData *postData = [postBody dataUsingEncoding:NSUTF8StringEncoding];
     NSError *compressionError;

FirebaseRemoteConfig/Sources/RCNConfigSettings.m

@@ -21,7 +21,6 @@
 #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigDBManager.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigValue_Internal.h"
-#import "FirebaseRemoteConfig/Sources/RCNDevice.h"
 
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>
 #import "FirebaseCore/Extension/FirebaseCoreInternal.h"
@@ -293,7 +292,7 @@ - (void)updateMetadataWithFetchSuccessStatus:(BOOL)fetchSuccess
   if (fetchSuccess) {
     [self updateLastFetchTimeInterval:[[NSDate date] timeIntervalSince1970]];
     // Note: We expect the googleAppID to always be available.
-    _deviceContext = FIRRemoteConfigDeviceContextWithProjectIdentifier(_googleAppID);
+    _deviceContext = [[Device remoteConfigDeviceContextWith:_googleAppID] mutableCopy];
     _lastFetchedTemplateVersion = templateVersion;
     [_userDefaultsManager setLastFetchedTemplateVersion:templateVersion];
   }
@@ -398,23 +397,25 @@ - (NSString *)nextRequestWithUserProperties:(NSDictionary *)userProperties {
                                                                 _configInstallationsToken]];
   ret = [ret stringByAppendingString:[NSString stringWithFormat:@", app_id:'%@'", _googleAppID]];
 
-  ret = [ret stringByAppendingString:[NSString stringWithFormat:@", country_code:'%@'",
-                                                                FIRRemoteConfigDeviceCountry()]];
+  ret =
+      [ret stringByAppendingString:[NSString stringWithFormat:@", country_code:'%@'",
+                                                              [Device remoteConfigDeviceCountry]]];
   ret = [ret stringByAppendingString:[NSString stringWithFormat:@", language_code:'%@'",
-                                                                FIRRemoteConfigDeviceLocale()]];
+                                                                [Device remoteConfigDeviceLocale]]];
   ret = [ret
       stringByAppendingString:[NSString stringWithFormat:@", platform_version:'%@'",
                                                          [GULAppEnvironmentUtil systemVersion]]];
   ret = [ret stringByAppendingString:[NSString stringWithFormat:@", time_zone:'%@'",
-                                                                FIRRemoteConfigTimezone()]];
+                                                                [Device remoteConfigTimezone]]];
   ret = [ret stringByAppendingString:[NSString stringWithFormat:@", package_name:'%@'",
                                                                 _bundleIdentifier]];
   ret = [ret stringByAppendingString:[NSString stringWithFormat:@", app_version:'%@'",
-                                                                FIRRemoteConfigAppVersion()]];
-  ret = [ret stringByAppendingString:[NSString stringWithFormat:@", app_build:'%@'",
-                                                                FIRRemoteConfigAppBuildVersion()]];
+                                                                [Device remoteConfigAppVersion]]];
+  ret = [ret
+      stringByAppendingString:[NSString stringWithFormat:@", app_build:'%@'",
+                                                         [Device remoteConfigAppBuildVersion]]];
   ret = [ret stringByAppendingString:[NSString stringWithFormat:@", sdk_version:'%@'",
-                                                                FIRRemoteConfigPodVersion()]];
+                                                                [Device remoteConfigPodVersion]]];
 
   if (userProperties && userProperties.count > 0) {
     NSError *error;