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

Allow import of accounts to manually added (not imported) instances

Browse Source
This commit is contained in:
Arkadiusz Fal 2024-07-06 13:23:21 +02:00
parent 7755b392b7
commit 43c8484514
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Model/Import Export Settings/Importers/LocationsSettingsGroupImporter.swift
View File

@ -68,7 +68,7 @@ struct LocationsSettingsGroupImporter {
if let password, if let password,
!password.isEmpty, !password.isEmpty,
let instanceID = account.instanceID, let instanceID = account.instanceID,
let instance = InstancesModel.shared.find(instanceID) let instance = InstancesModel.shared.find(instanceID) ?? InstancesModel.shared.findByURLString(account.urlString)
{ {
if !instance.accounts.contains(where: { instanceAccount in if !instance.accounts.contains(where: { instanceAccount in
let (username, _) = instanceAccount.credentials let (username, _) = instanceAccount.credentials

2
Shared/Settings/Import/ImportSettingsAccountRow.swift
View File

@ -62,7 +62,7 @@ struct ImportSettingsAccountRow: View {
} }
} else { } else {
Group { Group {
if InstancesModel.shared.find(instanceID) != nil { if InstancesModel.shared.find(instanceID) != nil || InstancesModel.shared.findByURLString(account.urlString) != nil {
HStack { HStack {
Image(systemName: "checkmark.circle.fill") Image(systemName: "checkmark.circle.fill")
.foregroundColor(.green) .foregroundColor(.green)

2
Shared/Settings/Import/ImportSettingsSheetViewModel.swift
View File

@ -42,7 +42,7 @@ final class ImportSettingsSheetViewModel: ObservableObject {
return ((account.password != nil && !account.password!.isEmpty) || return ((account.password != nil && !account.password!.isEmpty) ||
importableAccounts.contains(account.id)) && ( importableAccounts.contains(account.id)) && (
(InstancesModel.shared.find(instanceID) != nil) || (InstancesModel.shared.find(instanceID) != nil || InstancesModel.shared.findByURLString(account.urlString) != nil) ||
selectedInstances.contains(instanceID) selectedInstances.contains(instanceID)
) )
} }