reformat

lukasa1993 · Apr 10, 2018 · 7305dc2 · 7305dc2
1 parent d6ce5a8
commit 7305dc2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 30 deletions.
diff --git a/SCP.xcodeproj/project.xcworkspace/xcuserdata/ld.xcuserdatad/UserInterfaceState.xcuserstate b/SCP.xcodeproj/project.xcworkspace/xcuserdata/ld.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/SCP.xcodeproj/xcuserdata/ld.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SCP.xcodeproj/xcuserdata/ld.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,22 +2,4 @@
 <Bucket
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "SCP/DetailViewController.swift"
-            timestampString = "545043784.3560309"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "57"
-            endingLineNumber = "57"
-            landmarkName = "prepareForPopoverPresentation(_:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>
diff --git a/SCP/AddServerViewController.swift b/SCP/AddServerViewController.swift
@@ -45,14 +45,23 @@ class AddServerViewController: FormViewController {
             <<< ButtonRow(){
                 $0.title = "Add Server"
                 }.onCellSelection {  cell, row in
-                    let valuesDictionary = self.serverForm?.values()
                     let keychain = Keychain()
                     do {
-                        let server = SSHServer(name: valuesDictionary!["name"] as! String,
-                                               host: valuesDictionary!["host"] as! String,
-                                               port: valuesDictionary!["port"] as! Int,
-                                               user: valuesDictionary!["user"] as! String,
-                                               pass: valuesDictionary!["pass"] as! String)
+                        let nameRow: TextRow? = self.serverForm?.rowBy(tag: "name")
+                        let portRow: IntRow? = self.serverForm?.rowBy(tag: "port")
+                        let userRow: TextRow? = self.serverForm?.rowBy(tag: "user")
+                        let hostRow: TextRow? = self.serverForm?.rowBy(tag: "host")
+                        let passRow: PasswordRow? = self.serverForm?.rowBy(tag: "pass")
+
+                        let name = nameRow?.value != nil ? nameRow?.value : "SSH Server"
+                        let port = portRow?.value != nil ? portRow?.value : 22
+                        let user = userRow?.value != nil ? userRow?.value : "root"
+
+                        let server = SSHServer(name: name!,
+                                               host: hostRow!.value!,
+                                               port: port!,
+                                               user: user!,
+                                               pass: passRow!.value!)
 
                         let jsonEncoder = JSONEncoder()
                         let jsonData = try jsonEncoder.encode(server)

diff --git a/SCP/DetailViewController.swift b/SCP/DetailViewController.swift
@@ -52,11 +52,6 @@ class DetailViewController: UIViewController,UIPopoverPresentationControllerDele
         }
     }
 
-
-    func prepareForPopoverPresentation(_ popoverPresentationController: UIPopoverPresentationController) {
-        popoverPresentationController.sourceView = self.view
-    }
-
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
 

diff --git a/SCP/Info.plist b/SCP/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>10</string>
+	<string>15</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>