Marino Faggiana 8 years ago
parent
commit
092bc62dc7
2 changed files with 7 additions and 4 deletions
  1. 6 3
      iOSClient/Actions/CCActions.swift
  2. 1 1
      iOSClient/Main/CCMain.m

+ 6 - 3
iOSClient/Actions/CCActions.swift

@@ -167,28 +167,31 @@ class CCActions: NSObject {
                 
                 do {
                     
-                    let dataFile = try NSData.init(contentsOfFile: "\(appDelegate.directoryUser)/\(metadata.fileID)", options:[])
+                    let file = "\(appDelegate.directoryUser!)/\(metadata.fileID!)"
+                    let dataFile = try NSData.init(contentsOfFile: file, options:[])
                     
                     do {
                         
                         let dataFileEncrypted = try RNEncryptor.encryptData(dataFile as Data!, with: kRNCryptorAES256Settings, password: crypto.getKeyPasscode(metadata.uuid))
                         
-                        let fileUrl = Foundation.URL(string: "\(NSTemporaryDirectory())\(metadata.fileNameData)")!
-                        
                         do {
                             
+                            let fileUrl = URL(fileURLWithPath: "\(NSTemporaryDirectory())\(metadata.fileNameData!)")
                             try dataFileEncrypted.write(to: fileUrl, options: [])
                             
                         } catch let error {
                             print(error.localizedDescription)
+                            return
                         }
                         
                     } catch let error {
                         print(error.localizedDescription)
+                        return
                     }
 
                 } catch let error {
                     print(error.localizedDescription)
+                    return
                 }
             }
             

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -1467,7 +1467,7 @@
         [app loadTableAutomaticUploadForSelector:selector];
 
     // Read File test do not exists
-    if (errorCode == CCErrorFileUploadNotFound) {
+    if (errorCode == CCErrorFileUploadNotFound && fileID) {
        
         CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];