Ver Fonte

migrate some func to swift

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana há 2 anos atrás
pai
commit
a0371d436b

+ 3 - 38
iOSClient/Networking/E2EE/NCNetworkingE2EE.swift

@@ -25,48 +25,13 @@ import NextcloudKit
 import CFNetwork
 import Alamofire
 
-@objc class NCNetworkingE2EE: NSObject {
-    @objc public static let shared: NCNetworkingE2EE = {
+class NCNetworkingE2EE: NSObject {
+    public static let shared: NCNetworkingE2EE = {
         let instance = NCNetworkingE2EE()
         return instance
     }()
 
-    /*
-     + (BOOL)isFolderEncrypted:(NSString *)serverUrl e2eEncrypted:(BOOL)e2eEncrypted account:(NSString *)account urlBase:(NSString *)urlBase userId:(NSString *)userId
-     {
-         NSString *home = [[NCUtilityFileSystem shared] getHomeServerWithUrlBase:urlBase userId:userId];
-
-         if (e2eEncrypted) {
-
-             return true;
-
-         } else if ([serverUrl isEqualToString:home] || [serverUrl isEqualToString:@".."]) {
-
-             return false;
-
-         } else {
-
-             tableDirectory *directory = [[NCManageDatabase shared] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@", account, serverUrl]];
-
-             while (directory != nil && ![directory.serverUrl isEqualToString:home]) {
-                 if (directory.e2eEncrypted == true) {
-                     return true;
-                 }
-                 NSString* home = [[NCUtilityFileSystem shared] getHomeServerWithUrlBase:urlBase userId:userId];
-                 NSString* path = [[NCUtilityFileSystem shared] deleteLastPathWithServerUrlPath:serverUrl home:home];
-                 if (path != nil) {
-                     serverUrl = path;
-                 }
-                 directory = [[NCManageDatabase shared] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@", account, serverUrl]];
-             }
-
-             return false;
-         }
-     }
-
-     */
-
-    @objc func generateRandomIdentifier() -> String {
+    func generateRandomIdentifier() -> String {
 
         var UUID = NSUUID().uuidString
         UUID = "E2EE" + UUID.replacingOccurrences(of: "-", with: "").lowercased()

+ 2 - 2
iOSClient/Networking/E2EE/NCNetworkingE2EECreateFolder.swift

@@ -26,8 +26,8 @@ import CFNetwork
 import Alamofire
 import Foundation
 
-@objc class NCNetworkingE2EECreateFolder: NSObject {
-    @objc public static let shared: NCNetworkingE2EECreateFolder = {
+class NCNetworkingE2EECreateFolder: NSObject {
+    public static let shared: NCNetworkingE2EECreateFolder = {
         let instance = NCNetworkingE2EECreateFolder()
         return instance
     }()

+ 2 - 2
iOSClient/Networking/E2EE/NCNetworkingE2EEDelete.swift

@@ -26,8 +26,8 @@ import CFNetwork
 import Alamofire
 import Foundation
 
-@objc class NCNetworkingE2EEDelete: NSObject {
-    @objc public static let shared: NCNetworkingE2EEDelete = {
+class NCNetworkingE2EEDelete: NSObject {
+    public static let shared: NCNetworkingE2EEDelete = {
         let instance = NCNetworkingE2EEDelete()
         return instance
     }()

+ 2 - 2
iOSClient/Networking/E2EE/NCNetworkingE2EERename.swift

@@ -26,8 +26,8 @@ import CFNetwork
 import Alamofire
 import Foundation
 
-@objc class NCNetworkingE2EERename: NSObject {
-    @objc public static let shared: NCNetworkingE2EERename = {
+class NCNetworkingE2EERename: NSObject {
+    public static let shared: NCNetworkingE2EERename = {
         let instance = NCNetworkingE2EERename()
         return instance
     }()

+ 2 - 2
iOSClient/Networking/E2EE/NCNetworkingE2EEUpload.swift

@@ -26,8 +26,8 @@ import CFNetwork
 import Alamofire
 import Foundation
 
-@objc class NCNetworkingE2EEUpload: NSObject {
-    @objc public static let shared: NCNetworkingE2EEUpload = {
+class NCNetworkingE2EEUpload: NSObject {
+    public static let shared: NCNetworkingE2EEUpload = {
         let instance = NCNetworkingE2EEUpload()
         return instance
     }()