- ShareViewController: add support for new "block password removal" c…

…apabilities
owncloud · Feb 5, 2025 · 5f702e5 · 5f702e5
1 parent cbde29b
commit 5f702e5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/ios-sdk b/ios-sdk
diff --git a/ownCloudAppShared/Client/Sharing/ShareViewController.swift b/ownCloudAppShared/Client/Sharing/ShareViewController.swift
@@ -610,17 +610,33 @@ open class ShareViewController: CollectionViewController, SearchViewControllerDe
 			   permissions?.contains(.delete) == true && (
 				permissions?.contains(.create) == true ||
 				permissions?.contains(.update) == true) {
+				// Read/Write/Delete
+				if mode == .edit {
+					return capabilities.publicSharingPasswordBlockRemovalForReadWriteDelete == true
+				}
 				return capabilities.publicSharingPasswordEnforcedForReadWriteDelete == true
 			}
 			if permissions?.contains(.read) == true && (
 				permissions?.contains(.create) == true ||
 				permissions?.contains(.update) == true) {
+				// Read/Write
+				if mode == .edit {
+					return capabilities.publicSharingPasswordBlockRemovalForReadWrite == true
+				}
 				return capabilities.publicSharingPasswordEnforcedForReadWrite == true
 			}
 			if permissions?.contains(.create) == true {
+				// Upload only
+				if mode == .edit {
+					return capabilities.publicSharingPasswordBlockRemovalForUploadOnly == true
+				}
 				return capabilities.publicSharingPasswordEnforcedForUploadOnly == true
 			}
 			if permissions?.contains(.read) == true {
+				// Read only
+				if mode == .edit {
+					return capabilities.publicSharingPasswordBlockRemovalForReadOnly == true
+				}
 				return capabilities.publicSharingPasswordEnforcedForReadOnly == true
 			}
 		}
+5 −0		ownCloudSDK/Connection/Capabilities/OCCapabilities.h
+27 −0		ownCloudSDK/Connection/Capabilities/OCCapabilities.m
+61 −1		ownCloudSDK/Resources/Localizable.xcstrings