Skip to content

Upload fix multisession #129

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 2 commits into from
Mar 10, 2025
Merged

Upload fix multisession #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c992972
fix
marinofaggiana Mar 10, 2025
c570d1f
fix
marinofaggiana Mar 10, 2025
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
6 changes: 6 additions & 0 deletions Sources/NextcloudKit/NKCommon.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ public struct NKCommon: Sendable {
public var delegate: NextcloudKitDelegate?
public var groupIdentifier: String?

// Foreground
public let identifierSessionDownload: String = "com.nextcloud.nextcloudkit.session.download"
public let identifierSessionUpload: String = "com.nextcloud.nextcloudkit.session.upload"
// Background
public let identifierSessionDownloadBackground: String = "com.nextcloud.session.downloadbackground"
public let identifierSessionUploadBackground: String = "com.nextcloud.session.uploadbackground"
public let identifierSessionUploadBackgroundWWan: String = "com.nextcloud.session.uploadbackgroundWWan"
Expand Down Expand Up @@ -474,6 +476,10 @@ public struct NKCommon: Sendable {

// MARK: - Common

public func getSessionConfigurationIdentifier(_ identifier: String, account: String) -> String {
return "\(identifier).\(account)"
}

public func getSession(account: String) -> NKSession? {
var session: NKSession?
nksessions.forEach { result in
Expand Down
6 changes: 3 additions & 3 deletions Sources/NextcloudKit/NKSession.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public struct NKSession: Sendable {
eventMonitors: [NKMonitor(nkCommonInstance: nkCommonInstance)])

/// Session Download Background
let configurationDownloadBackground = URLSessionConfiguration.background(withIdentifier: NKCommon().identifierSessionDownloadBackground)
let configurationDownloadBackground = URLSessionConfiguration.background(withIdentifier: NKCommon().getSessionConfigurationIdentifier(NKCommon().identifierSessionDownloadBackground, account: account))
configurationDownloadBackground.allowsCellularAccess = true

if #available(macOS 11, *) {
Expand All @@ -93,7 +93,7 @@ public struct NKSession: Sendable {
sessionDownloadBackground = URLSession(configuration: configurationDownloadBackground, delegate: backgroundSessionDelegate, delegateQueue: OperationQueue.main)

/// Session Upload Background
let configurationUploadBackground = URLSessionConfiguration.background(withIdentifier: NKCommon().identifierSessionUploadBackground)
let configurationUploadBackground = URLSessionConfiguration.background(withIdentifier: NKCommon().getSessionConfigurationIdentifier(NKCommon().identifierSessionUploadBackground, account: account))
configurationUploadBackground.allowsCellularAccess = true

if #available(macOS 11, *) {
Expand All @@ -112,7 +112,7 @@ public struct NKSession: Sendable {
sessionUploadBackground = URLSession(configuration: configurationUploadBackground, delegate: backgroundSessionDelegate, delegateQueue: OperationQueue.main)

/// Session Upload Background WWan
let configurationUploadBackgroundWWan = URLSessionConfiguration.background(withIdentifier: NKCommon().identifierSessionUploadBackgroundWWan)
let configurationUploadBackgroundWWan = URLSessionConfiguration.background(withIdentifier: NKCommon().getSessionConfigurationIdentifier(NKCommon().identifierSessionUploadBackgroundWWan, account: account))
configurationUploadBackgroundWWan.allowsCellularAccess = false

if #available(macOS 11, *) {
Expand Down
Loading