Skip to content

Commit a4d6eb9

Browse files
marinofaggianamarinofaggiana
authored
Version 6.2.4 (#3290)
1 parent fe920b4 commit a4d6eb9

File tree

168 files changed

+1267
-938
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+1267
-938
lines changed

‎Brand/Database.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ import Foundation
2626
// Database Realm
2727
//
2828
let databaseName = "nextcloud.realm"
29-
let databaseSchemaVersion: UInt64 = 370
29+
let databaseSchemaVersion: UInt64 = 371

‎Brand/NCBrand.swift‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ let userAgent: String = {
4242
var pushNotificationServerProxy: String = "https://push-notifications.nextcloud.com"
4343
var linkLoginHost: String = "https://nextcloud.com/install"
4444
var linkloginPreferredProviders: String = "https://nextcloud.com/signup-ios"
45-
var webLoginAutenticationProtocol: String = "nc://" // example "abc://"
45+
var webLoginAutenticationProtocol: String = "nc://" // example "abc://"
4646
var privacy: String = "https://nextcloud.com/privacy"
4747
var sourceCode: String = "https://github.com/nextcloud/ios"
4848
var mobileconfig: String = "/remote.php/dav/provisioning/apple-provisioning.mobileconfig"
@@ -65,7 +65,7 @@ let userAgent: String = {
6565
var disable_request_login_url: Bool = false
6666
var disable_multiaccount: Bool = false
6767
var disable_more_external_site: Bool = false
68-
var disable_openin_file: Bool = false // Don't touch me !!
68+
var disable_openin_file: Bool = false // Don't touch me !!
6969
var disable_crash_service: Bool = false
7070
var disable_log: Bool = false
7171
var disable_mobileconfig: Bool = false
@@ -79,11 +79,12 @@ let userAgent: String = {
7979
var enforce_servers: [(name: String, url: String)] = []
8080

8181
// Internal option behaviour
82-
var cleanUpDay: Int = 0 // Set default "Delete all cached files older than" possible days value are: 0, 1, 7, 30, 90, 180, 365
82+
var cleanUpDay: Int = 0 // Set default "Delete all cached files older than" possible days value are: 0, 1, 7, 30, 90, 180, 365
8383

84-
// Max download/upload concurrent
85-
let maxConcurrentOperationDownload: Int = 5
86-
let maxConcurrentOperationUpload: Int = 5
84+
// Max request/download/upload concurrent
85+
let httpMaximumConnectionsPerHost: Int = 6
86+
let httpMaximumConnectionsPerHostInDownload: Int = 6
87+
let httpMaximumConnectionsPerHostInUpload: Int = 6
8788

8889
// Number of failed attempts after reset app
8990
let resetAppPasscodeAttempts: Int = 10

‎File Provider Extension/FileProviderData.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ class fileProviderData: NSObject {
111111
password: NCKeychain().getPassword(account: tblAccount.account),
112112
userAgent: userAgent,
113113
nextcloudVersion: NCCapabilities.shared.getCapabilities(account: tblAccount.account).capabilityServerVersionMajor,
114+
httpMaximumConnectionsPerHost: NCBrandOptions.shared.httpMaximumConnectionsPerHost,
115+
httpMaximumConnectionsPerHostInDownload: NCBrandOptions.shared.httpMaximumConnectionsPerHostInDownload,
116+
httpMaximumConnectionsPerHostInUpload: NCBrandOptions.shared.httpMaximumConnectionsPerHostInUpload,
114117
groupIdentifier: NCBrandOptions.shared.capabilitiesGroup)
115118
NCNetworking.shared.delegate = providerExtension as? NCNetworkingDelegate
116119

‎Nextcloud.xcodeproj/project.pbxproj‎

Lines changed: 38 additions & 5 deletions
Large diffs are not rendered by default.

‎Share/NCShareExtension+Files.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ extension NCShareExtension {
3030
@objc func reloadDatasource(withLoadFolder: Bool) {
3131
let layoutForView = NCManageDatabase.shared.getLayoutForView(account: session.account, key: keyLayout, serverUrl: serverUrl) ?? NCDBLayoutForView()
3232
let predicate = NSPredicate(format: "account == %@ AND serverUrl == %@ AND directory == true", session.account, serverUrl)
33-
let metadatas = self.database.getResultsMetadatasPredicate(predicate, layoutForView: layoutForView)
33+
let directoryOnTop = NCKeychain().getDirectoryOnTop(account: session.account)
34+
let metadatas = self.database.getResultsMetadatasPredicate(predicate, layoutForView: layoutForView, directoryOnTop: directoryOnTop)
3435

35-
self.dataSource = NCCollectionViewDataSource(metadatas: metadatas)
36+
self.dataSource = NCCollectionViewDataSource(metadatas: metadatas, directoryOnTop: directoryOnTop)
3637

3738
if withLoadFolder {
3839
loadFolder()

‎Share/NCShareExtension+NCAccountRequestDelegate.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ extension NCShareExtension: NCAccountRequestDelegate {
8181
password: NCKeychain().getPassword(account: tableAccount.account),
8282
userAgent: userAgent,
8383
nextcloudVersion: capabilities.capabilityServerVersionMajor,
84+
httpMaximumConnectionsPerHost: NCBrandOptions.shared.httpMaximumConnectionsPerHost,
85+
httpMaximumConnectionsPerHostInDownload: NCBrandOptions.shared.httpMaximumConnectionsPerHostInDownload,
86+
httpMaximumConnectionsPerHostInUpload: NCBrandOptions.shared.httpMaximumConnectionsPerHostInUpload,
8487
groupIdentifier: NCBrandOptions.shared.capabilitiesGroup)
8588

8689
// SESSION

‎Widget/Dashboard/DashboardData.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ func getDashboardDataEntry(configuration: DashboardIntent?, isPreview: Bool, dis
139139
password: password,
140140
userAgent: userAgent,
141141
nextcloudVersion: capabilities.capabilityServerVersionMajor,
142+
httpMaximumConnectionsPerHost: NCBrandOptions.shared.httpMaximumConnectionsPerHost,
143+
httpMaximumConnectionsPerHostInDownload: NCBrandOptions.shared.httpMaximumConnectionsPerHostInDownload,
144+
httpMaximumConnectionsPerHostInUpload: NCBrandOptions.shared.httpMaximumConnectionsPerHostInUpload,
142145
groupIdentifier: NCBrandOptions.shared.capabilitiesGroup)
143146

144147
// LOG

‎Widget/Files/FilesData.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ func getFilesDataEntry(configuration: AccountIntent?, isPreview: Bool, displaySi
118118
password: password,
119119
userAgent: userAgent,
120120
nextcloudVersion: NCCapabilities.shared.getCapabilities(account: activeTableAccount.account).capabilityServerVersionMajor,
121+
httpMaximumConnectionsPerHost: NCBrandOptions.shared.httpMaximumConnectionsPerHost,
122+
httpMaximumConnectionsPerHostInDownload: NCBrandOptions.shared.httpMaximumConnectionsPerHostInDownload,
123+
httpMaximumConnectionsPerHostInUpload: NCBrandOptions.shared.httpMaximumConnectionsPerHostInUpload,
121124
groupIdentifier: NCBrandOptions.shared.capabilitiesGroup)
122125

123126
let requestBodyRecent =

‎Widget/Intent/el.lproj/Intent.strings‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
"13zjVT" = "Account";
2+
3+
"CAIVXf" = "Applications";
4+
5+
"DN8Bxl" = "Account";
6+
7+
"LIw8E9" = "Widget";
8+
9+
"NO1rJU" = "Dashboard";
10+
11+
"V3exc2" = "Account";
12+
13+
"VfbA9C" = "Account";
14+
15+
"ZgvlYN" = "Dashboard Widget";
16+
17+
"tAlZ1R" = "Accounts";
18+

‎Widget/Lockscreen/LockscreenData.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ func getLockscreenDataEntry(configuration: AccountIntent?, isPreview: Bool, fami
7272
password: password,
7373
userAgent: userAgent,
7474
nextcloudVersion: capabilities.capabilityServerVersionMajor,
75+
httpMaximumConnectionsPerHost: NCBrandOptions.shared.httpMaximumConnectionsPerHost,
76+
httpMaximumConnectionsPerHostInDownload: NCBrandOptions.shared.httpMaximumConnectionsPerHostInDownload,
77+
httpMaximumConnectionsPerHostInUpload: NCBrandOptions.shared.httpMaximumConnectionsPerHostInUpload,
7578
groupIdentifier: NCBrandOptions.shared.capabilitiesGroup)
7679

7780
let options = NKRequestOptions(timeout: 90, queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)

0 commit comments

Comments
 (0)