Updated branch PR suggestions.

Author: Edward Smith

Branch-SDK/Branch-SDK/BNCPreferenceHelper.m

@@ -609,62 +609,53 @@ - (void)writeObjectToDefaults:(NSString *)key value:(NSObject *)value {
     [self persistPrefsToDisk];
 }
 
-- (void)persistPrefsToDisk
-    {
-    @synchronized (self)
-        {
+- (void)persistPrefsToDisk {
+    @synchronized (self) {
         NSDictionary *persistenceDict = [self.persistenceDict copy];
-        NSBlockOperation *newPersistOp = [NSBlockOperation blockOperationWithBlock:
-        ^   {
+        NSBlockOperation *newPersistOp = [NSBlockOperation blockOperationWithBlock:^ {
             NSData *data = [NSKeyedArchiver archivedDataWithRootObject:persistenceDict];
-            if (!data)
-                {
+            if (!data) {
                 [self logWarning:@"Can't create preferences archive."];
                 return;
-                }
+            }
             NSError *error = nil;
             [data writeToURL:self.class.URLForPrefsFile
                 options:NSDataWritingAtomic error:&error];
-            if (error)
-                {
+            if (error) {
                 [self logWarning:
                     [NSString stringWithFormat:
                         @"Failed to persist preferences to disk: %@.", error]];
-                }
-            }];
-        [self.persistPrefsQueue addOperation:newPersistOp];
-        }
+            }
+        }];
+    [self.persistPrefsQueue addOperation:newPersistOp];
     }
+}
 
 #pragma mark - Reading From Persistence
 
-- (NSMutableDictionary *)persistenceDict
-    {
-    if (!_persistenceDict)
-        {
+- (NSMutableDictionary *)persistenceDict {
+    if (!_persistenceDict) {
         NSDictionary *persistenceDict = nil;
         @try {
             NSError *error = nil;
-            NSData *data =
-                [NSData dataWithContentsOfURL:self.class.URLForPrefsFile
+            NSData *data = [NSData dataWithContentsOfURL:self.class.URLForPrefsFile
                     options:0 error:&error];
             if (error || !data)
                 NSLog(@"Error opening prefs file: %@.", error);
             else
                 persistenceDict = [NSKeyedUnarchiver unarchiveObjectWithData:data];
-            }
-        @catch (NSException *exception)
-            {
+        }
+        @catch (NSException *exception) {
             [self logWarning:@"Failed to load preferences from disk."];
-            }
+        }
 
         if ([persistenceDict isKindOfClass:[NSDictionary class]])
             _persistenceDict = [persistenceDict mutableCopy];
         else
             _persistenceDict = [[NSMutableDictionary alloc] init];
-        }
-    return _persistenceDict;
     }
+    return _persistenceDict;
+}
 
 - (NSObject *)readObjectFromDefaults:(NSString *)key {
     NSObject *obj = self.persistenceDict[key];
@@ -696,17 +687,15 @@ - (NSInteger)readIntegerFromDefaults:(NSString *)key {
     return NSNotFound;
 }
 
-+ (NSString *)prefsFile_deprecated
-    {
++ (NSString *)prefsFile_deprecated {
     NSString * path =
         [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)
             firstObject]
                 stringByAppendingPathComponent:BRANCH_PREFS_FILE];
     return path;
-    }
+}
 
-+ (NSURL*) URLForBranchDirectory
-    {
++ (NSURL*) URLForBranchDirectory {
     NSError *error = nil;
     NSURL *URL =
         [[NSFileManager defaultManager]
@@ -715,34 +704,30 @@ + (NSURL*) URLForBranchDirectory
             appropriateForURL:nil
             create:YES
             error:&error];
-    if (error)
-        {
+    if (error) {
         NSLog(@"Error creating URLForPrefsDirectory: %@.", error);
         return nil;
-        }
+    }
     URL = [URL URLByAppendingPathComponent:@"io.branch"];
     [[NSFileManager defaultManager]
         createDirectoryAtURL:URL
         withIntermediateDirectories:YES
         attributes:nil
         error:&error];
-    if (error)
-        {
+    if (error) {
         NSLog(@"Error creating URLForPrefsDirectory: %@.", error);
         return nil;
-        }
-    return URL;
     }
+    return URL;
+}
 
-+ (NSURL*) URLForPrefsFile
-    {
++ (NSURL*) URLForPrefsFile {
     NSURL *URL = [self URLForBranchDirectory];
     URL = [URL URLByAppendingPathComponent:BRANCH_PREFS_FILE];
     return URL;
-    }
+}
 
-+ (void) moveOldPrefsFile
-    {
++ (void) moveOldPrefsFile {
     NSURL *oldURL = [NSURL fileURLWithPath:self.prefsFile_deprecated];
     NSURL *newURL = [self URLForBranchDirectory];
 
@@ -752,22 +737,19 @@ + (void) moveOldPrefsFile
         toURL:newURL
         error:&error];
 
-    if (error && error.code != NSFileNoSuchFileError)
-        {
-        if (error.code == NSFileWriteFileExistsError)
-            {
+    if (error && error.code != NSFileNoSuchFileError) {
+        if (error.code == NSFileWriteFileExistsError) {
             [[NSFileManager defaultManager]
                 removeItemAtURL:oldURL
                 error:&error];
-            }
-        else
+        } else {
             NSLog(@"Error moving prefs file: %@.", error);
         }
     }
+}
 
-+ (void) initialize
-    {
++ (void) initialize {
     [self moveOldPrefsFile];
-    }
+}
 
 @end

Branch-SDK/Branch-SDK/BNCServerRequestQueue.m

@@ -187,14 +187,12 @@ - (void)persistEventually {
 
 - (void)persistImmediately {
     [self.writeTimer invalidate];
-    
     [self persistToDisk];
 }
 
 - (void)persistToDisk {
     NSArray *requestsToPersist = [self.queue copy];
-    dispatch_async(self.asyncQueue,
-    ^   {
+    dispatch_async(self.asyncQueue, ^ {
         @try {
             NSMutableArray *encodedRequests = [[NSMutableArray alloc] init];
             for (BNCServerRequest *req in requestsToPersist) {
@@ -208,29 +206,26 @@ - (void)persistToDisk {
             }
 
             NSData *data = [NSKeyedArchiver archivedDataWithRootObject:encodedRequests];
-            if (!data)
-                {
+            if (!data) {
                 [[BNCPreferenceHelper preferenceHelper]
                     logWarning:@"Cannot create archive data."];
                 return;
-                }
+            }
             NSError *error = nil;
             [data writeToURL:self.class.URLForQueueFile
                 options:NSDataWritingAtomic error:&error];
-            if (error)
-                {
+            if (error) {
                 [[BNCPreferenceHelper preferenceHelper] logWarning:
                     [NSString stringWithFormat:@"Failed to persist queue to disk: %@", error]];
-                }
             }
-        @catch (NSException *exception)
-            {
+        }
+        @catch (NSException *exception) {
             NSString *warningMessage =
                 [NSString stringWithFormat:
                     @"An exception occurred while attempting to save the queue. Exception information:\n\n%@",
                         [self exceptionString:exception]];
             [[BNCPreferenceHelper preferenceHelper] logWarning:warningMessage];
-            }
+        }
     });
 }
 
@@ -247,17 +242,16 @@ - (void)retrieve {
                 [NSString stringWithFormat:@"Error loading network queue: %@.", error]];
         else
             encodedRequests = [NSKeyedUnarchiver unarchiveObjectWithData:data];
-        }
-    @catch (NSException *exception)
-        {
+    }
+    @catch (NSException *exception) {
         NSString *warningMessage =
             [NSString stringWithFormat:
                 @"An exception occurred while attempting to load the queue file, proceeding without requests. Exception information:\n\n%@",
                         [self exceptionString:exception]];
         [[BNCPreferenceHelper preferenceHelper] logWarning:warningMessage];
         self.queue = queue;
         return;
-        }
+    }
 
     for (NSData *encodedRequest in encodedRequests) {
         BNCServerRequest *request;
@@ -292,24 +286,21 @@ - (NSString *)exceptionString:(NSException *)exception {
     return [NSString stringWithFormat:@"Name: %@\nReason: %@\nStack:\n\t%@\n\n", exception.name, exception.reason, [exception.callStackSymbols componentsJoinedByString:@"\n\t"]];
 }
 
-+ (NSString *)queueFile_deprecated
-    {
++ (NSString *)queueFile_deprecated {
     NSString *path =
         [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)
             firstObject]
                 stringByAppendingPathComponent:BRANCH_QUEUE_FILE];
     return path;
-    }
+}
 
-+ (NSURL*) URLForQueueFile
-    {
++ (NSURL*) URLForQueueFile {
     NSURL *URL = [BNCPreferenceHelper URLForBranchDirectory];
     URL = [URL URLByAppendingPathComponent:BRANCH_QUEUE_FILE];
     return URL;
-    }
+}
 
-+ (void) moveOldQueueFile
-    {
++ (void) moveOldQueueFile {
     NSURL *oldURL = [NSURL fileURLWithPath:self.queueFile_deprecated];
     NSURL *newURL = [self URLForQueueFile];
     NSError *error = nil;
@@ -318,36 +309,36 @@ + (void) moveOldQueueFile
         toURL:newURL
         error:&error];
 
-    if (error && error.code != NSFileNoSuchFileError)
-        {
-        if (error.code == NSFileWriteFileExistsError)
-            {
+    if (error && error.code != NSFileNoSuchFileError) {
+        if (error.code == NSFileWriteFileExistsError) {
             [[NSFileManager defaultManager]
                 removeItemAtURL:oldURL
                 error:&error];
-            }
-        else
+        } else {
             NSLog(@"Error moving queue file: %@.", error);
         }
     }
+}
 
-+ (void) initialize
-    {
++ (void) initialize {
     [self moveOldQueueFile];
-    }
+}
 
 #pragma mark - Singleton method
 
 + (id)getInstance {
     static BNCServerRequestQueue *sharedQueue = nil;
     static dispatch_once_t onceToken;
 
-    dispatch_once(&onceToken, ^{
+    dispatch_once(&onceToken, ^ {
         sharedQueue = [[BNCServerRequestQueue alloc] init];
         [sharedQueue retrieve];
-        [[BNCPreferenceHelper preferenceHelper] log:FILE_NAME line:LINE_NUM message:@"Retrieved from Persist: %@", sharedQueue];
+        [[BNCPreferenceHelper preferenceHelper]
+            log:FILE_NAME
+            line:LINE_NUM
+            message:@"Retrieved from Persist: %@", sharedQueue];
     });
-    
+
     return sharedQueue;
 }