[milestone/11.11.1] Milestone 11.11.1 (#1170)

* prepared new version 11.11.1 * [fix/markup-ios16-crash2] Markup Mode on iOS 16 (#1167) * added changelog and fastlane release notes * Calens changelog updated Co-authored-by: Matthias Hühne <> Co-authored-by: hosy <[email protected]>
owncloud · Oct 30, 2022 · 58fd75c · 58fd75c
1 parent 12dd42c
commit 58fd75c
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+Changelog for ownCloud iOS Client [11.11.1] (2022-10-30)
+=======================================
+The following sections list the changes in ownCloud iOS Client 11.11.1 relevant to
+ownCloud admins and users.
+
+[11.11.1]: https://github.com/owncloud/ios-app/compare/milestone/11.11.0...milestone/11.11.1
+
+Summary
+-------
+
+* Bugfix - Enabling Markup Mode: [#1141](https://github.com/owncloud/ios-app/issues/1141)
+
+Details
+-------
+
+* Bugfix - Enabling Markup Mode: [#1141](https://github.com/owncloud/ios-app/issues/1141)
+
+   Enabling markup mode crashed on iOS 16.
+
+   https://github.com/owncloud/ios-app/issues/1141
+
 Changelog for ownCloud iOS Client [11.11.0] (2022-09-26)
 =======================================
 The following sections list the changes in ownCloud iOS Client 11.11.0 relevant to

diff --git a/changelog/11.11.1_2022-10-30/1141 b/changelog/11.11.1_2022-10-30/1141
@@ -0,0 +1,5 @@
+Bugfix: Enabling Markup Mode
+
+Enabling markup mode crashed on iOS 16.
+
+https://github.com/owncloud/ios-app/issues/1141
diff --git a/fastlane/metadata-emm/en-US/release_notes.txt b/fastlane/metadata-emm/en-US/release_notes.txt
@@ -1,15 +1,3 @@
-• New Dark Mode Themes
-Two new dark mode themes are available.
-
 • iOS 16: Markup Mode
 Markup mode was not enabled automatically on iOS 16.
 
-• iOS 16: Video Player
-Video player controls were not showing on iOS 16.
-
-• Video Player
-Metadata image could overlay the video player canvas.
-
-• Passcode Interval
-The passcode lock interval was not taken into use in the share extension.
-
diff --git a/fastlane/metadata-owncloud-online/en-US/release_notes.txt b/fastlane/metadata-owncloud-online/en-US/release_notes.txt
@@ -1,15 +1,3 @@
-• New Dark Mode Themes
-Two new dark mode themes are available.
-
 • iOS 16: Markup Mode
 Markup mode was not enabled automatically on iOS 16.
 
-• iOS 16: Video Player
-Video player controls were not showing on iOS 16.
-
-• Video Player
-Metadata image could overlay the video player canvas.
-
-• Passcode Interval
-The passcode lock interval was not taken into use in the share extension.
-
diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt
@@ -1,15 +1,3 @@
-• New Dark Mode Themes
-Two new dark mode themes are available.
-
 • iOS 16: Markup Mode
 Markup mode was not enabled automatically on iOS 16.
 
-• iOS 16: Video Player
-Video player controls were not showing on iOS 16.
-
-• Video Player
-Metadata image could overlay the video player canvas.
-
-• Passcode Interval
-The passcode lock interval was not taken into use in the share extension.
-
diff --git a/ownCloud.xcodeproj/project.pbxproj b/ownCloud.xcodeproj/project.pbxproj
@@ -4686,8 +4686,8 @@
 				APP_BUILD_FLAGS = "$(inherited)";
 				APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
 				APP_PRODUCT_NAME = ownCloud;
-				APP_SHORT_VERSION = 11.11.0;
-				APP_VERSION = 229;
+				APP_SHORT_VERSION = 11.11.1;
+				APP_VERSION = 230;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -4755,8 +4755,8 @@
 				APP_BUILD_FLAGS = "$(inherited)";
 				APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
 				APP_PRODUCT_NAME = ownCloud;
-				APP_SHORT_VERSION = 11.11.0;
-				APP_VERSION = 229;
+				APP_SHORT_VERSION = 11.11.1;
+				APP_VERSION = 230;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

diff --git a/ownCloud/Client/Actions/EditDocumentViewController.swift b/ownCloud/Client/Actions/EditDocumentViewController.swift
@@ -124,21 +124,22 @@ class EditDocumentViewController: QLPreviewController, Themeable {
 	}
 
 	@objc func enableEditingMode() {
-		// Activate editing mode by performing the action on pencil icon. Unfortunately that's the only way to do it apparently
+        // Activate editing mode by performing the action on pencil icon. Unfortunately that's the only way to do it apparently
         if #available(iOS 16.0, *) {
-            if self.navigationItem.rightBarButtonItems?.count ?? 0 > 3 {
+            if self.navigationItem.rightBarButtonItems?.count ?? 0 > 0 {
                 guard let markupButton = self.navigationItem.rightBarButtonItems?[0] else { return }
                 _ = markupButton.target?.perform(markupButton.action, with: markupButton)
-            } else if self.toolbarItems?.count ?? 0 > 4 {
+            }
+            else if self.toolbarItems?.count ?? 0 > 4 {
                 guard let markupButton = self.toolbarItems?[4] else { return }
                 _ = markupButton.target?.perform(markupButton.action, with: markupButton)
-            } else if self.toolbarItems?.count ?? 0 < 4 {
+            } else if self.toolbarItems?.count ?? 0 > 1, self.toolbarItems?.count ?? 0 < 4 {
                 guard let markupButton = self.toolbarItems?[2] else { return }
                 _ = markupButton.target?.perform(markupButton.action, with: markupButton)
             }
         } else if #available(iOS 15.0, *) {
-			if self.navigationItem.rightBarButtonItems?.count ?? 0 > 2 {
-				guard let markupButton = self.navigationItem.rightBarButtonItems?[1] else { return }
+            if self.navigationItem.rightBarButtonItems?.count ?? 0 > 2 {
+                guard let markupButton = self.navigationItem.rightBarButtonItems?[1] else { return }
 				_ = markupButton.target?.perform(markupButton.action, with: markupButton)
 			} else if UIDevice.current.isIpad, self.navigationItem.rightBarButtonItems?.count ?? 0 == 2 {
 				guard let markupButton = self.navigationItem.rightBarButtonItems?[1] else { return }

diff --git a/ownCloud/Release Notes/ReleaseNotes.plist b/ownCloud/Release Notes/ReleaseNotes.plist
@@ -1687,6 +1687,23 @@ Added an optional &quot;Wait for completion&quot; option to the &quot;Save File&
 				</dict>
 			</array>
 		</dict>
+		<dict>
+			<key>Version</key>
+			<string>11.11.1</string>
+			<key>ReleaseNotes</key>
+			<array>
+				<dict>
+					<key>Title</key>
+					<string>iOS 16: Markup Mode</string>
+					<key>Subtitle</key>
+					<string>Markup mode was not enabled automatically on iOS 16.</string>
+					<key>Type</key>
+					<string>Fix</string>
+					<key>ImageName</key>
+					<string>wrench</string>
+				</dict>
+			</array>
+		</dict>
 	</array>
 </dict>
 </plist>