Merge branch 'master' into milestone/12.3

owncloud · May 27, 2024 · 62ac8dc · 62ac8dc
2 parents 57c2046 + d0a3b3d
commit 62ac8dc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Table of Contents
 
+* [Changelog for 12.2.1](#changelog-for-owncloud-ios-client-1221-2024-04-30)
 * [Changelog for 12.2.0](#changelog-for-owncloud-ios-client-1220-2024-04-23)
 * [Changelog for 12.1.0](#changelog-for-owncloud-ios-client-1210-2024-01-29)
 * [Changelog for 12.0.3](#changelog-for-owncloud-ios-client-1203-2023-08-31)
@@ -23,6 +24,25 @@
 * [Changelog for 11.5.1](#changelog-for-owncloud-ios-client-1151-2021-02-17)
 * [Changelog for 11.5.0](#changelog-for-owncloud-ios-client-1150-2021-02-10)
 * [Changelog for 11.4.5 versions and below](#changelog-for-1145-versions-and-below)
+# Changelog for ownCloud iOS Client [12.2.1] (2024-04-30)
+The following sections list the changes in ownCloud iOS Client 12.2.1 relevant to
+ownCloud admins and users.
+
+[12.2.1]: https://github.com/owncloud/ios-app/compare/milestone/12.2.0...milestone/12.2.1
+
+## Summary
+
+* Bugfix - Detect attempts to bypass a lock timeout by changing the clock: [#1347](https://github.com/owncloud/ios-app/pull/1347)
+
+## Details
+
+* Bugfix - Detect attempts to bypass a lock timeout by changing the clock: [#1347](https://github.com/owncloud/ios-app/pull/1347)
+
+   - detect attempts to bypass a lock timeout by changing the clock - code
+   cleanups/modernizations of `AppLockManager` - supersedes #1324
+
+   https://github.com/owncloud/ios-app/pull/1347
+
 # Changelog for ownCloud iOS Client [12.2.0] (2024-04-23)
 The following sections list the changes in ownCloud iOS Client 12.2.0 relevant to
 ownCloud admins and users.

diff --git a/changelog/12.2.1_2024-04-30/1347 b/changelog/12.2.1_2024-04-30/1347
@@ -1,4 +1,4 @@
-Fix: Detect attempts to bypass a lock timeout by changing the clock
+Bugfix: Detect attempts to bypass a lock timeout by changing the clock
 
 - detect attempts to bypass a lock timeout by changing the clock
 - code cleanups/modernizations of `AppLockManager`

diff --git a/ownCloud/Licensing/Offers/LicenseOfferButton.swift b/ownCloud/Licensing/Offers/LicenseOfferButton.swift
@@ -30,6 +30,7 @@ class LicenseOfferButton: ThemeButton {
 		self.translatesAutoresizingMaskIntoConstraints = false
 		self.setContentCompressionResistancePriority(.required, for: .horizontal)
 		self.setContentCompressionResistancePriority(.required, for: .vertical)
+		self.configuration = .filled()
 		self.buttonFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
 		self.buttonVerticalPadding = -5
 		self.buttonHorizontalPadding = 23
@@ -49,6 +50,7 @@ class LicenseOfferButton: ThemeButton {
 		super.init(frame: .zero)
 
 		self.translatesAutoresizingMaskIntoConstraints = false
+		self.configuration = .filled()
 		self.buttonFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
 
 		self.buttonVerticalPadding = 15