Refactor AIActivityHandler.m

Author: wellle

Adjust/AIActivityHandler.m

@@ -19,11 +19,11 @@
 #import "AIAdjustFactory.h"
 
 static NSString   * const kActivityStateFilename = @"AdjustIoActivityState";
+static NSString   * const kAdjustPrefix          = @"adjust_";
 static const char * const kInternalQueueName     = "io.adjust.ActivityQueue";
-static NSString * const kAdjustPrefix            = @"adjust_";
 
-static const uint64_t kTimerInterval      = 60 * NSEC_PER_SEC; // 1 minute
-static const uint64_t kTimerLeeway        =  1 * NSEC_PER_SEC; // 1 second
+static const uint64_t kTimerInterval = 60 * NSEC_PER_SEC; // 1 minute
+static const uint64_t kTimerLeeway   =  1 * NSEC_PER_SEC; // 1 second
 
 
 #pragma mark -
@@ -317,32 +317,37 @@ - (void)revenueInternal:(double)amount
 }
 
 - (void) readOpenUrlInternal:(NSURL *)url {
-    NSString* queryString = [url query];
-    NSArray* queryArray = [queryString componentsSeparatedByString:@"&"];
+    NSArray* queryArray = [url.query componentsSeparatedByString:@"&"];
     NSMutableDictionary* adjustDeepLinks = [NSMutableDictionary dictionary];
 
     for (NSString* fieldValuePair in queryArray) {
         NSArray* pairComponents = [fieldValuePair componentsSeparatedByString:@"="];
+        if (pairComponents.count != 2) continue;
+
         NSString* key = [pairComponents objectAtIndex:0];
-        if ([key hasPrefix:kAdjustPrefix] && [pairComponents count] == 2) {
-            NSString* value = [pairComponents objectAtIndex:1];
-            NSString* keyWOutPrefix = [key substringFromIndex:[kAdjustPrefix length]];
-            if ([keyWOutPrefix length] > 0 && [value length] > 0) {
-                [adjustDeepLinks setObject:value forKey:keyWOutPrefix];
-            }
-        }
-    }
+        if (![key hasPrefix:kAdjustPrefix]) continue;
 
-    if ([adjustDeepLinks count] != 0) {
-        AIPackageBuilder *reattributionBuilder = [[AIPackageBuilder alloc] init];
-        reattributionBuilder.deeplinkParameters = adjustDeepLinks;
-        [self injectGeneralAttributes:reattributionBuilder];
-        AIActivityPackage *reattributionPackage = [reattributionBuilder buildReattributionPackage];
-        [self.packageHandler addPackage:reattributionPackage];
-        [self.packageHandler sendFirstPackage];
+        NSString* value = [pairComponents objectAtIndex:1];
+        if (value.length == 0) continue;
+
+        NSString* keyWOutPrefix = [key substringFromIndex:kAdjustPrefix.length];
+        if (keyWOutPrefix.length == 0) continue;
 
-        [self.logger info:@"Reattribution %@", adjustDeepLinks];
+        [adjustDeepLinks setObject:value forKey:keyWOutPrefix];
     }
+
+    if (adjustDeepLinks.count == 0) {
+        return;
+    }
+
+    AIPackageBuilder *reattributionBuilder = [[AIPackageBuilder alloc] init];
+    reattributionBuilder.deeplinkParameters = adjustDeepLinks;
+    [self injectGeneralAttributes:reattributionBuilder];
+    AIActivityPackage *reattributionPackage = [reattributionBuilder buildReattributionPackage];
+    [self.packageHandler addPackage:reattributionPackage];
+    [self.packageHandler sendFirstPackage];
+
+    [self.logger debug:@"Reattribution %@", adjustDeepLinks];
 }
 
 #pragma mark - private