Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feature/infinite-propfind] Infinite PROPFIND support #1002

Merged
merged 17 commits into from
Jan 18, 2022
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions doc/CONFIGURATION.json
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,33 @@
"status" : "supported",
"type" : "string"
},
{
"autoExpansion" : "none",
"category" : "Bookmarks",
"categoryTag" : "bookmarks",
"classIdentifier" : "bookmark",
"className" : "ownCloud.BookmarkViewController",
"description" : "Controls prepopulation of the local database with the full item set during account setup.",
"flatIdentifier" : "bookmark.prepopulation",
"key" : "prepopulation",
"label" : "bookmark.prepopulation",
"possibleValues" : [
{
"description" : "No prepopulation. Request the contents of every folder individually.",
"value" : "doNot"
},
{
"description" : "Parse the prepopulation metadata after receiving it as a whole.",
"value" : "split"
},
{
"description" : "Parse the prepopulation metadata while receiving it.",
"value" : "streaming"
}
],
"status" : "supported",
"type" : "string"
},
{
"autoExpansion" : "none",
"category" : "Bookmarks",
Expand Down
21 changes: 21 additions & 0 deletions docs/modules/ROOT/pages/ios_mdm_tables.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,27 @@ tag::bookmarks[]
|The default URL for the creation of new bookmarks.
|supported `candidate`

|bookmark.prepopulation
|string
|
|Controls prepopulation of the local database with the full item set during account setup.
[cols="1,2"]
!===
! Value
! Description
! `doNot`
! No prepopulation. Request the contents of every folder individually.

! `split`
! Parse the prepopulation metadata after receiving it as a whole.

! `streaming`
! Parse the prepopulation metadata while receiving it.

!===

|supported `candidate`

|bookmark.url-editable
|bool
|`true`
Expand Down
2 changes: 1 addition & 1 deletion ownCloud Share Extension/ShareViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ class ShareViewController: MoreStaticTableViewController {
OnMainThread {
self.navigationController?.popToViewController(self, animated: false)

let progressViewController = ProgressIndicatorViewController(initialProgressLabel: "Preparing…".localized, cancelHandler: {})
let progressViewController = ProgressIndicatorViewController(initialProgressLabel: "Preparing…".localized, progress: nil, cancelHandler: {})

self.present(progressViewController, animated: false)

Expand Down
24 changes: 12 additions & 12 deletions ownCloud.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -4730,8 +4730,8 @@
APP_BUILD_FLAGS = "$(inherited)";
APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
APP_PRODUCT_NAME = ownCloud;
APP_SHORT_VERSION = 11.8.0;
APP_VERSION = 202;
APP_SHORT_VERSION = 11.8.1;
APP_VERSION = 203;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down Expand Up @@ -4799,8 +4799,8 @@
APP_BUILD_FLAGS = "$(inherited)";
APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
APP_PRODUCT_NAME = ownCloud;
APP_SHORT_VERSION = 11.8.0;
APP_VERSION = 202;
APP_SHORT_VERSION = 11.8.1;
APP_VERSION = 203;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down Expand Up @@ -4863,8 +4863,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
APP_SHORT_VERSION = 11.8.0;
APP_VERSION = 202;
APP_SHORT_VERSION = 11.8.1;
APP_VERSION = 203;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = ownCloud/ownCloud.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
Expand Down Expand Up @@ -4897,8 +4897,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
APP_SHORT_VERSION = 11.8.0;
APP_VERSION = 202;
APP_SHORT_VERSION = 11.8.1;
APP_VERSION = 203;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = ownCloud/ownCloud.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
Expand Down Expand Up @@ -5255,8 +5255,8 @@
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
APP_SHORT_VERSION = 11.8.0;
APP_VERSION = 202;
APP_SHORT_VERSION = 11.8.1;
APP_VERSION = 203;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
Expand Down Expand Up @@ -5299,8 +5299,8 @@
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
APP_SHORT_VERSION = 11.8.0;
APP_VERSION = 202;
APP_SHORT_VERSION = 11.8.1;
APP_VERSION = 203;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
Expand Down
12 changes: 11 additions & 1 deletion ownCloud.xcodeproj/xcshareddata/xcschemes/ownCloud.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
<EnvironmentVariable
key = "oc:log.enabled-components"
value = "[writer.stderr,writer.file,option.log-requests-and-responses]"
isEnabled = "YES">
isEnabled = "NO">
</EnvironmentVariable>
<EnvironmentVariable
key = "oc:log.colored"
Expand Down Expand Up @@ -335,6 +335,16 @@
value = "[com.owncloud.action.copy,com.owncloud.action.move]"
isEnabled = "NO">
</EnvironmentVariable>
<EnvironmentVariable
key = "oc:bookmark.prepopulation"
value = "string:streaming"
isEnabled = "NO">
</EnvironmentVariable>
<EnvironmentVariable
key = "oc:bookmark.prepopulation"
value = "string:split"
isEnabled = "NO">
</EnvironmentVariable>
<EnvironmentVariable
key = "oc:branding.disabled-import-methods"
value = "[share-extension,open-with,file-provider]"
Expand Down
Loading