Marino Faggiana 7 жил өмнө
parent
commit
4cc00e5782

+ 4 - 4
iOSClient/Database/NCManageDatabase.swift

@@ -996,10 +996,10 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table e2e Encryption
     
-    @objc func adde2eEncryption(_ e2e: tableE2eEncryption) -> tableE2eEncryption? {
+    @objc func adde2eEncryption(_ e2e: tableE2eEncryption) -> Bool {
 
         guard self.getAccountActive() != nil else {
-            return nil
+            return false
         }
         
         let realm = try! Realm()
@@ -1010,10 +1010,10 @@ class NCManageDatabase: NSObject {
             }
         } catch let error {
             print("[LOG] Could not write to database: ", error)
-            return nil
+            return false
         }
         
-        return tableE2eEncryption.init(value: e2e)
+        return true
     }
     
     @objc func deletee2eEncryption(predicate: NSPredicate) {

+ 10 - 2
iOSClient/Networking/CCNetworking.m

@@ -819,11 +819,19 @@
                             addObject.fileNameEncrypted = metadataNet.fileNameEncrypted;
                             addObject.key = key;
                             addObject.initializationVector = initializationVector;
-                            addObject.mimeType =  @"";
+                            
+                            CFStringRef UTI = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)[metadataNet.fileName pathExtension], NULL);
+                            CFStringRef mimeTypeRef = UTTypeCopyPreferredTagWithClass (UTI, kUTTagClassMIMEType);
+                            if (mimeTypeRef) {
+                                addObject.mimeType = (__bridge NSString *)mimeTypeRef;
+                            } else {
+                                addObject.mimeType = @"application/octet-stream";
+                            }
+
                             addObject.serverUrl = metadataNet.serverUrl;
                             addObject.version = [[NCManageDatabase sharedInstance] getEndToEndEncryptionVersion];
                             
-                            (void)[[NCManageDatabase sharedInstance] adde2eEncryption:addObject];
+                            result = [[NCManageDatabase sharedInstance] adde2eEncryption:addObject];
                         }                        
                     }