Merge pull request #1 from mindsnacks/fix/tracking-release-reset

[FINAL] Don't reset values on upgrade.

Author: jeiting

Appirater.m

@@ -337,40 +337,32 @@ - (void)incrementUseCount {
 	{
 		trackingVersion = version;
 		[userDefaults setObject:version forKey:kAppiraterCurrentVersion];
-	}
-	
-	if (_debug)
-		NSLog(@"APPIRATER Tracking version: %@", trackingVersion);
-	
-	if ([trackingVersion isEqualToString:version])
-	{
-		// check if the first use date has been set. if not, set it.
-		NSTimeInterval timeInterval = [userDefaults doubleForKey:kAppiraterFirstUseDate];
-		if (timeInterval == 0)
-		{
-			timeInterval = [[NSDate date] timeIntervalSince1970];
-			[userDefaults setDouble:timeInterval forKey:kAppiraterFirstUseDate];
-		}
-		
-		// increment the use count
-		NSInteger useCount = [userDefaults integerForKey:kAppiraterUseCount];
-		useCount++;
-		[userDefaults setInteger:useCount forKey:kAppiraterUseCount];
-		if (_debug)
-			NSLog(@"APPIRATER Use count: %@", @(useCount));
-	}
-	else
-	{
-		// it's a new version of the app, so restart tracking
-		[userDefaults setObject:version forKey:kAppiraterCurrentVersion];
 		[userDefaults setDouble:[[NSDate date] timeIntervalSince1970] forKey:kAppiraterFirstUseDate];
-		[userDefaults setInteger:1 forKey:kAppiraterUseCount];
+		[userDefaults setInteger:0 forKey:kAppiraterUseCount];
 		[userDefaults setInteger:0 forKey:kAppiraterSignificantEventCount];
 		[userDefaults setBool:NO forKey:kAppiraterRated];
 		[userDefaults setBool:NO forKey:kAppiraterDeclinedToRate];
 		[userDefaults setDouble:0 forKey:kAppiraterReminderRequestDate];
 	}
 
+	if (_debug)
+		NSLog(@"APPIRATER Tracking version: %@", trackingVersion);
+	
+    // check if the first use date has been set. if not, set it.
+    NSTimeInterval timeInterval = [userDefaults doubleForKey:kAppiraterFirstUseDate];
+    if (timeInterval == 0)
+    {
+        timeInterval = [[NSDate date] timeIntervalSince1970];
+        [userDefaults setDouble:timeInterval forKey:kAppiraterFirstUseDate];
+    }
+    
+    // increment the use count
+    NSInteger useCount = [userDefaults integerForKey:kAppiraterUseCount];
+    useCount++;
+    [userDefaults setInteger:useCount forKey:kAppiraterUseCount];
+    if (_debug)
+        NSLog(@"APPIRATER Use count: %@", @(useCount));
+	
 	[userDefaults synchronize];
 }
 
@@ -385,40 +377,33 @@ - (void)incrementSignificantEventCount {
 	{
 		trackingVersion = version;
 		[userDefaults setObject:version forKey:kAppiraterCurrentVersion];
-	}
-	
-	if (_debug)
-		NSLog(@"APPIRATER Tracking version: %@", trackingVersion);
-	
-	if ([trackingVersion isEqualToString:version])
-	{
-		// check if the first use date has been set. if not, set it.
-		NSTimeInterval timeInterval = [userDefaults doubleForKey:kAppiraterFirstUseDate];
-		if (timeInterval == 0)
-		{
-			timeInterval = [[NSDate date] timeIntervalSince1970];
-			[userDefaults setDouble:timeInterval forKey:kAppiraterFirstUseDate];
-		}
-		
-		// increment the significant event count
-		NSInteger sigEventCount = [userDefaults integerForKey:kAppiraterSignificantEventCount];
-		sigEventCount++;
-		[userDefaults setInteger:sigEventCount forKey:kAppiraterSignificantEventCount];
-		if (_debug)
-			NSLog(@"APPIRATER Significant event count: %@", @(sigEventCount));
-	}
-	else
-	{
-		// it's a new version of the app, so restart tracking
-		[userDefaults setObject:version forKey:kAppiraterCurrentVersion];
 		[userDefaults setDouble:0 forKey:kAppiraterFirstUseDate];
 		[userDefaults setInteger:0 forKey:kAppiraterUseCount];
-		[userDefaults setInteger:1 forKey:kAppiraterSignificantEventCount];
+		[userDefaults setInteger:0 forKey:kAppiraterSignificantEventCount];
 		[userDefaults setBool:NO forKey:kAppiraterRated];
 		[userDefaults setBool:NO forKey:kAppiraterDeclinedToRate];
 		[userDefaults setDouble:0 forKey:kAppiraterReminderRequestDate];
 	}
 
+	if (_debug)
+		NSLog(@"APPIRATER Tracking version: %@", trackingVersion);
+	
+    // check if the first use date has been set. if not, set it.
+    NSTimeInterval timeInterval = [userDefaults doubleForKey:kAppiraterFirstUseDate];
+    if (timeInterval == 0)
+    {
+        timeInterval = [[NSDate date] timeIntervalSince1970];
+        [userDefaults setDouble:timeInterval forKey:kAppiraterFirstUseDate];
+    }
+    
+    // increment the significant event count
+    NSInteger sigEventCount = [userDefaults integerForKey:kAppiraterSignificantEventCount];
+    sigEventCount++;
+    [userDefaults setInteger:sigEventCount forKey:kAppiraterSignificantEventCount];
+
+    if (_debug)
+        NSLog(@"APPIRATER Significant event count: %@", @(sigEventCount));
+	
 	[userDefaults synchronize];
 }