release 12.4.0 (#1440)

* doc: add changelog items for 12.4.0

* - ownCloud project: update version and build number
- ReleaseNotes: add changes for v12.4
- THIRD_PARTY: fix typo, line with bad encoding and include better description of PLCrashReporter license

* - Xcode project: change version number from 12.4 to 12.4.0

* - ReleaseNotes: update version number from 12.4 to 12.4.0, too

* - ImportPasteboardAction:
	- add missing error handling and calls to OCCoreManager.returnCore
	- add comments
	- fix formatting
- NSURL+OCVaultTools: NSURL additions to simplify finding out if a file is located within the SDK/app vault storage - and if it is a local file (or something else, like a folder)
- OCCore+BundleImport:
	- make imports more straightforward and avoid file coordination if the file to import is a local file managed by the SDK/app
	- for imports outside the vault, use file coordination only for non-file types
	- add missing error handling in case file coordination fails

* - bump build number to 294

* - update SDK to include changes that greatly decrease memory consumption in minimum memory configuration

* - AppRootViewController: remove wording pointing to "Send Feedback" feature from beta warning
- Branding+App: remove default URL for sending feedback, so the stock client will no longer show that option
- include updated xcstrings files

* - bump build number

* - update ios-sdk to address finding (3) (lack of proper handling for 409 status code for direct uploads)

* - updated App Store release notes
- Changelog: Moved all changelog files from the unreleased folder to the new version folder

---------

Co-authored-by: Felix Schwarz <fs-git@iospirit.com>
Co-authored-by: Matthias Hühne <github@hosy.de>

Author: 3 people

THIRD_PARTY.txt

@@ -21,7 +21,7 @@
 ###########
 
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License verions 3,
+it under the terms of the GNU General Public License version 3,
 as published by the Free Software Foundation.
 
 This program is distributed in the hope that it will be useful,
@@ -77,13 +77,13 @@ The third party software included and used by this project is:
  *      PLCrashReporter
         Copyright (c) Microsoft Corporation.
         Copyright (c) 2008 - 2014 Plausible Labs Cooperative, Inc.
-        Licensed under proprietary license
+        Licensed under MIT, Apache License 2.0 (see license file)
         Placed as Swift package
         Original license document included at ownCloud/Resources/PLCrashReporter.LICENSE.
         See https://github.com/microsoft/plcrashreporter
 
  *      PocketSVG
-        Copyright (c) Ponderwell, Ariel Elkin, Fj�lnir �sgeirsson, and Contributors
+        Copyright (c) Ponderwell, Ariel Elkin, Fjölnir Ásgeirsson, and Contributors
         Licensed under MIT License.
         Placed as Swift package
         Original license document included at ownCloudAppShared/PocketSVG.LICENSE.

changelog/12.4.0_2025-02-03/1416

@@ -0,0 +1,6 @@
+Bugfix: Memory usage optimizations
+
+Memory optimizations specifically to the file provider to ensure stability.
+
+https://github.com/owncloud/ios-app/pull/1416
+https://github.com/owncloud/ios-sdk/pull/121

changelog/12.4.0_2025-02-03/1430

@@ -0,0 +1,7 @@
+Enhancement: Content Protection
+
+Content is protected by water marking and screenshot prevention mechanisms.
+Available via MDM and buils time settings.
+
+https://github.com/owncloud/ios-app/pull/1430
+

fastlane/metadata-emm/en-US/release_notes.txt

@@ -1,6 +1,6 @@
-• iOS 18
-The app is now compatible with iOS 18.
+• Confidential Protection
+Watermarking, screenshot protection and more are now available via MDM and branding.
 
-• General Improvements
-General app improvements and internal fixes to enhance performance, synchronization, and stability.
+• File Provider Memory Efficiency
+The File Provider is now more stable thanks to improved memory efficiency.
 

fastlane/metadata-owncloud-online/en-US/release_notes.txt

@@ -1,6 +1,6 @@
-• iOS 18
-The app is now compatible with iOS 18.
+• Confidential Protection
+Watermarking, screenshot protection and more are now available via MDM and branding.
 
-• General Improvements
-General app improvements and internal fixes to enhance performance, synchronization, and stability.
+• File Provider Memory Efficiency
+The File Provider is now more stable thanks to improved memory efficiency.
 

fastlane/metadata/en-US/release_notes.txt

@@ -1,6 +1,6 @@
-• iOS 18
-The app is now compatible with iOS 18.
+• Confidential Protection
+Watermarking, screenshot protection and more are now available via MDM and branding.
 
-• General Improvements
-General app improvements and internal fixes to enhance performance, synchronization, and stability.
+• File Provider Memory Efficiency
+The File Provider is now more stable thanks to improved memory efficiency.
 

ios-sdk

@@ -3,7 +3,6 @@
   "strings" : {
     "CFBundleDisplayName" : {
       "comment" : "Bundle display name",
-      "extractionState" : "extracted_with_value",
       "localizations" : {
         "cs" : {
           "stringUnit" : {
@@ -75,7 +74,6 @@
     },
     "CFBundleName" : {
       "comment" : "Bundle name",
-      "extractionState" : "extracted_with_value",
       "localizations" : {
         "cs" : {
           "stringUnit" : {
@@ -147,7 +145,6 @@
     },
     "NSHumanReadableCopyright" : {
       "comment" : "Copyright (human-readable)",
-      "extractionState" : "extracted_with_value",
       "localizations" : {
         "cs" : {
           "stringUnit" : {

ownCloud Action Extension/InfoPlist.xcstrings

@@ -3,7 +3,6 @@
   "strings" : {
     "CFBundleDisplayName" : {
       "comment" : "Bundle display name",
-      "extractionState" : "extracted_with_value",
       "localizations" : {
         "ar" : {
           "stringUnit" : {
@@ -123,7 +122,6 @@
     },
     "CFBundleName" : {
       "comment" : "Bundle name",
-      "extractionState" : "extracted_with_value",
       "localizations" : {
         "cs" : {
           "stringUnit" : {

ownCloud Share Extension/InfoPlist.xcstrings

@@ -149,6 +149,9 @@
 		DC0030C12350B1CE00BB8570 /* NSData+Encoding.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0030BF2350B1CE00BB8570 /* NSData+Encoding.m */; };
 		DC0030C22350B1CE00BB8570 /* NSData+Encoding.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0030C02350B1CE00BB8570 /* NSData+Encoding.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DC0030CB2350B75000BB8570 /* ScanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC1AC7CF2319ADAE002B7892 /* ScanViewController.swift */; };
+		DC0073EC2D4B893100C1C6F7 /* NSURL+OCVaultTools.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0073EB2D4B893100C1C6F7 /* NSURL+OCVaultTools.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DC0073ED2D4B893100C1C6F7 /* NSURL+OCVaultTools.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0073EA2D4B893100C1C6F7 /* NSURL+OCVaultTools.m */; };
+		DC0073F12D4B898100C1C6F7 /* NSURL+OCVaultTools.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0073EA2D4B893100C1C6F7 /* NSURL+OCVaultTools.m */; };
 		DC0196AB20F7690C00C41B78 /* OCBookmark+FileProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = DC27A1A420CBEF85008ACB6C /* OCBookmark+FileProvider.m */; };
 		DC01AF2128411D8400903101 /* ThemeableCollectionViewListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC01AF2028411D8400903101 /* ThemeableCollectionViewListCell.swift */; };
 		DC01CDCC212EDDF600FC8E38 /* TextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC01CDCB212EDDF600FC8E38 /* TextViewController.swift */; };
@@ -1182,6 +1185,8 @@
 		D0D9C062DD1E85A838608B0F /* EarlGrey.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EarlGrey.framework; path = Pods/EarlGrey/EarlGrey/EarlGrey.framework; sourceTree = SOURCE_ROOT; };
 		DC0030BF2350B1CE00BB8570 /* NSData+Encoding.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Encoding.m"; sourceTree = "<group>"; };
 		DC0030C02350B1CE00BB8570 /* NSData+Encoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+Encoding.h"; sourceTree = "<group>"; };
+		DC0073EA2D4B893100C1C6F7 /* NSURL+OCVaultTools.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSURL+OCVaultTools.m"; sourceTree = "<group>"; };
+		DC0073EB2D4B893100C1C6F7 /* NSURL+OCVaultTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSURL+OCVaultTools.h"; sourceTree = "<group>"; };
 		DC018F8B20A1060A00135198 /* ProgressHUDViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressHUDViewController.swift; sourceTree = "<group>"; };
 		DC01AF2028411D8400903101 /* ThemeableCollectionViewListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeableCollectionViewListCell.swift; sourceTree = "<group>"; };
 		DC01CDCB212EDDF600FC8E38 /* TextViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextViewController.swift; sourceTree = "<group>"; };
@@ -3196,6 +3201,8 @@
 				DCCD776A2604C81B00098573 /* NSDate+ComputedTimes.h */,
 				DC70398426128B89009F2DC1 /* NSString+ByteCountParser.m */,
 				DC70398326128B89009F2DC1 /* NSString+ByteCountParser.h */,
+				DC0073EA2D4B893100C1C6F7 /* NSURL+OCVaultTools.m */,
+				DC0073EB2D4B893100C1C6F7 /* NSURL+OCVaultTools.h */,
 			);
 			path = "Foundation Extensions";
 			sourceTree = "<group>";
@@ -3766,6 +3773,7 @@
 				DC3DDF07287E1C0E00E5586D /* UIViewController+HostBundleID.h in Headers */,
 				DCB330D629F07ECF00BFF393 /* UIImage+ViewProvider.h in Headers */,
 				DCFEFE39236877A7009A142F /* OCLicenseFeature.h in Headers */,
+				DC0073EC2D4B893100C1C6F7 /* NSURL+OCVaultTools.h in Headers */,
 				DC23D1DA238F391200423F62 /* OCLicenseAppStoreReceipt.h in Headers */,
 				DC24E0EA28B36A81002E4F5B /* OCSearchSegment.h in Headers */,
 				DC70398526128B89009F2DC1 /* NSString+ByteCountParser.h in Headers */,
@@ -4940,6 +4948,7 @@
 				DC24B29825BA2A34005783E2 /* Branding.m in Sources */,
 				DCFEFE3E236877B7009A142F /* OCLicenseProduct.m in Sources */,
 				DC774E6422F44E6D000B11A1 /* OCCore+BundleImport.m in Sources */,
+				DC0073ED2D4B893100C1C6F7 /* NSURL+OCVaultTools.m in Sources */,
 				DC6179E828E0578400C7C4E0 /* OCFileProviderSettings.m in Sources */,
 				DC8E99E3297E906700594697 /* OCLicenseQAProvider.m in Sources */,
 				DCF2DA7E24C835BF0026D790 /* OCVault+FPServices.m in Sources */,
@@ -5011,6 +5020,7 @@
 				DC1251E62C7470820040FBC6 /* Branding.m in Sources */,
 				DC2218CC2823329100808BCE /* FileProviderContentEnumerator.m in Sources */,
 				DC27A1E920CC56B0008ACB6C /* FileProviderExtensionThumbnailRequest.m in Sources */,
+				DC0073F12D4B898100C1C6F7 /* NSURL+OCVaultTools.m in Sources */,
 				DCF2DA7A24C82E480026D790 /* FileProviderServiceSource.m in Sources */,
 				DC2FB16A2D3EF4FD00726E97 /* ConfidentialManager.m in Sources */,
 				DC625141225C904700736874 /* NSError+MessageResolution.m in Sources */,
@@ -5263,8 +5273,8 @@
 				APP_BUILD_FLAGS = "$(inherited)";
 				APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
 				APP_PRODUCT_NAME = ownCloud;
-				APP_SHORT_VERSION = 12.3.1;
-				APP_VERSION = 292;
+				APP_SHORT_VERSION = 12.4.0;
+				APP_VERSION = 295;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -5334,8 +5344,8 @@
 				APP_BUILD_FLAGS = "$(inherited)";
 				APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
 				APP_PRODUCT_NAME = ownCloud;
-				APP_SHORT_VERSION = 12.3.1;
-				APP_VERSION = 292;
+				APP_SHORT_VERSION = 12.4.0;
+				APP_VERSION = 295;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

ownCloud.xcodeproj/project.pbxproj

@@ -267,7 +267,7 @@ open class AppRootViewController: EmbeddingViewController, BrowserNavigationView
 			let lastGitCommit = GitInfo.app.lastCommit,
 			(lastBetaWarningCommit == nil) || (lastBetaWarningCommit != lastGitCommit) {
 			// Beta warning has never been shown before - or has last been shown for a different release
-			let betaAlert = ThemedAlertController(with: OCLocalizedString("Beta Warning", nil), message: OCLocalizedString("\nThis is a BETA release that may - and likely will - still contain bugs.\n\nYOU SHOULD NOT USE THIS BETA VERSION WITH PRODUCTION SYSTEMS, PRODUCTION DATA OR DATA OF VALUE. YOU'RE USING THIS BETA AT YOUR OWN RISK.\n\nPlease let us know about any issues that come up via the \"Send Feedback\" option in the settings.", nil), okLabel: OCLocalizedString("Agree", nil)) {
+			let betaAlert = ThemedAlertController(with: OCLocalizedString("Beta Warning", nil), message: OCLocalizedString("\nThis is a BETA release that may - and likely will - still contain bugs.\n\nYOU SHOULD NOT USE THIS BETA VERSION WITH PRODUCTION SYSTEMS, PRODUCTION DATA OR DATA OF VALUE. YOU'RE USING THIS BETA AT YOUR OWN RISK.", nil), okLabel: OCLocalizedString("Agree", nil)) {
 				OCAppIdentity.shared.userDefaults?.set(lastGitCommit, forKey: "LastBetaWarningCommit")
 				OCAppIdentity.shared.userDefaults?.set(NSDate(), forKey: "LastBetaWarningAcceptDate")
 			}

ownCloud/App Controllers/AppRootViewController.swift

@@ -7,14 +7,14 @@
 //
 
 /*
-* Copyright (C) 2019, ownCloud GmbH.
-*
-* This code is covered by the GNU Public License Version 3.
-*
-* For distribution utilizing Apple mechanisms please see https://owncloud.org/contribute/iOS-license-exception/
-* You should have received a copy of this license along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.en.html>.
-*
-*/
+ * Copyright (C) 2019, ownCloud GmbH.
+ *
+ * This code is covered by the GNU Public License Version 3.
+ *
+ * For distribution utilizing Apple mechanisms please see https://owncloud.org/contribute/iOS-license-exception/
+ * You should have received a copy of this license along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.en.html>.
+ *
+ */
 
 import Foundation
 import ownCloudSDK
@@ -81,19 +81,20 @@ class ImportPasteboardAction : Action {
 		let generalPasteboard = UIPasteboard.general
 
 		if generalPasteboard.contains(pasteboardTypes: [ImportPasteboardAction.InternalPasteboardCopyKey, ImportPasteboardAction.InternalPasteboardCutKey]) {
-
+			// Internal pasteboard items
 			for item in generalPasteboard.itemProviders {
 				// Copy Items Internally
 				item.loadDataRepresentation(forTypeIdentifier: ImportPasteboardAction.InternalPasteboardCopyKey, completionHandler: { data, error in
-					if let data = data, let object = OCItemPasteboardValue.decode(data: data) {
+					if let data, let object = OCItemPasteboardValue.decode(data: data) {
 						guard let bookmarkUUID = object.bookmarkUUID,
 						      let item = object.item,
 						      let name = item.name
 						else {
-						      return
+							return
 						}
 
 						if core.bookmark.uuid.uuidString == bookmarkUUID {
+							// Copy within account
 							core.copy(item, to: rootItem, withName: name, options: nil, resultHandler: { (error, _, _, _) in
 								if error != nil {
 									self.completed(with: error)
@@ -103,31 +104,40 @@ class ImportPasteboardAction : Action {
 							// Move between Accounts
 							guard let sourceBookmark = OCBookmarkManager.shared.bookmark(forUUIDString: bookmarkUUID), let destinationItem = self.context.items.first else {return }
 
-								OCCoreManager.shared.requestCore(for: sourceBookmark, setup: nil) { (srcCore, error) in
-									if error == nil {
-										srcCore?.downloadItem(item, options: nil, resultHandler: { (error, _, srcItem, _) in
-											if error == nil, let srcItem = srcItem, let localURL = srcCore?.localCopy(of: srcItem) {
-												core.importItemNamed(srcItem.name, at: destinationItem, from: localURL, isSecurityScoped: false, options: nil, placeholderCompletionHandler: nil) { (_, _, _, _) in
-												}
-											}
-										})
-									}
+							// Request core from source account
+							OCCoreManager.shared.requestCore(for: sourceBookmark, setup: nil) { (srcCore, error) in
+								if error == nil {
+									// Download file from source account
+									srcCore?.downloadItem(item, options: nil, resultHandler: { (error, _, srcItem, _) in
+										if error == nil, let srcItem, let localURL = srcCore?.localCopy(of: srcItem) {
+											// Import local copy of file from source account
+											core.importItemNamed(srcItem.name, at: destinationItem, from: localURL, isSecurityScoped: false, options: nil, placeholderCompletionHandler: nil, resultHandler: { err, core, item, parameter in
+												// Release core of source account
+												OCCoreManager.shared.returnCore(for: sourceBookmark)
+											})
+										} else {
+											// Release core of source account
+											OCCoreManager.shared.returnCore(for: sourceBookmark)
+										}
+									})
 								}
+							}
 						}
 					}
 				})
 
 				// Cut Item Internally
 				item.loadDataRepresentation(forTypeIdentifier: ImportPasteboardAction.InternalPasteboardCutKey, completionHandler: { data, error in
-					if let data = data, let object = OCItemPasteboardValue.decode(data: data) {
+					if let data, let object = OCItemPasteboardValue.decode(data: data) {
 						guard let bookmarkUUID = object.bookmarkUUID,
 						      let item = object.item,
 						      let name = item.name
 						else {
-						      return
+							return
 						}
 
 						if core.bookmark.uuid.uuidString == bookmarkUUID {
+							// Move within same account
 							core.move(item, to: rootItem, withName: name, options: nil) { (error, _, _, _) in
 								if error != nil {
 									self.completed(with: error)
@@ -139,32 +149,44 @@ class ImportPasteboardAction : Action {
 							// Move between Accounts
 							guard let sourceBookmark = OCBookmarkManager.shared.bookmark(forUUIDString: bookmarkUUID), let destinationItem = self.context.items.first else {return }
 
-								OCCoreManager.shared.requestCore(for: sourceBookmark, setup: nil) { (srcCore, error) in
-									if error == nil {
-										srcCore?.downloadItem(item, options: nil, resultHandler: { (error, _, srcItem, _) in
-											if error == nil, let srcItem = srcItem, let localURL = srcCore?.localCopy(of: srcItem) {
-												core.importItemNamed(srcItem.name, at: destinationItem, from: localURL, isSecurityScoped: false, options: nil, placeholderCompletionHandler: nil) { (_, _, _, _) in
-
+							// Request a core from the source account
+							OCCoreManager.shared.requestCore(for: sourceBookmark, setup: nil) { (srcCore, error) in
+								if error == nil {
+									// Download item from source account
+									srcCore?.downloadItem(item, options: nil, resultHandler: { (error, _, srcItem, _) in
+										if error == nil, let srcItem, let localURL = srcCore?.localCopy(of: srcItem) {
+											// Import file into destination account
+											core.importItemNamed(srcItem.name, at: destinationItem, from: localURL, isSecurityScoped: false, options: nil, placeholderCompletionHandler: nil) {  err, core, importedItem, parameter in
+												if err == nil {
+													// Delete file from source account
 													srcCore?.delete(srcItem, requireMatch: true, resultHandler: { (error, _, _, _) in
-													   if error != nil {
-														   Log.log("Error \(String(describing: error)) deleting \(String(describing: item.path))")
-													} else {
-
-														generalPasteboard.items = []
-													}
-												   })
+														if error != nil {
+															Log.log("Error \(String(describing: error)) deleting \(String(describing: srcItem.path))")
+														} else {
+															generalPasteboard.items = []
+														}
+
+														// Return source account core
+														OCCoreManager.shared.returnCore(for: sourceBookmark)
+													})
+												} else {
+													// Return source account core
+													OCCoreManager.shared.returnCore(for: sourceBookmark)
 												}
 											}
-										})
-									}
+										} else {
+											// Return source account core
+											OCCoreManager.shared.returnCore(for: sourceBookmark)
+										}
+									})
 								}
+							}
 						}
 					}
 				})
 			}
 		} else {
 			// System-wide Pasteboard Items
-
 			for item in generalPasteboard.itemProviders {
 				let typeIdentifiers = item.registeredTypeIdentifiers
 				let preferredUTIs = [
@@ -231,9 +253,9 @@ class ImportPasteboardAction : Action {
 						fileName = url.lastPathComponent
 					}
 
-					guard let name = fileName else { return }
+					guard let fileName else { return }
 
-					self.upload(itemURL: url, rootItem: rootItem, name: name)
+					self.upload(itemURL: url, rootItem: rootItem, name: fileName)
 				}
 			}
 		}