|
@@ -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()
|