Explorar el Código

new view offline folder

Marino Faggiana hace 8 años
padre
commit
4aeb5da58b
Se han modificado 2 ficheros con 13 adiciones y 10 borrados
  1. 6 6
      iOSClient/Main/CCMain.m
  2. 7 4
      iOSClient/Offline/CCOfflinePageContent.m

+ 6 - 6
iOSClient/Main/CCMain.m

@@ -536,14 +536,15 @@
         
         [self setTitleBackgroundTableView:nil];
     }
-
 }
 
 - (void)setTitleBackgroundTableView:(NSString *)title
 {
     if (title) {
+        
         // message if table is empty
         UILabel *messageLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height)];
+        
         if ([app.reachability isReachable] == NO) {
             messageLabel.text = NSLocalizedString(@"_comm_erro_pull_down_", nil);
             messageLabel.textColor = COLOR_NO_CONNECTION;
@@ -553,13 +554,17 @@
             messageLabel.textColor = [UIColor blackColor];
             messageLabel.font = [UIFont systemFontOfSize:14];
         }
+        
         messageLabel.numberOfLines = 0;
         messageLabel.textAlignment = NSTextAlignmentCenter;
         [messageLabel sizeToFit];
+        
         [self.tableView reloadData];
         self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         self.tableView.backgroundView = messageLabel;
+        
     } else {
+        
         [self.tableView setBackgroundView:nil];
         self.tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine;
     }
@@ -5112,11 +5117,6 @@
 
     BOOL isOfflineFile = [CCCoreData isOfflineLocalFileID:metadata.fileID activeAccount:app.activeAccount];
     
-    // Verify Offline
-    if(_isOfflineServerUrl || isOfflineFile) {
-        isOfflineFile = YES;
-    }
-    
     if (isOfflineFile) {
         
         if (metadata.cryptated) cell.offlineImageView.image = [UIImage imageNamed:image_offlinecrypto];

+ 7 - 4
iOSClient/Offline/CCOfflinePageContent.m

@@ -465,10 +465,13 @@
         metadata = [dataSource objectAtIndex:indexPath.row];
         cell.fileImageView.image = [UIImage imageWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.ico", app.directoryUser, metadata.fileID]];
         
-        if (metadata.cryptated)
-            cell.offlineImageView.image = [UIImage imageNamed:image_offlinecrypto];
-        else
-            cell.offlineImageView.image = [UIImage imageNamed:image_offline];
+        if (_serverUrl == nil) {
+            
+            if (metadata.cryptated)
+                cell.offlineImageView.image = [UIImage imageNamed:image_offlinecrypto];
+            else
+                cell.offlineImageView.image = [UIImage imageNamed:image_offline];
+        }
     }
     
     // i am in local