[feature/mem-optimizations] Memory usage optimizations (#1416)

* - remove direct usage of OCCoreManager.shared.memoryConfiguration (API has been removed, memory configuration now directly managed by SDK's OCPlatform) * Configuration documentation updated * Update SDK reference --------- Co-authored-by: felix-schwarz <[email protected]> Co-authored-by: Matthias Hühne <[email protected]>
owncloud · Jan 21, 2025 · 14a72b6 · 14a72b6
1 parent fea7fed
commit 14a72b6
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 44 deletions.
diff --git a/doc/CONFIGURATION.json b/doc/CONFIGURATION.json
@@ -662,20 +662,6 @@
     "status" : "advanced",
     "type" : "stringArray"
   },
-  {
-    "autoExpansion" : "none",
-    "category" : "OAuth2",
-    "categoryTag" : "oauth2",
-    "classIdentifier" : "authentication-oauth2",
-    "className" : "OCAuthenticationMethodOAuth2",
-    "defaultValue" : false,
-    "description" : "Send Client ID and Client Secret in the body of POST requests to the token endpoint. As per RFC 6749 section 2.3.1, this should only be used if the token endpoint does not support receiving these via Basic authentication.",
-    "flatIdentifier" : "authentication-oauth2.post-client-id-and-secret",
-    "key" : "post-client-id-and-secret",
-    "label" : "authentication-oauth2.post-client-id-and-secret",
-    "status" : "advanced",
-    "type" : "bool"
-  },
   {
     "autoExpansion" : "none",
     "category" : "Authentication",
@@ -726,19 +712,6 @@
     "status" : "supported",
     "type" : "bool"
   },
-  {
-    "autoExpansion" : "none",
-    "category" : "Authentication",
-    "categoryTag" : "authentication",
-    "classIdentifier" : "authentication",
-    "className" : "OCAuthenticationMethod",
-    "description" : "Overrides whether the default WebDAV endpoint should be probed to detect available authentication methods. By default, the necessity for this is determined dynamically.",
-    "flatIdentifier" : "authentication.skip-www-authenticate-checks",
-    "key" : "skip-www-authenticate-checks",
-    "label" : "authentication.skip-www-authenticate-checks",
-    "status" : "supported",
-    "type" : "bool"
-  },
   {
     "autoExpansion" : "none",
     "category" : "Bookmarks",

diff --git a/doc/configuration.adoc b/doc/configuration.adoc
@@ -409,12 +409,6 @@ tag::authentication[]
 |Indicates whether the app should ask iOS for a private authentication (web) session for OAuth2 or OpenID Connect. Private authentication sessions do not share cookies and other browsing data with the user's normal browser. Apple only promises that [this setting](https://developer.apple.com/documentation/authenticationservices/aswebauthenticationsession/3237231-prefersephemeralwebbrowsersessio) will be honored if the user has set Safari as default browser.
 |supported `candidate`
 
-|authentication.skip-www-authenticate-checks
-|bool
-|
-|Overrides whether the default WebDAV endpoint should be probed to detect available authentication methods. By default, the necessity for this is determined dynamically.
-|supported `candidate`
-
 |===
 end::authentication[]
 
@@ -1560,12 +1554,6 @@ tag::oauth2[]
 |Omit Authorization Request Parameters - parameter names provided here are omitted from OAuth2 authorization requests.
 |advanced `candidate`
 
-|authentication-oauth2.post-client-id-and-secret
-|bool
-|`false`
-|Send Client ID and Client Secret in the body of POST requests to the token endpoint. As per RFC 6749 section 2.3.1, this should only be used if the token endpoint does not support receiving these via Basic authentication.
-|advanced `candidate`
-
 |authentication-oauth2.oa2-expiration-override-seconds
 |int
 |

diff --git a/ios-sdk b/ios-sdk
diff --git a/ownCloud File Provider UI/DocumentActionViewController.swift b/ownCloud File Provider UI/DocumentActionViewController.swift
@@ -45,7 +45,6 @@ class DocumentActionViewController: FPUIActionExtensionViewController {
 		CollectionViewCellProvider.registerStandardImplementations()
 		CollectionViewSupplementaryCellProvider.registerStandardImplementations()
 
-		OCCoreManager.shared.memoryConfiguration = .minimum // Limit memory usage
 		OCHTTPPipelineManager.setupPersistentPipelines() // Set up HTTP pipelines
 
 		OCItem.registerIcons()

diff --git a/ownCloud File Provider/FileProviderExtension.m b/ownCloud File Provider/FileProviderExtension.m
@@ -64,8 +64,6 @@ - (instancetype)init
 
 	NSDictionary *bundleInfoDict = [[NSBundle bundleForClass:[FileProviderExtension class]] infoDictionary];
 
-	OCCoreManager.sharedCoreManager.memoryConfiguration = OCCoreMemoryConfigurationMinimum;
-
 	OCAppIdentity.sharedAppIdentity.appIdentifierPrefix = bundleInfoDict[@"OCAppIdentifierPrefix"];
 	OCAppIdentity.sharedAppIdentity.keychainAccessGroupIdentifier = bundleInfoDict[@"OCKeychainAccessGroupIdentifier"];
 	OCAppIdentity.sharedAppIdentity.appGroupIdentifier = bundleInfoDict[@"OCAppGroupIdentifier"];

diff --git a/ownCloud Share Extension/ShareExtensionViewController.swift b/ownCloud Share Extension/ShareExtensionViewController.swift
@@ -65,7 +65,6 @@ class ShareExtensionViewController: EmbeddingViewController, Themeable {
 		ShareExtensionViewController._servicesHaveBeenSetup = true
 
 		// Setup services
-		OCCoreManager.shared.memoryConfiguration = .minimum // Limit memory usage
 		OCHTTPPipelineManager.setupPersistentPipelines() // Set up HTTP pipelines
 
 		if AppLockManager.supportedOnDevice {
+2 −2		ownCloudSDK/Bookmark/OCBookmark+DataItem.m
+5 −0		ownCloudSDK/Bookmark/OCBookmark.h
+69 −5		ownCloudSDK/Bookmark/OCBookmark.m
+3 −3		ownCloudSDK/Connection/OCConnection+Upload.m
+2 −2		ownCloudSDK/Core/ItemList/OCCore+ItemList.m
+3 −8		ownCloudSDK/Core/OCCore.h
+6 −6		ownCloudSDK/Core/OCCore.m
+1 −1		ownCloudSDK/Core/Resources/Manager/OCResourceManager.h
+4 −4		ownCloudSDK/Core/Resources/Manager/OCResourceManager.m
+10 −0		ownCloudSDK/Platforms/OCPlatform.h
+31 −0		ownCloudSDK/Platforms/OCPlatform.m
+18 −0		ownCloudSDK/Resource Management/OCBookmarkManager.m
+0 −1		ownCloudSDK/Resource Management/OCCoreManager.h
+0 −23		ownCloudSDK/Resource Management/OCCoreManager.m
+31 −1		ownCloudSDK/Settings/OCClassSettings.m
+5 −5		ownCloudSDK/Vaults/Database/OCDatabase.m
+7 −1		ownCloudSDK/Vaults/Database/SQLite/OCSQLiteDB.m
+6 −0		ownCloudSDK/Vaults/OCVault.h
+14 −0		ownCloudSDK/Vaults/OCVault.m