Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-11-01 01:17:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tell the accounts apart, and let a disabled source come back

Browse Source
This commit is contained in:
Arkadiusz Fal
2026-09-07 18:53:21 +02:00
parent 5ac6b7188d
commit 02efc71e7c
15 changed files with 533 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Yattee/Views/Settings/EditSourceView.swift
View File

@@ -329,13 +329,13 @@ private struct EditRemoteServerContent: View {
.presentationCompactAdaptation(.sheet)
#if os(tvOS)
.fullScreenCover(item: $loginTarget) { target in
InstanceLoginView(instance: instance) { credential, username in
InstanceLoginView(instance: instance, initialUsername: storedUsername(for: target)) { credential, username in
storeLogin(credential: credential, username: username, target: target)
}
}
#else
.sheet(item: $loginTarget) { target in
InstanceLoginView(instance: instance) { credential, username in
InstanceLoginView(instance: instance, initialUsername: storedUsername(for: target)) { credential, username in
storeLogin(credential: credential, username: username, target: target)
}
}
@@ -417,6 +417,13 @@ private struct EditRemoteServerContent: View {
return stored
}
/// The identifier an existing account last signed in with, when this device
/// holds it. A new account has nobody to name yet.
private func storedUsername(for target: AccountLoginTarget) -> String? {
guard let account = target.account else { return nil }
return appEnvironment?.accountCredentialsManager(for: account)?.username(for: account)
}
private func loadServerInfo() async {
guard instance.type == .yatteeServer, let appEnvironment else { return }