Tweak user agent generation to be smart about the version numbers used

pokeb · Sep 13, 2009 · be69495 · be69495
1 parent 04bc671
commit be69495
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/Classes/ASIHTTPRequest.m b/Classes/ASIHTTPRequest.m
@@ -2465,9 +2465,21 @@ + (NSString *)defaultUserAgentString
 	if (!appName) {
 		return nil;
 	}
-	NSString *appVersion = [[bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"] stringByAppendingFormat:@" (%@)",
-                          [bundle objectForInfoDictionaryKey:@"CFBundleVersion"]];
-	NSString *deviceName;;
+	NSString *appVersion = nil;
+	NSString *marketingVersionNumber = [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
+    NSString *developmentVersionNumber = [bundle objectForInfoDictionaryKey:@"CFBundleVersion"];
+	if (marketingVersionNumber && developmentVersionNumber) {
+		if ([marketingVersionNumber isEqualToString:developmentVersionNumber]) {
+			appVersion = marketingVersionNumber;
+		} else {
+			appVersion = [NSString stringWithFormat:@"%@ rv:%@",marketingVersionNumber,developmentVersionNumber];
+		}
+	} else {
+		appVersion = (marketingVersionNumber ? marketingVersionNumber : developmentVersionNumber);
+	}
+
+
+	NSString *deviceName;
 	NSString *OSName;
 	NSString *OSVersion;