Merge branch 'master' of github.com:BranchMetrics/ios-branch-deep-linking into QA

Author: Edward Smith

Branch-SDK/Branch-SDK/Branch.m

@@ -152,6 +152,8 @@ + (void) openLog {
                 BNCLogSetOutputToURLByteWrap(bnc_logURL, 102400);
             #else
                 BNCLogSetOutputFunction(NULL);
+                if (bnc_logURL)
+                    [[NSFileManager defaultManager] removeItemAtURL:bnc_logURL error:nil];
             #endif
             BNCLogSetDisplayLevel(BNCLogLevelWarning);  // Default
 
@@ -219,7 +221,7 @@ - (id)initWithInterface:(BNCServerInterface *)interface
     _requestQueue = queue;
     _linkCache = cache;
     _preferenceHelper = preferenceHelper;
-    
+
     _contentDiscoveryManager = [[BNCContentDiscoveryManager alloc] init];
     _isInitialized = NO;
     _shouldCallSessionInitCallback = YES;
@@ -745,25 +747,25 @@ - (BOOL)handleUniversalDeepLink:(NSURL*)url fromSelf:(BOOL)isFromSelf {
 
 - (BOOL)continueUserActivity:(NSUserActivity *)userActivity {
     BNCLogDebugSDK(@"continueUserActivity:");
-    
+
     // Check to see if a browser activity needs to be handled
     if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
-        
+
         // If we're already in-progress cancel the last open and do this one.
         BOOL isNewSession = NO;
         if (![self removeInstallOrOpen]) {
             isNewSession = YES;
         }
-        
+
         return [self handleUniversalDeepLink:userActivity.webpageURL fromSelf:isNewSession];
     }
-    
+
     // Check to see if a spotlight activity needs to be handled
     NSString *spotlightIdentifier =
         [self.contentDiscoveryManager spotlightIdentifierFromActivity:userActivity];
     NSURL *webURL = userActivity.webpageURL;
-    
-    
+
+
     if ([self isBranchLink:userActivity.userInfo[CSSearchableItemActivityIdentifier]]) {
         return [self handleDeepLinkWithNewSession:[NSURL URLWithString:userActivity.userInfo[CSSearchableItemActivityIdentifier]]];
     }
@@ -782,7 +784,7 @@ - (BOOL)continueUserActivity:(NSUserActivity *)userActivity {
     }
     self.preferenceHelper.shouldWaitForInit = NO;
     [self initUserSessionAndCallCallback:YES];
-    
+
     return spotlightIdentifier != nil;
 }
 
@@ -799,7 +801,7 @@ - (BOOL)isBranchLink: (NSString*)urlString {
             }
         }
     }
-    
+
     NSString *userActivityURL = urlString;
     NSArray *branchDomains = [NSArray arrayWithObjects:@"bnc.lt", @"app.link", @"test-app.link", nil];
     for (NSString* domain in branchDomains) {
@@ -822,7 +824,7 @@ - (void)handlePushNotification:(NSDictionary *)userInfo {
 
     // If app is active, then close out the session and start a new one.
     // Else the URL will be handled by `applicationDidBecomeActive`.
-    
+
     Class UIApplicationClass = NSClassFromString(@"UIApplication");
     if ([[UIApplicationClass sharedApplication] applicationState] == UIApplicationStateActive) {
         NSURL *url = [NSURL URLWithString:urlStr];
@@ -1440,7 +1442,7 @@ - (void)indexOnSpotlightWithBranchUniversalObject:(BranchUniversalObject*)univer
                                    linkProperties:(BranchLinkProperties*)linkProperties
                                        completion:(void (^) (BranchUniversalObject *universalObject, NSString * url,NSError *error))completion {
     BNCSpotlightService *spotlightService = [[BNCSpotlightService alloc] init];
-    
+
     if (!universalObject) {
         NSError* error = [NSError branchErrorWithCode:BNCInitError localizedMessage:@"Branch Universal Object is nil"];
         completion(universalObject,nil,error);
@@ -1464,7 +1466,7 @@ - (void)indexOnSpotlightWithBranchUniversalObject:(BranchUniversalObject*)univer
 - (void)indexOnSpotlightUsingSearchableItems:(NSArray<BranchUniversalObject*>* )universalObjects
                                   completion:(void (^) (NSArray<BranchUniversalObject*>* universalObjects,
                                                         NSError* error))completion {
-    
+
     BNCSpotlightService *spotlight = [[BNCSpotlightService alloc] init];
     [spotlight indexPrivatelyWithBranchUniversalObjects:universalObjects
                                              completion:^(NSArray<BranchUniversalObject *> * _Nullable universalObjects,
@@ -1477,7 +1479,7 @@ - (void)indexOnSpotlightUsingSearchableItems:(NSArray<BranchUniversalObject*>* )
 - (void)removeSearchableItemWithBranchUniversalObject:(BranchUniversalObject *)universalObject
                                              callback:(void (^_Nullable)(NSError * _Nullable error))completion {
     BNCSpotlightService *spotlight = [[BNCSpotlightService alloc] init];
-    
+
     NSString *dynamicUrl = [universalObject getLongUrlWithChannel:nil
                                                           andTags:nil
                                                        andFeature:BNCSpotlightFeature
@@ -1504,7 +1506,7 @@ - (void)removeSearchableItemsWithBranchUniversalObjects:(NSArray<BranchUniversal
                                                              andStage:nil andAlias:nil];
         [identifiers addObject:dynamicUrl];
     }
-    
+
     [spotlight removeSearchableItemsWithIdentifiers:identifiers
                                            callback:^(NSError * error) {
                                                if (completion)
@@ -1949,7 +1951,7 @@ - (void) clearNetworkQueue {
     dispatch_semaphore_wait(self.processing_sema, DISPATCH_TIME_FOREVER);
     self.networkCount = 0;
     [[BNCServerRequestQueue getInstance] clearQueue];
-    dispatch_semaphore_signal(self.processing_sema);    
+    dispatch_semaphore_signal(self.processing_sema);
 }
 
 #pragma mark - Session Initialization
@@ -2218,7 +2220,7 @@ - (void) sendOpenNotificationWithLinkParameters:(NSDictionary*)linkParameters
         }
         if ([self.delegate respondsToSelector:@selector(branch:didStartSessionWithURL:branchLink:)])
             [self.delegate branch:self didStartSessionWithURL:originalURL branchLink:branchLink];
-            
+
     }
 
     NSMutableDictionary *userInfo = [NSMutableDictionary new];

ChangeLog.md

@@ -33,6 +33,10 @@ Branch iOS SDK Change Log
   * Suppressed more unnecessary compatibility warnings.
   * Testbed-Swift now has many more third party integrations.
 
+- v0.20.3
+  * _*Master Release*_ - November 9, 2017
+  * Logging not persisted.
+
 - v0.20.2
   * _*Master Release*_ - October 18, 2017
   * Fixed Carthage build for the new version of Carthage.