Skip to content

Commit 068af31

Browse files
authored
fixes new servers being set as default erroneously (#28)
* fixes new servers being set as default * restore auto open new server * fix test and fix webview launch after add
1 parent 17389b0 commit 068af31

File tree

4 files changed

+5
-43
lines changed

4 files changed

+5
-43
lines changed

Django Files/Views/ContentView.swift

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -107,33 +107,15 @@ struct ContentView: View {
107107
}
108108
.onAppear() {
109109
selectedServer = items.first(where: { $0.defaultSession }) ?? items.first
110-
setDefaultServer()
110+
if items.count == 0{
111+
self.showingEditor.toggle()
112+
}
111113
}
112114
.frame(maxWidth: .infinity, maxHeight: .infinity)
113115
.edgesIgnoringSafeArea(.all)
114116
}
115-
116-
private func setDefaultServer(){
117-
if items.count > 0{
118-
var server = items.first(where: {
119-
return $0.defaultSession == true
120-
})
121-
if server == nil {
122-
server = items.first(where: {
123-
return $0.auth
124-
})
125-
if server != nil{
126-
server?.defaultSession = true
127-
}
128-
}
129-
}
130-
if items.count == 0{
131-
self.showingEditor.toggle()
132-
}
133-
}
134117

135118
private func deleteItems(offsets: IndexSet) {
136-
setDefaultServer()
137119
withAnimation {
138120
for index in offsets {
139121
modelContext.delete(items[index])
@@ -243,22 +225,6 @@ public struct AuthViewContainer: View {
243225
}
244226
}
245227
}
246-
247-
private func setDefaultServer(){
248-
if items.count > 0{
249-
var server = items.first(where: {
250-
return $0.defaultSession == true
251-
})
252-
if server == nil {
253-
server = items.first(where: {
254-
return $0.auth
255-
})
256-
if server != nil{
257-
server?.defaultSession = true
258-
}
259-
}
260-
}
261-
}
262228
}
263229

264230
struct LoadingView: View {

Django Files/Views/SessionEditor.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ struct SessionEditor: View {
3737

3838
let newSession = DjangoFilesSession()
3939
newSession.url = url?.absoluteString ?? ""
40-
for item in items {
41-
item.defaultSession = false
42-
}
43-
newSession.defaultSession = true
4440
newSession.token = token
4541
newSession.auth = false
4642
modelContext.insert(newSession)

Django FilesUITests/Django_FilesUITests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ final class Django_FilesUITests: XCTestCase {
3131
app.launch()
3232
let textField = app.textFields["urlTextField"]
3333
textField.tap()
34-
textField.typeText("https://df.cssnr.com")
34+
textField.typeText("df.cssnr.com")
3535
let submitButton = app.buttons["serverSubmitButton"]
3636
submitButton.tap()
3737

UploadAndCopy/ShareViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class ShareViewController: UIViewController, UITextFieldDelegate, URLSessionTask
154154
var selectedServer: DjangoFilesSession?
155155
do{
156156
let servers = try sharedModelContainer.mainContext.fetch(FetchDescriptor<DjangoFilesSession>())
157-
if servers.count == 0{
157+
if servers.count == 0 {
158158
return nil
159159
}
160160
selectedServer = servers.first(where: {

0 commit comments

Comments
 (0)