diff --git a/.xcode-version b/.xcode-version
index 2b4b4d7cb..c3d10c59d 100644
--- a/.xcode-version
+++ b/.xcode-version
@@ -1 +1 @@
-12.5.1
+13.3.1
diff --git a/changelog/11.10.0_2022-05-16/1066 b/changelog/11.10.0_2022-05-16/1066
new file mode 100644
index 000000000..5208206de
--- /dev/null
+++ b/changelog/11.10.0_2022-05-16/1066
@@ -0,0 +1,5 @@
+Bugfix: iOS 15 SDK
+
+After upgrading to iOS 15 SDK some UI fixes were needed.
+
+https://github.com/owncloud/ios-app/issue/1066
diff --git a/changelog/11.10.0_2022-05-16/1114 b/changelog/11.10.0_2022-05-16/1114
new file mode 100644
index 000000000..e52a8c1c9
--- /dev/null
+++ b/changelog/11.10.0_2022-05-16/1114
@@ -0,0 +1,5 @@
+Bugfix: EMM Shortcuts Licensing
+
+If app was build as EMM version, the app shown an licensing error, when running shortcut intents.
+
+https://github.com/owncloud/ios-app/issue/1114
diff --git a/changelog/11.10.0_2022-05-16/1116 b/changelog/11.10.0_2022-05-16/1116
new file mode 100644
index 000000000..510d7303f
--- /dev/null
+++ b/changelog/11.10.0_2022-05-16/1116
@@ -0,0 +1,5 @@
+Change: Migration to OpenSSL 1.1.0
+
+Migrated code to OpenSSL 1.1.1 API.
+
+https://github.com/owncloud/ios-app/pull/1116
diff --git a/changelog/11.10.0_2022-05-16/1119 b/changelog/11.10.0_2022-05-16/1119
new file mode 100644
index 000000000..f0a286103
--- /dev/null
+++ b/changelog/11.10.0_2022-05-16/1119
@@ -0,0 +1,5 @@
+Bugfix: Increased Timeout for Copy Action
+
+Increased HTTP request timeout for COPY actions from 1 minute to 10 minutes and improved error handling for request timeouts.
+
+https://github.com/owncloud/ios-app/issue/1119
diff --git a/changelog/11.10.0_2022-05-16/1123 b/changelog/11.10.0_2022-05-16/1123
new file mode 100644
index 000000000..10f4444b5
--- /dev/null
+++ b/changelog/11.10.0_2022-05-16/1123
@@ -0,0 +1,5 @@
+Bugfix: Shortcuts Action Delete Path Item
+
+The shortcuts action Delete Path Item did not provided configured accounts.
+
+https://github.com/owncloud/ios-app/issue/1123
diff --git a/fastlane/README.md b/fastlane/README.md
index fc497b33b..9cd0e4ebe 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -1,99 +1,144 @@
fastlane documentation
-================
+----
+
# Installation
Make sure you have the latest version of the Xcode command line tools installed:
-```
+```sh
xcode-select --install
```
-Install _fastlane_ using
-```
-[sudo] gem install fastlane -NV
-```
-or alternatively using `brew install fastlane`
+For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
# Available Actions
+
## iOS
+
### ios beta
+
+```sh
+[bundle exec] fastlane ios beta
```
-fastlane ios beta
-```
+
Push a new beta build to TestFlight
+
### ios register_new_devices
+
+```sh
+[bundle exec] fastlane ios register_new_devices
```
-fastlane ios register_new_devices
-```
+
Register new devices to Apple portal
+
### ios build_ipa_ad_hoc
+
+```sh
+[bundle exec] fastlane ios build_ipa_ad_hoc
```
-fastlane ios build_ipa_ad_hoc
-```
+
Ad-Hoc Distribution IPA generation
+
### ios screenshots
+
+```sh
+[bundle exec] fastlane ios screenshots
```
-fastlane ios screenshots
-```
+
Generate the screenshots for the AppStore
+
### ios prepare_metadata
+
+```sh
+[bundle exec] fastlane ios prepare_metadata
```
-fastlane ios prepare_metadata
-```
+
Create Metadata Release Notes, Screenshots and push to git
+
### ios release_on_appstore
+
+```sh
+[bundle exec] fastlane ios release_on_appstore
```
-fastlane ios release_on_appstore
-```
+
Create Release Notes, Screenshots, Build, Upload of regular iOS App and EMM App
+
### ios owncloud_regular_build
+
+```sh
+[bundle exec] fastlane ios owncloud_regular_build
```
-fastlane ios owncloud_regular_build
-```
+
+
### ios owncloud_emm_build
+
+```sh
+[bundle exec] fastlane ios owncloud_emm_build
```
-fastlane ios owncloud_emm_build
-```
+
+
### ios owncloud_online_build
+
+```sh
+[bundle exec] fastlane ios owncloud_online_build
```
-fastlane ios owncloud_online_build
-```
+
+
### ios owncloud_branding_adhoc_build
+
+```sh
+[bundle exec] fastlane ios owncloud_branding_adhoc_build
```
-fastlane ios owncloud_branding_adhoc_build
-```
+
+
### ios owncloud_branding_appstore_build
+
+```sh
+[bundle exec] fastlane ios owncloud_branding_appstore_build
```
-fastlane ios owncloud_branding_appstore_build
-```
+
+
### ios owncloud_ownbrander_build
+
+```sh
+[bundle exec] fastlane ios owncloud_ownbrander_build
```
-fastlane ios owncloud_ownbrander_build
-```
+
+
### ios owncloud_enterprise_build
+
+```sh
+[bundle exec] fastlane ios owncloud_enterprise_build
```
-fastlane ios owncloud_enterprise_build
-```
+
+
### ios generate_appicon
+
+```sh
+[bundle exec] fastlane ios generate_appicon
```
-fastlane ios generate_appicon
-```
+
+
### ios build_ipa_in_house
+
+```sh
+[bundle exec] fastlane ios build_ipa_in_house
```
-fastlane ios build_ipa_in_house
-```
+
In-House Enterprise IPA generation
----
This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
-More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
-The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
+
+More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
+
+The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
diff --git a/fastlane/metadata-emm/en-US/release_notes.txt b/fastlane/metadata-emm/en-US/release_notes.txt
index c5fff08a7..5da11c0dc 100644
--- a/fastlane/metadata-emm/en-US/release_notes.txt
+++ b/fastlane/metadata-emm/en-US/release_notes.txt
@@ -1,6 +1,9 @@
-• Faster Account Scan
-We improved the time for the initial scan after setting up a new account
+• UI fixes on iOS 15
+This version fixes some UI problems on iOS 15.
-• Biometrical Authentication Button
-Improvements when setting up a passcode with biometrical unlock
+• Shortcuts Action
+The shortcuts action Delete Path Item did not provided configured accounts.
+
+• Increased Timeout for Copy Action
+Timeout for Copy Action was increased up to 10 minutes.
diff --git a/fastlane/metadata-owncloud-online/en-US/release_notes.txt b/fastlane/metadata-owncloud-online/en-US/release_notes.txt
index c5fff08a7..5da11c0dc 100644
--- a/fastlane/metadata-owncloud-online/en-US/release_notes.txt
+++ b/fastlane/metadata-owncloud-online/en-US/release_notes.txt
@@ -1,6 +1,9 @@
-• Faster Account Scan
-We improved the time for the initial scan after setting up a new account
+• UI fixes on iOS 15
+This version fixes some UI problems on iOS 15.
-• Biometrical Authentication Button
-Improvements when setting up a passcode with biometrical unlock
+• Shortcuts Action
+The shortcuts action Delete Path Item did not provided configured accounts.
+
+• Increased Timeout for Copy Action
+Timeout for Copy Action was increased up to 10 minutes.
diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt
index c5fff08a7..5da11c0dc 100644
--- a/fastlane/metadata/en-US/release_notes.txt
+++ b/fastlane/metadata/en-US/release_notes.txt
@@ -1,6 +1,9 @@
-• Faster Account Scan
-We improved the time for the initial scan after setting up a new account
+• UI fixes on iOS 15
+This version fixes some UI problems on iOS 15.
-• Biometrical Authentication Button
-Improvements when setting up a passcode with biometrical unlock
+• Shortcuts Action
+The shortcuts action Delete Path Item did not provided configured accounts.
+
+• Increased Timeout for Copy Action
+Timeout for Copy Action was increased up to 10 minutes.
diff --git a/ios-sdk b/ios-sdk
index d2fa23526..6bcd960e1 160000
--- a/ios-sdk
+++ b/ios-sdk
@@ -1 +1 @@
-Subproject commit d2fa23526c6981d0ba53cc2e801424f6f532db8d
+Subproject commit 6bcd960e12f6beddddd0afea5027fd11281afc72
diff --git a/ownCloud Intents/Base.lproj/Intents.intentdefinition b/ownCloud Intents/Base.lproj/Intents.intentdefinition
index 024b80fc0..89d555c95 100644
--- a/ownCloud Intents/Base.lproj/Intents.intentdefinition
+++ b/ownCloud Intents/Base.lproj/Intents.intentdefinition
@@ -126,11 +126,11 @@
INIntentDefinitionNamespace
K5U8aR
INIntentDefinitionSystemVersion
- 21A559
+ 21E230
INIntentDefinitionToolsBuildVersion
- 13A233
+ 13E113
INIntentDefinitionToolsVersion
- 13.0
+ 13.3
INIntents
@@ -2358,6 +2358,8 @@
INIntentParameterConfigurable
+ INIntentParameterCustomDisambiguation
+
INIntentParameterDisplayName
Path
INIntentParameterDisplayNameID
@@ -2441,6 +2443,8 @@
Confirmation
+ INIntentParameterSupportsDynamicEnumeration
+
INIntentParameterSupportsResolution
INIntentParameterTag
diff --git a/ownCloud.xcodeproj/project.pbxproj b/ownCloud.xcodeproj/project.pbxproj
index 3d4d004b6..496ac4819 100644
--- a/ownCloud.xcodeproj/project.pbxproj
+++ b/ownCloud.xcodeproj/project.pbxproj
@@ -49,6 +49,7 @@
391C79AE24E187C400CB6333 /* LegacyCredentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02F2890F24BFAF0100E3D35C /* LegacyCredentials.swift */; };
392378FF24EBD1A1006E86DE /* branding-splashscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 39F48A6624D848550000E3F9 /* branding-splashscreen.png */; };
3923790524EBD1A5006E86DE /* branding-splashscreen-background.png in Resources */ = {isa = PBXBuildFile; fileRef = 39F48A6724D848550000E3F9 /* branding-splashscreen-background.png */; };
+ 3924AB5827FC6A270055DC8A /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = 3924AB5727FC6A270055DC8A /* OpenSSL */; };
39265BB223D9987500B0C4CA /* MediaEditingAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39265BB123D9987500B0C4CA /* MediaEditingAction.swift */; };
392CFEB72705831700631D2B /* LAContext+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392CFEB62705831700631D2B /* LAContext+Extension.swift */; };
392DDAE624C8923B009E5406 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 233BDEA6204FEFE500C06732 /* Assets.xcassets */; };
@@ -106,7 +107,6 @@
39BF674C25E7FE020039663F /* CancelLabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39BF674B25E7FE020039663F /* CancelLabelViewController.swift */; };
39BF67B225E804DF0039663F /* ownCloudUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2393697C2076110900BCE21A /* ownCloudUI.framework */; };
39BF67B325E804EF0039663F /* ownCloudSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 239369782076110900BCE21A /* ownCloudSDK.framework */; };
- 39BF67B425E804FB0039663F /* openssl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2347445E2076138000859C93 /* openssl.framework */; };
39BF684D25E8E2DD0039663F /* ownCloudAppShared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 394A0AF922EEFC2C00603813 /* ownCloudAppShared.framework */; };
39CC8AE6228C12100020253B /* Array+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39CC8AE5228C12100020253B /* Array+Extension.swift */; };
39CD755423D8392D00193950 /* EditDocumentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39CD755323D8392D00193950 /* EditDocumentViewController.swift */; };
@@ -306,12 +306,9 @@
DC36885824DC98BF00333600 /* OCFileProviderServiceSession.h in Headers */ = {isa = PBXBuildFile; fileRef = DC36885624DC98BF00333600 /* OCFileProviderServiceSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
DC36885924DC98BF00333600 /* OCFileProviderServiceSession.m in Sources */ = {isa = PBXBuildFile; fileRef = DC36885724DC98BF00333600 /* OCFileProviderServiceSession.m */; };
DC36885D24DD916800333600 /* ownCloudApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC0855C2293F1FD008CC05C /* ownCloudApp.framework */; };
- DC36885E24DD917400333600 /* openssl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2347445E2076138000859C93 /* openssl.framework */; };
DC36885F24DD917900333600 /* ownCloudUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2393697C2076110900BCE21A /* ownCloudUI.framework */; };
DC36886224DDA9AB00333600 /* ProgressIndicatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC36886024DDA3C300333600 /* ProgressIndicatorViewController.swift */; };
- DC3BE0D72077BC5D002A0AC0 /* openssl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2347445E2076138000859C93 /* openssl.framework */; };
DC3BE0D82077BC5D002A0AC0 /* ownCloudSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 239369782076110900BCE21A /* ownCloudSDK.framework */; };
- DC3BE0D92077BC6B002A0AC0 /* openssl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 2347445E2076138000859C93 /* openssl.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
DC3BE0DA2077BC6B002A0AC0 /* ownCloudSDK.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 239369782076110900BCE21A /* ownCloudSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
DC3BE0DF2077CC14002A0AC0 /* ClientRootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC3BE0DD2077CC13002A0AC0 /* ClientRootViewController.swift */; };
DC3DEC7B22AFA1F000F3352D /* DownloadItemsHUDViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC3DEC7A22AFA1F000F3352D /* DownloadItemsHUDViewController.swift */; };
@@ -361,7 +358,6 @@
DC85572C20513B8C00189B9A /* ServerListTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC85572A20513B8C00189B9A /* ServerListTableViewController.swift */; };
DC85572D20513B8C00189B9A /* ServerListTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DC85572B20513B8C00189B9A /* ServerListTableViewController.xib */; };
DC869A592153B1F60088977E /* OCMockingManager+SwiftTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC869A582153B1F60088977E /* OCMockingManager+SwiftTools.swift */; };
- DC8EB26C23927FDD009148F9 /* openssl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2347445E2076138000859C93 /* openssl.framework */; };
DC8EB271239308E5009148F9 /* LicenseOffersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC8EB270239308E5009148F9 /* LicenseOffersViewController.swift */; };
DC973BBE24A28ED0001DEEC4 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCEC3DE3242F665D0076B43C /* CoreServices.framework */; };
DC98BBCB20FF815C00F4ED3E /* NSNumber+OCSyncAnchorData.m in Sources */ = {isa = PBXBuildFile; fileRef = DC98BBCA20FF815C00F4ED3E /* NSNumber+OCSyncAnchorData.m */; };
@@ -540,13 +536,6 @@
remoteGlobalIDString = 233BDE9B204FEFE500C06732;
remoteInfo = ownCloud;
};
- 2347445D2076138000859C93 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = DCD344AF205BD0FA00189B9A /* openssl.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = DC30949D205749EA00189B9A;
- remoteInfo = openssl;
- };
239369772076110900BCE21A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 233BDEBF204FEFF300C06732 /* ownCloudSDK.xcodeproj */;
@@ -687,13 +676,6 @@
remoteGlobalIDString = DCC8F9AA202852A200EB6701;
remoteInfo = ownCloudSDK;
};
- DC3BE0CC2077BC52002A0AC0 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = DCD344AF205BD0FA00189B9A /* openssl.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = DC30949C205749EA00189B9A;
- remoteInfo = openssl;
- };
DC3BE0CE2077BC52002A0AC0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 233BDEBF204FEFF300C06732 /* ownCloudSDK.xcodeproj */;
@@ -722,13 +704,6 @@
remoteGlobalIDString = DCE93FE221FCA42C000E14F2;
remoteInfo = libzip;
};
- DC8EB26D23927FE7009148F9 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = DCD344AF205BD0FA00189B9A /* openssl.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = DC30949C205749EA00189B9A;
- remoteInfo = openssl;
- };
DCB2C058250C1C3F001083CA /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 233BDE94204FEFE500C06732 /* Project object */;
@@ -876,7 +851,6 @@
394A0B0122EEFC2C00603813 /* ownCloudAppShared.framework in Copy Frameworks */,
DCC085722293F1FD008CC05C /* ownCloudApp.framework in Copy Frameworks */,
DCFBAD0C21BE67A100943F76 /* ownCloudUI.framework in Copy Frameworks */,
- DC3BE0D92077BC6B002A0AC0 /* openssl.framework in Copy Frameworks */,
DC3BE0DA2077BC6B002A0AC0 /* ownCloudSDK.framework in Copy Frameworks */,
);
name = "Copy Frameworks";
@@ -1401,7 +1375,6 @@
DCD1301023A23F4E00255779 /* OCLicenseManager+AppStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OCLicenseManager+AppStore.swift"; sourceTree = ""; };
DCD2D40522F06ECA0071FB8F /* DataSettingsSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataSettingsSection.swift; sourceTree = ""; };
DCD344A5205BD0C000189B9A /* openssl.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = openssl.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- DCD344AF205BD0FA00189B9A /* openssl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openssl.xcodeproj; path = "ios-sdk/ownCloudUI/openssl/framework/openssl.xcodeproj"; sourceTree = ""; };
DCD71E7C2742745D001592C6 /* BuildOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BuildOptions.h; sourceTree = ""; };
DCD71E7D2742745D001592C6 /* BuildOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BuildOptions.m; sourceTree = ""; };
DCD810922398492C003B0053 /* OCLicenseDuration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCLicenseDuration.h; sourceTree = ""; };
@@ -1505,8 +1478,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 3924AB5827FC6A270055DC8A /* OpenSSL in Frameworks */,
024F3A2124A3AB410083E11E /* CrashReporter in Frameworks */,
- DC3BE0D72077BC5D002A0AC0 /* openssl.framework in Frameworks */,
394A0B0022EEFC2C00603813 /* ownCloudAppShared.framework in Frameworks */,
DC3BE0D82077BC5D002A0AC0 /* ownCloudSDK.framework in Frameworks */,
DC080CF1238C8D850044C5D2 /* StoreKit.framework in Frameworks */,
@@ -1551,7 +1524,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 39BF67B425E804FB0039663F /* openssl.framework in Frameworks */,
39DC7CF425C305E80001E08C /* ownCloudAppShared.framework in Frameworks */,
39DC7CE725C305E40001E08C /* ownCloudApp.framework in Frameworks */,
39BF67B225E804DF0039663F /* ownCloudUI.framework in Frameworks */,
@@ -1583,7 +1555,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- DC8EB26C23927FDD009148F9 /* openssl.framework in Frameworks */,
DC774E6822F44F6A000B11A1 /* libzip.framework in Frameworks */,
DCC0857B2293F29F008CC05C /* ownCloudSDK.framework in Frameworks */,
);
@@ -1613,7 +1584,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- DC36885E24DD917400333600 /* openssl.framework in Frameworks */,
DC36885D24DD916800333600 /* ownCloudApp.framework in Frameworks */,
DC36885F24DD917900333600 /* ownCloudUI.framework in Frameworks */,
DCE4E48024C1F58D0051722F /* ownCloudSDK.framework in Frameworks */,
@@ -1648,7 +1618,6 @@
isa = PBXGroup;
children = (
DC9BFBB220A19AF3007064B5 /* doc */,
- DCD344AF205BD0FA00189B9A /* openssl.xcodeproj */,
233BDEBF204FEFF300C06732 /* ownCloudSDK.xcodeproj */,
233BDE9E204FEFE500C06732 /* ownCloud */,
DC7DBA10207F59C500E7337D /* External */,
@@ -1734,14 +1703,6 @@
path = ownCloudTests;
sourceTree = "";
};
- 2347445A2076138000859C93 /* Products */ = {
- isa = PBXGroup;
- children = (
- 2347445E2076138000859C93 /* openssl.framework */,
- );
- name = Products;
- sourceTree = "";
- };
2366821521144DCD0045EF72 /* Card Presentation Controller */ = {
isa = PBXGroup;
children = (
@@ -3256,7 +3217,6 @@
);
dependencies = (
DC63207D21FCA71B007EC0A8 /* PBXTargetDependency */,
- DC3BE0CD2077BC52002A0AC0 /* PBXTargetDependency */,
DC3BE0CF2077BC52002A0AC0 /* PBXTargetDependency */,
DC3BE0D12077BC52002A0AC0 /* PBXTargetDependency */,
DCC6566420C9B7E400110A97 /* PBXTargetDependency */,
@@ -3270,6 +3230,7 @@
name = ownCloud;
packageProductDependencies = (
024F3A2024A3AB410083E11E /* CrashReporter */,
+ 3924AB5727FC6A270055DC8A /* OpenSSL */,
);
productName = ownCloud;
productReference = 233BDE9C204FEFE500C06732 /* ownCloud.app */;
@@ -3415,7 +3376,6 @@
buildRules = (
);
dependencies = (
- DC8EB26E23927FE7009148F9 /* PBXTargetDependency */,
DC774E6722F44F65000B11A1 /* PBXTargetDependency */,
DCC0857A2293F296008CC05C /* PBXTargetDependency */,
);
@@ -3593,6 +3553,7 @@
packageReferences = (
024F3A1F24A3AB410083E11E /* XCRemoteSwiftPackageReference "plcrashreporter" */,
DC049197258CAF8200DEDC27 /* XCRemoteSwiftPackageReference "PocketSVG" */,
+ 3924AB5627FC6A270055DC8A /* XCRemoteSwiftPackageReference "OpenSSL" */,
);
productRefGroup = 233BDE9D204FEFE500C06732 /* Products */;
projectDirPath = "";
@@ -3601,10 +3562,6 @@
ProductGroup = DCE93FEF21FCA434000E14F2 /* Products */;
ProjectRef = DCE93FEE21FCA434000E14F2 /* libzip.xcodeproj */;
},
- {
- ProductGroup = 2347445A2076138000859C93 /* Products */;
- ProjectRef = DCD344AF205BD0FA00189B9A /* openssl.xcodeproj */;
- },
{
ProductGroup = 239369712076110900BCE21A /* Products */;
ProjectRef = 233BDEBF204FEFF300C06732 /* ownCloudSDK.xcodeproj */;
@@ -3628,13 +3585,6 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- 2347445E2076138000859C93 /* openssl.framework */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.framework;
- path = openssl.framework;
- remoteRef = 2347445D2076138000859C93 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
239369782076110900BCE21A /* ownCloudSDK.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
@@ -4484,11 +4434,6 @@
name = ownCloudSDK;
targetProxy = DC27A19220CAA0C6008ACB6C /* PBXContainerItemProxy */;
};
- DC3BE0CD2077BC52002A0AC0 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = openssl;
- targetProxy = DC3BE0CC2077BC52002A0AC0 /* PBXContainerItemProxy */;
- };
DC3BE0CF2077BC52002A0AC0 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = ownCloudSDK;
@@ -4509,11 +4454,6 @@
name = libzip;
targetProxy = DC774E6622F44F65000B11A1 /* PBXContainerItemProxy */;
};
- DC8EB26E23927FE7009148F9 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = openssl;
- targetProxy = DC8EB26D23927FE7009148F9 /* PBXContainerItemProxy */;
- };
DCB2C059250C1C3F001083CA /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DCC0855B2293F1FD008CC05C /* ownCloudApp */;
@@ -4730,8 +4670,8 @@
APP_BUILD_FLAGS = "$(inherited)";
APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
APP_PRODUCT_NAME = ownCloud;
- APP_SHORT_VERSION = 11.9.1;
- APP_VERSION = 213;
+ APP_SHORT_VERSION = 11.10.0;
+ APP_VERSION = 217;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -4799,8 +4739,8 @@
APP_BUILD_FLAGS = "$(inherited)";
APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
APP_PRODUCT_NAME = ownCloud;
- APP_SHORT_VERSION = 11.9.1;
- APP_VERSION = 213;
+ APP_SHORT_VERSION = 11.10.0;
+ APP_VERSION = 217;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -5606,6 +5546,14 @@
minimumVersion = 1.7.0;
};
};
+ 3924AB5627FC6A270055DC8A /* XCRemoteSwiftPackageReference "OpenSSL" */ = {
+ isa = XCRemoteSwiftPackageReference;
+ repositoryURL = "https://github.com/krzyzanowskim/OpenSSL.git";
+ requirement = {
+ kind = upToNextMajorVersion;
+ minimumVersion = 1.1.180;
+ };
+ };
DC049197258CAF8200DEDC27 /* XCRemoteSwiftPackageReference "PocketSVG" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pocketsvg/PocketSVG.git";
@@ -5627,6 +5575,11 @@
package = 024F3A1F24A3AB410083E11E /* XCRemoteSwiftPackageReference "plcrashreporter" */;
productName = CrashReporter;
};
+ 3924AB5727FC6A270055DC8A /* OpenSSL */ = {
+ isa = XCSwiftPackageProductDependency;
+ package = 3924AB5627FC6A270055DC8A /* XCRemoteSwiftPackageReference "OpenSSL" */;
+ productName = OpenSSL;
+ };
DC0491A9258CAF9800DEDC27 /* PocketSVG */ = {
isa = XCSwiftPackageProductDependency;
package = DC049197258CAF8200DEDC27 /* XCRemoteSwiftPackageReference "PocketSVG" */;
diff --git a/ownCloud.xcodeproj/xcshareddata/xcschemes/ownCloud.xcscheme b/ownCloud.xcodeproj/xcshareddata/xcschemes/ownCloud.xcscheme
index b6809e148..e0dd390a7 100644
--- a/ownCloud.xcodeproj/xcshareddata/xcschemes/ownCloud.xcscheme
+++ b/ownCloud.xcodeproj/xcshareddata/xcschemes/ownCloud.xcscheme
@@ -310,6 +310,11 @@
value = "[auth-race-condition]"
isEnabled = "NO">
+
+
+
+ Version
+ 11.10.0
+ ReleaseNotes
+
+
+ Title
+ UI fixes on iOS 15
+ Subtitle
+ This version fixes some UI problems on iOS 15.
+ Type
+ Fix
+ ImageName
+ wrench
+
+
+ Title
+ Shortcuts Action
+ Subtitle
+ The shortcuts action Delete Path Item did not provide configured accounts.
+ Type
+ Fix
+ ImageName
+ wrench
+
+
+ Title
+ Increased Timeout for Copy Action
+ Subtitle
+ Timeout for Copy Action was increased up to 10 minutes.
+ Type
+ Fix
+ ImageName
+ wrench
+
+
+
diff --git a/ownCloudAppFramework/Licensing/Providers/EMM/OCLicenseEMMProvider.m b/ownCloudAppFramework/Licensing/Providers/EMM/OCLicenseEMMProvider.m
index 9ff649dff..3fd080a54 100644
--- a/ownCloudAppFramework/Licensing/Providers/EMM/OCLicenseEMMProvider.m
+++ b/ownCloudAppFramework/Licensing/Providers/EMM/OCLicenseEMMProvider.m
@@ -32,12 +32,26 @@ - (instancetype)initWithUnlockedProductIdentifiers:(NSArray