Merge pull request #743 from Microsoft/develop

Merge develop to master
microsoft · Aug 30, 2017 · 7c4f4f4 · 7c4f4f4
2 parents eb890d2 + 12a683b
commit 7c4f4f4
Show file tree

Hide file tree

Showing 113 changed files with 116 additions and 81 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,19 +1,34 @@
 # Mobile Center SDK for iOS Change Log
 
+## Version 0.12.1
+
+This version contains bug fixes.
+
+### MobileCenterCrashes
+
+* **[Fix]** Fixed missing logs sent to server on crash.
+
+### MobileCenterDistribute
+
+* **[Fix]** Workaraound a bug on iOS 11 where the Safari in-app page remains stuck activating in-app update. It is now opening the Safari app.
+* **[Fix]** Fixed update won't start until the app is explicitly closed on iOS 11.
+
+___
+
 ## Version 0.12.0
 
 This version contains bug fixes, an improvement and a new feature. When you update to this release, there will be **potential data loss** if an application installed with previous versions of MobileCenter SDK on devices that has pending logs which are not sent to server yet at the time of the application is being updated.
 
-## MobileCenter
+### MobileCenter
 
 * **[Improvement]** Changed to send one crash or error attachment log at a time to prevent HTTP requests become bigger.
 * **[Fix]** Fixed database access failure when an application contains other SQLite libraries for custom database.
 
-## MobileCenterCrashes
+### MobileCenterCrashes
 
 * **[Fix]** Fixed duplicated logs sent to server on crash.
 
-## MobileCenterDistribute
+### MobileCenterDistribute
 
 * **[Feature]** New feature that allows to share your applications to anyone with public link.
 
@@ -23,7 +38,7 @@ ___
 
 This version contains a bug fix that wasn't properly fixed in the previous release.
 
-## MobileCenterCrashes
+### MobileCenterCrashes
 
 * **[Fix]** Fixed a bug that the Crashes picked up one next session after previous crash.
 
@@ -33,15 +48,15 @@ ___
 
 This version contains bug fixes and an improvement that changes the current behavior.
 
-## MobileCenter
+### MobileCenter
 
 * **[Fix]** Fix bugs that sent multiple or empty service start logs at launch time.
 
-## MobileCenterAnalytics
+### MobileCenterAnalytics
 
 * **[Improvement]** Send truncated event name and properties instead of skipping it if its lengths are beyond the limits.
 
-## MobileCenterCrashes
+### MobileCenterCrashes
 
 * **[Fix]** Fixes two bugs that caused error logs to be assiciated with wrong session information.
 

diff --git a/Config/Global.xcconfig b/Config/Global.xcconfig
@@ -1,5 +1,5 @@
 BUILD_NUMBER = 1
-VERSION_STRING = 0.12.0
+VERSION_STRING = 0.12.1
 
 // :Mark: Architectures
 MS_WATCH_ARCHS = armv7k

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/MobileCenter.podspec b/MobileCenter.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'MobileCenter'
-  s.version           = '0.12.0'
+  s.version           = '0.12.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/MobileCenter/MobileCenter/Internals/Channel/MSLogManagerDefault.m b/MobileCenter/MobileCenter/Internals/Channel/MSLogManagerDefault.m
@@ -156,6 +156,10 @@ - (void)processLog:(id<MSLog>)log forGroupId:(NSString *)groupId {
   }
 
   // Notify delegates.
+  [self enumerateDelegatesForSelector:@selector(onPreparedLog:withInternalId:)
+                            withBlock:^(id<MSLogManagerDelegate> delegate) {
+                              [delegate onPreparedLog:log withInternalId:internalLogId];
+                            }];
   [self enumerateDelegatesForSelector:@selector(onEnqueuingLog:withInternalId:)
                             withBlock:^(id<MSLogManagerDelegate> delegate) {
                               [delegate onEnqueuingLog:log withInternalId:internalLogId];

diff --git a/MobileCenter/MobileCenter/Internals/Channel/MSLogManagerDelegate.h b/MobileCenter/MobileCenter/Internals/Channel/MSLogManagerDelegate.h
@@ -8,6 +8,14 @@
 
 @optional
 
+/**
+ * A callback that is called when a log is ready to enqueue.
+ *
+ * @param log The log.
+ * @param internalId An internal Id that can be used to keep track of logs.
+ */
+- (void)onPreparedLog:(id<MSLog>)log withInternalId:(NSString *)internalId;
+
 /**
  * A callback that is called when a log has been enqueued, before a log has been forwarded to persistence, etc.
  *

diff --git a/MobileCenter/MobileCenterTests/MSLogManagerDefaultTests.m b/MobileCenter/MobileCenterTests/MSLogManagerDefaultTests.m
@@ -82,6 +82,7 @@ - (void)testProcessingLogWillTriggerOnProcessingCall {
   [sut processLog:log forGroupId:groupId];
 
   // Then
+  OCMVerify([mockDelegate onPreparedLog:log withInternalId:OCMOCK_ANY]);
   OCMVerify([mockDelegate onEnqueuingLog:log withInternalId:OCMOCK_ANY]);
 }
 

diff --git a/MobileCenterAnalytics/MobileCenterAnalytics/Internals/Session/MSSessionTracker.m b/MobileCenterAnalytics/MobileCenterAnalytics/Internals/Session/MSSessionTracker.m
@@ -188,7 +188,7 @@ - (void)applicationWillEnterForeground {
 
 #pragma mark - MSLogManagerDelegate
 
-- (void)onEnqueuingLog:(id<MSLog>)log withInternalId:(NSString *)internalId {
+- (void)onPreparedLog:(id<MSLog>)log withInternalId:(NSString *)internalId {
   (void)internalId;
 
   /*

diff --git a/MobileCenterAnalytics/MobileCenterAnalyticsTests/MSSessionTrackerTests.m b/MobileCenterAnalytics/MobileCenterAnalyticsTests/MSSessionTrackerTests.m
@@ -208,7 +208,7 @@ - (void)testOnProcessingLog {
   XCTAssertNil(log.timestamp);
 
   // When
-  [self.sut onEnqueuingLog:log withInternalId:nil];
+  [self.sut onPreparedLog:log withInternalId:nil];
 
   // Then
   XCTAssertNil(log.timestamp);
@@ -217,7 +217,7 @@ - (void)testOnProcessingLog {
   // When
   NSDate *timestamp = [NSDate dateWithTimeIntervalSince1970:42];
   log.timestamp = timestamp;
-  [self.sut onEnqueuingLog:log withInternalId:nil];
+  [self.sut onPreparedLog:log withInternalId:nil];
 
   // Then
   XCTAssertEqual(timestamp, log.timestamp);
@@ -234,7 +234,7 @@ - (void)testNoStartSessionWithStartSessionLog {
   XCTAssertNil(log.timestamp);
 
   // When
-  [self.sut onEnqueuingLog:log withInternalId:nil];
+  [self.sut onPreparedLog:log withInternalId:nil];
 
   // Then
   XCTAssertNil(log.timestamp);
@@ -248,7 +248,7 @@ - (void)testNoStartSessionWithStartSessionLog {
   XCTAssertNil(sessionLog.timestamp);
 
   // When
-  [self.sut onEnqueuingLog:sessionLog withInternalId:nil];
+  [self.sut onPreparedLog:sessionLog withInternalId:nil];
 
   // Then
   XCTAssertNil(sessionLog.timestamp);
@@ -262,7 +262,7 @@ - (void)testNoStartSessionWithStartSessionLog {
   XCTAssertNil(serviceLog.timestamp);
 
   // When
-  [self.sut onEnqueuingLog:serviceLog withInternalId:nil];
+  [self.sut onPreparedLog:serviceLog withInternalId:nil];
 
   // Then
   XCTAssertNil(serviceLog.timestamp);

diff --git a/MobileCenterDistribute/MobileCenterDistribute/MSDistribute.m b/MobileCenterDistribute/MobileCenterDistribute/MSDistribute.m
@@ -214,15 +214,18 @@ - (void)requestInstallInformationWith:(NSString *)releaseHash {
     if (url) {
 
 /*
- * iOS 9+ only, check for `SFSafariViewController` availability. `SafariServices` framework MUST be weakly linked.
- * We can't use `NSClassFromString` here to avoid the warning.
- * It doesn't detect the class correctly unless the application explicitly imports the related framework.
+ * Only iOS 9.x and 10.x will download the update after users click the "Install" button. 
+ * We need to force-exit the application for other versions or for any versions when the update is mandatory.
  */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wpartial-availability"
       Class clazz = [SFSafariViewController class];
 #pragma clang diagnostic pop
-      if (clazz) {
+      /*
+       * TODO Checking operating system version is a workaround for iOS 11 where SFSafariViewController can't read Safari's cookies.
+       * Revert this change when SFAuthenticationSession will be ready.
+       */
+      if (clazz && ![NSProcessInfo.processInfo isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){11, 0, 0}]) {
 
         // Manipulate App UI on the main queue.
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -672,11 +675,13 @@ - (void)startDownload:(nullable MSReleaseDetails *)details {
         }
 
         /*
-         * We've seen the behavior on iOS 8.x devices in HockeyApp that it doesn't download until the application
-         * goes in background by pressing home button. Simply exit the app to start the update process.
-         * For iOS version >= 9.0, we still need to exit the app if it is a mandatory update.
+         * On iOS 8.x and >= iOS 11.0 devices the update download doesn't start until the application goes
+         * in background by pressing home button. Simply exit the app to start the update process.
+         * For iOS version >= 9.0 and < iOS 11.0, we still need to exit the app if it is a mandatory update.
          */
-        if ((floor(NSFoundationVersionNumber) < NSFoundationVersionNumber_iOS_9_0) || details.mandatoryUpdate) {
+        if ((floor(NSFoundationVersionNumber) < NSFoundationVersionNumber_iOS_9_0) ||
+            [NSProcessInfo.processInfo isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){11, 0, 0}] ||
+            details.mandatoryUpdate) {
           [self closeApp];
         }
       }];
@@ -753,7 +758,9 @@ - (BOOL)openURL:(NSURL *)url {
       [MSKeychainUtil deleteStringForKey:kMSUpdateTokenKey];
     }
     if (queryUpdateToken || queryDistributionGroupId) {
-      [self checkLatestRelease:queryUpdateToken distributionGroupId:queryDistributionGroupId releaseHash:MSPackageHash()];
+      [self checkLatestRelease:queryUpdateToken
+           distributionGroupId:queryDistributionGroupId
+                   releaseHash:MSPackageHash()];
     } else {
       MSLogError([MSDistribute logTag], @"Cannot find either update token or distribution group id.");
     }