remove old code

Signed-off-by: Marino Faggiana <[email protected]>
nextcloud · Jun 6, 2024 · 42c713e · 42c713e
1 parent 2b2cc81
commit 42c713e
Show file tree

Hide file tree

Showing 36 changed files with 168 additions and 305 deletions.
diff --git a/File Provider Extension UI/FileProviderExtensionUI-Bridging-Header.h b/File Provider Extension UI/FileProviderExtensionUI-Bridging-Header.h
diff --git a/File Provider Extension/FileProviderExtension-Bridging-Header.h b/File Provider Extension/FileProviderExtension-Bridging-Header.h
diff --git a/File Provider Extension/FileProviderExtension.swift b/File Provider Extension/FileProviderExtension.swift
@@ -22,6 +22,7 @@
 //
 
 import UIKit
+import UniformTypeIdentifiers
 import FileProvider
 import NextcloudKit
 import Alamofire

diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj
diff --git a/Notification Service Extension/Notification_Service_Extension-Bridging-Header.h b/Notification Service Extension/Notification_Service_Extension-Bridging-Header.h
@@ -19,5 +19,4 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import "CCUtility.h"
 #import "NCPushNotificationEncryption.h"
diff --git a/Share/Share-Bridging-Header.h b/Share/Share-Bridging-Header.h
@@ -3,5 +3,4 @@
 //
 
 #import "NCEndToEndEncryption.h"
-#import "CCUtility.h"
 #import "UIImage+animatedGIF.h"
diff --git a/Widget/Widget-Brinding-header.h b/Widget/Widget-Brinding-header.h
@@ -2,5 +2,4 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 
-#import "CCUtility.h"
 #import "UIImage+animatedGIF.h"
diff --git a/WidgetDashboardIntentHandler/WidgetDashboardIntentHandler-Brinding-header.h b/WidgetDashboardIntentHandler/WidgetDashboardIntentHandler-Brinding-header.h
@@ -2,4 +2,3 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 
-#import "CCUtility.h"
diff --git a/iOSClient/Data/NCManageDatabase+Avatar.swift b/iOSClient/Data/NCManageDatabase+Avatar.swift
@@ -22,6 +22,7 @@
 //
 
 import Foundation
+import UIKit
 import RealmSwift
 import NextcloudKit
 

diff --git a/iOSClient/Data/NCManageDatabase+PhotoLibrary.swift b/iOSClient/Data/NCManageDatabase+PhotoLibrary.swift
@@ -22,6 +22,8 @@
 //
 
 import Foundation
+import UIKit
+import Photos
 import RealmSwift
 import NextcloudKit
 

diff --git a/iOSClient/Extensions/PHAsset+Extension.swift b/iOSClient/Extensions/PHAsset+Extension.swift
@@ -23,6 +23,7 @@
 
 import Foundation
 import UIKit
+import Photos
 
 extension PHAsset {
     var originalFilename: NSString {

diff --git a/iOSClient/Main/Create cloud/NCCreateFormUploadDocuments.swift b/iOSClient/Main/Create cloud/NCCreateFormUploadDocuments.swift
@@ -340,8 +340,8 @@ import XLForm
                 }
 
                 self.dismiss(animated: true, completion: {
-                    let createFileName = (fileName as NSString).deletingPathExtension + "." + self.fileNameExtension
-                    let metadata = NCManageDatabase.shared.createMetadata(account: self.appDelegate.account, user: self.appDelegate.user, userId: self.appDelegate.userId, fileName: createFileName, fileNameView: createFileName, ocId: UUID, serverUrl: self.serverUrl, urlBase: self.appDelegate.urlBase, url: url, contentType: "")
+                    let newFileName = (fileName as NSString).deletingPathExtension + "." + self.fileNameExtension
+                    let metadata = NCManageDatabase.shared.createMetadata(account: self.appDelegate.account, user: self.appDelegate.user, userId: self.appDelegate.userId, fileName: newFileName, fileNameView: newFileName, ocId: UUID, serverUrl: self.serverUrl, urlBase: self.appDelegate.urlBase, url: url, contentType: "")
                     if let viewController = self.controller?.currentViewController() {
                         NCViewer().view(viewController: viewController, metadata: metadata, metadatas: [metadata], imageIcon: nil)
                     }

diff --git a/iOSClient/Main/Create cloud/Upload Assets/NCUploadAssetsModel.swift b/iOSClient/Main/Create cloud/Upload Assets/NCUploadAssetsModel.swift
@@ -116,14 +116,13 @@ class NCUploadAssetsModel: NSObject, ObservableObject, NCCreateFormUploadConflic
         NCKeychain().setFileNameType(key: NCGlobal.shared.keyFileNameType, prefix: addFilenametype)
         NCKeychain().setFileNameMask(key: NCGlobal.shared.keyFileNameMask, mask: fileName)
 
-        preview = CCUtility.createFileName(
-            getOriginalFilenameForPreview() as String,
-            fileDate: creationDate,
-            fileType: asset.mediaType,
-            keyFileName: fileName.isEmptyOrNil ? nil : NCGlobal.shared.keyFileNameMask,
-            keyFileNameType: NCGlobal.shared.keyFileNameType,
-            keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginal,
-            forcedNewFileName: false
+        preview = NCUtilityFileSystem().createFileName(getOriginalFilenameForPreview() as String,
+                                                       fileDate: creationDate,
+                                                       fileType: asset.mediaType,
+                                                       keyFileName: fileName.isEmptyOrNil ? nil : NCGlobal.shared.keyFileNameMask,
+                                                       keyFileNameType: NCGlobal.shared.keyFileNameType,
+                                                       keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginal,
+                                                       forcedNewFileName: false
         )
 
         let trimmedPreview = preview.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -223,14 +222,13 @@ class NCUploadAssetsModel: NSObject, ObservableObject, NCCreateFormUploadConflic
             let creationDate = asset.creationDate ?? Date()
             let ext = assetFileName.pathExtension.lowercased()
 
-            let fileName = previewStore.fileName.isEmpty
-            ? CCUtility.createFileName(assetFileName as String,
-                                       fileDate: creationDate,
-                                       fileType: asset.mediaType,
-                                       keyFileName: NCGlobal.shared.keyFileNameMask,
-                                       keyFileNameType: NCGlobal.shared.keyFileNameType,
-                                       keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginal,
-                                       forcedNewFileName: false)!
+            let fileName = previewStore.fileName.isEmpty ? utilityFileSystem.createFileName(assetFileName as String,
+                                                                                            fileDate: creationDate,
+                                                                                            fileType: asset.mediaType,
+                                                                                            keyFileName: NCGlobal.shared.keyFileNameMask,
+                                                                                            keyFileNameType: NCGlobal.shared.keyFileNameType,
+                                                                                            keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginal,
+                                                                                            forcedNewFileName: false)
             : (previewStore.fileName + "." + ext)
 
             if previewStore.assetType == .livePhoto && NCKeychain().livePhoto && previewStore.data == nil {

diff --git a/iOSClient/Main/NCActionCenter.swift b/iOSClient/Main/NCActionCenter.swift
@@ -374,7 +374,13 @@ class NCActionCenter: NSObject, UIDocumentInteractionControllerDelegate, NCSelec
 
     func saveAsScan(metadata: tableMetadata, controller: NCMainTabBarController?) {
         let fileNamePath = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)
-        let fileNameDestination = CCUtility.createFileName("scan.png", fileDate: Date(), fileType: PHAssetMediaType.image, keyFileName: NCGlobal.shared.keyFileNameMask, keyFileNameType: NCGlobal.shared.keyFileNameType, keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginal, forcedNewFileName: true)!
+        let fileNameDestination = utilityFileSystem.createFileName("scan.png",
+                                                                   fileDate: Date(),
+                                                                   fileType: PHAssetMediaType.image,
+                                                                   keyFileName: NCGlobal.shared.keyFileNameMask,
+                                                                   keyFileNameType: NCGlobal.shared.keyFileNameType,
+                                                                   keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginal,
+                                                                   forcedNewFileName: true)
         let fileNamePathDestination = utilityFileSystem.directoryScan + "/" + fileNameDestination
 
         utilityFileSystem.copyFile(atPath: fileNamePath, toPath: fileNamePathDestination)

diff --git a/iOSClient/Main/NCDragDrop.swift b/iOSClient/Main/NCDragDrop.swift
@@ -22,6 +22,7 @@
 //
 
 import UIKit
+import UniformTypeIdentifiers
 import NextcloudKit
 
 class NCDragDrop: NSObject {

diff --git a/iOSClient/Main/NCPickerViewController.swift b/iOSClient/Main/NCPickerViewController.swift
@@ -48,9 +48,8 @@ class NCPhotosPickerViewController: NSObject {
             if !assets.isEmpty {
                 let serverUrl = controller.currentServerUrl()
                 let view = NCUploadAssetsView(model: NCUploadAssetsModel(assets: assets, serverUrl: serverUrl, userBaseUrl: self.appDelegate, controller: controller))
-                let controller = UIHostingController(rootView: view)
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {
-                    controller.present(controller, animated: true, completion: nil)
+                    controller.present(UIHostingController(rootView: view), animated: true, completion: nil)
                 }
             }
         }

diff --git a/iOSClient/Media/NCMedia+DragDrop.swift b/iOSClient/Media/NCMedia+DragDrop.swift
@@ -22,6 +22,7 @@
 //
 
 import UIKit
+import UniformTypeIdentifiers
 import NextcloudKit
 
 // MARK: - Drag

diff --git a/iOSClient/Menu/UIViewController+Menu.swift b/iOSClient/Menu/UIViewController+Menu.swift
@@ -22,9 +22,10 @@
 //
 
 import Foundation
+import UIKit
+import MessageUI
 import SVGKit
 import NextcloudKit
-import UIKit
 
 extension UIViewController {
     fileprivate func handleProfileAction(_ action: NKHovercard.Action, for userId: String) {

diff --git a/iOSClient/More/CCManageAccount.m b/iOSClient/More/CCManageAccount.m
@@ -23,7 +23,6 @@
 
 #import "CCManageAccount.h"
 #import "NCBridgeSwift.h"
-#import "CCUtility.h"
 
 #define actionSheetCancellaAccount 1
 

diff --git a/iOSClient/Networking/E2EE/NCEndToEndEncryption.m b/iOSClient/Networking/E2EE/NCEndToEndEncryption.m
@@ -23,7 +23,6 @@
 
 #import "NCEndToEndEncryption.h"
 #import "NCBridgeSwift.h"
-#import "CCUtility.h"
 
 #import <CommonCrypto/CommonDigest.h>
 #import <CommonCrypto/CommonKeyDerivation.h>

diff --git a/iOSClient/Networking/NCAutoUpload.swift b/iOSClient/Networking/NCAutoUpload.swift
@@ -115,7 +115,13 @@ class NCAutoUpload: NSObject {
                 let assetDate = asset.creationDate ?? Date()
                 let assetMediaType = asset.mediaType
                 var serverUrl: String = ""
-                let fileName = CCUtility.createFileName(asset.originalFilename as String, fileDate: assetDate, fileType: assetMediaType, keyFileName: NCGlobal.shared.keyFileNameAutoUploadMask, keyFileNameType: NCGlobal.shared.keyFileNameAutoUploadType, keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginalAutoUpload, forcedNewFileName: false)!
+                let fileName = NCUtilityFileSystem().createFileName(asset.originalFilename as String, 
+                                                                    fileDate: assetDate,
+                                                                    fileType: assetMediaType,
+                                                                    keyFileName: NCGlobal.shared.keyFileNameAutoUploadMask,
+                                                                    keyFileNameType: NCGlobal.shared.keyFileNameAutoUploadType,
+                                                                    keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginalAutoUpload,
+                                                                    forcedNewFileName: false)
 
                 if account.autoUploadCreateSubfolder {
                     serverUrl = NCUtilityFileSystem().createGranularityPath(asset: asset, serverUrl: autoUploadPath)

diff --git a/iOSClient/Nextcloud-Bridging-Header.h b/iOSClient/Nextcloud-Bridging-Header.h
@@ -6,6 +6,5 @@
 #import "NCEndToEndEncryption.h"
 #import "NYMnemonic.h"
 #import "UIImage+animatedGIF.h"
-#import "CCUtility.h"
 #import "NCPushNotification.h"
 #import "NCPushNotificationEncryption.h"
diff --git a/iOSClient/PushNotification/NCPushNotification.m b/iOSClient/PushNotification/NCPushNotification.m
@@ -26,7 +26,6 @@
 #import "NCPushNotification.h"
 #import "NCPushNotificationEncryption.h"
 #import "NCEndToEndEncryption.h"
-#import "CCUtility.h"
 
 @interface NCPushNotification ()
 {

diff --git a/iOSClient/PushNotification/NCPushNotificationEncryption.m b/iOSClient/PushNotification/NCPushNotificationEncryption.m
@@ -28,7 +28,6 @@
 #import <OpenSSL/OpenSSL.h>
 #import <CommonCrypto/CommonDigest.h>
 #import "NCEndToEndEncryption.h"
-#import "CCUtility.h"
 
 @implementation NCPushNotificationEncryption
 

diff --git a/iOSClient/Scan document/NCDocumentCamera.swift b/iOSClient/Scan document/NCDocumentCamera.swift
@@ -22,6 +22,8 @@
 //
 
 import Foundation
+import UIKit
+import Photos
 import VisionKit
 
 class NCDocumentCamera: NSObject, VNDocumentCameraViewControllerDelegate {
@@ -46,13 +48,13 @@ class NCDocumentCamera: NSObject, VNDocumentCameraViewControllerDelegate {
     func documentCameraViewController(_ controller: VNDocumentCameraViewController, didFinishWith scan: VNDocumentCameraScan) {
 
         for pageNumber in 0..<scan.pageCount {
-            let fileName = CCUtility.createFileName("scan.png",
-                                                    fileDate: Date(),
-                                                    fileType: PHAssetMediaType.image,
-                                                    keyFileName: NCGlobal.shared.keyFileNameMask,
-                                                    keyFileNameType: NCGlobal.shared.keyFileNameType,
-                                                    keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginal,
-                                                    forcedNewFileName: true)!
+            let fileName = utilityFileSystem.createFileName("scan.png",
+                                                            fileDate: Date(),
+                                                            fileType: PHAssetMediaType.image,
+                                                            keyFileName: NCGlobal.shared.keyFileNameMask,
+                                                            keyFileNameType: NCGlobal.shared.keyFileNameType,
+                                                            keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginal,
+                                                            forcedNewFileName: true)
             let fileNamePath = utilityFileSystem.directoryScan + "/" + fileName
             let image = scan.imageOfPage(at: pageNumber)
             do {

diff --git a/iOSClient/Scan document/NCScan.swift b/iOSClient/Scan document/NCScan.swift
@@ -344,19 +344,15 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
     }
 
     @objc func pasteImage() {
-
         let pasteboard = UIPasteboard.general
-
         if pasteboard.hasImages {
-
             guard let image = pasteboard.image?.fixedOrientation() else { return }
-
-            let fileName = CCUtility.createFileName("scan.png", fileDate: Date(),
-                                                    fileType: PHAssetMediaType.image,
-                                                    keyFileName: NCGlobal.shared.keyFileNameMask,
-                                                    keyFileNameType: NCGlobal.shared.keyFileNameType,
-                                                    keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginal,
-                                                    forcedNewFileName: true)!
+            let fileName = utilityFileSystem.createFileName("scan.png", fileDate: Date(),
+                                                            fileType: PHAssetMediaType.image,
+                                                            keyFileName: NCGlobal.shared.keyFileNameMask,
+                                                            keyFileNameType: NCGlobal.shared.keyFileNameType,
+                                                            keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginal,
+                                                            forcedNewFileName: true)
             let fileNamePath = utilityFileSystem.directoryScan + "/" + fileName
 
             do {

diff --git a/iOSClient/Settings/AutoUpload/AutoUploadFileNames/NCAutoUploadFileNamesModel.swift b/iOSClient/Settings/AutoUpload/AutoUploadFileNames/NCAutoUploadFileNamesModel.swift
@@ -25,7 +25,7 @@
 import Foundation
 import NextcloudKit
 import SwiftUI
-import Combine
+import Photos
 
 /// A view model responsible for managing auto-upload file names.
 class NCAutoUploadFileNamesModel: ObservableObject, ViewOnAppearHandling {
@@ -110,11 +110,23 @@ class NCAutoUploadFileNamesModel: ObservableObject, ViewOnAppearHandling {
             // If the changed name is empty, set the filename mask to empty and generate a new filename
             if valueRenameTrimming.isEmpty {
                 keychain.setFileNameMask(key: NCGlobal.shared.keyFileNameAutoUploadMask, mask: "")
-                returnString = CCUtility.createFileName("IMG_0001.JPG", fileDate: dateExample, fileType: PHAssetMediaType.image, keyFileName: nil, keyFileNameType: NCGlobal.shared.keyFileNameAutoUploadType, keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginalAutoUpload, forcedNewFileName: false)
+                returnString = NCUtilityFileSystem().createFileName("IMG_0001.JPG",
+                                                                    fileDate: dateExample,
+                                                                    fileType: PHAssetMediaType.image,
+                                                                    keyFileName: nil,
+                                                                    keyFileNameType: NCGlobal.shared.keyFileNameAutoUploadType,
+                                                                    keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginalAutoUpload,
+                                                                    forcedNewFileName: false)
             } else {
                 // If there is a changed name, set the filename mask and generate a new filename
                 keychain.setFileNameMask(key: NCGlobal.shared.keyFileNameAutoUploadMask, mask: changedName)
-                returnString = CCUtility.createFileName("IMG_0001.JPG", fileDate: dateExample, fileType: PHAssetMediaType.image, keyFileName: NCGlobal.shared.keyFileNameAutoUploadMask, keyFileNameType: NCGlobal.shared.keyFileNameAutoUploadType, keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginalAutoUpload, forcedNewFileName: false)
+                returnString = NCUtilityFileSystem().createFileName("IMG_0001.JPG",
+                                                                    fileDate: dateExample,
+                                                                    fileType: PHAssetMediaType.image,
+                                                                    keyFileName: NCGlobal.shared.keyFileNameAutoUploadMask,
+                                                                    keyFileNameType: NCGlobal.shared.keyFileNameAutoUploadType,
+                                                                    keyFileNameOriginal: NCGlobal.shared.keyFileNameOriginalAutoUpload,
+                                                                    forcedNewFileName: false)
             }
         }
         return returnString

diff --git a/iOSClient/Settings/AutoUpload/NCAutoUploadModel.swift b/iOSClient/Settings/AutoUpload/NCAutoUploadModel.swift
@@ -23,6 +23,7 @@
 //
 
 import Foundation
+import Photos
 import NextcloudKit
 
 /// A model that allows the user to configure the `auto upload settings for Nextcloud`

diff --git a/iOSClient/Settings/NCKeychain.swift b/iOSClient/Settings/NCKeychain.swift
@@ -22,6 +22,7 @@
 //
 
 import Foundation
+import UIKit
 import KeychainAccess
 
 @objc class NCKeychain: NSObject {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,3 @@
		// Use this file to import your target's public headers that you would like to expose to Swift.
		//

		#import "CCUtility.h"