Merge pull request #215 from apptentive/rc/5.0.4

frankus · web-flow · commit 00bb088c924a · 2018-05-07T10:58:27.000-07:00
Release 5.0.4
diff --git a/Apptentive/Apptentive.xcodeproj/project.pbxproj b/Apptentive/Apptentive.xcodeproj/project.pbxproj
@@ -2306,7 +2306,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 9;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -2363,7 +2363,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 9;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2395,7 +2395,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 86WML2UN43;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3;
+				DYLIB_CURRENT_VERSION = 9;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "APPTENTIVE_DEBUG=1";
@@ -2417,7 +2417,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 86WML2UN43;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3;
+				DYLIB_CURRENT_VERSION = 9;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
@@ -2468,7 +2468,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 86WML2UN43;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3;
+				DYLIB_CURRENT_VERSION = 9;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = ApptentiveDebugging/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -2487,7 +2487,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 86WML2UN43;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3;
+				DYLIB_CURRENT_VERSION = 9;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = ApptentiveDebugging/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
diff --git a/Apptentive/Apptentive/Apptentive.h b/Apptentive/Apptentive/Apptentive.h
@@ -20,7 +20,7 @@ FOUNDATION_EXPORT double ApptentiveVersionNumber;
 FOUNDATION_EXPORT const unsigned char ApptentiveVersionString[];
 
 /** The version number of the Apptentive SDK. */
-#define kApptentiveVersionString @"5.0.3"
+#define kApptentiveVersionString @"5.0.4"
 
 /** The version number of the Apptentive API platform. */
 #define kApptentiveAPIVersionString @"9"
diff --git a/Apptentive/Apptentive/Engagement/Model/ApptentiveConversationManager.m b/Apptentive/Apptentive/Engagement/Model/ApptentiveConversationManager.m
@@ -48,6 +48,7 @@
 static NSInteger ApptentiveInternalInconsistency = -201;
 static NSInteger ApptentiveAlreadyLoggedInErrorCode = -202;
 static NSInteger ApptentiveInBackgroundErrorCode = -203;
+static NSInteger ApptentiveLoginRequestInProcessErrorCode = -204;
 
 NSString *const ApptentiveConversationStateDidChangeNotification = @"ApptentiveConversationStateDidChangeNotification";
 NSString *const ApptentiveConversationStateDidChangeNotificationKeyConversation = @"conversation";
@@ -295,6 +296,12 @@ - (void)createMessageManagerForConversation:(ApptentiveConversation *)conversati
 - (void)endActiveConversation {
 	ApptentiveAssertOperationQueue(self.operationQueue);
 
+	if (self.loginRequestOperation != nil) {
+		ApptentiveLogInfo(ApptentiveLogTagConversation, @"Cancelling login request due to logout");
+		[self.loginRequestOperation cancel];
+		self.loginRequestOperation = nil;
+	}
+
 	if (self.activeConversation != nil) {
 		ApptentiveMutableConversation *conversation = [self.activeConversation mutableCopy];
 
@@ -470,13 +477,18 @@ - (BOOL)saveMetadata {
 - (void)logInWithToken:(NSString *)token completion:(void (^)(BOOL, NSError *_Nonnull))completion {
 	ApptentiveAssertOperationQueue(self.operationQueue);
 
-	self.loginCompletionBlock = [completion copy];
-
-	[self requestLoggedInConversationWithToken:token];
+	[self requestLoggedInConversationWithToken:token completion:completion];
 }
 
-- (void)requestLoggedInConversationWithToken:(NSString *)token {
+- (void)requestLoggedInConversationWithToken:(NSString *)token completion:(void (^)(BOOL, NSError *_Nonnull))completion {
 	[self.operationQueue dispatchAsync:^{
+		self.loginCompletionBlock = [completion copy];
+
+		if (self.loginRequestOperation != nil) {
+			[self failLoginWithErrorCode:ApptentiveLoginRequestInProcessErrorCode failureReason:@"Login request already in process."];
+			return;
+		}
+
 		if (!Apptentive.shared.backend.foreground) {
 			[self failLoginWithErrorCode:ApptentiveInBackgroundErrorCode failureReason:@"App is in background state"];
 			return;
@@ -583,8 +595,14 @@ - (void)failLoginWithErrorCode:(NSInteger)errorCode failureReason:(NSString *)fo
 }
 
 - (void)completeLoginSuccess:(BOOL)success error:(nullable NSError *)error {
-	self.loginCompletionBlock(success, error);
-	self.loginCompletionBlock = nil;
+	ApptentiveAssertNotNil(self.loginCompletionBlock, @"Login completion block was nil");
+
+	if (_loginCompletionBlock != nil) {
+		self.loginCompletionBlock(success, error);
+		self.loginCompletionBlock = nil;
+	} else {
+		ApptentiveLogError(ApptentiveLogTagConversation, @"Unexpectedly found nil login completion block");
+	}
 }
 
 #pragma mark - ApptentiveConversationDelegate
diff --git a/Apptentive/Apptentive/Info.plist b/Apptentive/Apptentive/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0.3</string>
+	<string>5.0.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
diff --git a/Apptentive/ApptentiveDebugging/Info.plist b/Apptentive/ApptentiveDebugging/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0.3</string>
+	<string>5.0.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
diff --git a/Apptentive/ApptentiveTests/Info.plist b/Apptentive/ApptentiveTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0.3</string>
+	<string>5.0.4</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 2018-05-04 - v5.0.4
+
+#### Bugs Fixed
+
+- Fixed a race condition where two login operations could overlap, potentially causing a crash.
+
 # 2018-03-07 - v5.0.3
 
 #### Bugs Fixed
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - apptentive-ios (5.0.3)
+  - apptentive-ios (5.0.4)
 
 DEPENDENCIES:
   - apptentive-ios (from `..`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: ..
 
 SPEC CHECKSUMS:
-  apptentive-ios: ad55e169a5ad1d1b999f4f9e996948a2227c1bce
+  apptentive-ios: a309254660710639ca9110b1f8d3c072b4cf6e7f
 
 PODFILE CHECKSUM: fb7822acbd17e9b6c60d2db75808647cc370b6a0
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.4.0
diff --git a/apptentive-ios.podspec b/apptentive-ios.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name     = 'apptentive-ios'
   s.module_name = 'Apptentive'
-  s.version  = '5.0.3'
+  s.version  = '5.0.4'
   s.license  = 'BSD'
   s.summary  = 'Apptentive Customer Communications SDK.'
   s.homepage = 'https://www.apptentive.com/'
