Continue Picker dev

Picker/Base.lproj/MainInterface.storyboard

@@ -13,7 +13,7 @@
         <!--Document Picker View Controller-->
         <scene sceneID="Q8I-MS-tKG">
             <objects>
-                <viewController id="J6p-g8-CHO" customClass="DocumentPickerViewController" customModule="Picker" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="DocumentPickerViewController" id="J6p-g8-CHO" customClass="DocumentPickerViewController" customModule="Picker" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="hST-wJ-eYy"/>
                         <viewControllerLayoutGuide type="bottom" id="UQD-kz-Mfv"/>

Picker/DocumentPickerViewController.swift

@@ -28,7 +28,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
     // MARK: - Properties
     
     var metadata : CCMetadata?
-    var recordsTableMetadata = [TableMetadata]()
+    var recordsTableMetadata : [TableMetadata]?
     let dirGroup = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: capabilitiesGroups)
     
     var activeAccount : String?
@@ -73,9 +73,13 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             activeUrl = record.url!
             activeUser = record.user!
             typeCloud = record.typeCloud!
-            localServerUrl = CCUtility.getHomeServerUrlActiveUrl(activeUrl!, typeCloud: typeCloud!)
             directoryUser = CCUtility.getDirectoryActiveUser(activeUser!, activeUrl: activeUrl!)
             
+            if (localServerUrl == nil) {
+            
+                localServerUrl = CCUtility.getHomeServerUrlActiveUrl(activeUrl!, typeCloud: typeCloud!)
+            }
+            
         } else {
             
             // Close error no account return nil
@@ -107,8 +111,8 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         let directoryID : String? = CCCoreData.getDirectoryID(fromServerUrl: localServerUrl!, activeAccount: activeAccount!)
         let predicate = NSPredicate(format: "(account == %@) AND (directoryID == %@)", activeAccount!, directoryID!)
         
-        recordsTableMetadata = CCCoreData.getTableMetadata(with: predicate, fieldOrder: CCUtility.getOrderSettings()!, ascending: CCUtility.getAscendingSettings()) as! [TableMetadata]
-        
+        recordsTableMetadata = CCCoreData.getTableMetadata(with: predicate, fieldOrder: CCUtility.getOrderSettings()!, ascending: CCUtility.getAscendingSettings()) as? [TableMetadata]
+                
         tableView.reloadData()
     }
 }
@@ -129,7 +133,11 @@ extension DocumentPickerViewController: UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
-        return recordsTableMetadata.count
+        if (recordsTableMetadata == nil) {
+            return 0
+        } else {
+            return recordsTableMetadata!.count
+        }
     }
         
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -138,8 +146,8 @@ extension DocumentPickerViewController: UITableViewDataSource {
         
         cell.separatorInset = UIEdgeInsetsMake(0, 60, 0, 0)
         
-        let recordMetadata = recordsTableMetadata[(indexPath as NSIndexPath).row]
-        let metadata = CCCoreData.insertEntity(in: recordMetadata)!
+        let recordTableMetadata = recordsTableMetadata?[(indexPath as NSIndexPath).row]
+        let metadata = CCCoreData.insertEntity(in: recordTableMetadata)!
         
         // File Image View
         let filePath = directoryUser!+"/"+metadata.fileID!+".ico"
@@ -158,6 +166,18 @@ extension DocumentPickerViewController: UITableViewDataSource {
         
         return cell
     }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        let recordTableMetadata = recordsTableMetadata?[(indexPath as NSIndexPath).row]
+        
+        let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "DocumentPickerViewController") as! DocumentPickerViewController
+        
+        nextViewController.localServerUrl = CCUtility.stringAppendServerUrl(localServerUrl!, addServerUrl: recordTableMetadata!.fileName)
+        
+        self.navigationController?.pushViewController(nextViewController, animated: true)
+        
+    }
 }
 
 // MARK: - Class UITableViewCell