Browse Source

improvements

Marino Faggiana 8 years ago
parent
commit
75ead83f54
3 changed files with 10 additions and 8 deletions
  1. 1 1
      iOSClient/AppDelegate.m
  2. 5 3
      iOSClient/Main/CCMain.m
  3. 4 4
      iOSClient/Networking/OCNetworking.m

+ 1 - 1
iOSClient/AppDelegate.m

@@ -166,7 +166,7 @@
     
     // Page Control
     UIPageControl *pageControl = [UIPageControl appearance];
-    pageControl.pageIndicatorTintColor = COLOR_SEPARATOR_TABLE;
+    pageControl.pageIndicatorTintColor = [UIColor whiteColor];
     pageControl.currentPageIndicatorTintColor = COLOR_NEXTCLOUD;
     pageControl.backgroundColor = COLOR_NAVBAR_IOS7; //[UIColor clearColor];
     

+ 5 - 3
iOSClient/Main/CCMain.m

@@ -364,7 +364,9 @@
     }
     if (alertView.tag == alertOfflineFolder && buttonIndex == 1) {
         
-        NSString *dir = [CCUtility stringAppendServerUrl:_serverUrl addServerUrl:_metadata.fileNameData];
+        NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:_metadata.directoryID activeAccount:_metadata.account];
+
+        NSString *dir = [CCUtility stringAppendServerUrl:serverUrl addServerUrl:_metadata.fileNameData];
         
         [[CCOfflineFileFolder sharedOfflineFileFolder] addOfflineFolder:dir];
         
@@ -1148,10 +1150,10 @@
         
         metadataNet.action = actionGetNotificationsOfServer;
         [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-        
+
         metadataNet.action = actionReadFile;
         metadataNet.selector = selectorReadFileQuota;
-        metadataNet.serverUrl = _serverUrl;
+        metadataNet.serverUrl = [CCUtility getHomeServerUrlActiveUrl:app.activeUrl typeCloud:app.typeCloud];
         [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
     }
 }

+ 4 - 4
iOSClient/Networking/OCNetworking.m

@@ -342,9 +342,9 @@
         _metadataNet.directoryID = directoryID;
         
 #ifndef EXTENSION
-        NSString *home = [CCUtility getHomeServerUrlActiveUrl:_activeUrl typeCloud:_typeCloud];
+        NSString *root = [CCUtility getHomeServerUrlActiveUrl:_activeUrl typeCloud:_typeCloud];
         
-        if ([home isEqualToString:_metadataNet.serverUrl]) {
+        if ([root isEqualToString:_metadataNet.serverUrl]) {
             
             app.quotaUsed = itemDtoDirectory.quotaUsed;
             app.quotaAvailable = itemDtoDirectory.quotaAvailable;
@@ -639,9 +639,9 @@
             metadata = [CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:_metadataNet.fileNamePrint serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser typeCloud:_typeCloud];
             
 #ifndef EXTENSION
-            NSString *home = [CCUtility getHomeServerUrlActiveUrl:_activeUrl typeCloud:_typeCloud];
+            NSString *root = [CCUtility getHomeServerUrlActiveUrl:_activeUrl typeCloud:_typeCloud];
             
-            if ([home isEqualToString:fileName]) {
+            if ([root isEqualToString:fileName]) {
                 
                 app.quotaUsed = itemDto.quotaUsed;
                 app.quotaAvailable = itemDto.quotaAvailable;