Merge pull request #82 from apptentive/Next

Release v1.2.9

Author: pkamb

ApptentiveConnect/art/camera icon 2.png

@@ -13,7 +13,7 @@
 #import <Cocoa/Cocoa.h>
 #endif
 
-#define kATConnectVersionString @"1.2.8"
+#define kATConnectVersionString @"1.2.9"
 
 #if TARGET_OS_IPHONE
 #	define kATConnectPlatformString @"iOS"

ApptentiveConnect/art/camera icon.png

@@ -277,6 +277,9 @@ - (void)setup {
 	self.apptentivePrivacyTextView.text = ATLocalizedString(@"Your feedback is hosted by Apptentive and is subject to Apptentive's privacy policy and the privacy policy of the developer of this app.", @"Description of Apptentive privacy policy.");
 	[self.gotoPrivacyPolicyButton setTitle:ATLocalizedString(@"Go to Apptentive's Privacy Policy", @"Title for button to open Apptentive's privacy policy") forState:UIControlStateNormal];
 
+	if ([tableView respondsToSelector:@selector(setAccessibilityIdentifier:)]) {
+		[tableView setAccessibilityIdentifier:@"ATInfoViewTable"];
+	}
 	tableView.delegate = self;
 	tableView.dataSource = self;
 	tableView.tableHeaderView = self.headerView;

ApptentiveConnect/art/generated/at_apptentive_icon_small.png

@@ -17,7 +17,10 @@ - (void)didScroll:(NSNotification *)notification {
 	NSDictionary *userInfo = [notification userInfo];
 	NSNumber *offset = userInfo[ATMessageCollectionTopOffsetKey];
 	if (offset) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunreachable-code"
 		CGFloat topOffset = CGFLOAT_IS_DOUBLE ? [offset doubleValue] : [offset floatValue];
+#pragma clang diagnostic pop
 		UIView *collectionView = self;
 		while ((collectionView = [collectionView superview])) {
 			if ([collectionView isKindOfClass:[UICollectionView class]]) {

ApptentiveConnect/art/generated/[email protected]

@@ -91,6 +91,7 @@ - (void)viewDidLoad {
 	self.navigationItem.leftBarButtonItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(donePressed:)] autorelease];
 	if ([self.navigationItem.leftBarButtonItem respondsToSelector:@selector(initWithImage:landscapeImagePhone:style:target:action:)]) {
 		self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithImage:[ATBackend imageNamed:@"at_user_button_image"] landscapeImagePhone:[ATBackend imageNamed:@"at_user_button_image_landscape"] style:UIBarButtonItemStylePlain target:self action:@selector(settingsPressed:)]autorelease];
+		self.navigationItem.rightBarButtonItem.accessibilityLabel = ATLocalizedString(@"Contact Settings", @"Title of contact information edit screen");
 	} else {
 		self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithImage:[ATBackend imageNamed:@"at_user_button_image"] style:UIBarButtonItemStylePlain target:self action:@selector(settingsPressed:)]autorelease];
 	}

ApptentiveConnect/art/generated/at_apptentive_logo.png

@@ -77,6 +77,9 @@ - (void)viewDidUnload {
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+	if ([self.tableView respondsToSelector:@selector(setAccessibilityIdentifier:)]) {
+		[self.tableView setAccessibilityIdentifier:@"ATContactInfoTable"];
+	}
 	if ([self respondsToSelector:@selector(edgesForExtendedLayout)]) {
 		self.edgesForExtendedLayout = UIRectEdgeNone;
 	}
@@ -166,9 +169,19 @@ - (BOOL)savePersonData {
 	NSString *emailAddress = self.emailTextField.text;
 	NSString *name = self.nameTextField.text;
 	if (emailAddress && ![emailAddress isEqualToString:person.emailAddress]) {
-		person.emailAddress = emailAddress;
-		person.needsUpdate = YES;
+		// Do not save empty string as person's email address
+		if (emailAddress.length > 0) {
+			person.emailAddress = emailAddress;
+			person.needsUpdate = YES;
+		}
+		
+		// Deleted email address from form, then submitted.
+		if ([emailAddress isEqualToString:@""] && person.emailAddress) {
+			person.emailAddress = @"";
+			person.needsUpdate = YES;
+		}
 	}
+	
 	if (name && ![name isEqualToString:person.name]) {
 		person.name = name;
 		person.needsUpdate = YES;

ApptentiveConnect/art/generated/[email protected]

@@ -9,6 +9,7 @@
 
 #import "ATTextMessageCellV7.h"
 #import "ATBackend.h"
+#import "ATConnect_Private.h"
 #import "ATMessageSender.h"
 
 #define kMinimumIconConstraint 4
@@ -22,7 +23,41 @@ - (void)setup {
 	self.messageLabel.enabledTextCheckingTypes = types;
 	self.messageLabel.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
 	self.messageLabel.textColor = [UIColor blackColor];
-	self.messageLabel.text = self.message.body;
+	
+	NSString *messageBody = self.message.body;
+	if ([[self.message pendingState] intValue] == ATPendingMessageStateSending) {
+		NSString *sendingText = ATLocalizedString(@"Sending:", @"Sending prefix on messages that are sending");
+		NSString *fullText = [NSString stringWithFormat:@"%@ %@", sendingText, messageBody];
+		[self.messageLabel setText:fullText afterInheritingLabelAttributesAndConfiguringWithBlock:^ NSMutableAttributedString *(NSMutableAttributedString *mutableAttributedString) {
+			NSRange boldRange = NSMakeRange(0, [sendingText length]);
+			
+			UIFont *boldFont = [UIFont boldSystemFontOfSize:15];
+			CTFontRef font = CTFontCreateWithName((CFStringRef)[boldFont fontName], [boldFont pointSize], NULL);
+			if (font) {
+				[mutableAttributedString addAttribute:(NSString *)kCTFontAttributeName value:(id)font range:boldRange];
+				CFRelease(font), font = NULL;
+			}
+			return mutableAttributedString;
+		}];
+	} else if ([[self.message pendingState] intValue] == ATPendingMessageStateError) {
+		NSString *sendingText = NSLocalizedString(@"Error:", @"Error prefix on messages that failed to send");
+		NSString *fullText = [NSString stringWithFormat:@"%@ %@", sendingText, messageBody];
+		[self.messageLabel setText:fullText afterInheritingLabelAttributesAndConfiguringWithBlock:^ NSMutableAttributedString *(NSMutableAttributedString *mutableAttributedString) {
+			NSRange boldRange = NSMakeRange(0, [sendingText length]);
+			
+			UIFont *boldFont = [UIFont boldSystemFontOfSize:15];
+			UIColor *redColor = [UIColor redColor];
+			CTFontRef font = CTFontCreateWithName((CFStringRef)[boldFont fontName], [boldFont pointSize], NULL);
+			if (font) {
+				[mutableAttributedString addAttribute:(NSString *)kCTFontAttributeName value:(id)font range:boldRange];
+				CFRelease(font), font = NULL;
+			}
+			[mutableAttributedString addAttribute:(NSString *)kCTForegroundColorAttributeName value:(id)redColor.CGColor range:boldRange];
+			return mutableAttributedString;
+		}];
+	} else {
+		self.messageLabel.text = messageBody;
+	}
 
 	self.textContainerView.backgroundColor = [UIColor colorWithRed:1 green:1 blue:1 alpha:1];
 	self.textContainerView.layer.cornerRadius = 10;

ApptentiveConnect/art/generated/at_attachment_bg.png

@@ -46,11 +46,7 @@ + (UIImage *)imageByTakingScreenshotExcludingWindow:(UIWindow *)excludedWindow {
 	// On iOS prior to 4, fall back to use UIGraphicsBeginImageContext
 	CGRect applicationFrame = [[UIScreen mainScreen] applicationFrame];
 	CGSize imageSize = applicationFrame.size;
-	if (NULL != UIGraphicsBeginImageContextWithOptions) {
-		UIGraphicsBeginImageContextWithOptions(imageSize, NO, 0.0);
-	} else {
-		UIGraphicsBeginImageContext(imageSize);
-	}
+	UIGraphicsBeginImageContextWithOptions(imageSize, NO, 0.0);
 
 	CGContextRef context = UIGraphicsGetCurrentContext();
 
@@ -115,9 +111,6 @@ + (UIImage *)imageByTakingScreenshotIncludingBlankStatusBarArea:(BOOL)includeSta
 			case UIInterfaceOrientationLandscapeRight:
 				origin = CGPointMake(0, 0);
 				break;
-			default:
-				origin = CGPointMake(0, 0);
-				break;
 		}
 		[screenshot drawAtPoint:origin];
 		UIImage *screenshotPlusStatusBar = UIGraphicsGetImageFromCurrentImageContext();
@@ -144,8 +137,6 @@ + (UIImage *)imageByRotatingImage:(UIImage *)image toInterfaceOrientation:(UIInt
 		case UIInterfaceOrientationLandscapeRight:
 			imageOrientation = UIImageOrientationLeft;
 			break;
-		default:
-			break;
 	}
 	UIImage *rotated = [[[UIImage alloc] initWithCGImage:[image CGImage] scale:1 orientation:imageOrientation] autorelease];
 

ApptentiveConnect/art/generated/[email protected]

@@ -32,7 +32,8 @@ - (void)updateWithJSON:(NSDictionary *)json {
 
 - (NSDictionary *)apiJSON {
 	NSDictionary *parentJSON = [super apiJSON];
-	NSMutableDictionary *result = [NSMutableDictionary dictionary];
+	NSMutableDictionary *result = [[[NSMutableDictionary alloc] init] autorelease];
+
 	if (parentJSON) {
 		[result addEntriesFromDictionary:parentJSON];
 	}
@@ -49,7 +50,10 @@ - (NSDictionary *)apiJSON {
 	}
 
 	// Monitor that the Event payload has not been dropped on retry
-	if (!result || result.count == 0) {
+	if (!result) {
+		ATLogError(@"Event json should not be nil.");
+	}
+	if (result.count == 0) {
 		ATLogError(@"Event json should return a result.");
 	}
 	if (!result[@"label"]) {
@@ -59,7 +63,7 @@ - (NSDictionary *)apiJSON {
 		ATLogError(@"Event json should include a `nonce`.");
 	}
 
-	return @{@"event":result};
+	return @{@"event": result};
 }
 
 - (void)setup {

ApptentiveConnect/art/generated/at_attachment_photo_icon.png

@@ -125,9 +125,14 @@ - (NSDictionary *)apiJSON {
 	if (self.facebookID) {
 		[person setObject:self.facebookID forKey:@"facebook_id"];
 	}
+	
 	if (self.emailAddress && [self.emailAddress length] > 0 && [ATUtilities emailAddressIsValid:self.emailAddress]) {
 		[person setObject:self.emailAddress forKey:@"email"];
+	} else if ([[self.emailAddress stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] isEqualToString:@""]) {
+		// Delete a previously entered email
+		[person setObject:[NSNull null] forKey:@"email"];
 	}
+
 	if (self.secret) {
 		[person setObject:self.secret forKey:@"secret"];
 	}

ApptentiveConnect/art/generated/[email protected]

@@ -349,7 +349,7 @@ - (BOOL)sendImageMessageWithImage:(UIImage *)image fromSource:(ATFeedbackImageSo
 - (BOOL)sendImageMessageWithImage:(UIImage *)image hiddenOnClient:(BOOL)hidden fromSource:(ATFeedbackImageSource)imageSource {
 	NSData *imageData = UIImageJPEGRepresentation(image, 1.0);
 	NSString *mimeType = @"image/jpeg";
-	ATFIleAttachmentSource source;
+	ATFIleAttachmentSource source = ATFileAttachmentSourceUnknown;
 	switch (imageSource) {
 		case ATFeedbackImageSourceCamera:
 		case ATFeedbackImageSourcePhotoLibrary:
@@ -365,9 +365,6 @@ - (BOOL)sendImageMessageWithImage:(UIImage *)image hiddenOnClient:(BOOL)hidden f
 		case ATFeedbackImageSourceProgrammatic:
 			source = ATFIleAttachmentSourceProgrammatic;
 			break;
-		default:
-			source = ATFileAttachmentSourceUnknown;
-			break;
 	}
 
 	return [self sendFileMessageWithFileData:imageData andMimeType:mimeType hiddenOnClient:hidden fromSource:source];
@@ -564,6 +561,10 @@ - (void)presentMessageCenterFromViewController:(UIViewController *)viewControlle
 - (void)presentMessageCenterFromViewController:(UIViewController *)viewController withCustomData:(NSDictionary *)customData {
 	self.currentCustomData = customData;
 
+	if (!viewController) {
+		ATLogError(@"Attempting to present Apptentive Message Center from a nil View Controller.");
+	}
+	
 	NSPredicate *notHidden = [NSPredicate predicateWithFormat:@"hidden != %@", @YES];
 	NSUInteger messageCount = [ATData countEntityNamed:@"ATAbstractMessage" withPredicate:notHidden];
 	if (messageCount == 0 || ![[ATConnect sharedConnection] messageCenterEnabled]) {
@@ -692,9 +693,19 @@ - (void)messagePanel:(ATMessagePanelViewController *)messagePanel didSendMessage
 			person = [[[ATPersonInfo alloc] init] autorelease];
 		}
 		if (emailAddress && ![emailAddress isEqualToString:person.emailAddress]) {
-			person.emailAddress = emailAddress;
-			person.needsUpdate = YES;
+			// Do not save empty string as person's email address
+			if (emailAddress.length > 0) {
+				person.emailAddress = emailAddress;
+				person.needsUpdate = YES;
+			}
+			
+			// Deleted email address from form, then submitted.
+			if ([emailAddress isEqualToString:@""] && person.emailAddress) {
+				person.emailAddress = @"";
+				person.needsUpdate = YES;
+			}
 		}
+		
 		[person saveAsCurrentPerson];
 
 		[self sendTextMessageWithBody:message completion:^(NSString *pendingMessageID) {

ApptentiveConnect/art/generated/at_button_shadow_overlay.png

@@ -268,6 +268,7 @@ - (NSString *)stringForSource:(ATFeedbackSource)aSource {
 		case ATFeedbackSourceEnjoymentDialog:
 			result = @"enjoyment_dialog";
 			break;
+		case ATFeedbackSourceUnknown:
 		default:
 			break;
 	}

ApptentiveConnect/art/generated/[email protected]

@@ -152,6 +152,10 @@ - (void)dealloc {
 
 #if TARGET_OS_IPHONE
 - (BOOL)showRatingFlowFromViewControllerIfConditionsAreMet:(UIViewController *)vc {
+	if (!viewController) {
+		ATLogError(@"Attempting to show Apptentive Rating Flow from a nil View Controller.");
+	}
+	
 	self.viewController = vc;
 #	if TARGET_IPHONE_SIMULATOR
 	[self logDefaults];

ApptentiveConnect/art/generated/at_camera_button_v7.png

@@ -135,21 +135,27 @@ - (void)presentSurveyControllerWithNoTagsFromViewController:(UIViewController *)
 		[self resetSurvey];
 	}
 	currentSurvey = [[self surveyWithNoTags] retain];
-	if (currentSurvey == nil) {
-		return;
+	if (currentSurvey) {
+		[self presentSurveyControllerFromViewControllerWithCurrentSurvey:viewController];
+	} else {
+		ATLogInfo(@"No surveys without tags found!");
+		ATLogInfo(@"Apptentive surveys have a 24 hour caching period. If you've recently created a survey, please reset your device/simulator and try again.");
 	}
-	[self presentSurveyControllerFromViewControllerWithCurrentSurvey:viewController];
 }
 
 - (void)presentSurveyControllerWithTags:(NSSet *)tags fromViewController:(UIViewController *)viewController {
 	if (currentSurvey != nil) {
 		[self resetSurvey];
 	}
 	currentSurvey = [[self surveyWithTags:tags] retain];
-	if (currentSurvey == nil) {
-		return;
+	
+	if (currentSurvey) {
+		[self presentSurveyControllerFromViewControllerWithCurrentSurvey:viewController];
+	} else {
+		NSString *tagsString = [[[tags allObjects] valueForKey:@"description"] componentsJoinedByString:@", "];
+		ATLogInfo(@"No surveys with tags [%@] found!", tagsString);
+		ATLogInfo(@"Apptentive surveys have a 24 hour caching period. If you've recently created a survey, please reset your device/simulator and try again.");
 	}
-	[self presentSurveyControllerFromViewControllerWithCurrentSurvey:viewController];
 }
 
 - (void)setDidSendSurvey:(ATSurvey *)survey {
@@ -194,20 +200,23 @@ - (ATSurvey *)surveyWithTags:(NSSet *)tags {
 
 - (BOOL)hasSurveyAvailableWithNoTags {
 	ATSurvey *survey = [self surveyWithNoTags];
-	if (survey) {
-		return YES;
-	} else {
-		return NO;
+	if (!survey) {
+		ATLogInfo(@"No surveys without tags found!");
+		ATLogInfo(@"Apptentive surveys have a 24 hour caching period. If you've recently created a survey, please reset your device/simulator and try again.");
 	}
+	
+	return (survey != nil);
 }
 
 - (BOOL)hasSurveyAvailableWithTags:(NSSet *)tags {
 	ATSurvey *survey = [self surveyWithTags:tags];
-	if (survey) {
-		return YES;
-	} else {
-		return NO;
+	if (!survey) {
+		NSString *tagsString = [[[tags allObjects] valueForKey:@"description"] componentsJoinedByString:@", "];
+		ATLogInfo(@"No surveys with tags [%@] found!", tagsString);
+		ATLogInfo(@"Apptentive surveys have a 24 hour caching period. If you've recently created a survey, please reset your device/simulator and try again.");
 	}
+		
+	return (survey != nil);
 }
 @end
 

ApptentiveConnect/art/generated/[email protected]

@@ -8,6 +8,7 @@
 
 #import "ATSurveyGetSurveysTask.h"
 #import "ATBackend.h"
+#import "ATDeviceUpdater.h"
 #import "ATSurveyParser.h"
 #import "ATSurveysBackend.h"
 #import "ATWebClient.h"
@@ -40,6 +41,10 @@ - (BOOL)canStart {
 	if (![ATConversationUpdater conversationExists]) {
 		return NO;
 	}
+	if ([ATDeviceUpdater shouldUpdate]) {
+		// Surveys may depend upon device attributes.
+		return NO;
+	}
 	return YES;
 }
 

ApptentiveConnect/art/generated/at_cancel_bg.png

@@ -120,8 +120,6 @@ - (void)at_APIRequestDidFinish:(ATAPIRequest *)sender result:(id)result {
 			case ATRecordRequestTaskFinishedResult:
 				self.finished = YES;
 				break;
-			default:
-				break;
 		}
 		[self stop];
 		[self release];

ApptentiveConnect/art/generated/[email protected]

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