From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Wed, 15 Mar 2023 11:37:14 +0000 (+0100)
Subject: Properly set cancellation, pausing, and resuming handlers on FileProviderExtension... 
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~55^2~77
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=221848f23091490b1e082c9f24539929536cd0dc;p=nextcloud-desktop.git

Properly set cancellation, pausing, and resuming handlers on FileProviderExtension task progress

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift
index 3a10b993f..892d1619d 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift
@@ -157,8 +157,8 @@ class FileProviderExtension: NSObject, NSFileProviderReplicatedExtension, NKComm
 
                 self.ncKit.download(serverUrlFileName: serverUrlFileName,
                                     fileNameLocalPath: fileNameLocalPath.path,
-                                    requestHandler: { _ in
-
+                                    requestHandler: { request in
+                    progress.setHandlersFromAfRequest(request)
                 }, taskHandler: { task in
                     NSFileProviderManager(for: self.domain)?.register(task, forItemWithIdentifier: itemIdentifier, completionHandler: { _ in })
                 }, progressHandler: { downloadProgress in
@@ -294,7 +294,8 @@ class FileProviderExtension: NSObject, NSFileProviderReplicatedExtension, NKComm
 
         self.ncKit.upload(serverUrlFileName: newServerUrlFileName,
                           fileNameLocalPath: fileNameLocalPath,
-                          requestHandler: { _ in
+                          requestHandler: { request in
+            progress.setHandlersFromAfRequest(request)
         }, taskHandler: { task in
             NSFileProviderManager(for: self.domain)?.register(task, forItemWithIdentifier: itemTemplate.itemIdentifier, completionHandler: { _ in })
         }, progressHandler: { uploadProgress in
@@ -483,7 +484,8 @@ class FileProviderExtension: NSObject, NSFileProviderReplicatedExtension, NKComm
 
                 self.ncKit.upload(serverUrlFileName: newServerUrlFileName,
                                   fileNameLocalPath: fileNameLocalPath,
-                                  requestHandler: { _ in
+                                  requestHandler: { request in
+                    progress.setHandlersFromAfRequest(request)
                 }, taskHandler: { task in
                     NSFileProviderManager(for: self.domain)?.register(task, forItemWithIdentifier: item.itemIdentifier, completionHandler: { _ in })
                 }, progressHandler: { uploadProgress in