Merge pull request #474 from ianyh/crashlytics

Add Crashlytics back in as opt-in configuration option

Amethyst.xcodeproj/project.pbxproj

@@ -583,7 +583,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "source ./bin/CrashlyticsKeys.sh\nif [ -n \"$CRASHLYTICS_API_KEY\" -a -n \"$CRASHLYTICS_APP_KEY\" ]; then\n    ./Fabric.framework/run $CRASHLYTICS_API_KEY $CRASHLYTICS_APP_KEY\n    /usr/libexec/PlistBuddy -c \"Delete Fabric:APIKey\" Amethyst/Amethyst-Info.plist\nfi\n";
+			shellScript = "source ./bin/CrashlyticsKeys.sh\nif [ -n \"$CRASHLYTICS_API_KEY\" -a -n \"$CRASHLYTICS_APP_KEY\" ]; then\n    ${PODS_ROOT}/Fabric/run $CRASHLYTICS_API_KEY $CRASHLYTICS_APP_KEY\n    /usr/libexec/PlistBuddy -c \"Delete Fabric:APIKey\" Amethyst/Amethyst-Info.plist\nfi\n";
 		};
 		5D538A7AD98DDD09209924DA /* 📦 Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;

Amethyst/AppDelegate.swift

@@ -68,12 +68,14 @@ public class AppDelegate: NSObject, NSApplicationDelegate {
                 self?.statusItem?.image = statusItemImage
             }
 
-        let crashlyticsAPIKey = NSBundle.mainBundle().infoDictionary?["AMCrashlyticsAPIKey"]
-        if crashlyticsAPIKey != nil {
-            Fabric.with([Crashlytics.self])
-            #if DEBUG
-                Crashlytics.sharedInstance().debugMode = true
-            #endif
+        if let fabricData = NSBundle.mainBundle().infoDictionary?["Fabric"] as? [String: AnyObject] where fabricData["APIKey"] != nil {
+            if UserConfiguration.sharedConfiguration.shouldSendCrashReports() {
+                LogManager.log?.info("Crash reporting enabled")
+                Fabric.with([Crashlytics.self])
+                #if DEBUG
+                    Crashlytics.sharedInstance().debugMode = true
+                #endif
+            }
         }
 
         preferencesWindowController = CCNPreferencesWindowController()

Amethyst/Preferences/UserConfiguration.swift

@@ -40,6 +40,7 @@ internal enum ConfigurationKey: String {
     case LayoutHUDOnSpaceChange = "enables-layout-hud-on-space-change"
     case UseCanaryBuild = "use-canary-build"
     case NewWindowsToMain = "new-windows-to-main"
+    case SendCrashReports = "send-crash-reports"
 
     static var defaultsKeys: [ConfigurationKey] {
         return [
@@ -53,7 +54,8 @@ internal enum ConfigurationKey: String {
             .LayoutHUDOnSpaceChange,
             .UseCanaryBuild,
             .WindowMargins,
-            .WindowMarginSize
+            .WindowMarginSize,
+            .SendCrashReports
         ]
     }
 }
@@ -345,4 +347,8 @@ public class UserConfiguration: NSObject {
     public func sendNewWindowsToMainPane() -> Bool {
         return storage.boolForKey(ConfigurationKey.NewWindowsToMain.rawValue)
     }
+
+    public func shouldSendCrashReports() -> Bool {
+        return storage.boolForKey(ConfigurationKey.SendCrashReports.rawValue)
+    }
 }

Amethyst/default.amethyst

@@ -195,5 +195,6 @@
     "window-margins": false,
     "ignore-menu-bar": false,
     "use-canary-build": false,
-    "new-windows-to-main": false
+    "new-windows-to-main": false,
+    "send-crash-reports": false
 }