Merge pull request #626 from Microsoft/develop

develop -> master
microsoft · Jun 19, 2017 · 2d1af11 · 2d1af11
2 parents a83c516 + 5fa260e
commit 2d1af11
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Mobile Center SDK for iOS Change Log
 
+## Version 0.10.1
+
+This version contains a bugfix for crash attachments.
+
+### MobileCenterCrashes
+
+* **[Fix]** Fix crash attachments which were broken in 0.10.0. 
+
+___
+
 ## Version 0.10.0
 
 This version has **breaking changes**.
@@ -21,6 +31,8 @@ It contains improvements and new features.
 
 * **[Bug]** Fix a potential crash that occured in case the request for updates returned a 200 but the data was empty.
 
+___
+
 ## Version 0.9.0
 
 This version has **breaking changes**.

diff --git a/Documentation/MobileCenter/.jazzy.yaml b/Documentation/MobileCenter/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../Themes/apple
 
 module: MobileCenter
-module_version: 0.10.0
+module_version: 0.10.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/MobileCenterAnalytics/.jazzy.yaml b/Documentation/MobileCenterAnalytics/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../Themes/apple
 
 module: MobileCenterAnalytics
-module_version: 0.10.0
+module_version: 0.10.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/MobileCenterCrashes/.jazzy.yaml b/Documentation/MobileCenterCrashes/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../Themes/apple
 
 module: Crashes
-module_version: 0.10.0
+module_version: 0.10.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/MobileCenterDistribute/.jazzy.yaml b/Documentation/MobileCenterDistribute/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../Themes/apple
 
 module: Distribute
-module_version: 0.10.0
+module_version: 0.10.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/MobileCenterPush/.jazzy.yaml b/Documentation/MobileCenterPush/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../Themes/apple
 
 module: MobileCenterPush
-module_version: 0.10.0
+module_version: 0.10.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Global.xcconfig b/Global.xcconfig
@@ -1,5 +1,5 @@
 BUILD_NUMBER = 1
-VERSION_STRING = 0.10.0
+VERSION_STRING = 0.10.1
 
 SDK_NAME = mobilecenter.ios
 

diff --git a/MobileCenter.podspec b/MobileCenter.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'MobileCenter'
-  s.version           = '0.10.0'
+  s.version           = '0.10.1'
 
   s.summary           = 'Mobile Center is mission control for mobile apps. Get faster release cycles, higher-quality apps, and the insights to build what users want.'
   s.description       = <<-DESC

diff --git a/MobileCenterCrashes/MobileCenterCrashes/MSCrashes.mm b/MobileCenterCrashes/MobileCenterCrashes/MSCrashes.mm
@@ -201,7 +201,7 @@ + (void)notifyWithUserConfirmation:(MSUserConfirmation)userConfirmation {
     unsigned int totalProcessedAttachments = 0;
     for (MSErrorAttachmentLog *attachment in attachments) {
       attachment.errorId = log.errorId;
-      if(![attachment isValid]) {
+      if(![self validatePropertiesForAttachment:attachment]) {
         MSLogError([MSCrashes logTag], @"Not all required fields are present in MSErrorAttachmentLog.");
         continue;
       }
@@ -953,4 +953,13 @@ - (void)setCrashFiles:(NSMutableArray *)crashFiles {
   _crashFiles = [[NSMutableArray alloc] initWithArray:crashFiles];
 }
 
++ (BOOL)validatePropertiesForAttachment:(MSErrorAttachmentLog *)attachment {
+  BOOL errorIdValid = attachment.errorId && ([attachment.errorId length] > 0);
+  BOOL attachmentIdValid = attachment.attachmentId && ([attachment.attachmentId length] > 0);
+  BOOL attachmentDataValid = attachment.data && ([attachment.data length] > 0);
+  BOOL contentTypeValid = attachment.contentType && ([attachment.contentType length] > 0);
+
+  return errorIdValid && attachmentIdValid && attachmentDataValid && contentTypeValid;
+}
+
 @end