mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Added clearance of NextcloudKit account error state on injection of credentials.

Browse Source 
Signed-off-by: Iva Horn <iva.horn@icloud.com>
Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
This commit is contained in:
Iva Horn 2025-09-11 10:38:51 +02:00 committed by Matthieu Gallien
parent 41b388652c
commit 5148264847
3 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Extensions/NextcloudKit+clearAccountErrorState.swift Normal file
View File

@ -0,0 +1,68 @@
// SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
// SPDX-License-Identifier: GPL-2.0-or-later
import NextcloudKit
import os
extension NextcloudKit {
///
/// Removes the given NextcloudKit accound identifier from the persisted list of accounts with certain errors managed by NextcloudKit.
///
/// Copied from `removeServerErrorAccount(_:)` in the iOS Files app project as an interim solution.
/// This implementation should actually be part of NextcloudKit and not the consuming projects.
///
/// - Parameters:
/// - identifier: The composite account identifier string as typically used by NextcloudKit.
///
static func clearAccountErrorState(for identifier: String) {
let nkCommon = NextcloudKit.shared.nkCommonInstance
let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "NextcloudKit+clearAccountErrorState")
logger.debug("Attempt to clear account error state for account identifier: \"\(identifier)\"...")
// MARK: User defaults group lookup.
guard let groupDefaults = UserDefaults(suiteName: nkCommon.groupIdentifier) else {
logger.error("Failed to get user defaults for NextcloudKit group identifier: \(nkCommon.groupIdentifier ?? "nil")")
return
}
// MARK: Unauthorized state accounts.
var unauthorized = groupDefaults.array(forKey: nkCommon.groupDefaultsUnauthorized) as? [String] ?? []
logger.debug("Found list of accounts in unauthorized state:\n\(unauthorized.map { "\t- \($0)" }.joined(separator: "\n"))")
unauthorized.removeAll { item in
item == identifier
}
groupDefaults.set(unauthorized, forKey: nkCommon.groupDefaultsUnauthorized)
// MARK: Unavailable state accounts.
var unavailable = groupDefaults.array(forKey: nkCommon.groupDefaultsUnavailable) as? [String] ?? []
logger.debug("Found list of accounts in unavailable state:\n\(unavailable.map { "\t- \($0)" }.joined(separator: "\n"))")
unavailable.removeAll { item in
item == identifier
}
groupDefaults.set(unavailable, forKey: nkCommon.groupDefaultsUnavailable)
// MARK: Missing terms of service state accounts.
var termsOfService = groupDefaults.array(forKey: nkCommon.groupDefaultsToS) as? [String] ?? []
logger.debug("Found list of accounts in terms of service state:\n\(termsOfService.map { "\t- \($0)" }.joined(separator: "\n"))")
termsOfService.removeAll { item in
item == identifier
}
groupDefaults.set(termsOfService, forKey: nkCommon.groupDefaultsToS)
// MARK: Forced persistence.
groupDefaults.synchronize()
logger.debug("Completed clearance of account error state call.")
}
}

5
shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension+ClientInterface.swift
View File

@ -117,6 +117,8 @@ extension FileProviderExtension: NSFileProviderServicing, ChangeNotificationInte
return
}
NextcloudKit.clearAccountErrorState(for: account.ncKitAccount)
Task {
ncKit.appendSession(
account: account.ncKitAccount,
@ -180,7 +182,8 @@ extension FileProviderExtension: NSFileProviderServicing, ChangeNotificationInte
} else {
Logger.fileProviderExtension.error("Invalid db manager, cannot start RCO")
}
ncKit.setup(delegate: changeObserver)
ncKit.setup(groupIdentifier: Bundle.main.bundleIdentifier!, delegate: changeObserver)
signalEnumeratorAfterAccountSetup()
}
}

4
shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj
View File

@ -55,6 +55,7 @@
53FE145B2B8F1305006C4193 /* NKShare+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53FE145A2B8F1305006C4193 /* NKShare+Extensions.swift */; };
53FE14652B8F6700006C4193 /* ShareViewDataSourceUIDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53FE14642B8F6700006C4193 /* ShareViewDataSourceUIDelegate.swift */; };
53FE14672B8F78B6006C4193 /* ShareOptionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53FE14662B8F78B6006C4193 /* ShareOptionsView.swift */; };
AA9987862E72B6EF00B2C428 /* NextcloudKit+clearAccountErrorState.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9987852E72B6DB00B2C428 /* NextcloudKit+clearAccountErrorState.swift */; };
AAA69D932E3BB09900BBD44D /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = AAA69D922E3BB09900BBD44D /* Localizable.xcstrings */; };
AAC00D2A2E37B29D006010FE /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = AAC00D292E37B29D006010FE /* Localizable.xcstrings */; };
C2B573BA1B1CD91E00303B36 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C2B573B91B1CD91E00303B36 /* main.m */; };
@ -199,6 +200,7 @@
53FE145A2B8F1305006C4193 /* NKShare+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NKShare+Extensions.swift"; sourceTree = "<group>"; };
53FE14642B8F6700006C4193 /* ShareViewDataSourceUIDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewDataSourceUIDelegate.swift; sourceTree = "<group>"; };
53FE14662B8F78B6006C4193 /* ShareOptionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareOptionsView.swift; sourceTree = "<group>"; };
AA9987852E72B6DB00B2C428 /* NextcloudKit+clearAccountErrorState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NextcloudKit+clearAccountErrorState.swift"; sourceTree = "<group>"; };
AAA69D922E3BB09900BBD44D /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
AAC00D292E37B29D006010FE /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
C2B573B11B1CD91E00303B36 /* desktopclient.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = desktopclient.app; sourceTree = BUILT_PRODUCTS_DIR; };
@ -288,6 +290,7 @@
5352E85929B7BFB4002CE85C /* Extensions */ = {
isa = PBXGroup;
children = (
AA9987852E72B6DB00B2C428 /* NextcloudKit+clearAccountErrorState.swift */,
535AE30D29C0A2CC0042A9BA /* Logger+Extensions.swift */,
);
path = Extensions;
@ -820,6 +823,7 @@
buildActionMask = 2147483647;
files = (
53D666612B70C9A70042C03D /* FileProviderConfig.swift in Sources */,
AA9987862E72B6EF00B2C428 /* NextcloudKit+clearAccountErrorState.swift in Sources */,
53ED473029C9CE0B00795DB1 /* FileProviderExtension+ClientInterface.swift in Sources */,
538E396D27F4765000FA63D5 /* FileProviderExtension.swift in Sources */,
536EFBF7295CF58100F4CB13 /* FileProviderSocketLineProcessor.swift in Sources */,