Merge branch 'release/2.4.3'

Author: tobihagemann

Cryptomator.xcodeproj/project.pbxproj

@@ -3254,7 +3254,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.4.2;
+				MARKETING_VERSION = 2.4.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3316,7 +3316,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.4.2;
+				MARKETING_VERSION = 2.4.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200";

Cryptomator/S3/S3AuthenticationViewController.swift

@@ -11,14 +11,14 @@ import CryptomatorCommonCore
 import SwiftUI
 import UIKit
 
-class S3AuthenticationViewController: UIHostingController<S3AuthenticationView> {
+class S3AuthenticationViewController: UIViewController {
 	weak var coordinator: (Coordinator & S3Authenticating)?
 	let viewModel: S3AuthenticationViewModel
 	private var subscriptions = Set<AnyCancellable>()
 
 	init(viewModel: S3AuthenticationViewModel) {
 		self.viewModel = viewModel
-		super.init(rootView: S3AuthenticationView(viewModel: viewModel))
+		super.init(nibName: nil, bundle: nil)
 	}
 
 	@available(*, unavailable)
@@ -28,6 +28,8 @@ class S3AuthenticationViewController: UIHostingController<S3AuthenticationView>
 
 	override func viewDidLoad() {
 		super.viewDidLoad()
+		setupSwiftUIView()
+
 		let doneButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(done))
 		navigationItem.rightBarButtonItem = doneButton
 		let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(cancel))
@@ -64,4 +66,13 @@ class S3AuthenticationViewController: UIHostingController<S3AuthenticationView>
 	@objc func cancel() {
 		coordinator?.cancel()
 	}
+
+	private func setupSwiftUIView() {
+		let child = UIHostingController(rootView: S3AuthenticationView(viewModel: viewModel))
+		addChild(child)
+		view.addSubview(child.view)
+		child.didMove(toParent: self)
+		child.view.translatesAutoresizingMaskIntoConstraints = false
+		NSLayoutConstraint.activate(child.view.constraints(equalTo: view))
+	}
 }

Cryptomator/WebDAV/WebDAVAuthentication.swift

@@ -20,7 +20,7 @@ struct WebDAVAuthentication: View {
 	@FocusStateLegacy private var focusedField: Fields? = .url
 
 	var body: some View {
-		List {
+		Form {
 			TextField(LocalizedString.getValue("common.cells.url"), text: $viewModel.url)
 				.keyboardType(.URL)
 				.disableAutocorrection(true)

Cryptomator/WebDAV/WebDAVAuthenticationViewController.swift

@@ -13,15 +13,15 @@ import Promises
 import SwiftUI
 import UIKit
 
-class WebDAVAuthenticationViewController: UIHostingController<WebDAVAuthentication> {
+class WebDAVAuthenticationViewController: UIViewController {
 	weak var coordinator: (Coordinator & WebDAVAuthenticating)?
-	private var viewModel: WebDAVAuthenticationViewModel
+	private let viewModel: WebDAVAuthenticationViewModel
 	private var cancellables = Set<AnyCancellable>()
 	private var hud: ProgressHUD?
 
 	init(viewModel: WebDAVAuthenticationViewModel) {
 		self.viewModel = viewModel
-		super.init(rootView: WebDAVAuthentication(viewModel: viewModel))
+		super.init(nibName: nil, bundle: nil)
 	}
 
 	@available(*, unavailable)
@@ -31,6 +31,8 @@ class WebDAVAuthenticationViewController: UIHostingController<WebDAVAuthenticati
 
 	override func viewDidLoad() {
 		super.viewDidLoad()
+		setupSwiftUIView()
+
 		title = "WebDAV"
 		let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(cancel))
 		navigationItem.leftBarButtonItem = cancelButton
@@ -87,6 +89,15 @@ class WebDAVAuthenticationViewController: UIHostingController<WebDAVAuthenticati
 	@objc func cancel() {
 		coordinator?.cancel()
 	}
+
+	private func setupSwiftUIView() {
+		let child = UIHostingController(rootView: WebDAVAuthentication(viewModel: viewModel))
+		addChild(child)
+		view.addSubview(child.view)
+		child.didMove(toParent: self)
+		child.view.translatesAutoresizingMaskIntoConstraints = false
+		NSLayoutConstraint.activate(child.view.constraints(equalTo: view))
+	}
 }
 
 #if DEBUG

fastlane/changelog.txt

@@ -1,4 +1 @@
-- Added possibility to edit WebDAV connections (#256)
-- Added Danish translation
-- Fixed missing files when encrypted files are offloaded in iCloud Drive (#279)
-- Fixed flickering when vault list is empty (#257)
+- Fixed missing buttons when adding WebDAV/S3 connections on iOS 13/14 (#280, #282)

fastlane/metadata/de-DE/release_notes.txt

@@ -1,4 +1 @@
-- Möglichkeit zum Bearbeiten von WebDAV-Verbindungen hinzugefügt (#256)
-- Dänische Übersetzung hinzugefügt
-- Fehlende Dateien behoben, wenn verschlüsselte Dateien in iCloud Drive nicht lokal vorliegen (#279)
-- Flackern behoben, wenn die Tresorliste leer ist (#257)
+- Fehlende Buttons beim Hinzufügen von WebDAV/S3-Verbindungen unter iOS 13/14 behoben (#280, #282)

fastlane/metadata/en-US/release_notes.txt

@@ -1,4 +1 @@
-- Added possibility to edit WebDAV connections (#256)
-- Added Danish translation
-- Fixed missing files when encrypted files are offloaded in iCloud Drive (#279)
-- Fixed flickering when vault list is empty (#257)
+- Fixed missing buttons when adding WebDAV/S3 connections on iOS 13/14 (#280, #282)