Merge pull request #221 from apptentive/branch_5.2.1

Release 5.2.1

Author: frankus

Apptentive/Apptentive.xcodeproj/project.pbxproj

@@ -2382,7 +2382,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 19;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -2440,7 +2440,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 19;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2472,7 +2472,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 86WML2UN43;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 16;
+				DYLIB_CURRENT_VERSION = 19;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "APPTENTIVE_DEBUG=1";
@@ -2494,7 +2494,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 86WML2UN43;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 16;
+				DYLIB_CURRENT_VERSION = 19;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;

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.2.0"
+#define kApptentiveVersionString @"5.2.1"
 
 /** The version number of the Apptentive API platform. */
 #define kApptentiveAPIVersionString @"9"

Apptentive/Apptentive/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.2.0</string>
+	<string>5.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Apptentive/Apptentive/Networking/ApptentiveClient.h

@@ -25,6 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (readonly, nonatomic) NSURL *baseURL;
 @property (readonly, nonatomic) NSString *apptentiveKey;
 @property (readonly, nonatomic) NSString *apptentiveSignature;
+@property (assign, nonatomic, getter=isPaused) BOOL paused;
 
 - (instancetype)initWithBaseURL:(NSURL *)baseURL apptentiveKey:(NSString *)apptentiveKey apptentiveSignature:(NSString *)apptentiveSignature delegateQueue:(ApptentiveDispatchQueue *)delegateQueue;
 

Apptentive/Apptentive/Networking/ApptentiveClient.m

@@ -95,6 +95,13 @@ - (instancetype)initWithBaseURL:(NSURL *)baseURL apptentiveKey:(nonnull NSString
 	return self;
 }
 
+- (void)setPaused:(BOOL)paused {
+	_paused = paused;
+
+	ApptentiveLogInfo(ApptentiveLogTagNetwork, @"%@ %@", paused ? @"Pausing" : @"Resuming", NSStringFromClass([self class]));
+	self.networkQueue.suspended = self.paused;
+}
+
 #pragma mark - Creating request operations
 
 - (ApptentiveRequestOperation *)requestOperationWithRequest:(id<ApptentiveRequest>)request token:(nullable NSString *)token delegate:(ApptentiveRequestOperationCallback *)delegate {

Apptentive/Apptentive/Persistence/ApptentiveBackend.m

@@ -279,11 +279,13 @@ - (void)startUp {
 	ApptentiveAssertOperationQueue(self.operationQueue);
 
 	_client = [[ApptentiveClient alloc] initWithBaseURL:self.baseURL apptentiveKey:self.apptentiveKey apptentiveSignature:self.apptentiveSignature delegateQueue:self.operationQueue];
+	_client.paused = !self.networkAvailable;
 
 	_conversationManager = [[ApptentiveConversationManager alloc] initWithStoragePath:self.supportDirectoryPath operationQueue:self.operationQueue client:self.client parentManagedObjectContext:self.managedObjectContext];
 	self.conversationManager.delegate = self;
 
 	_payloadSender = [[ApptentivePayloadSender alloc] initWithBaseURL:self.baseURL apptentiveKey:self.apptentiveKey apptentiveSignature:self.apptentiveSignature managedObjectContext:self.managedObjectContext delegateQueue:self.operationQueue];
+	_payloadSender.paused = !self.networkAvailable;
 
 	[self.conversationManager loadActiveConversation];
 
@@ -458,10 +460,14 @@ - (void)updateNetworkingForCurrentNetworkStatus {
 		if (self.networkAvailable) {
 			[self.client.retryPolicy resetRetryDelay];
 			[self.payloadSender.retryPolicy resetRetryDelay];
+			self.client.paused = NO;
+			self.payloadSender.paused = NO;
 
 			[self completeHousekeepingTasks];
 		} else {
 			[self.payloadSender cancelNetworkOperations];
+			self.client.paused = YES;
+			self.payloadSender.paused = YES;
 		}
 	}
 }

Apptentive/Apptentive/Surveys/View Controllers/ApptentiveSurveyCollectionViewLayout.m

@@ -150,7 +150,7 @@ - (void)setShouldExpand:(BOOL)shouldExpand {
 - (void)updateHeaderHeight {
 	if ([self.collectionView isKindOfClass:[ApptentiveSurveyCollectionView class]]) {
 		UIView *collectionHeaderView = ((ApptentiveSurveyCollectionView *)self.collectionView).collectionHeaderView;
-		CGSize headerSize = [collectionHeaderView systemLayoutSizeFittingSize:CGSizeMake(self.collectionView.bounds.size.width, CGFLOAT_MAX)];
+		CGSize headerSize = [collectionHeaderView systemLayoutSizeFittingSize:CGSizeMake(self.collectionView.bounds.size.width, 10000.0)];
 		self.headerHeight = headerSize.height + self.sectionInset.bottom;
 	} else {
 		self.headerHeight = 0;

Apptentive/Apptentive/Surveys/View Controllers/ApptentiveSurveyViewController.m

@@ -121,9 +121,7 @@ - (void)dealloc {
 }
 
 - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
-	[coordinator animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
-		[self.collectionViewLayout invalidateLayout];
-	} completion:nil];
+	[self.collectionViewLayout invalidateLayout];
 }
 
 - (void)sizeDidUpdate:(NSNotification *)notification {

Apptentive/ApptentiveTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.2.0</string>
+	<string>5.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2018-09-18 - v5.2.1
+
+#### Bugs Fixed
+
+* Pause network requests when network is unreachable
+* Fix survey layout warning on rotation from landscape to portrait
+
 # 2018-08-23 - v5.2.0
 
 #### Improvements

Example/Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - apptentive-ios (5.2.0)
+  - apptentive-ios (5.2.1)
 
 DEPENDENCIES:
   - apptentive-ios (from `..`)
 
 EXTERNAL SOURCES:
   apptentive-ios:
-    :path: ..
+    :path: ".."
 
 SPEC CHECKSUMS:
-  apptentive-ios: fafd22764202d97acc37f097d8460a56b704d767
+  apptentive-ios: b646db39055d2335be8e6af13f7a9c1019e96883
 
 PODFILE CHECKSUM: 89d2b5f4683b04482e89df6d46b268cc9ed1ef79
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.3

apptentive-ios.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name     = 'apptentive-ios'
   s.module_name = 'Apptentive'
-  s.version  = '5.2.0'
+  s.version  = '5.2.1'
   s.license  = 'BSD'
   s.summary  = 'Apptentive Customer Communications SDK.'
   s.homepage = 'https://www.apptentive.com/'