Use develop in NextcloudKit - fix

Nextcloud.xcodeproj/project.pbxproj

@@ -4941,7 +4941,7 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/nextcloud/NextcloudKit";
 			requirement = {
-				branch = "2521-external-share-with-email-2-mails-sent-instead-of-1";
+				branch = develop;
 				kind = branch;
 			};
 		};

iOSClient/AppDelegate.swift

@@ -278,8 +278,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         scheduleAppRefresh()
         scheduleAppProcessing()
 
-        NCNetworking.shared.transferInForegorund = nil
-
         // Passcode
         presentPasscode { }
 

iOSClient/Data/NCDataSource.swift

@@ -51,7 +51,7 @@ class NCDataSource: NSObject {
         super.init()
 
         self.metadatas = metadatas.filter({
-            !(NCGlobal.shared.includeHiddenFiles.contains($0.fileNameView) || $0.isTransferInForeground())
+            !(NCGlobal.shared.includeHiddenFiles.contains($0.fileNameView) || $0.isTransferInForeground)
         })
         self.directory = directory
         self.localFiles = NCManageDatabase.shared.getTableLocalFile(account: account)

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -219,8 +219,8 @@ extension tableMetadata {
         status == NCGlobal.shared.metadataStatusInDownload || status == NCGlobal.shared.metadataStatusDownloading || status == NCGlobal.shared.metadataStatusInUpload || status == NCGlobal.shared.metadataStatusUploading
     }
 
-    func isTransferInForeground() -> Bool {
-        return (status > 0 && (chunk || e2eEncrypted))
+    var isTransferInForeground: Bool {
+        (status > 0 && (chunk || e2eEncrypted))
     }
 
     var isDownload: Bool {

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -488,7 +488,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         guard !isSearchingMode, let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else { return }
 
         // Header view trasfer
-        if metadata.isTransferInForeground() {
+        if metadata.isTransferInForeground {
             NCNetworking.shared.transferInForegorund = NCNetworking.TransferInForegorund(progress: 0, ocId: ocId)
             self.collectionView?.reloadData()
         } else if serverUrl == self.serverUrl, account == appDelegate.account {
@@ -1762,7 +1762,7 @@ extension NCCollectionViewCommon: UICollectionViewDelegateFlowLayout {
         if headerMenuTransferView,
            !isSearchingMode,
            let metadata = NCManageDatabase.shared.getMetadataFromOcId(NCNetworking.shared.transferInForegorund?.ocId),
-           metadata.isTransferInForeground() {
+           metadata.isTransferInForeground {
             size += NCGlobal.shared.heightHeaderTransfer
         } else {
             NCNetworking.shared.transferInForegorund = nil

iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -312,6 +312,9 @@ class NCNetworkingProcessUpload: NSObject {
 
         // metadataStatusUploading OR metadataStatusInUpload (FOREGROUND)
         let metadatasUploading = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "session == %@ AND (status == %d OR status == %d)", NextcloudKit.shared.nkCommonInstance.sessionIdentifierUpload, NCGlobal.shared.metadataStatusUploading, NCGlobal.shared.metadataStatusInUpload))
+        if metadatasUploading.isEmpty {
+            NCNetworking.shared.transferInForegorund = nil
+        }
         for metadata in metadatasUploading {
             let fileNameLocalPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
             if NCNetworking.shared.uploadRequest[fileNameLocalPath] == nil {

iOSClient/Utility/NCCameraRoll.swift

@@ -49,6 +49,9 @@ class NCCameraRoll: NSObject {
             }
             metadataSource.chunk = chunckSize != 0 && metadata.size > chunckSize
             metadataSource.e2eEncrypted = metadata.isDirectoryE2EE
+            if metadataSource.chunk || metadataSource.e2eEncrypted {
+                metadataSource.session = NextcloudKit.shared.nkCommonInstance.sessionIdentifierUpload
+            }
             metadataSource.isExtractFile = true
             if let metadata = NCManageDatabase.shared.addMetadata(metadataSource) {
                 metadatas.append(metadata)
@@ -97,6 +100,9 @@ class NCCameraRoll: NSObject {
                 if modifyMetadataForUpload {
                     metadata.chunk = chunckSize != 0 && metadata.size > chunckSize
                     metadata.e2eEncrypted = metadata.isDirectoryE2EE
+                    if metadata.chunk || metadata.e2eEncrypted {
+                        metadata.session = NextcloudKit.shared.nkCommonInstance.sessionIdentifierUpload
+                    }
                     metadata.isExtractFile = true
                     if let metadata = NCManageDatabase.shared.addMetadata(metadata) {
                         metadataReturn = metadata
@@ -263,6 +269,9 @@ class NCCameraRoll: NSObject {
                 metadataLivePhoto.status = metadata.status
                 metadataLivePhoto.chunk = chunckSize != 0 && metadata.size > chunckSize
                 metadataLivePhoto.e2eEncrypted = metadata.isDirectoryE2EE
+                if metadataLivePhoto.chunk || metadataLivePhoto.e2eEncrypted {
+                    metadataLivePhoto.session = NextcloudKit.shared.nkCommonInstance.sessionIdentifierUpload
+                }
                 metadataLivePhoto.creationDate = metadata.creationDate
                 metadataLivePhoto.date = metadata.date
                 metadataLivePhoto.uploadDate = metadata.uploadDate