Merge branch 'release/2.7.1'

Author: tobihagemann

Cryptomator.xcodeproj/project.pbxproj

@@ -3376,7 +3376,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 2.7.0;
+				MARKETING_VERSION = 2.7.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3438,7 +3438,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 2.7.0;
+				MARKETING_VERSION = 2.7.1;
 				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/Common/CloudAccountList/AccountListViewController.swift

@@ -142,7 +142,7 @@ class AccountListViewController: ListViewController<AccountCellContent>, ASWebAu
 
 	private func supportsEditing(_ cloudProviderType: CloudProviderType) -> Bool {
 		switch cloudProviderType {
-		case .box, .dropbox, .googleDrive, .localFileSystem, .microsoftGraph(type: .oneDrive), .microsoftGraph(type: .sharePoint), .pCloud:
+		case .box, .dropbox, .googleDrive, .localFileSystem, .microsoftGraph, .pCloud:
 			return false
 		case .s3, .webDAV:
 			return true

Cryptomator/MainCoordinator.swift

@@ -78,7 +78,7 @@ class MainCoordinator: NSObject, Coordinator, UINavigationControllerDelegate {
 		rootViewController.showDetailViewController(detailNavigationController, sender: nil)
 	}
 
-	// Temporarily added for Spring 2025 Sale
+	// Temporarily added for Summer 2025 Sale
 	func showPurchase() {
 		let modalNavigationController = BaseNavigationController()
 		let child = PurchaseCoordinator(navigationController: modalNavigationController)
@@ -124,7 +124,7 @@ extension MainCoordinator: StoreObserverDelegate {
 		switch transaction {
 		case .fullVersion, .yearlySubscription:
 			showFullVersionAlert()
-			// Temporarily added for Spring 2025 Sale
+			// Temporarily added for Summer 2025 Sale
 			NotificationCenter.default.post(name: .purchasedFullVersionNotification, object: nil)
 		case let .freeTrial(expiresOn):
 			showTrialAlert(expirationDate: expiresOn)

Cryptomator/Purchase/PurchaseCoordinator.swift

@@ -54,7 +54,7 @@ class PurchaseCoordinator: Coordinator {
 			}
 			self.unlockedPro()
 		}
-		// Temporarily added for Spring 2025 Sale
+		// Temporarily added for Summer 2025 Sale
 		NotificationCenter.default.post(name: .purchasedFullVersionNotification, object: nil)
 	}
 

Cryptomator/Purchase/PurchaseViewModel.swift

@@ -33,9 +33,9 @@ class PurchaseViewModel: BaseIAPViewModel, ProductFetching {
 		return LocalizedString.getValue("purchase.title")
 	}
 
-	// Temporarily added for Spring 2025 Sale
+	// Temporarily added for Summer 2025 Sale
 	override var infoText: NSAttributedString? {
-		if SalePromo.isSpring2025Active() {
+		if SalePromo.isSummer2025Active() {
 			return NSAttributedString(
 				string: "*Note: The discount amount may vary by region.",
 				attributes: [
@@ -91,8 +91,8 @@ class PurchaseViewModel: BaseIAPViewModel, ProductFetching {
 
 	private func addLifetimeLicenseItem() {
 		if let product = products[.fullVersion], let localizedPrice = product.localizedPrice {
-			// Temporarily added for Spring 2025 Sale
-			let productDetail = SalePromo.isSpring2025Active() ? "\(SalePromo.spring2025Emoji) \(SalePromo.spring2025Discount)" : nil
+			// Temporarily added for Summer 2025 Sale
+			let productDetail = SalePromo.isSummer2025Active() ? "\(SalePromo.summer2025Emoji) \(SalePromo.summer2025Discount)" : nil
 			let viewModel = PurchaseCellViewModel(productName: LocalizedString.getValue("purchase.product.lifetimeLicense"),
 			                                      productDetail: productDetail,
 			                                      price: localizedPrice,

Cryptomator/Purchase/SalePromo.swift

@@ -13,22 +13,22 @@ struct SalePromo {
 	@Dependency(\.cryptomatorSettings) private var cryptomatorSettings
 
 	static let shared = SalePromo()
-	static let spring2025Emoji = "🌸"
-	static let spring2025Discount = "25%* off until March 31"
+	static let summer2025Emoji = "☀️"
+	static let summer2025Discount = "25%* off until June 30"
 
-	static func isSpring2025Active() -> Bool {
-		let saleStartComponents = DateComponents(year: 2025, month: 3, day: 20)
-		let saleEndComponents = DateComponents(year: 2025, month: 3, day: 31)
+	static func isSummer2025Active() -> Bool {
+		let saleStartComponents = DateComponents(year: 2025, month: 6, day: 1)
+		let saleEndComponents = DateComponents(year: 2025, month: 6, day: 30)
 		guard let saleStartDate = Calendar.current.date(from: saleStartComponents), let saleEndDate = Calendar.current.date(from: saleEndComponents) else {
 			return false
 		}
 		let now = Date()
 		return now >= saleStartDate && now <= saleEndDate
 	}
 
-	func shouldShowSpring2025Banner() -> Bool {
+	func shouldShowSummer2025Banner() -> Bool {
 		#if !ALWAYS_PREMIUM
-		return SalePromo.isSpring2025Active() && !(cryptomatorSettings.fullVersionUnlocked || cryptomatorSettings.hasRunningSubscription) && !cryptomatorSettings.spring2025BannerDismissed
+		return SalePromo.isSummer2025Active() && !(cryptomatorSettings.fullVersionUnlocked || cryptomatorSettings.hasRunningSubscription) && !cryptomatorSettings.summer2025BannerDismissed
 		#else
 		return false
 		#endif

Cryptomator/VaultList/VaultListViewController.swift

@@ -21,7 +21,7 @@ class VaultListViewController: ListViewController<VaultCellViewModel> {
 	@Dependency(\.fullVersionChecker) private var fullVersionChecker
 
 	#if !ALWAYS_PREMIUM
-	private var spring2025BannerView: UIView?
+	private var summer2025BannerView: UIView?
 	private var fullVersionPurchasedObserver: NSObjectProtocol?
 	#endif
 
@@ -57,10 +57,10 @@ class VaultListViewController: ListViewController<VaultCellViewModel> {
 
 		#if !ALWAYS_PREMIUM
 		fullVersionPurchasedObserver = NotificationCenter.default.addObserver(forName: .purchasedFullVersionNotification, object: nil, queue: .main) { [weak self] _ in
-			self?.dismissSpring2025Banner()
+			self?.dismissSummer2025Banner()
 		}
-		if SalePromo.shared.shouldShowSpring2025Banner() {
-			showSpring2025Banner()
+		if SalePromo.shared.shouldShowSummer2025Banner() {
+			showSummer2025Banner()
 		}
 		#endif
 	}
@@ -126,21 +126,21 @@ class VaultListViewController: ListViewController<VaultCellViewModel> {
 	// MARK: - Sale Promo Banner
 
 	#if !ALWAYS_PREMIUM
-	private func showSpring2025Banner() {
+	private func showSummer2025Banner() {
 		let banner = UIView()
 		banner.backgroundColor = UIColor.cryptomatorPrimary
 		banner.translatesAutoresizingMaskIntoConstraints = false
 		banner.layer.cornerRadius = 12
 		banner.layer.masksToBounds = true
 
 		let emojiLabel = UILabel()
-		emojiLabel.text = SalePromo.spring2025Emoji
+		emojiLabel.text = SalePromo.summer2025Emoji
 		emojiLabel.translatesAutoresizingMaskIntoConstraints = false
 		emojiLabel.setContentHuggingPriority(.required, for: .horizontal)
 		emojiLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
 
 		let textLabel = UILabel()
-		textLabel.text = "Lifetime License is \(SalePromo.spring2025Discount)!"
+		textLabel.text = "Lifetime License is \(SalePromo.summer2025Discount)!"
 		textLabel.textColor = .white
 		textLabel.font = UIFont.preferredFont(forTextStyle: .footnote)
 		textLabel.adjustsFontSizeToFitWidth = true
@@ -149,7 +149,7 @@ class VaultListViewController: ListViewController<VaultCellViewModel> {
 		textLabel.translatesAutoresizingMaskIntoConstraints = false
 
 		let dismissButton = UIButton(type: .close)
-		dismissButton.addTarget(self, action: #selector(dismissSpring2025Banner), for: .touchUpInside)
+		dismissButton.addTarget(self, action: #selector(dismissSummer2025Banner), for: .touchUpInside)
 		dismissButton.translatesAutoresizingMaskIntoConstraints = false
 		dismissButton.setContentHuggingPriority(.required, for: .horizontal)
 		dismissButton.setContentCompressionResistancePriority(.required, for: .horizontal)
@@ -170,7 +170,7 @@ class VaultListViewController: ListViewController<VaultCellViewModel> {
 			dismissButton.centerYAnchor.constraint(equalTo: banner.centerYAnchor)
 		])
 
-		let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(spring2025BannerTapped))
+		let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(summer2025BannerTapped))
 		banner.addGestureRecognizer(tapGestureRecognizer)
 
 		view.addSubview(banner)
@@ -183,20 +183,20 @@ class VaultListViewController: ListViewController<VaultCellViewModel> {
 			banner.heightAnchor.constraint(equalToConstant: 50)
 		])
 
-		spring2025BannerView = banner
+		summer2025BannerView = banner
 	}
 
-	@objc private func dismissSpring2025Banner() {
+	@objc private func dismissSummer2025Banner() {
 		UIView.animate(withDuration: 0.3, animations: {
-			self.spring2025BannerView?.alpha = 0
+			self.summer2025BannerView?.alpha = 0
 		}, completion: { _ in
-			self.spring2025BannerView?.removeFromSuperview()
-			self.spring2025BannerView = nil
+			self.summer2025BannerView?.removeFromSuperview()
+			self.summer2025BannerView = nil
 		})
-		CryptomatorUserDefaults.shared.spring2025BannerDismissed = true
+		CryptomatorUserDefaults.shared.summer2025BannerDismissed = true
 	}
 
-	@objc private func spring2025BannerTapped() {
+	@objc private func summer2025BannerTapped() {
 		coordinator?.showPurchase()
 	}
 	#endif

CryptomatorCommon/Sources/CryptomatorCommonCore/CryptomatorKeychain.swift

@@ -25,7 +25,6 @@ class CryptomatorKeychain: CryptomatorKeychainType {
 	static let bundleId = CryptomatorConstants.mainAppBundleId
 	static let box = CryptomatorKeychain(service: "box.auth")
 	static let pCloud = CryptomatorKeychain(service: "pCloud.auth")
-	static let microsoftGraph = CryptomatorKeychain(service: "microsoftGraph.auth")
 	static let s3 = CryptomatorKeychain(service: "s3.auth")
 	static let webDAV = CryptomatorKeychain(service: "webDAV.auth")
 	static let localFileSystem = CryptomatorKeychain(service: "localFileSystem.auth")

CryptomatorCommon/Sources/CryptomatorCommonCore/CryptomatorUserDefaults.swift

@@ -16,7 +16,7 @@ public protocol CryptomatorSettings {
 	var fullVersionUnlocked: Bool { get set }
 	var hasRunningSubscription: Bool { get set }
 	#if !ALWAYS_PREMIUM
-	var spring2025BannerDismissed: Bool { get set }
+	var summer2025BannerDismissed: Bool { get set }
 	#endif
 }
 
@@ -113,7 +113,7 @@ extension CryptomatorUserDefaults: CryptomatorSettings {
 	}
 
 	#if !ALWAYS_PREMIUM
-	public var spring2025BannerDismissed: Bool {
+	public var summer2025BannerDismissed: Bool {
 		get { read() ?? false }
 		set { write(value: newValue) }
 	}

CryptomatorCommon/Sources/CryptomatorCommonCore/Mocks/CryptomatorSettingsMock.swift

@@ -15,7 +15,7 @@ class CryptomatorSettingsMock: CryptomatorSettings {
 	var fullVersionUnlocked: Bool = false
 	var hasRunningSubscription: Bool = false
 	#if !ALWAYS_PREMIUM
-	var spring2025BannerDismissed: Bool = false
+	var summer2025BannerDismissed: Bool = false
 	#endif
 }
 #endif