Marino Faggiana 8 年之前
父节点
当前提交
2f37641ab4
共有 2 个文件被更改,包括 18 次插入9 次删除
  1. 16 8
      Picker/DocumentPickerViewController.swift
  2. 2 1
      iOSClient/Main/CCMain.m

+ 16 - 8
Picker/DocumentPickerViewController.swift

@@ -316,18 +316,26 @@ extension DocumentPickerViewController: UITableViewDataSource {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         let recordTableMetadata = recordsTableMetadata?[(indexPath as NSIndexPath).row]
-        var dir : String! = recordTableMetadata!.fileName
 
-        let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "DocumentPickerViewController") as! DocumentPickerViewController
+        tableView.deselectRow(at: indexPath, animated: true)
         
-        if recordTableMetadata?.cryptated == 1 {
-            dir = CCUtility.trasformedFileNamePlist(inCrypto: recordTableMetadata!.fileName)
-        }
+        if recordTableMetadata?.cryptated == 0 {
+            
+            
+        } else {
+            
+            var dir : String! = recordTableMetadata!.fileName
+            let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "DocumentPickerViewController") as! DocumentPickerViewController
+        
+            if recordTableMetadata?.cryptated == 1 {
+                dir = CCUtility.trasformedFileNamePlist(inCrypto: recordTableMetadata!.fileName)
+            }
         
-        nextViewController.localServerUrl = CCUtility.stringAppendServerUrl(localServerUrl!, addServerUrl: dir)
-        nextViewController.titleFolder = recordTableMetadata?.fileNamePrint
+            nextViewController.localServerUrl = CCUtility.stringAppendServerUrl(localServerUrl!, addServerUrl: dir)
+            nextViewController.titleFolder = recordTableMetadata?.fileNamePrint
         
-        self.navigationController?.pushViewController(nextViewController, animated: true)
+            self.navigationController?.pushViewController(nextViewController, animated: true)
+        }
     }
 }
 

+ 2 - 1
iOSClient/Main/CCMain.m

@@ -5438,7 +5438,8 @@
     UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
     
     // se non può essere selezionata deseleziona
-    if ([cell isEditing] == NO) [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    if ([cell isEditing] == NO)
+        [tableView deselectRowAtIndexPath:indexPath animated:YES];
     
     // se siamo in modalità editing impostiamo il titolo dei selezioati e usciamo subito
     if (self.tableView.editing) {