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

+ 2 - 0
iOSClient/AppDelegate.h

@@ -58,6 +58,8 @@
 @property (nonatomic, strong) NSString *typeCloud;
 @property (nonatomic, strong) NSString *serverUrl;
 @property (nonatomic, strong) NSString *directoryUser;
+@property long long quotaUsed;
+@property long long quotaAvailable;
 
 // next version ... ? ...
 @property double currentLatitude;

+ 1 - 0
iOSClient/CCGlobal.h

@@ -234,6 +234,7 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define selectorReadFileFolder          @"readFileFolder"
 #define selectorReadFileUploadFile      @"readFileUploadFile"
 #define selectorReadFileVerifyUpload    @"readFileVerifyUpload"
+#define selectorReadFileQuota           @"readFileQuota"
 #define selectorReadFolder              @"readFolder"
 #define selectorReadFolderForced        @"readFolderForced"
 #define selectorReadShare               @"readShare"

+ 11 - 0
iOSClient/Main/CCMain.m

@@ -1048,6 +1048,11 @@
         
         metadataNet.action = actionGetCapabilities;
         [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
+        
+        metadataNet.action = actionReadFile;
+        metadataNet.selector = selectorReadFileQuota;
+        metadataNet.serverUrl = _localServerUrl;
+        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
     }
 }
 
@@ -1586,6 +1591,12 @@
         else
             [app addNetworkingOperationQueue:app.netQueueUpload delegate:self metadataNet:metadataNet];
     }
+    
+    // Quota
+    if ([metadataNet.selector isEqualToString:selectorReadFileQuota]) {
+        
+        NSLog(@"Quota");
+    }
 }
 
 - (void)readFileSelfFolderRev

+ 22 - 3
iOSClient/Networking/OCNetworking.m

@@ -331,8 +331,7 @@
         NSString *permissions = itemDtoDirectory.permissions;
         NSString *rev = itemDtoDirectory.etag;
         NSDate *date = [NSDate dateWithTimeIntervalSince1970:itemDtoDirectory.date];
-        long long quota = itemDtoDirectory.quotaUsed + itemDtoDirectory.quotaAvailable;
-            
+        
         NSString *directoryID = [CCCoreData addDirectory:_metadataNet.serverUrl date:date permissions:permissions activeAccount:_metadataNet.account];
             
         NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
@@ -342,6 +341,16 @@
         // Update metadataNet.directoryID
         _metadataNet.directoryID = directoryID;
         
+#ifndef EXTENSION
+        NSString *home = [CCUtility getHomeServerUrlActiveUrl:_activeUrl typeCloud:_typeCloud];
+        
+        if ([home isEqualToString:_metadataNet.serverUrl]) {
+            
+            app.quotaUsed = itemDtoDirectory.quotaUsed;
+            app.quotaAvailable = itemDtoDirectory.quotaAvailable;
+        }
+#endif
+        
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
 
             NSArray *itemsSortedArray = [items sortedArrayUsingComparator:^NSComparisonResult(id a, id b) {
@@ -628,7 +637,17 @@
             NSString *directoryUser = [CCUtility getDirectoryActiveUser:_activeUser activeUrl:_activeUrl];
         
             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];
+            
+            if ([home isEqualToString:fileName]) {
+                
+                app.quotaUsed = itemDto.quotaUsed;
+                app.quotaAvailable = itemDto.quotaAvailable;
+            }
+#endif
+            
             if([self.delegate respondsToSelector:@selector(readFileSuccess:metadata:)])
                 [self.delegate readFileSuccess:_metadataNet metadata:metadata];
         }