[e2ee] Forced k_upload_session_foreground

Nextcloud.xcodeproj/project.pbxproj

@@ -894,13 +894,6 @@
 		F74344911E128E96001CC831 /* PickerFileProvider.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = PickerFileProvider.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		F743B2C31C95BBE8006F5B4A /* CCShareInfoCMOC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShareInfoCMOC.h; sourceTree = "<group>"; };
 		F743B2C41C95BBE8006F5B4A /* CCShareInfoCMOC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCShareInfoCMOC.m; sourceTree = "<group>"; };
-		F74C5D901F923E4700B7CC01 /* fi-FI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fi-FI"; path = "fi-FI.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F74C5D911F923E4700B7CC01 /* fi-FI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fi-FI"; path = "fi-FI.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F74C5D921F923E4700B7CC01 /* fi-FI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fi-FI"; path = "fi-FI.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
-		F74C5D931F923E4700B7CC01 /* fi-FI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fi-FI"; path = "fi-FI.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		F74C5D941F923E4800B7CC01 /* fi-FI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fi-FI"; path = "fi-FI.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F74C5D951F923E4800B7CC01 /* fi-FI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fi-FI"; path = "fi-FI.lproj/Intro.strings"; sourceTree = "<group>"; };
-		F74C5D961F923E4800B7CC01 /* fi-FI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fi-FI"; path = "fi-FI.lproj/Error.strings"; sourceTree = "<group>"; };
 		F74D3DBD1BAC1941000BAE4B /* OCNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCNetworking.h; sourceTree = "<group>"; };
 		F74D3DBE1BAC1941000BAE4B /* OCNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCNetworking.m; sourceTree = "<group>"; };
 		F75037431DBFA91A008FB480 /* ALView+PureLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ALView+PureLayout.h"; sourceTree = "<group>"; };
@@ -3315,7 +3308,6 @@
 				"sk-SK",
 				"en-GB",
 				"zh-Hans",
-				"fi-FI",
 				"ka-GE",
 				hu,
 				"zh-Hant-TW",
@@ -4071,7 +4063,6 @@
 				F7D532531F5D4155006568B1 /* sk-SK */,
 				F7D5328E1F5D443B006568B1 /* en-GB */,
 				F7D532A31F5D4461006568B1 /* zh-Hans */,
-				F74C5D921F923E4700B7CC01 /* fi-FI */,
 				F77438EA1FCD694900662C46 /* ka-GE */,
 				F77438F11FCD69D200662C46 /* hu */,
 				F77438F81FCD6A0D00662C46 /* zh-Hant-TW */,
@@ -4116,7 +4107,6 @@
 				F7D532521F5D4155006568B1 /* sk-SK */,
 				F7D5328D1F5D443B006568B1 /* en-GB */,
 				F7D532A21F5D4461006568B1 /* zh-Hans */,
-				F74C5D911F923E4700B7CC01 /* fi-FI */,
 				F77438E91FCD694900662C46 /* ka-GE */,
 				F77438F01FCD69D200662C46 /* hu */,
 				F77438F71FCD6A0D00662C46 /* zh-Hant-TW */,
@@ -4161,7 +4151,6 @@
 				F7D532561F5D4155006568B1 /* sk-SK */,
 				F7D532911F5D443B006568B1 /* en-GB */,
 				F7D532A61F5D4462006568B1 /* zh-Hans */,
-				F74C5D951F923E4800B7CC01 /* fi-FI */,
 				F77438ED1FCD694900662C46 /* ka-GE */,
 				F77438F41FCD69D300662C46 /* hu */,
 				F77438FB1FCD6A0E00662C46 /* zh-Hant-TW */,
@@ -4206,7 +4195,6 @@
 				F7D532511F5D4155006568B1 /* sk-SK */,
 				F7D5328C1F5D443B006568B1 /* en-GB */,
 				F7D532A11F5D4461006568B1 /* zh-Hans */,
-				F74C5D901F923E4700B7CC01 /* fi-FI */,
 				F77438E81FCD694900662C46 /* ka-GE */,
 				F77438EF1FCD69D200662C46 /* hu */,
 				F77438F61FCD6A0D00662C46 /* zh-Hant-TW */,
@@ -4251,7 +4239,6 @@
 				F7D532571F5D4156006568B1 /* sk-SK */,
 				F7D532921F5D443B006568B1 /* en-GB */,
 				F7D532A71F5D4462006568B1 /* zh-Hans */,
-				F74C5D961F923E4800B7CC01 /* fi-FI */,
 				F77438EE1FCD694900662C46 /* ka-GE */,
 				F77438F51FCD69D300662C46 /* hu */,
 				F77438FC1FCD6A0E00662C46 /* zh-Hant-TW */,
@@ -4296,7 +4283,6 @@
 				F7D532551F5D4155006568B1 /* sk-SK */,
 				F7D532901F5D443B006568B1 /* en-GB */,
 				F7D532A51F5D4461006568B1 /* zh-Hans */,
-				F74C5D941F923E4800B7CC01 /* fi-FI */,
 				F77438EC1FCD694900662C46 /* ka-GE */,
 				F77438F31FCD69D300662C46 /* hu */,
 				F77438FA1FCD6A0E00662C46 /* zh-Hant-TW */,
@@ -4341,7 +4327,6 @@
 				F7D532541F5D4155006568B1 /* sk-SK */,
 				F7D5328F1F5D443B006568B1 /* en-GB */,
 				F7D532A41F5D4461006568B1 /* zh-Hans */,
-				F74C5D931F923E4700B7CC01 /* fi-FI */,
 				F77438EB1FCD694900662C46 /* ka-GE */,
 				F77438F21FCD69D300662C46 /* hu */,
 				F77438F91FCD6A0D00662C46 /* zh-Hant-TW */,

iOSClient/Database/NCManageDatabase.swift

@@ -2015,6 +2015,11 @@ 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)
                     }
                 }
@@ -2037,6 +2042,9 @@ class NCManageDatabase: NSObject {
         
         do {
             try realm.write {
+        
+                var serverUrl = ""
+                var e2eeFolder = false
                 
                 for metadataNet in metadatasNet {
                     
@@ -2057,6 +2065,15 @@ 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)
                     }
                 }