Skip to content

Tos-Fix #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marinofaggiana merged 1 commit into from
Jun 17, 2025
Merged

Tos-Fix #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Sources/NextcloudKit/NKCommon.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ public struct NKCommon: Sendable {
guard let groupDefaults = UserDefaults(suiteName: groupIdentifier) else {
return
}
let capabilities = NCCapabilities.shared.getCapabilitiesBlocking(for: account)

/// Unavailable
if errorCode == 503 {
Expand All @@ -429,7 +430,7 @@ public struct NKCommon: Sendable {
groupDefaults.set(array, forKey: NextcloudKit.shared.nkCommonInstance.groupDefaultsUnauthorized)
}
/// ToS
} else if errorCode == 403 {
} else if errorCode == 403, capabilities.termsOfService {
var array = groupDefaults.array(forKey: NextcloudKit.shared.nkCommonInstance.groupDefaultsToS) as? [String] ?? []

if !array.contains(account) {
Expand Down
4 changes: 2 additions & 2 deletions Sources/NextcloudKit/NextcloudKitBackground.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public final class NKBackground: NSObject, URLSessionTaskDelegate, URLSessionDel
var url: URL?
let groupDefaults = UserDefaults(suiteName: NextcloudKit.shared.nkCommonInstance.groupIdentifier)

/// Check error in groupDefaults
/// Check if error is in groupDefaults
if let array = groupDefaults?.array(forKey: NextcloudKit.shared.nkCommonInstance.groupDefaultsUnauthorized) as? [String],
array.contains(account) {
return (nil, .unauthorizedError)
Expand Down Expand Up @@ -77,7 +77,7 @@ public final class NKBackground: NSObject, URLSessionTaskDelegate, URLSessionDel
var uploadSession: URLSession?
let groupDefaults = UserDefaults(suiteName: NextcloudKit.shared.nkCommonInstance.groupIdentifier)

/// Check error in groupDefaults
/// Check if error is in groupDefaults
if let array = groupDefaults?.array(forKey: NextcloudKit.shared.nkCommonInstance.groupDefaultsUnauthorized) as? [String],
array.contains(account) {
return (nil, .unauthorizedError)
Expand Down
Loading