Browse Source

Crash readFolder

Marino Faggiana 8 years ago
parent
commit
1aa5625e26
2 changed files with 17 additions and 17 deletions
  1. 1 1
      iOSClient/InfoPlist/InfoNextcloud.plist
  2. 16 16
      iOSClient/Networking/OCNetworking.m

+ 1 - 1
iOSClient/InfoPlist/InfoNextcloud.plist

@@ -73,7 +73,7 @@
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
 	<key>ITSEncryptionExportComplianceCode</key>
-	<string>00000</string>
+	<string>3b2bb0b1-fa12-43cb-a78f-0f7e1afd33df</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>dbapi-1</string>

+ 16 - 16
iOSClient/Networking/OCNetworking.m

@@ -323,32 +323,32 @@
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
     [communication readFolder:_metadataNet.serverUrl withUserSessionToken:nil onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSArray *items, NSString *redirectedServer, NSString *token) {
         
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-            
-            NSMutableArray *metadatas = [[NSMutableArray alloc] init];
+        NSMutableArray *metadatas = [[NSMutableArray alloc] init];
         
-            // directory [0]
-            OCFileDto *itemDtoDirectory = [items objectAtIndex:0];
-            NSString *permissions = itemDtoDirectory.permissions;
-            NSString *rev = itemDtoDirectory.etag;
-            NSDate *date = [NSDate dateWithTimeIntervalSince1970:itemDtoDirectory.date];
+        // directory [0]
+        OCFileDto *itemDtoDirectory = [items objectAtIndex:0];
+        NSString *permissions = itemDtoDirectory.permissions;
+        NSString *rev = itemDtoDirectory.etag;
+        NSDate *date = [NSDate dateWithTimeIntervalSince1970:itemDtoDirectory.date];
             
-            NSString *directoryID = [CCCoreData addDirectory:_metadataNet.serverUrl date:date permissions:permissions activeAccount:_metadataNet.account];
+        NSString *directoryID = [CCCoreData addDirectory:_metadataNet.serverUrl date:date permissions:permissions activeAccount:_metadataNet.account];
             
-            NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
-            NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl typeCloud:_typeCloud];
-            NSString *directoryUser = [CCUtility getDirectoryActiveUser:_activeUser activeUrl:_activeUrl];
+        NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
+        NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl typeCloud:_typeCloud];
+        NSString *directoryUser = [CCUtility getDirectoryActiveUser:_activeUser activeUrl:_activeUrl];
         
-            // Update metadataNet.directoryID
-            _metadataNet.directoryID = directoryID;
-            
+        // Update metadataNet.directoryID
+        _metadataNet.directoryID = directoryID;
+        
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+
             NSArray *itemsSortedArray = [items sortedArrayUsingComparator:^NSComparisonResult(id a, id b) {
                 
                 NSString *first = [(OCFileDto*)a fileName];
                 NSString *second = [(OCFileDto*)b fileName];
                 return [[first lowercaseString] compare:[second lowercaseString]];
             }];
-            
+        
             for (NSUInteger i=1; i < [itemsSortedArray count]; i++) {
                 
                 OCFileDto *itemDto = [itemsSortedArray objectAtIndex:i];