SDK-479 improve test reliability. DeviceInfo no longer shadows the static user agent variable with an instance variable.

Author: echo-branch

Branch-SDK/Branch-SDK/BNCDeviceInfo.h

@@ -38,7 +38,6 @@
 
 @property (atomic, copy, readonly) NSString* country;            //!< The iso2 Country name (us, in,etc).
 @property (atomic, copy, readonly) NSString* language;           //!< The iso2 language code (en, ml).
-@property (atomic, copy, readonly) NSString* browserUserAgent;   //!< Simple user agent string.
 @property (atomic, copy, readonly) NSString* localIPAddress;     //!< The current local IP address.
 @property (atomic, copy, readonly) NSArray<NSString*> *allIPAddresses; //!< All local IP addresses.
 //----------Methods----------------//

Branch-SDK/Branch-SDK/BNCDeviceInfo.m

@@ -174,7 +174,6 @@ - (id)init {
 
     _country = [BNCDeviceInfo bnc_country].copy;
     _language = [BNCDeviceInfo bnc_language].copy;
-    _browserUserAgent = [BNCDeviceInfo userAgentString].copy;
     _extensionType = self.class.extensionType.copy;
     _branchSDKVersion = [NSString stringWithFormat:@"ios%@", BNC_SDK_VERSION];
     _applicationVersion = [NSBundle mainBundle].infoDictionary[@"CFBundleShortVersionString"];
@@ -355,7 +354,6 @@ - (NSDictionary*) v2dictionary {
     } else {
         addString(adId,             idfa);
     }
-    addString(browserUserAgent,     user_agent);
     addString(country,              country);
     addString(language,             language);
     addString(brandName,            brand);
@@ -368,6 +366,8 @@ - (NSDictionary*) v2dictionary {
     addString(localIPAddress,       local_ip);
 
     #include "BNCFieldDefines.h"
+    
+    dictionary[@"user_agent"] = [BNCDeviceInfo userAgentString];
 
     if (!self.isAdTrackingEnabled)
         dictionary[@"limit_ad_tracking"] = (__bridge NSNumber*) kCFBooleanTrue;

Branch-SDK/Branch-SDK/BNCUserAgentCollector.m

@@ -72,13 +72,21 @@ - (void)saveUserAgent:(NSString *)userAgent forSystemBuildVersion:(NSString *)sy
 // collect user agent from webkit.  this is expensive.
 - (void)collectUserAgentWithCompletion:(void (^)(NSString *userAgent))completion {
     dispatch_async(dispatch_get_main_queue(), ^{
-        self.webview = [[WKWebView alloc] initWithFrame:CGRectZero];
+        if (!self.webview) {
+            self.webview = [[WKWebView alloc] initWithFrame:CGRectZero];
+        }
+        
         [self.webview evaluateJavaScript:@"navigator.userAgent;" completionHandler:^(id _Nullable response, NSError * _Nullable error) {            
             if (completion) {
-                completion(response);
-                
-                // release the webview
-                self.webview = nil;
+                if (response) {
+                    // release the webview
+                    self.webview = nil;
+                    
+                    completion(response);
+                } else {
+                    // retry if we failed to obtain user agent.  This occasionally occurs on simulator.
+                    [self collectUserAgentWithCompletion:completion];
+                }
             }
         }];
     });

Branch-SDK/Branch-SDK/Networking/BNCServerInterface.m

@@ -894,7 +894,7 @@ - (void)updateDeviceInfoToMutableDictionary:(NSMutableDictionary *)dict {
     [self safeSetValue:deviceInfo.screenWidth forKey:BRANCH_REQUEST_KEY_SCREEN_WIDTH onDict:dict];
     [self safeSetValue:deviceInfo.screenHeight forKey:BRANCH_REQUEST_KEY_SCREEN_HEIGHT onDict:dict];
 
-    [self safeSetValue:deviceInfo.browserUserAgent forKey:@"user_agent" onDict:dict];
+    [self safeSetValue:[BNCDeviceInfo userAgentString] forKey:@"user_agent" onDict:dict];
     [self safeSetValue:deviceInfo.country forKey:@"country" onDict:dict];
     [self safeSetValue:deviceInfo.language forKey:@"language" onDict:dict];
     dict[@"local_ip"] = deviceInfo.localIPAddress;