Marino Faggiana 7 жил өмнө
parent
commit
692a647bd7

+ 0 - 2
iOSClient/CCGlobal.h

@@ -52,8 +52,6 @@ extern NSString *const urlBaseUploadDB;
 
 #define k_dismissAfterSecond                            4
 
-#define k_MaxDimensionUpload                            524288000       // 500 MB
-
 #define k_dayForceReadFolder                            3
 
 #define k_daysOfActivity                                7

+ 31 - 20
iOSClient/Main/CCDetail.m

@@ -462,33 +462,44 @@
 
 - (void)photoBrowser:(MWPhotoBrowser *)photoBrowser didDisplayPhotoAtIndex:(NSUInteger)index
 {
-    tableMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
-    NSString *directory;
+    if (index != _indexNowVisible) {
     
-    self.indexNowVisible = index;
-    self.fileIDNowVisible = metadata.fileID;
+        tableMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
     
-    photoBrowser.toolbar.hidden = NO;
+        NSString *directory;
+        NSString *fileID = metadata.fileID;
+    
+        self.indexNowVisible = index;
+        self.fileIDNowVisible = metadata.fileID;
+    
+        photoBrowser.toolbar.hidden = NO;
     
-    if (_reload) {
-        
-        [self.photoBrowser performSelector:@selector(reloadData) withObject:nil afterDelay:0.1];
         
-        _reload = NO;
-    }
     
-    if (_sourceDirectoryLocal)
-        directory = self.metadataDetail.directoryID;
-    else
-        directory = app.directoryUser;
+        if (_sourceDirectoryLocal)
+            directory = self.metadataDetail.directoryID;
+        else
+            directory = app.directoryUser;
 
-    // Download
-    if (metadata && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", directory, metadata.fileID]] == NO && [metadata.session length] == 0)
-        [self performSelector:@selector(downloadPhotoBrowser:) withObject:metadata afterDelay:0.1];
+        // Download
+        if (fileID) {
+        
+            metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
+        
+            if (metadata && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", directory, metadata.fileID]] == NO && [metadata.session length] == 0)
+                [self performSelector:@selector(downloadPhotoBrowser:) withObject:metadata afterDelay:0.1];
+        
+            // Title
+            if (metadata && !photoBrowser.isGridController)
+                self.title = metadata.fileNamePrint;
+        }
+    }
     
-    // Title
-    if (metadata && !photoBrowser.isGridController)
-        self.title = metadata.fileNamePrint;
+    if (_reload) {
+        
+        [self.photoBrowser performSelector:@selector(reloadData) withObject:nil];
+        _reload = NO;
+    }
 }
 
 - (id <MWPhoto>)photoBrowser:(MWPhotoBrowser *)photoBrowser photoAtIndex:(NSUInteger)index

+ 6 - 9
iOSClient/Main/CCMain.m

@@ -1545,16 +1545,13 @@
     //selectorLoadViewImage
     if ([selector isEqualToString:selectorLoadViewImage]) {
         
-        dispatch_async(dispatch_get_main_queue(), ^{
-            
-            // Detail
-            if (app.activeDetail)
-                [app.activeDetail downloadPhotoBrowserSuccess:metadata selector:selector];
+        // Detail
+        if (app.activeDetail)
+            [app.activeDetail downloadPhotoBrowserSuccess:metadata selector:selector];
             
-            // Photos
-            if (app.activePhotos)
-                [app.activePhotos downloadFileSuccess:metadata];
-        });
+        // Photos
+        if (app.activePhotos)
+            [app.activePhotos downloadFileSuccess:metadata];
 
         [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
     }

+ 1 - 1
iOSClient/QuickActions/CCQuickActions.m

@@ -144,7 +144,7 @@
         }];
     }
     
-    if (imageSize > k_MaxDimensionUpload || (picker.selectedAssets.count >= (k_pickerControllerMax - _numTaskUploadInProgress))) {
+    if (picker.selectedAssets.count >= (k_pickerControllerMax - _numTaskUploadInProgress)) {
         
         [app messageNotification:@"_info_" description:@"_limited_dimension_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo errorCode:0];