Marino Faggiana 8 жил өмнө
parent
commit
e7ccde10c7

+ 0 - 1
Picker/DocumentPickerViewController.swift

@@ -89,7 +89,6 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         
         providerDB = providerSessionDB.sharedInstance
         
-        //if let record = CCCoreData.getActiveAccount() {
         if let record = NCManageDatabase.sharedInstance.getAccountActive() {
             
             activeAccount = record.account

+ 1 - 2
Share Ext/ShareViewController.m

@@ -55,7 +55,6 @@
     [MagicalRecord setupCoreDataStackWithAutoMigratingSqliteStoreNamed:(id)[dirGroup URLByAppendingPathComponent:[appDatabase stringByAppendingPathComponent:@"cryptocloud"]]];
     [MagicalRecord setLoggingLevel:MagicalRecordLoggingLevelOff];
 
-    //TableAccount *recordAccount = [CCCoreData getActiveAccount];
     tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     if (recordAccount == nil) {
         
@@ -261,7 +260,7 @@
         
         [self addNetworkingQueue:metadataNet];
         
-        [self.hud visibleHudTitle:NSLocalizedString(@"_uploading_", nil) mode:MBProgressHUDModeDeterminateHorizontalBar color:self.view.tintColor];
+        [self.hud visibleHudTitle:NSLocalizedString(@"_uploading_", nil) mode:MBProgressHUDModeDeterminateHorizontalBar color:[NCBrandColor sharedInstance].brand];
        
         [self.hud AddButtonCancelWithTarget:self selector:@"cancelTransfer"];
     }

+ 0 - 1
iOSClient/Favorites/CCSynchronize.m

@@ -401,7 +401,6 @@
 - (void)readFileFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
 {
     // verify active user
-    //TableAccount *recordAccount = [CCCoreData getActiveAccount];
     tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     // File not present, remove it

+ 0 - 3
iOSClient/Main/CCMain.m

@@ -4173,9 +4173,6 @@
         // Directory bloccata ?
         if ([CCCoreData isDirectoryLock:dirServerUrl activeAccount:app.activeAccount] && [[CCUtility getBlockCode] length] && app.sessionePasscodeLock == nil) lockDirectory = YES;
         
-        //NSString *cameraUploadFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
-        //NSString *cameraUploadFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
-        
         NSString *cameraUploadFolderName = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderName];
         NSString *cameraUploadFolderPath = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPath:app.activeUrl];
         

+ 0 - 1
iOSClient/Move/CCMove.m

@@ -45,7 +45,6 @@
 {
     [super viewDidLoad];
     
-    //TableAccount *recordAccount = [CCCoreData getActiveAccount];
     tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     if (recordAccount) {

+ 0 - 4
iOSClient/Networking/OCNetworking.m

@@ -440,9 +440,6 @@
         
         NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderName];
         NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPath:_activeUrl];
-
-        //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
-        //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl];
         NSString *directoryUser = [CCUtility getDirectoryActiveUser:_activeUser activeUrl:_activeUrl];
 
         for(OCFileDto *itemDto in items) {
@@ -744,7 +741,6 @@
         
     } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
         
-        //TableAccount *recordAccount = [CCCoreData getActiveAccount];
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
 
         [communication createFolder:folderPathName onCommunication:communication withForbiddenCharactersSupported:YES successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {