Implementation: fix checking the username so it won't generate undefined behavior during ui rendering

This commit is contained in:
2026-05-06 20:00:37 +02:00
parent ec66ac93c0
commit 23fd16f88e
+21 -8
View File
@@ -17,17 +17,19 @@ struct ContentView: View {
@State private var notesClient: NoteEditingSessionClient? @State private var notesClient: NoteEditingSessionClient?
@State private var ownPeer: OwnPeer? @State private var ownPeer: OwnPeer?
var isUsernameValid: Bool {
username != "fallback_user" && !username.isEmpty
}
var body: some View { var body: some View {
NavigationStack { NavigationStack {
List { List {
Section("Your notes") { Section("Your notes") {
ForEach(notes) { note in ForEach(notes) { note in
NavigationLink(note.name) { NavigationLink(note.name) {
let peer = ownPeer ?? .init(peer: .init(displayName: username)) if let ownPeer {
if ownPeer == nil { NoteEditorScreen(note: note, peer: ownPeer)
ownPeer = peer
} }
return NoteEditorScreen(note: note, peer: peer)
} }
} }
} }
@@ -53,15 +55,26 @@ struct ContentView: View {
} }
.onAppear { .onAppear {
notes = NotesStorage().loadNotes() notes = NotesStorage().loadNotes()
if notesClient == nil { if isUsernameValid {
notesClient = .init(peer: .init(displayName: username)) setupSession()
} }
notesClient?.startBrowsingForNotes()
} }
.sheet(isPresented: .constant(username == "fallback_user" || username.isEmpty)) { .onChange(of: username) { _, newUsername in
guard isUsernameValid else { return }
setupSession()
}
.sheet(isPresented: .constant(!isUsernameValid)) {
SetUserNameBottomSheetView(username: $username) SetUserNameBottomSheetView(username: $username)
} }
} }
private func setupSession() {
notesClient?.stopBrowsingForNotes()
let peer = OwnPeer(peer: .init(displayName: username))
ownPeer = peer
notesClient = .init(peer: peer.peer)
notesClient?.startBrowsingForNotes()
}
} }
#Preview { #Preview {