Updated crash reporting and other minor changes

Author: GregorIwanowski

AppCenter/AppCenterSDK+HiDrive.swift

@@ -17,6 +17,7 @@ fileprivate enum AppCenterConstants {
 
 	static let appSecretKey					= "AppCenterAppSecret"
 	static let smfLogUploadMaxSize	: Int	= 5000
+	static let crashLogFileName				= "SMFLogger.log"
 }
 
 class AppCenterSDK: NSObject {
@@ -33,8 +34,7 @@ class AppCenterSDK: NSObject {
 
 	// MARK: - Private properties
 
-	fileprivate static var shared			: AppCenterSDK?
-	fileprivate var configuration			: Configuration?
+	fileprivate static var delegate			: AppCenterSDKDelegate?
 
 	// MARK: - Public properties
 
@@ -54,15 +54,17 @@ class AppCenterSDK: NSObject {
 			return
 		}
 
+		self.delegate = AppCenterSDKDelegate(isLogUploadEnabled: configuration.isLogUploadEnabled)
+
 		let services = (configuration.isDistributionEnabled == true) ? [MSCrashes.self, MSDistribute.self] : [MSCrashes.self]
 
 		MSAppCenter.start(configuration.appSecret, withServices: services)
-		MSCrashes.setEnabled(configuration.enableCrashes)
-		MSCrashes.setDelegate(shared)
+		MSCrashes.setEnabled(configuration.isCrashReportEnabled)
+		MSCrashes.setDelegate(self.delegate)
 	}
 
 	/// Returns True, if and only if the Service got started and is enabled.
-	var isDistributionEnabled: Bool {
+	static var isDistributionEnabled: Bool {
 		return MSDistribute.isEnabled()
 	}
 
@@ -76,10 +78,29 @@ class AppCenterSDK: NSObject {
 	/// - Enable Distribution at a later time using the same method
 	///
 	/// - Parameter enabled: Enable or Disable Distribtion
-	func enableDistribution(enabled: Bool = true) {
+	static func enableDistribution(enabled: Bool = true) {
 		MSDistribute.setEnabled(enabled)
 	}
 
+	/// Returns True, if and only if Crash Reporting is enabled.
+	static var isCrashReportingEnabled: Bool {
+		return MSCrashes.isEnabled()
+	}
+
+	/// Will enable or disable the sending od crash reports to AppCenter
+	/// While disabling works always.
+	/// For enabling the Setup (aka. start) - Method should be called before.
+	///
+	/// Flow in the App, for Apps that want to dynamically change that State:
+	/// - Call the Setup Method for with `isDistributionEnabled` set to true.
+	/// - Disable Distribution using `enableDistribution(enabled: false)`
+	/// - Enable Distribution at a later time using the same method
+	///
+	/// - Parameter enabled: Enable or Disable Distribtion
+	static func enableCrashReporting(enabled: Bool = true) {
+		MSCrashes.setEnabled(enabled)
+	}
+
 	/// This will create a `fatalError` to crash the app.
 	static func performTestCrash() {
 
@@ -94,15 +115,18 @@ extension AppCenterSDK {
 		fileprivate var enableDebug				: Bool
 		fileprivate var appSecret				: String
 		fileprivate var isDistributionEnabled	: Bool
-		fileprivate var enableCrashes			: Bool
+		fileprivate var isCrashReportEnabled	: Bool
+		fileprivate var isLogUploadEnabled		: Bool
 
 		/// Initializes a AppCenterSDK Configuration
 		///
 		///	- Parameters:
 		///		- appSecret: supply this manually if you dont want it in the info.plist
 		///		- enableDebug: Should start the Services even for Debug, Default is false
-		///		- isDistributionEnabled: Should start the Distribution Service, Default is false for Debug and Live apps, else true,
-		init(appSecret: String? = nil, enableDebug: Bool = false, isDistributionEnabled: Bool? = nil, enableCrashes: Bool = true) {
+		///		- isDistributionEnabled: Should start the Distribution Service, Default is false for Debug and Live apps, else true
+		///		- isCrashReportEnabled: enables sending of crash reports, Default is true
+		///		- isLogUploadEnabled: enables attachment of logs to crash reports, Default is true
+		init(appSecret: String? = nil, enableDebug: Bool = false, isDistributionEnabled: Bool? = nil, isCrashReportEnabled: Bool = true, isLogUploadEnabled: Bool = true) {
 
 			let appSecretFromBundle = Bundle.main.object(forInfoDictionaryKey: AppCenterConstants.appSecretKey) as? String
 
@@ -112,7 +136,8 @@ extension AppCenterSDK {
 
 			self.enableDebug			= enableDebug
 			self.appSecret				= _appSecret
-			self.enableCrashes			= enableCrashes
+			self.isCrashReportEnabled	= isCrashReportEnabled
+			self.isLogUploadEnabled		= isLogUploadEnabled
 
 			#if DEBUG
 			self.isDistributionEnabled	= isDistributionEnabled ?? false
@@ -129,19 +154,26 @@ extension AppCenterSDK {
 	}
 }
 
-extension AppCenterSDK: MSCrashesDelegate {
+private class AppCenterSDKDelegate	: NSObject, MSCrashesDelegate {
+
+	private var isLogUploadEnabled	: Bool
+
+	init(isLogUploadEnabled	: Bool) {
+		self.isLogUploadEnabled = isLogUploadEnabled
+	}
 
 	func attachments(with crashes: MSCrashes!, for errorReport: MSErrorReport!) -> [MSErrorAttachmentLog]! {
 		return [
-			MSErrorAttachmentLog.attachment(withText: self.applicationLog ?? "No Log found", filename: "SMFLogger.log")
+			MSErrorAttachmentLog.attachment(withText: self.applicationLog, filename: AppCenterConstants.crashLogFileName)
 		]
 	}
 
-	private var applicationLog:  String? {
+	private var applicationLog: String {
 		guard
+			(self.isLogUploadEnabled == true),
 			let description = Logger.logFilesContent(maxSize: AppCenterConstants.smfLogUploadMaxSize),
 			(description.isEmpty == false) else {
-				return nil
+				return "No Log found"
 		}
 
 		return description

AppCenter/AppCenterSDK+SMFLogger.swift

@@ -28,11 +28,6 @@ class AppCenterSDK: NSObject {
 		#endif
 	}()
 
-	// MARK: - Private properties
-
-	fileprivate var isInitialized			= false
-	fileprivate var configuration			: Configuration?
-
 	// MARK: - Public properties
 
 	static var wasInitialized				: Bool {
@@ -57,7 +52,7 @@ class AppCenterSDK: NSObject {
 	}
 
 	/// Returns True, if and only if the Service got started and is enabled.
-	var isDistributionEnabled: Bool {
+	static var isDistributionEnabled: Bool {
 		return MSDistribute.isEnabled()
 	}
 
@@ -71,7 +66,7 @@ class AppCenterSDK: NSObject {
 	/// - Enable Distribution at a later time using the same method
 	///
 	/// - Parameter enabled: Enable or Disable Distribtion
-	func enableDistribution(enabled: Bool = true) {
+	static func enableDistribution(enabled: Bool = true) {
 		MSDistribute.setEnabled(enabled)
 	}