Merge pull request #117 from xing/plist_over_userdefaults

Plist settings over UserDefaults
xing · Jan 10, 2018 · e548865 · e548865
2 parents f88b010 + 7ed8ded
commit e548865
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 30 deletions.
diff --git a/Launcher/Classes/ApplicationStateHandler.swift b/Launcher/Classes/ApplicationStateHandler.swift
@@ -13,8 +13,6 @@ class ApplicationStateHandler {
         case language = "testLanguage"
         case tag = "testTag"
         case debugState = "debugCheckboxState"
-        case cucumberProfile = "cucumberProfile"
-        case additionalRunParameters = "additionalRunParameters"
         case deviceIP = "deviceIP"
         case bundleID = "bundleID"
     }
@@ -91,24 +89,6 @@ class ApplicationStateHandler {
         }
     }
 
-    var cucumberProfile: String? {
-        get {
-            return defaults.string(forKey: .cucumberProfile)
-        }
-        set {
-            defaults.set(newValue, forKey: .cucumberProfile)
-        }
-    }
-
-    var additionalRunParameters: String? {
-        get {
-            return defaults.string(forKey: .additionalRunParameters)
-        }
-        set {
-            defaults.set(newValue, forKey: .additionalRunParameters)
-        }
-    }
-
     var deviceIP: String? {
         get {
             return defaults.string(forKey: .deviceIP)

diff --git a/Launcher/Classes/ViewControllers/SettingsViewController.swift b/Launcher/Classes/ViewControllers/SettingsViewController.swift
@@ -36,10 +36,14 @@ class SettingsViewController: NSViewController {
             (linkField4, linkDescriptionField4)
         ]
 
-        if let cucumberProfile = applicationStateHandler.cucumberProfile {
+        if let cucumberProfile = plistOperations.readValues(forKey: Constants.Keys.cucumberProfileInfo).first {
             cucumberProfileField.stringValue = cucumberProfile
         }
 
+        if let additionalParameters = plistOperations.readValues(forKey: Constants.Keys.additionalFieldInfo).first {
+            additionalRunParameters.stringValue = additionalParameters
+        }
+
         let linkArray = plistOperations.readKeys(forKey: Constants.Keys.linkInfo)
         let linkDescriptionArray = plistOperations.readValues(forKey: Constants.Keys.linkInfo)
 
@@ -50,10 +54,6 @@ class SettingsViewController: NSViewController {
         for (index, element) in linkDescriptionArray.enumerated() {
             elements[index].1.stringValue = String(describing: element)
         }
-
-        if let additionalParameters = applicationStateHandler.additionalRunParameters {
-            additionalRunParameters.stringValue = additionalParameters
-        }
     }
 
     @IBAction func clickProceedButton(_ sender: Any) {
@@ -99,9 +99,6 @@ class SettingsViewController: NSViewController {
 
         plistOperations.create(from: resultingDictionary)
 
-        applicationStateHandler.cucumberProfile = cucumberProfileField.stringValue
-        applicationStateHandler.additionalRunParameters = additionalRunParameters.stringValue
-
         // Reload build picker to get new elements
         if
             let tabViewController = NSApplication.shared.mainWindow?.contentViewController as? NSTabViewController,

diff --git a/Launcher/Classes/ViewControllers/TasksViewController.swift b/Launcher/Classes/ViewControllers/TasksViewController.swift
@@ -383,7 +383,7 @@ class TasksViewController: NSViewController {
 
         arguments.append(calabashFolderPath)
 
-        if let cucumberProfile = applicationStateHandler.cucumberProfile, !cucumberProfile.isEmpty {
+        if let cucumberProfile = plistOperations.readValues(forKey: Constants.Keys.cucumberProfileInfo).first, !cucumberProfile.isEmpty {
             arguments.append("-p \(cucumberProfile)")
         }
 
@@ -394,7 +394,7 @@ class TasksViewController: NSViewController {
             arguments.append("")
         }
 
-        if let additionalRunParameter = applicationStateHandler.additionalRunParameters, !additionalRunParameter.isEmpty {
+        if let additionalRunParameter = plistOperations.readValues(forKey: Constants.Keys.additionalFieldInfo).first, !additionalRunParameter.isEmpty {
             arguments.append("export \(additionalRunParameter)")
         } else {
             arguments.append("")