Merge pull request #87 from kishikawakatsumi/port

Fix port validation
kishikawakatsumi · Jul 27, 2024 · 6ff42dd · 6ff42dd
2 parents b80fa0e + 6743588
commit 6ff42dd
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Examples/FileBrowser/FileBrowser (iOS)/ConnectServerView.swift b/Examples/FileBrowser/FileBrowser (iOS)/ConnectServerView.swift
@@ -18,7 +18,7 @@ struct ConnectServerView: View {
   @State private var password: String
 
   private var canSubmit: Bool {
-    !server.isEmpty && !username.isEmpty && !password.isEmpty
+    !server.isEmpty && (port.isEmpty || Int(port) != nil ) && !username.isEmpty && !password.isEmpty
   }
 
   @FocusState
@@ -81,6 +81,7 @@ struct ConnectServerView: View {
             TextField("Port", text: $port)
               .multilineTextAlignment(.trailing)
               .focused($focusedField, equals: .port)
+              .keyboardType(.numberPad)
           } label: {
             Text("Port")
           }
@@ -133,7 +134,12 @@ struct ConnectServerView: View {
   private func submit() {
     Task { @MainActor in
       do {
-        let client = SMBClient(host: server, port: Int(port)!)
+        let client: SMBClient
+        if let port = Int(port) {
+          client = SMBClient(host: server, port: port)
+        } else {
+          client = SMBClient(host: server)
+        }
         try await client.login(username: username, password: password)
 
         dismiss()