Merge branch 'release/2.0.1'

* release/2.0.1:
  Fix a warning
  Add device identifier of iPhone 4S
  Fix using wrong constant string
  Fix the reported iOS version to be the one of the crash report, instead the one when sending the report
  Use dispatch_once for initializing shared instance if deployment version >= 4.0
  Update demo project Xcode settings to use llvm

client/iOS/BWQuincyManager.m

@@ -90,6 +90,22 @@ @implementation BWQuincyManager
 
 @synthesize appIdentifier = _appIdentifier;
 
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 40000
++(BWQuincyManager *)sharedQuincyManager
+{   
+    static BWQuincyManager *sharedInstance = nil;
+    static dispatch_once_t pred;
+
+    if (sharedInstance) return sharedInstance;
+
+    dispatch_once(&pred, ^{
+        sharedInstance = [BWQuincyManager alloc];
+        sharedInstance = [sharedInstance init];
+    });
+
+    return sharedInstance;
+}
+#else
 + (BWQuincyManager *)sharedQuincyManager {
 	static BWQuincyManager *quincyManager = nil;
 
@@ -99,6 +115,7 @@ + (BWQuincyManager *)sharedQuincyManager {
 
 	return quincyManager;
 }
+#endif
 
 - (id) init {
     if ((self = [super init])) {
@@ -288,7 +305,7 @@ - (BOOL)hasPendingCrashReport {
 
 
 - (void) showCrashStatusMessage {
-	UIAlertView *alertView;
+	UIAlertView *alertView = nil;
 
 	if (_serverResult >= CrashReportStatusAssigned && 
         _crashIdenticalCurrentVersion) {
@@ -321,7 +338,7 @@ - (void) showCrashStatusMessage {
 				break;
 		}
 
-		if (alertView != nil) {
+		if (alertView) {
 			[alertView setTag: QuincyKitAlertTypeFeedback];
 			[alertView show];
 			[alertView release];
@@ -483,7 +500,7 @@ - (void)_performSendingCrashReports {
 			[crashes appendFormat:@"<crash><applicationname>%s</applicationname><bundleidentifier>%@</bundleidentifier><systemversion>%@</systemversion><platform>%@</platform><senderversion>%@</senderversion><version>%@</version><userid>%@</userid><contact>%@</contact><description><![CDATA[%@]]></description><log><![CDATA[%@]]></log></crash>",
              [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleExecutable"] UTF8String],
              report.applicationInfo.applicationIdentifier,
-             [[UIDevice currentDevice] systemVersion],
+             report.systemInfo.operatingSystemVersion,
              [self _getDevicePlatform],
              [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"],
              report.applicationInfo.applicationVersion,

demo/iOS/QuincyDemo.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -171,8 +171,11 @@
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0410;
+			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "QuincyDemo" */;
-			compatibilityVersion = "Xcode 3.1";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -238,6 +241,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = QuincyDemo_Prefix.pch;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				INFOPLIST_FILE = Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
@@ -258,6 +262,7 @@
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = QuincyDemo_Prefix.pch;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				INFOPLIST_FILE = Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
@@ -276,7 +281,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				OTHER_LDFLAGS = "-all_load";
-				PREBINDING = NO;
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = iphoneos;
 			};
@@ -291,7 +295,6 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				PREBINDING = NO;
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = iphoneos;
 			};

server/admin/common.inc

@@ -223,6 +223,9 @@ function mapPlatform($device)
 			break;
     case "iPhone3,3":
       $platform = "4 CDMA";
+      break;
+    case "iPhone4,1":
+      $platform = "4S";
       break;
 		case "iPad1,1":
 			$platform = "iPad";