Marino Faggiana 7 年之前
父节点
当前提交
98baa0f19f
共有 2 个文件被更改,包括 2 次插入18 次删除
  1. 2 1
      iOSClient/AppDelegate.m
  2. 0 17
      iOSClient/Database/NCManageDatabase.swift

+ 2 - 1
iOSClient/AppDelegate.m

@@ -1529,6 +1529,7 @@
     }
     
     // Verify Lock
+    /*
     NSInteger counterUploadInSession = [[[NCManageDatabase sharedInstance] getTableMetadataUpload] count] + [[[NCManageDatabase sharedInstance] getTableMetadataUploadWWan] count];
     NSArray *tableMetadatasInLock = [[NCManageDatabase sharedInstance] getLockQueueUpload];
     
@@ -1541,7 +1542,7 @@
                 [[NCManageDatabase sharedInstance] unlockQueueUploadWithAssetLocalIdentifier:metadata.assetLocalIdentifier];
         }
     }
-    
+    */
     // In background verify Upload in error
     if ([[UIApplication sharedApplication] applicationState] == UIApplicationStateBackground) {
         [[CCNetworking sharedNetworking] verifyUploadInErrorOrWait];

+ 0 - 17
iOSClient/Database/NCManageDatabase.swift

@@ -2015,11 +2015,6 @@ class NCManageDatabase: NSObject {
                         addObject.serverUrl = metadataNet.serverUrl
                         addObject.session = metadataNet.session
                         
-                        // E2EE forced session : k_upload_session_foreground
-                        if CCUtility.isFolderEncrypted(metadataNet.serverUrl, account: tableAccount.account) == true && CCUtility.isEnd(toEndEnabled: tableAccount.account) == true {
-                            addObject.session = k_upload_session_foreground
-                        }
-                        
                         realm.add(addObject)
                     }
                 }
@@ -2042,9 +2037,6 @@ class NCManageDatabase: NSObject {
         
         do {
             try realm.write {
-        
-                var serverUrl = ""
-                var e2eeFolder = false
                 
                 for metadataNet in metadatasNet {
                     
@@ -2065,15 +2057,6 @@ class NCManageDatabase: NSObject {
                         addObject.serverUrl = metadataNet.serverUrl
                         addObject.session = metadataNet.session
                         
-                        // E2EE forced session : k_upload_session_foreground
-                        if (serverUrl != metadataNet.serverUrl) {
-                            serverUrl = metadataNet.serverUrl
-                            e2eeFolder = CCUtility.isFolderEncrypted(serverUrl, account: tableAccount.account) == true && CCUtility.isEnd(toEndEnabled: tableAccount.account) == true
-                        }
-                        if e2eeFolder == true {
-                            addObject.session = k_upload_session_foreground
-                        }
-                        
                         realm.add(addObject)
                     }
                 }