Merge pull request #1168 from Microsoft/develop

Merge to master for release

.clang-format

@@ -0,0 +1,3 @@
+BasedOnStyle: LLVM
+ColumnLimit: 140
+UseTab: Never

AppCenter.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'AppCenter'
-  s.version           = '1.9.0'
+  s.version           = '1.10.0'
 
   s.summary           = 'Visual Studio App Center is your continuous integration, delivery and learning solution for iOS and macOS apps.'
   s.description       = <<-DESC

AppCenter/AppCenter.xcodeproj/xcshareddata/xcschemes/AppCenterIOS.xcscheme

@@ -26,8 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

AppCenter/AppCenter/Internals/AppDelegate/MSAppDelegateForwarder.h

@@ -38,9 +38,8 @@ typedef NS_OPTIONS(NSUInteger, MSCompletionExecutor) {
  *
  * @param selector An app delegate selector to swizzle.
  *
- * @discussion Due to the early registration of swizzling on the original app
- * delegate each custom delegate must sign up for selectors to swizzle within
- * the `load` method of a category over the @see MSAppDelegateForwarder class.
+ * @discussion Due to the early registration of swizzling on the original app delegate each custom delegate must sign up for selectors to
+ * swizzle within the `load` method of a category over the @see MSAppDelegateForwarder class.
  */
 + (void)addAppDelegateSelectorToSwizzle:(SEL)selector;
 

AppCenter/AppCenter/Internals/AppDelegate/MSAppDelegateForwarderPrivate.h

@@ -7,26 +7,22 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Hash table containing all the delegates as weak references.
  */
-@property(nonatomic, class)
-    NSHashTable<id<MSCustomApplicationDelegate>> *delegates;
+@property(nonatomic, class) NSHashTable<id<MSCustomApplicationDelegate>> *delegates;
 
 /**
  * Keep track of original selectors to swizzle.
  */
-@property(nonatomic, class, readonly)
-    NSMutableSet<NSString *> *selectorsToSwizzle;
+@property(nonatomic, class, readonly) NSMutableSet<NSString *> *selectorsToSwizzle;
 
 /**
  * Dictionary of deprecated original selectors indexed by their new equivalent.
  */
-@property(nonatomic, class, readonly)
-    NSDictionary<NSString *, NSString *> *deprecatedSelectors;
+@property(nonatomic, class, readonly) NSDictionary<NSString *, NSString *> *deprecatedSelectors;
 
 /**
  * Keep track of the original delegate's method implementations.
  */
-@property(nonatomic, class, readonly)
-    NSMutableDictionary<NSString *, NSValue *> *originalImplementations;
+@property(nonatomic, class, readonly) NSMutableDictionary<NSString *, NSValue *> *originalImplementations;
 
 #if TARGET_OS_OSX
 /**

AppCenter/AppCenter/Internals/AppDelegate/MSAppDelegateUtil.h

@@ -1,18 +1,24 @@
 #import <Foundation/Foundation.h>
+
 #if TARGET_OS_OSX
 #import <AppKit/AppKit.h>
+
 #ifndef MSApplicationDelegate
 #define MSApplicationDelegate NSApplicationDelegate
 #endif
+
 #ifndef MSApplication
 #define MSApplication NSApplication
 #endif
 #else
 #import <UIKit/UIKit.h>
+
 #ifndef MSApplicationDelegate
 #define MSApplicationDelegate UIApplicationDelegate
 #endif
+
 #ifndef MSApplication
 #define MSApplication UIApplication
 #endif
+
 #endif

AppCenter/AppCenter/Internals/AppDelegate/MSCustomApplicationDelegate.h

@@ -5,11 +5,9 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Custom delegate matching `UIApplicationDelegate`.
  *
- * @discussion Delegates here are using swizzling. Any delegate that can be
- * registered through the notification center should not be registered through
- * swizzling. Due to the early registration of swizzling on the original app
- * delegate each custom delegate must sign up for selectors to swizzle within
- * the `load` method of a category over the @see MSAppDelegateForwarder class.
+ * @discussion Delegates here are using swizzling. Any delegate that can be registered through the notification center should not be
+ * registered through swizzling. Due to the early registration of swizzling on the original app delegate each custom delegate must sign up
+ * for selectors to swizzle within the `load` method of a category over the @see MSAppDelegateForwarder class.
  */
 @protocol MSCustomApplicationDelegate <NSObject>
 
@@ -18,20 +16,15 @@ NS_ASSUME_NONNULL_BEGIN
 #if !TARGET_OS_OSX
 
 /**
- * Asks the delegate to open a resource specified by a URL, and provides a
- * dictionary of launch options.
+ * Asks the delegate to open a resource specified by a URL, and provides a dictionary of launch options.
  *
  * @param application The singleton app object.
- * @param url The URL resource to open. This resource can be a network resource
- * or a file.
- * @param sourceApplication The bundle ID of the app that is requesting your app
- * to open the URL (url).
- * @param annotation A Property list supplied by the source app to communicate
- * information to the receiving app.
+ * @param url The URL resource to open. This resource can be a network resource or a file.
+ * @param sourceApplication The bundle ID of the app that is requesting your app to open the URL (url).
+ * @param annotation A Property list supplied by the source app to communicate information to the receiving app.
  * @param returnedValue Value returned by the original delegate implementation.
  *
- * @return `YES` if the delegate successfully handled the request or `NO` if the
- * attempt to open the URL resource failed.
+ * @return `YES` if the delegate successfully handled the request or `NO` if the attempt to open the URL resource failed.
  */
 - (BOOL)application:(UIApplication *)application
               openURL:(NSURL *)url
@@ -40,20 +33,15 @@ NS_ASSUME_NONNULL_BEGIN
         returnedValue:(BOOL)returnedValue;
 
 /**
- * Asks the delegate to open a resource specified by a URL, and provides a
- * dictionary of launch options.
+ * Asks the delegate to open a resource specified by a URL, and provides a dictionary of launch options.
  *
  * @param application The singleton app object.
- * @param url The URL resource to open. This resource can be a network resource
- * or a file.
- * @param options A dictionary of URL handling options.
- * For information about the possible keys in this dictionary and how to handle
- * them, @see UIApplicationOpenURLOptionsKey. By default, the value of this
- * parameter is an empty dictionary.
+ * @param url The URL resource to open. This resource can be a network resource or a file.
+ * @param options A dictionary of URL handling options. For information about the possible keys in this dictionary and how to handle them,
+ * @see UIApplicationOpenURLOptionsKey. By default, the value of this parameter is an empty dictionary.
  * @param returnedValue Value returned by the original delegate implementation.
  *
- * @return `YES` if the delegate successfully handled the request or `NO` if the
- * attempt to open the URL resource failed.
+ * @return `YES` if the delegate successfully handled the request or `NO` if the attempt to open the URL resource failed.
  */
 - (BOOL)application:(UIApplication *)application
             openURL:(NSURL *)url

AppCenter/AppCenter/Internals/Channel/MSCSEpochAndSeq.m

@@ -9,4 +9,5 @@ - (instancetype)initWithEpoch:(NSString *)epoch {
   }
   return self;
 }
+
 @end

AppCenter/AppCenter/Internals/Channel/MSChannelDelegate.h

@@ -1,9 +1,9 @@
 #import <Foundation/Foundation.h>
 
-@protocol MSLog;
 @protocol MSChannelUnitProtocol;
 @protocol MSChannelGroupProtocol;
 @protocol MSChannelProtocol;
+@protocol MSLog;
 
 @protocol MSChannelDelegate <NSObject>
 
@@ -15,12 +15,10 @@
  * @param channelGroup The channel group.
  * @param channel The newly added channel.
  */
-- (void)channelGroup:(id<MSChannelGroupProtocol>)channelGroup
-    didAddChannelUnit:(id<MSChannelUnitProtocol>)channel;
+- (void)channelGroup:(id<MSChannelGroupProtocol>)channelGroup didAddChannelUnit:(id<MSChannelUnitProtocol>)channel;
 
 /**
- * A callback that is called when a log is just enqueued. Delegates may want to
- * prepare the log a little more before further processing.
+ * A callback that is called when a log is just enqueued. Delegates may want to prepare the log a little more before further processing.
  *
  * @param log The log to prepare.
  */
@@ -32,24 +30,18 @@
  * @param log The log.
  * @param internalId An internal Id to keep track of logs.
  */
-- (void)channel:(id<MSChannelProtocol>)channel
-     didPrepareLog:(id<MSLog>)log
-    withInternalId:(NSString *)internalId;
+- (void)channel:(id<MSChannelProtocol>)channel didPrepareLog:(id<MSLog>)log withInternalId:(NSString *)internalId;
 
 /**
- * A callback that is called after a log completed the enqueueing process
- * weither it was successfull or not.
+ * A callback that is called after a log completed the enqueueing process weither it was successfull or not.
  *
  * @param log The log.
  * @param internalId An internal Id to keep track of logs.
  */
-- (void)channel:(id<MSChannelProtocol>)channel
-    didCompleteEnqueueingLog:(id<MSLog>)log
-              withInternalId:(NSString *)internalId;
+- (void)channel:(id<MSChannelProtocol>)channel didCompleteEnqueueingLog:(id<MSLog>)log withInternalId:(NSString *)internalId;
 
 /**
- * Callback method that will be called before each log will be send to the
- * server.
+ * Callback method that will be called before each log will be send to the server.
  *
  * @param channel The channel object.
  * @param log The log to be sent.
@@ -62,8 +54,7 @@
  * @param channel The channel object.
  * @param log The log to be sent.
  */
-- (void)channel:(id<MSChannelProtocol>)channel
-    didSucceedSendingLog:(id<MSLog>)log;
+- (void)channel:(id<MSChannelProtocol>)channel didSucceedSendingLog:(id<MSLog>)log;
 
 /**
  * Callback method that will be called in case the SDK was unable to send a log.
@@ -72,9 +63,7 @@
  * @param log The log to be sent.
  * @param error The error that occured.
  */
-- (void)channel:(id<MSChannelProtocol>)channel
-    didFailSendingLog:(id<MSLog>)log
-            withError:(NSError *)error;
+- (void)channel:(id<MSChannelProtocol>)channel didFailSendingLog:(id<MSLog>)log withError:(NSError *)error;
 
 /**
  * A callback that is called when setEnabled has been invoked.
@@ -83,20 +72,33 @@
  * @param isEnabled The boolean that indicates enabled.
  * @param deletedData The boolean that indicates deleting data on disabled.
  */
-- (void)channel:(id<MSChannelProtocol>)channel
-              didSetEnabled:(BOOL)isEnabled
-    andDeleteDataOnDisabled:(BOOL)deletedData;
+- (void)channel:(id<MSChannelProtocol>)channel didSetEnabled:(BOOL)isEnabled andDeleteDataOnDisabled:(BOOL)deletedData;
+
+/**
+ * A callback that is called when pause has been invoked.
+ *
+ * @param channel The channel.
+ * @param identifyingObject The identifying object used to pause the channel.
+ */
+- (void)channel:(id<MSChannelProtocol>)channel didPauseWithIdentifyingObject:(id<NSObject>)identifyingObject;
+
+/**
+ * A callback that is called when resume has been invoked.
+ *
+ * @param channel The channel.
+ * @param identifyingObject The identifying object used to resume the channel.
+ */
+- (void)channel:(id<MSChannelProtocol>)channel didResumeWithIdentifyingObject:(id<NSObject>)identifyingObject;
 
 /**
- * Callback method that will determine if a log should be filtered out from the
- * usual processing pipeline. If any delegate returns true, the log is filtered.
+ * Callback method that will determine if a log should be filtered out from the usual processing pipeline. If any delegate returns true, the
+ * log is filtered.
  *
  * @param channelUnit The channel unit that is going to send the log.
  * @param log The log to be filtered or not.
  *
  * @return `true` if the log should be filtered out.
  */
-- (BOOL)channelUnit:(id<MSChannelUnitProtocol>)channelUnit
-    shouldFilterLog:(id<MSLog>)log;
+- (BOOL)channelUnit:(id<MSChannelUnitProtocol>)channelUnit shouldFilterLog:(id<MSLog>)log;
 
 @end

AppCenter/AppCenter/Internals/Channel/MSChannelGroupDefault.h

@@ -5,17 +5,15 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class MSHttpIngestion;
+@class MSAppCenterIngestion;
+
 @protocol MSStorage;
 
 /**
- * A channel group which triggers and manages the processing of log items on
- * different channels. All items will be immediately passed to the persistence
- * layer in order to make the queue crash safe. Once a maximum number of items
- * have been enqueued or the internal timer finished running, events will be
- * forwarded to the ingestion. Furthermore, its responsibility is to tell the
- * persistence layer what to do with a pending batch based on the status code
- * returned by the ingestion
+ * A channel group which triggers and manages the processing of log items on different channels. All items will be immediately passed to the
+ * persistence layer in order to make the queue crash safe. Once a maximum number of items have been enqueued or the internal timer finished
+ * running, events will be forwarded to the ingestion. Furthermore, its responsibility is to tell the persistence layer what to do with a
+ * pending batch based on the status code returned by the ingestion
  */
 @interface MSChannelGroupDefault : NSObject <MSChannelGroupProtocol>
 
@@ -35,10 +33,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic) NSHashTable<id<MSChannelDelegate>> *delegates;
 
 /**
- * An ingestion instance that is used to send batches of log items to the
- * backend.
+ * An ingestion instance that is used to send batches of log items to the backend.
  */
-@property(nonatomic, strong, nullable) MSHttpIngestion *ingestion;
+@property(nonatomic, strong, nullable) MSAppCenterIngestion *ingestion;
 
 /**
  * A storage instance to store and read enqueued log items.