ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ignore object replacement character (#550)

This commit is contained in:
Ethan Pippin 2022-09-01 22:55:13 -06:00 committed by GitHub
parent 199e8adf91
commit 2a8685a420
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shared/Extensions/StringExtensions.swift
View File

@ -55,3 +55,7 @@ extension String {
return textSize.width return textSize.width
} }
} }
public extension CharacterSet {
static var objectReplacement: CharacterSet = .init(charactersIn: "\u{fffc}")
}

14
Shared/ViewModels/ConnectToServerViewModel.swift
View File

@ -46,17 +46,11 @@ final class ConnectToServerViewModel: ViewModel {
func connectToServer(uri: String, redirectCount: Int = 0) { func connectToServer(uri: String, redirectCount: Int = 0) {
#if targetEnvironment(simulator) let uri = uri.trimmingCharacters(in: .whitespacesAndNewlines)
var uri = uri .trimmingCharacters(in: .objectReplacement)
if uri == "http://localhost" || uri == "localhost" {
uri = "http://localhost:8096"
}
#endif
let trimmedURI = uri.trimmingCharacters(in: .whitespaces) LogManager.log.debug("Attempting to connect to server at \"\(uri)\"", tag: "connectToServer")
SessionManager.main.connectToServer(with: uri)
LogManager.log.debug("Attempting to connect to server at \"\(trimmedURI)\"", tag: "connectToServer")
SessionManager.main.connectToServer(with: trimmedURI)
.trackActivity(loading) .trackActivity(loading)
.sink(receiveCompletion: { completion in .sink(receiveCompletion: { completion in
// This is disgusting. ViewModel Error handling overall needs to be refactored // This is disgusting. ViewModel Error handling overall needs to be refactored

5
Shared/ViewModels/UserSignInViewModel.swift
View File

@ -48,6 +48,11 @@ final class UserSignInViewModel: ViewModel {
func signIn(username: String, password: String) { func signIn(username: String, password: String) {
LogManager.log.debug("Attempting to login to server at \"\(server.currentURI)\"", tag: "login") LogManager.log.debug("Attempting to login to server at \"\(server.currentURI)\"", tag: "login")
let username = username.trimmingCharacters(in: .whitespacesAndNewlines)
.trimmingCharacters(in: .objectReplacement)
let password = password.trimmingCharacters(in: .whitespacesAndNewlines)
.trimmingCharacters(in: .objectReplacement)
SessionManager.main.signInUser(server: server, username: username, password: password) SessionManager.main.signInUser(server: server, username: username, password: password)
.trackActivity(loading) .trackActivity(loading)
.sink { completion in .sink { completion in