Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2024-12-22 21:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to private account on selecting to not use public location (#212)

Browse Source
This commit is contained in:
Arkadiusz Fal 2022-07-03 22:39:10 +02:00
parent 02a27b4f95
commit 9cb6ff64ff
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Model/Accounts/AccountsModel.swift
View File

@ -54,6 +54,15 @@ final class AccountsModel: ObservableObject {
) )
} }
func configureAccount() {
if let account = lastUsed ??
InstancesModel.lastUsed?.anonymousAccount ??
InstancesModel.all.first?.anonymousAccount
{
setCurrent(account)
}
}
func setCurrent(_ account: Account! = nil) { func setCurrent(_ account: Account! = nil) {
guard account != current else { guard account != current else {
return return

2
Model/Accounts/InstancesModel.swift
View File

@ -14,7 +14,7 @@ final class InstancesModel: ObservableObject {
return InstancesModel.find(id) return InstancesModel.find(id)
} }
var lastUsed: Instance? { static var lastUsed: Instance? {
guard let id = Defaults[.lastInstanceID] else { guard let id = Defaults[.lastInstanceID] else {
return nil return nil
} }

2
Model/InstancesManifest.swift
View File

@ -31,7 +31,7 @@ final class InstancesManifest: Service, ObservableObject {
guard let country = country else { guard let country = country else {
accounts.publicAccount = nil accounts.publicAccount = nil
if asCurrent { if asCurrent {
accounts.setCurrent(nil) accounts.configureAccount()
} }
return return
} }

8
Shared/YatteeApp.swift
View File

@ -174,12 +174,8 @@ struct YatteeApp: App {
} }
#endif #endif
if Defaults[.lastAccountID] != "public", if Defaults[.lastAccountID] != "public" {
let account = accounts.lastUsed ?? accounts.configureAccount()
instances.lastUsed?.anonymousAccount ??
InstancesModel.all.first?.anonymousAccount
{
accounts.setCurrent(account)
} }
let countryOfPublicInstances = Defaults[.countryOfPublicInstances] let countryOfPublicInstances = Defaults[.countryOfPublicInstances]