remove appDelegate serverUrl

iOSClient/AppDelegate.h

@@ -56,7 +56,6 @@
 @property (nonatomic, strong) NSString *activeUID;
 @property (nonatomic, strong) NSString *activeAccessToken;
 @property (nonatomic, strong) NSString *typeCloud;
-@property (nonatomic, strong) NSString *serverUrl;
 @property (nonatomic, strong) NSString *directoryUser;
 @property double quotaUsed;
 @property double quotaAvailable;

iOSClient/AppDelegate.m

@@ -917,6 +917,9 @@
 
 - (BOOL)lockScreenManagerShouldShowLockScreen:(BKPasscodeLockScreenManager *)aManager
 {
+    // ServerUrl active
+    NSString *serverUrl = self.activeMain.localServerUrl;
+    
     // fermiamo la data della sessione
     self.sessionePasscodeLock = nil;
     
@@ -927,7 +930,7 @@
     // se non c'è il passcode esci con NON attivare la richiesta password
     if ([[CCUtility getKeyChainPasscodeForUUID:[CCUtility getUUID]] length] == 0) return NO;
     // se non è attivo il OnlyLockDir esci con NON attivare la richiesta password
-    if ([CCUtility getOnlyLockDir] && ![CCCoreData isBlockZone:self.serverUrl activeAccount:self.activeAccount]) return NO;
+    if ([CCUtility getOnlyLockDir] && ![CCCoreData isBlockZone:serverUrl activeAccount:self.activeAccount]) return NO;
         
     return YES;
 }
@@ -969,7 +972,8 @@
         [aViewController dismissViewControllerAnimated:YES completion:nil];
         
         // start session Passcode Lock
-        if ([CCCoreData isBlockZone:self.serverUrl activeAccount:self.activeAccount])
+        NSString *serverUrl = self.activeMain.localServerUrl;
+        if ([CCCoreData isBlockZone:serverUrl activeAccount:self.activeAccount])
             self.sessionePasscodeLock = [NSDate date];
     }
 }

iOSClient/Main/CCMain.m

@@ -170,7 +170,6 @@
     if (_isMain == NO && app.activeAccount) {
         
         // Settings this folder & delegate & Loading datasource
-        app.serverUrl = _localServerUrl;
         app.directoryUser = [CCUtility getDirectoryActiveUser:app.activeUser activeUrl:app.activeUrl];
         _localDirectoryID = [CCCoreData getDirectoryIDFromServerUrl:_localServerUrl activeAccount:app.activeAccount];
         
@@ -203,7 +202,6 @@
     
     // Settings this folder & delegate & Loading datasource
     if (app.activeAccount) {
-        app.serverUrl = _localServerUrl;
         app.directoryUser = [CCUtility getDirectoryActiveUser:app.activeUser activeUrl:app.activeUrl];
         _localDirectoryID = [CCCoreData getDirectoryIDFromServerUrl:_localServerUrl activeAccount:app.activeAccount];
     }
@@ -308,7 +306,6 @@
         _localDirectoryID = [CCCoreData getDirectoryIDFromServerUrl:_localServerUrl activeAccount:app.activeAccount];
         _isFolderEncrypted = NO;
         
-        app.serverUrl = _localServerUrl;
         app.directoryUser = [CCUtility getDirectoryActiveUser:app.activeUser activeUrl:app.activeUrl];
     
         // add list

iOSClient/PeekPop/CCPeekPop.m

@@ -104,18 +104,20 @@
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
     
+    NSString *serverUrl = app.activeMain.localServerUrl;
+    
     metadataNet.action = actionDownloadThumbnail;
     metadataNet.fileID = metadata.fileID;
     
     if ([metadata.typeCloud isEqualToString:typeCloudOwnCloud] || [metadata.typeCloud isEqualToString:typeCloudNextcloud])
-        metadataNet.fileName = [self returnFileNamePathFromFileName:metadata.fileName serverUrl:app.serverUrl];
+        metadataNet.fileName = [self returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl];
     
     metadataNet.fileNameLocal = metadata.fileID;
     metadataNet.fileNamePrint = metadata.fileNamePrint;
     metadataNet.options = @"l";
     metadataNet.priority = NSOperationQueuePriorityLow;
     metadataNet.selector = selectorDownloadThumbnail;
-    metadataNet.serverUrl = app.serverUrl;
+    metadataNet.serverUrl = serverUrl;
     
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
 }

iOSClient/Settings/CCSettings.m

@@ -736,9 +736,7 @@
                 
                 [CCUtility setBlockCode:@""];
                 [CCCoreData setAllDirectoryUnLockForAccount:app.activeAccount];
-                CCMain *mainVC = [app.listMainVC objectForKey:app.serverUrl];
-                if (mainVC)
-                    [mainVC.tableView reloadData];
+                [app.activeMain.tableView reloadData];
             }
             
             // email Key EAS-256
@@ -751,9 +749,7 @@
                 // disable passcode
                 [CCUtility setBlockCode:@""];
                 [CCCoreData setAllDirectoryUnLockForAccount:app.activeAccount];
-                CCMain *mainVC = [app.listMainVC objectForKey:app.serverUrl];
-                if (mainVC)
-                    [mainVC.tableView reloadData];
+                [app.activeMain.tableView reloadData];
                 
                 [CCUtility setSimplyBlockCode:![CCUtility getSimplyBlockCode]];