change errors to warnings in BNCApplication. Remove telephony from testbed

Author: echo-branch

Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj

@@ -50,7 +50,6 @@
 		5F3D671B233062FD00454FF1 /* BNCJsonLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D671A233062FD00454FF1 /* BNCJsonLoader.m */; };
 		5F3D671C233062FD00454FF1 /* BNCJsonLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D671A233062FD00454FF1 /* BNCJsonLoader.m */; };
 		5F42763325DB3694005B9BBC /* AdServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F42763225DB3694005B9BBC /* AdServices.framework */; };
-		5F437E38237DE1320052064B /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F437E37237DE1320052064B /* CoreTelephony.framework */; settings = {ATTRIBUTES = (Required, ); }; };
 		5F437E40237E1A560052064B /* BNCDeviceSystemTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F437E3F237E1A560052064B /* BNCDeviceSystemTests.m */; };
 		5F5FDA102B7DE20800F14A43 /* BranchLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F5FDA0F2B7DE20800F14A43 /* BranchLogger.m */; };
 		5F5FDA122B7DE22A00F14A43 /* BranchLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F5FDA112B7DE22A00F14A43 /* BranchLogger.h */; };
@@ -569,7 +568,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				5F92B2362383644C00CA909B /* SystemConfiguration.framework in Frameworks */,
-				5F437E38237DE1320052064B /* CoreTelephony.framework in Frameworks */,
 				5F205D05231864E800C776D1 /* WebKit.framework in Frameworks */,
 				5FF7D2862A9549B40049158D /* AdServices.framework in Frameworks */,
 				466B584F1B17775900A69EDE /* AdSupport.framework in Frameworks */,

Sources/BranchSDK/BNCApplication.m

@@ -69,64 +69,66 @@ + (BNCApplication*) createCurrentApplication {
     return application;
 }
 
-+ (NSDate*) currentBuildDate {
++ (NSDate *)currentBuildDate {
     NSURL *appURL = nil;
     NSURL *bundleURL = [NSBundle mainBundle].bundleURL;
     NSDictionary *info = [NSBundle mainBundle].infoDictionary;
-    NSString *appName = info[(__bridge NSString*)kCFBundleExecutableKey];
+    NSString *appName = info[(__bridge NSString *)kCFBundleExecutableKey];
     if (appName.length > 0 && bundleURL) {
         appURL = [bundleURL URLByAppendingPathComponent:appName];
     } else {
         NSString *path = [[NSProcessInfo processInfo].arguments firstObject];
-        if (path) appURL = [NSURL fileURLWithPath:path];
+        if (path) {
+            appURL = [NSURL fileURLWithPath:path];
+        }
     }
-    if (appURL == nil)
+    if (appURL == nil) {
+        [[BranchLogger shared] logWarning:@"Failed to get build date, app path is nil" error:nil];
         return nil;
+    }
 
     NSError *error = nil;
     NSFileManager *fileManager = [NSFileManager defaultManager];
     NSDictionary *attributes = [fileManager attributesOfItemAtPath:appURL.path error:&error];
     if (error) {
-        [[BranchLogger shared] logError:[NSString stringWithFormat:@"Can't get build date: %@.", error] error:error];
+        [[BranchLogger shared] logWarning:@"Failed to get build date" error:error];
         return nil;
     }
-    NSDate * buildDate = [attributes fileCreationDate];
+    NSDate *buildDate = [attributes fileCreationDate];
     if (buildDate == nil || [buildDate timeIntervalSince1970] <= 0.0) {
-        [[BranchLogger shared] logError:[NSString stringWithFormat:@"Invalid build date: %@.", buildDate] error:nil];
+        [[BranchLogger shared] logWarning:[NSString stringWithFormat:@"Invalid build date: %@", buildDate] error:nil];
     }
     return buildDate;
 }
 
-+ (NSDate*) firstInstallBuildDate {
++ (NSDate *)firstInstallBuildDate {
     NSError *error = nil;
-    NSDate *firstBuildDate =
-        [BNCKeyChain retrieveDateForService:kBranchKeychainService
-            key:kBranchKeychainFirstBuildKey
-            error:&error];
-    if (firstBuildDate)
+    NSDate *firstBuildDate = [BNCKeyChain retrieveDateForService:kBranchKeychainService key:kBranchKeychainFirstBuildKey error:&error];
+    if (firstBuildDate) {
         return firstBuildDate;
-
+    }
+    
     firstBuildDate = [self currentBuildDate];
-    error = [BNCKeyChain storeDate:firstBuildDate
-        forService:kBranchKeychainService
-        key:kBranchKeychainFirstBuildKey
-        cloudAccessGroup:nil];
-    if (error) [[BranchLogger shared] logError:[NSString stringWithFormat:@"Keychain store: %@.", error] error:error];
-
+    error = [BNCKeyChain storeDate:firstBuildDate forService:kBranchKeychainService key:kBranchKeychainFirstBuildKey cloudAccessGroup:nil];
+    if (error) {
+        [[BranchLogger shared] logWarning:@"Error while saving build date" error:error];
+    }
     return firstBuildDate;
 }
 
-+ (NSDate *) currentInstallDate {
++ (NSDate *)currentInstallDate {
     NSDate *installDate = [NSDate date];
 
     #if !TARGET_OS_TV
     // tvOS always returns a creation date of Unix epoch 0 on device
     installDate = [self creationDateForLibraryDirectory];
-    #endif
-    
     if (installDate == nil || [installDate timeIntervalSince1970] <= 0.0) {
-        [[BranchLogger shared] logWarning:[NSString stringWithFormat:@"Invalid install date, using [NSDate date]."] error:nil];
+        [[BranchLogger shared] logWarning:@"Invalid install date, using [NSDate date]" error:nil];
     }
+    #else
+    [[BranchLogger shared] logWarning:@"File system creation date not supported on tvOS, using [NSDate date]" error:nil];
+    #endif
+
     return installDate;
 }
 
@@ -136,13 +138,13 @@ + (NSDate *)creationDateForLibraryDirectory {
     NSURL *directoryURL = [[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] firstObject];
     NSDictionary *attributes = [fileManager attributesOfItemAtPath:directoryURL.path error:&error];
     if (error) {
-        [[BranchLogger shared] logError:[NSString stringWithFormat:@"Can't get creation date for Library directory: %@", error] error:error];
-       return nil;
+        [[BranchLogger shared] logWarning:@"Failed to get creation date for Library directory" error:error];
+        return nil;
     }
     return [attributes fileCreationDate];
 }
 
-+ (NSDate*) firstInstallDate {
++ (NSDate *)firstInstallDate {
     // check keychain for stored install date, on iOS this is lost on app deletion.
     NSError *error = nil;
     NSDate* firstInstallDate = [BNCKeyChain retrieveDateForService:kBranchKeychainService key:kBranchKeychainFirstInstalldKey error:&error];
@@ -156,7 +158,7 @@ + (NSDate*) firstInstallDate {
     // save filesystem time to keychain
     error = [BNCKeyChain storeDate:firstInstallDate forService:kBranchKeychainService key:kBranchKeychainFirstInstalldKey cloudAccessGroup:nil];
     if (error) {
-        [[BranchLogger shared] logError:[NSString stringWithFormat:@"Keychain store: %@.", error] error:error];
+        [[BranchLogger shared] logWarning:@"Error while saving install date" error:error];
     }
     return firstInstallDate;
 }

Sources/BranchSDK/BranchQRCode.m

@@ -143,15 +143,14 @@ - (void)callQRCodeAPI:(nullable NSDictionary *)params
     NSURLSessionDataTask *postDataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
 
         if (error) {
-            [[BranchLogger shared] logError:[NSString stringWithFormat:@"QR Code Post Request Error: %@", [error localizedDescription]] error:error];
+            [[BranchLogger shared] logError:@"QR Code request failed" error:error];
             completion(nil, error);
             return;
         }
 
         NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
 
         if (httpResponse.statusCode == 200) {
-            
             [[BranchLogger shared] logDebug:[NSString stringWithFormat:@"Network finish operation %@ %1.3fs. Status %ld.",
                                                         request.URL.absoluteString,
                                                         [[NSDate date] timeIntervalSinceDate:startDate],