Fix for #256 - App crashes when trying to generate a thumbnail from a…

…n invalid image format that was uploaded from the web client Incremented app version
Alfresco · Mar 27, 2017 · fd95b89 · fd95b89
1 parent afa8942
commit fd95b89
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 9 deletions.
diff --git a/ActivitiSDK/NetworkServices/NetworkService/Constants/ASDKNetworkServiceConstants.h b/ActivitiSDK/NetworkServices/NetworkService/Constants/ASDKNetworkServiceConstants.h
@@ -81,3 +81,7 @@ extern NSString * const kASDKAPIJSONKeyApplicationID;
 // Notification keys
 extern NSString * const kADSKAPIUnauthorizedRequestNotification;
 
+// Error doomain
+extern NSString * const ASDKNetworkServiceErrorDomain;
+extern const NSInteger ASDKNetworkServiceErrorInvalidResponseFormat;
+
diff --git a/ActivitiSDK/NetworkServices/NetworkService/Constants/ASDKNetworkServiceConstants.m b/ActivitiSDK/NetworkServices/NetworkService/Constants/ASDKNetworkServiceConstants.m
@@ -106,3 +106,10 @@
 #pragma mark Notification keys
 
 NSString * const kADSKAPIUnauthorizedRequestNotification        = @"com.alfresco.activiti.ActivitiSDK.networkService.responseSerializer";
+
+
+#pragma mark -
+#pragma mark Error domain
+
+NSString * const ASDKNetworkServiceErrorDomain = @"ASDKNetworkServiceErrorDomain";
+const NSInteger ASDKNetworkServiceErrorInvalidResponseFormat = 1;
diff --git a/ActivitiSDK/NetworkServices/Proxy/ProfileNetworkServices/ASDKProfileNetworkServices.m b/ActivitiSDK/NetworkServices/Proxy/ProfileNetworkServices/ASDKProfileNetworkServices.m
@@ -278,13 +278,26 @@ - (void)fetchProfileImageWithCompletionBlock:(ASDKProfileImageCompletionBlock)co
                                   // Remove operation reference
                                   [strongSelf.networkOperations removeObject:dataTask];
 
-                                  UIImage *profileImage = (UIImage *)responseObject;
-                                  ASDKLogVerbose(@"Profile picture fetched successfully for request: %@.",
-                                                 [task stateDescriptionForResponse:nil]);
-
-                                  dispatch_async(strongSelf.resultsQueue, ^{
-                                      completionBlock(profileImage, nil);
-                                  });
+                                  UIImage *profileImage = nil;
+                                  if ([responseObject isKindOfClass:[UIImage class]]) {
+                                      ASDKLogVerbose(@"Profile picture fetched successfully for request: %@.",
+                                                     [task stateDescriptionForResponse:nil]);
+                                      profileImage = (UIImage *)responseObject;
+
+                                      dispatch_async(strongSelf.resultsQueue, ^{
+                                          completionBlock(profileImage, nil);
+                                      });
+                                  } else {
+                                      NSDictionary *userInfo = @{NSLocalizedDescriptionKey: NSLocalizedString(@"Invalid image format received", @""),
+                                                                 NSLocalizedFailureReasonErrorKey: [NSString stringWithFormat:@"Image cannot be parsed from response because a different format than expected was received:%@", NSStringFromClass([responseObject class])]};
+                                      NSError *imageFormatError = [NSError errorWithDomain:ASDKNetworkServiceErrorDomain
+                                                                                      code:ASDKNetworkServiceErrorInvalidResponseFormat
+                                                                                  userInfo:userInfo];
+
+                                      dispatch_async(strongSelf.resultsQueue, ^{
+                                          completionBlock(nil, imageFormatError);
+                                      });
+                                  }
                               } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
                                   __strong typeof(self) strongSelf = weakSelf;
 

diff --git a/AlfrescoActiviti/Info.plist b/AlfrescoActiviti/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>88</string>
+	<string>89</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/AlfrescoActiviti/Resources/Settings.bundle/Root.plist b/AlfrescoActiviti/Resources/Settings.bundle/Root.plist
@@ -12,7 +12,7 @@
 		</dict>
 		<dict>
 			<key>DefaultValue</key>
-			<string>1.1 (88)</string>
+			<string>1.1 (89)</string>
 			<key>Key</key>
 			<string>Prefs_AppVersion</string>
 			<key>Title</key>