fix

iOSClient/PeekPop/CCPeekPop.m

@@ -47,84 +47,33 @@
     [super viewDidLoad];
     
     appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
-    UIImage *image;
+    UIImage *image = self.imageFile;
 
     self.fileName.text = self.metadata.fileNameView;
     highLabelFileName = self.fileName.bounds.size.height + 5;
     
-    /*
-    if (self.imageFile != nil) {
-        
-        image = [UIImage imageWithContentsOfFile:[CCUtility getDirectoryProviderStorageFileID:self.metadata.fileID fileNameView:self.metadata.fileNameView]];
-        if (image == nil) {
-            image = self.imageFile;
-        }
-        
-    } else {
-        
-        if (self.metadata.iconName.length > 0) {
-            image = [UIImage imageNamed:self.metadata.iconName];
-        } else {
-            image = [UIImage imageNamed:@"file"];
-        }
-    }
-    
-    self.imagePreview.image = image;
-    self.imagePreview.contentMode = UIViewContentModeScaleToFill;
-    self.preferredContentSize = CGSizeMake(image.size.width, image.size.height + highLabelFileName);
-    */
-    
     if (self.metadata.hasPreview) {
         
         if ([CCUtility fileProviderStorageIconExists:self.metadata.fileID fileNameView:self.metadata.fileNameView]) {
             
-            image = [UIImage imageWithContentsOfFile:[CCUtility getDirectoryProviderStorageFileID:self.metadata.fileID fileNameView:self.metadata.fileNameView]];
-            if (image == nil) {
-                image = [UIImage imageWithContentsOfFile:[CCUtility getDirectoryProviderStorageIconFileID:self.metadata.fileID fileNameView:self.metadata.fileNameView]];
+            UIImage *fullImage = [UIImage imageWithContentsOfFile:[CCUtility getDirectoryProviderStorageFileID:self.metadata.fileID fileNameView:self.metadata.fileNameView]];
+            if (fullImage != nil) {
+                image = fullImage;
             }
             
-            image = [CCGraphics scaleImage:image toSize:CGSizeMake(self.view.bounds.size.width, self.view.bounds.size.height) isAspectRation:true];
-            
-            self.imagePreview.image = image;
-        
-            self.imagePreview.contentMode = UIViewContentModeScaleToFill;
-            self.preferredContentSize = CGSizeMake(image.size.width, image.size.height + highLabelFileName);
-            
         } else {
             
-            NSURL *url = [[NSBundle mainBundle] URLForResource:@"loading" withExtension:@"gif"];
-            self.imagePreview.image = [UIImage animatedImageWithAnimatedGIFURL:url];
-            
-            self.imagePreview.contentMode = UIViewContentModeCenter;
-            
             [self downloadThumbnail];
         }
-        
-    } else {
-        
-        if (self.metadata.directory) {
-            
-            if (self.imageFile != nil) {
-                image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folder"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
-            } else {
-                image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folder"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
-            }
-            
-        } else {
-            
-            if (self.metadata.iconName.length > 0) {
-                image = [UIImage imageNamed:self.metadata.iconName];
-            } else {
-                image = [UIImage imageNamed:@"file"];
-            }
-        }
-        
-        self.imagePreview.image = image;
-        self.imagePreview.contentMode = UIViewContentModeCenter;
-        self.preferredContentSize = CGSizeMake(image.size.width, image.size.height + highLabelFileName);
-
-        self.preferredContentSize = CGSizeMake(image.size.width, image.size.height + highLabelFileName);
     }
+    
+    self.imagePreview.image = [CCGraphics scaleImage:image toSize:CGSizeMake(self.view.bounds.size.width, self.view.bounds.size.height) isAspectRation:true];
+    self.preferredContentSize = CGSizeMake(self.imagePreview.image.size.width,  self.imagePreview.image.size.height + highLabelFileName);
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
 }
 
 - (void)didReceiveMemoryWarning
@@ -171,21 +120,7 @@
     [[OCNetworking sharedManager] downloadPreviewWithAccount:appDelegate.activeAccount metadata:_metadata withWidth:width andHeight:height completion:^(NSString *account, UIImage *image, NSString *message, NSInteger errorCode) {
      
         if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
-            
-            self.imagePreview.image = image;
-            
-            self.imagePreview.contentMode = UIViewContentModeScaleToFill;
-            self.preferredContentSize = CGSizeMake(image.size.width, image.size.height + highLabelFileName);
-            
-        } else {
-            
-            if (self.metadata.iconName.length > 0) {
-                self.imagePreview.image = [UIImage imageNamed:self.metadata.iconName];
-            } else {
-                self.imagePreview.image = [UIImage imageNamed:@"file"];
-            }
-            
-            self.imagePreview.contentMode = UIViewContentModeCenter;
+            self.imagePreview.image = [CCGraphics scaleImage:image toSize:CGSizeMake(self.view.bounds.size.width, self.view.bounds.size.height) isAspectRation:true];
             self.preferredContentSize = CGSizeMake(self.imagePreview.image.size.width, self.imagePreview.image.size.height + highLabelFileName);
         }
     }];