[milestone/12.0.2] Milestone 12.0.2 (#1230)

* - add OAuth2/OIDC "state" parameter support via SDK update * - FileProvider fixes: - fix broken thumbnails for VFS item IDs - fix #1228 * - bump version to 12.0.2 and build to 269 * implemented recents item in Quick Access section * - Add ":recent" shortcut - Change "Recents" sidebar item search to use ":recent" instead of ":1w", replicating the app behaviour in version 11 * - add "Recently used" as quick choice for search * - show "Recents" quick access item also after logging in, logging out and logging in again * - added changelog entries - added in-app release notes * Calens changelog updated * updated App Store release notes * updated build number --------- Co-authored-by: Matthias Hühne <github@hosy.de> Co-authored-by: hosy <hosy@users.noreply.github.com>
owncloud · Jun 27, 2023 · 15d4e44 · 15d4e44
1 parent b242f83
commit 15d4e44
Show file tree

Hide file tree

Showing 17 changed files with 171 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,46 @@
+Changelog for ownCloud iOS Client [12.0.2] (2023-06-23)
+=======================================
+The following sections list the changes in ownCloud iOS Client 12.0.2 relevant to
+ownCloud admins and users.
+
+[12.0.2]: https://github.com/owncloud/ios-app/compare/milestone/12.0.1...milestone/12.0.2
+
+Summary
+-------
+
+* Bugfix - Unable to authenticate using OpenID Connect: [#1219](https://github.com/owncloud/ios-app/issues/1219)
+* Bugfix - Files.app: [#1223](https://github.com/owncloud/ios-app/pull/1223)
+* Bugfix - Recent files view: [#1225](https://github.com/owncloud/ios-app/pull/1225)
+* Bugfix - Attach files from third-party apps: [#1228](https://github.com/owncloud/ios-app/pull/1228)
+
+Details
+-------
+
+* Bugfix - Unable to authenticate using OpenID Connect: [#1219](https://github.com/owncloud/ios-app/issues/1219)
+
+   It was not able to authenticate using OpenID Connect
+
+   https://github.com/owncloud/ios-app/issues/1219
+
+* Bugfix - Files.app: [#1223](https://github.com/owncloud/ios-app/pull/1223)
+
+   Solves "Content unavailable" in Files.app
+
+   https://github.com/owncloud/ios-app/pull/1223
+
+* Bugfix - Recent files view: [#1225](https://github.com/owncloud/ios-app/pull/1225)
+
+   Added Quick Access item "Recents", which was missing in version 12.0.1
+
+   https://github.com/owncloud/ios-app/pull/1225
+
+* Bugfix - Attach files from third-party apps: [#1228](https://github.com/owncloud/ios-app/pull/1228)
+
+   Attaching files in third-party apps via file provider were not possible, if file was not
+   downloaded.
+
+   https://github.com/owncloud/ios-app/pull/1228
+
 Changelog for ownCloud iOS Client [12.0.1] (2023-06-15)
 =======================================
 The following sections list the changes in ownCloud iOS Client 12.0.1 relevant to

diff --git a/changelog/12.0.2_2023-06-23/1219 b/changelog/12.0.2_2023-06-23/1219
@@ -0,0 +1,5 @@
+Bugfix: Unable to authenticate using OpenID Connect
+
+It was not able to authenticate using OpenID Connect
+
+https://github.com/owncloud/ios-app/issues/1219
diff --git a/changelog/12.0.2_2023-06-23/1223 b/changelog/12.0.2_2023-06-23/1223
@@ -0,0 +1,5 @@
+Bugfix: Files.app
+
+Solves "Content unavailable" in Files.app
+
+https://github.com/owncloud/ios-app/pull/1223
diff --git a/changelog/12.0.2_2023-06-23/1225 b/changelog/12.0.2_2023-06-23/1225
@@ -0,0 +1,5 @@
+Bugfix: Recent files view
+
+Added Quick Access item "Recents", which was missing in version 12.0.1
+
+https://github.com/owncloud/ios-app/pull/1225
diff --git a/changelog/12.0.2_2023-06-23/1228 b/changelog/12.0.2_2023-06-23/1228
@@ -0,0 +1,5 @@
+Bugfix: Attach files from third-party apps
+
+Attaching files in third-party apps via file provider were not possible, if file was not downloaded.
+
+https://github.com/owncloud/ios-app/pull/1228
diff --git a/fastlane/metadata-emm/en-US/release_notes.txt b/fastlane/metadata-emm/en-US/release_notes.txt
@@ -1,3 +1,7 @@
-• Bug Fixes
-Fixed keyboard, media streaming, full screen mode, offline indicator, duplicated sharing option, and UI issues.
+Bug Fixes
+
+• Added missing Recents Group
+• Unable to authenticate using OpenID Connect
+• Attach files from third-party apps
+• Solves "Content unavailable" in Files.app
 
diff --git a/fastlane/metadata-owncloud-online/en-US/release_notes.txt b/fastlane/metadata-owncloud-online/en-US/release_notes.txt
@@ -1,3 +1,7 @@
-• Bug Fixes
-Fixed keyboard, media streaming, full screen mode, offline indicator, duplicated sharing option, and UI issues.
+Bug Fixes
+
+• Added missing Recents Group
+• Unable to authenticate using OpenID Connect
+• Attach files from third-party apps
+• Solves "Content unavailable" in Files.app
 
diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt
@@ -1,3 +1,7 @@
-• Bug Fixes
-Fixed keyboard, media streaming, full screen mode, offline indicator, duplicated sharing option, and UI issues.
+Bug Fixes
+
+• Added missing Recents Group
+• Unable to authenticate using OpenID Connect
+• Attach files from third-party apps
+• Solves "Content unavailable" in Files.app
 
diff --git a/ios-sdk b/ios-sdk
diff --git a/ownCloud File Provider/FileProviderExtensionThumbnailRequest.m b/ownCloud File Provider/FileProviderExtensionThumbnailRequest.m
@@ -59,7 +59,20 @@ - (void)requestNextThumbnail
 
 		if ((core = self.extension.core) != nil)
 		{
-			[core retrieveItemFromDatabaseForLocalID:(OCLocalID)itemIdentifier completionHandler:^(NSError *error, OCSyncAnchor syncAnchor, OCItem *itemFromDatabase) {
+			OCLocalID localID = (OCLocalID)itemIdentifier;
+
+			// Translate item identifiers
+			OCVaultLocation *location;
+
+			if ((location = [[OCVaultLocation alloc] initWithVFSItemID:itemIdentifier]) != nil)
+			{
+				if (location.localID != nil)
+				{
+					localID = location.localID;
+				}
+			}
+
+			[core retrieveItemFromDatabaseForLocalID:localID completionHandler:^(NSError *error, OCSyncAnchor syncAnchor, OCItem *itemFromDatabase) {
 				OCLogDebug(@"Retrieving %ld: %@", self.cursorPosition-1, itemFromDatabase.name);
 
 				OCResourceManager *resourceManager = core.vault.resourceManager;

diff --git a/ownCloud.xcodeproj/project.pbxproj b/ownCloud.xcodeproj/project.pbxproj
@@ -5137,8 +5137,8 @@
 				APP_BUILD_FLAGS = "$(inherited)";
 				APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
 				APP_PRODUCT_NAME = ownCloud;
-				APP_SHORT_VERSION = 12.0.1;
-				APP_VERSION = 268;
+				APP_SHORT_VERSION = 12.0.2;
+				APP_VERSION = 270;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -5207,8 +5207,8 @@
 				APP_BUILD_FLAGS = "$(inherited)";
 				APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
 				APP_PRODUCT_NAME = ownCloud;
-				APP_SHORT_VERSION = 12.0.1;
-				APP_VERSION = 268;
+				APP_SHORT_VERSION = 12.0.2;
+				APP_VERSION = 270;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

diff --git a/ownCloud/Release Notes/ReleaseNotes.plist b/ownCloud/Release Notes/ReleaseNotes.plist
@@ -1724,6 +1724,53 @@ Added an optional &quot;Wait for completion&quot; option to the &quot;Save File&
 				</dict>
 			</array>
 		</dict>
+		<dict>
+			<key>Version</key>
+			<string>12.0.2</string>
+			<key>ReleaseNotes</key>
+			<array>
+				<dict>
+					<key>Title</key>
+					<string>Bug Fixes</string>
+					<key>Subtitle</key>
+					<string>Added missing Recents Group</string>
+					<key>Type</key>
+					<string>Fix</string>
+					<key>ImageName</key>
+					<string>wrench</string>
+				</dict>
+				<dict>
+					<key>Title</key>
+					<string>Bug Fixes</string>
+					<key>Subtitle</key>
+					<string>Unable to authenticate using OpenID Connect</string>
+					<key>Type</key>
+					<string>Fix</string>
+					<key>ImageName</key>
+					<string>wrench</string>
+				</dict>
+				<dict>
+					<key>Title</key>
+					<string>Bug Fixes</string>
+					<key>Subtitle</key>
+					<string>Attach files from third-party apps</string>
+					<key>Type</key>
+					<string>Fix</string>
+					<key>ImageName</key>
+					<string>wrench</string>
+				</dict>
+				<dict>
+					<key>Title</key>
+					<string>Bug Fixes</string>
+					<key>Subtitle</key>
+					<string>Solves &quot;Content unavailable&quot; in Files.app</string>
+					<key>Type</key>
+					<string>Fix</string>
+					<key>ImageName</key>
+					<string>wrench</string>
+				</dict>
+			</array>
+		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/ownCloudAppFramework/Resources/de.lproj/Localizable.strings b/ownCloudAppFramework/Resources/de.lproj/Localizable.strings
@@ -65,6 +65,7 @@
 "keyword_week" = "woche";
 "keyword_month" = "monat";
 "keyword_year" = "jahr";
+"keyword_recent" = "kürzlich";
 "keyword_d" = "t"; /* short-form for "day" */
 "keyword_w" = "w"; /* short-form for "week" */
 "keyword_m" = "m"; /* short-form for "month" */
@@ -132,3 +133,6 @@
 "This year" = "Dieses Jahr";
 "Since last year" = "Seit letztem Jahr";
 "Last %d years" = "Letzte %d Jahre";
+
+"Recently used" = "Kürzlich verwendet";
+"Not recently used" = "Nicht kürzlich verwendet";
diff --git a/ownCloudAppFramework/Resources/en.lproj/Localizable.strings b/ownCloudAppFramework/Resources/en.lproj/Localizable.strings
@@ -65,6 +65,7 @@
 "keyword_week" = "week";
 "keyword_month" = "month";
 "keyword_year" = "year";
+"keyword_recent" = "recent";
 "keyword_d" = "d"; /* short-form for "day" */
 "keyword_w" = "w"; /* short-form for "week" */
 "keyword_m" = "m"; /* short-form for "month" */
@@ -132,3 +133,7 @@
 "This year" = "This year";
 "Since last year" = "Since last year";
 "Last %d years" = "Last %d years";
+
+"Recently used" = "Recently used";
+"Not recently used" = "Not recently used";
+
diff --git a/ownCloudAppFramework/Search/OCQueryCondition+SearchSegmenter.m b/ownCloudAppFramework/Search/OCQueryCondition+SearchSegmenter.m
@@ -207,6 +207,7 @@ + (nullable NSString *)normalizeKeyword:(NSString *)keyword
 			TranslateKeyword(@"week"),
 			TranslateKeyword(@"month"),
 			TranslateKeyword(@"year"),
+			TranslateKeyword(@"recent"),
 
 			// Modifier keywords
 			TranslateKeyword(@"type"),
@@ -338,6 +339,10 @@ + (instancetype)forSearchSegment:(NSString *)segmentString
 			{
 				return ([[OCQueryCondition negating:negateCondition condition:[OCQueryCondition where:OCItemPropertyNameLastModified isGreaterThan:[NSDate startOfRelativeYear:0]]] withSymbolName:@"calendar" localizedDescription:(negateCondition ? OCLocalizedViaLocalizationBundle(@"Before this year") : OCLocalizedViaLocalizationBundle(@"This year")) searchSegment:searchSegment]);
 			}
+			else if ([keyword isEqual:@"recent"])
+			{
+				return ([[OCQueryCondition negating:negateCondition condition:[OCQueryCondition where:OCItemPropertyNameLastUsed isGreaterThan:[NSCalendar.currentCalendar dateByAddingUnit:NSCalendarUnitWeekOfYear value:-1 toDate:NSDate.date options:0]]] withSymbolName:@"clock.arrow.circlepath" localizedDescription:(negateCondition ? OCLocalizedViaLocalizationBundle(@"Not recently used") : OCLocalizedViaLocalizationBundle(@"Recently used")) searchSegment:searchSegment]);
+			}
 		}
 	}
 

diff --git a/ownCloudAppShared/Client/Account/Controller/AccountController.swift b/ownCloudAppShared/Client/Account/Controller/AccountController.swift
@@ -89,6 +89,7 @@ public class AccountController: NSObject, OCDataItem, OCDataItemVersioning, Acco
 			case searchImages
 			case searchVideos
 			case searchAudios
+			case recents
 
 		case activity
 	}
@@ -404,6 +405,14 @@ public class AccountController: NSObject, OCDataItem, OCDataItemVersioning, Acco
 			if configuration.showQuickAccess {
 				var quickAccessItems: [OCDataItem & OCDataItemVersioning] = []
 
+				// Recents
+				if specialItems[.recents] == nil {
+					specialItems[.recents] = OCSavedSearch(scope: .account, location: nil, name: "Recents".localized, isTemplate: false, searchTerm: ":recent :file").withCustomIcon(name: "clock.arrow.circlepath").useNameAsTitle(true)
+				}
+				if let sideBarItem = specialItems[.recents] {
+					quickAccessItems.append(sideBarItem)
+				}
+
 				// Favorites
 				if bookmark?.hasCapability(.favorites) == true {
 					if specialItems[.favoriteItems] == nil {

diff --git a/ownCloudAppShared/Client/Search/Item Search/ItemSearchSuggestionsViewController.swift b/ownCloudAppShared/Client/Search/Item Search/ItemSearchSuggestionsViewController.swift
@@ -68,6 +68,7 @@ class ItemSearchSuggestionsViewController: UIViewController, SearchElementUpdati
 			OCQueryCondition.fromSearchTerm(":audio")!
 		]),
 		Category(name: "Date".localized, selectionBehaviour: Category.mutuallyExclusiveSelectionBehaviour, options: [
+			OCQueryCondition.fromSearchTerm(":recent")!,
 			OCQueryCondition.fromSearchTerm(":today")!,
 			OCQueryCondition.fromSearchTerm(":week")!,
 			OCQueryCondition.fromSearchTerm(":month")!,
+2 −3		.tx/config
+3 −0		ownCloudSDK/Authentication/OCAuthenticationMethodOAuth2.h
+33 −1		ownCloudSDK/Authentication/OCAuthenticationMethodOAuth2.m
+3 −0		ownCloudSDK/Categories/Foundation/NSURL+OCURLNormalization.h
+28 −0		ownCloudSDK/Categories/Foundation/NSURL+OCURLNormalization.m
+4 −3		ownCloudSDK/Vaults/OCVault.m