Merge develop into feature/hub-sharebutton

Author: iammajid

.github/workflows/build.yml

@@ -11,20 +11,22 @@ jobs:
     runs-on: [self-hosted, macOS, ARM64]
     env:
       DERIVED_DATA_PATH: 'DerivedData'
-      DEVICE: 'iPhone 15 Pro'
+      DEVICE: 'iPhone 17 Pro'
     strategy:
       matrix:
         config: ['freemium', 'premium']
     steps:
       - uses: actions/checkout@v4
+        with:
+          # Disable shallow clone for SonarCloud analysis
+          # https://docs.sonarsource.com/sonarqube-cloud/advanced-setup/ci-based-analysis/github-actions-for-sonarcloud
+          fetch-depth: 0
       - uses: actions/cache@v4
         with:
           path: .build
           key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
           restore-keys: |
             ${{ runner.os }}-spm-
-      - name: Install SwiftLint
-        run: brew install swiftlint
       - name: Run process.sh script
         run: |
           ./Scripts/process.sh
@@ -33,8 +35,6 @@ jobs:
         run: |
           cd fastlane
           ./scripts/create-cloud-access-secrets.sh
-      - name: Select Xcode 15.3
-        run: sudo xcode-select -s /Applications/Xcode_15.3.app
       - name: Configuration for freemium
         if: ${{ matrix.config == 'freemium' }}
         run: |
@@ -44,15 +44,17 @@ jobs:
         run: |
           echo "BUILD_CMD=SWIFT_ACTIVE_COMPILATION_CONDITIONS='\$(inherited) ALWAYS_PREMIUM'" >> $GITHUB_ENV
       - name: Build
-        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild clean build-for-testing -scheme 'AllTests' -destination "name=$DEVICE" -derivedDataPath $DERIVED_DATA_PATH ${{ env.BUILD_CMD }} | xcpretty
+        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild clean build-for-testing -scheme 'AllTests' -destination "name=$DEVICE" -derivedDataPath $DERIVED_DATA_PATH ${{ env.BUILD_CMD }} | xcbeautify
       - name: Test
-        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild test-without-building -xctestrun $(find . -type f -name "*.xctestrun") -destination "name=$DEVICE" -derivedDataPath $DERIVED_DATA_PATH | xcpretty
-      - name: Upload code coverage report
+        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild test-without-building -xctestrun $(find . -type f -name "*.xctestrun") -destination "name=$DEVICE" -derivedDataPath $DERIVED_DATA_PATH | xcbeautify
+      - name: Generate coverage report
         if: ${{ matrix.config == 'freemium' }}
         run: |
-          gem install slather
-          slather coverage -x  --build-directory $DERIVED_DATA_PATH --ignore "$DERIVED_DATA_PATH/SourcePackages/*" --scheme AllTests Cryptomator.xcodeproj
-          bash <(curl -Ls https://coverage.codacy.com/get.sh)
+          xcresult_path=$(find $DERIVED_DATA_PATH/Logs/Test -name "*.xcresult" | head -n 1)
+          bash Scripts/xccov-to-sonarqube-generic.sh "$xcresult_path" > sonarqube-generic-coverage.xml
+      - name: SonarCloud Scan
+        if: ${{ matrix.config == 'freemium' }}
+        uses: SonarSource/[email protected]
         env:
-          CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         continue-on-error: true

.swiftformat

@@ -1,4 +1,5 @@
---minversion 0.49.2
+--minversion 0.58.3
+--exclude DerivedData
 
 # format options
 

.xcode-version

@@ -0,0 +1 @@
+26.0.1

Cryptomator.xcodeproj/project.pbxproj

@@ -3396,7 +3396,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 2.7.1;
+				MARKETING_VERSION = 2.7.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3458,7 +3458,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 2.7.1;
+				MARKETING_VERSION = 2.7.2;
 				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/AccountListViewModel.swift

@@ -220,7 +220,6 @@ class AccountListViewModel: AccountListViewModelProtocol {
 		let removedAccountInfo = accountInfos.remove(at: index)
 		do {
 			try cloudAuthenticator.deauthenticate(account: removedAccountInfo.cloudProviderAccount)
-			try updateAccountListPositions()
 		} catch {
 			removedRow = false
 			throw error

Cryptomator/MainCoordinator.swift

@@ -78,7 +78,7 @@ class MainCoordinator: NSObject, Coordinator, UINavigationControllerDelegate {
 		rootViewController.showDetailViewController(detailNavigationController, sender: nil)
 	}
 
-	// Temporarily added for Summer 2025 Sale
+	// Temporarily added for Autumn 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 Summer 2025 Sale
+			// Temporarily added for Autumn 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 Summer 2025 Sale
+		// Temporarily added for Autumn 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 Summer 2025 Sale
+	// Temporarily added for Autumn 2025 Sale
 	override var infoText: NSAttributedString? {
-		if SalePromo.isSummer2025Active() {
+		if SalePromo.isAutumn2025Active() {
 			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 Summer 2025 Sale
-			let productDetail = SalePromo.isSummer2025Active() ? "\(SalePromo.summer2025Emoji) \(SalePromo.summer2025Discount)" : nil
+			// Temporarily added for Autumn 2025 Sale
+			let productDetail = SalePromo.isAutumn2025Active() ? "\(SalePromo.autumn2025Emoji) \(SalePromo.autumn2025Discount)" : 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 summer2025Emoji = "☀️"
-	static let summer2025Discount = "25%* off until June 30"
+	static let autumn2025Emoji = "🍁"
+	static let autumn2025Discount = "25%* off until September 30"
 
-	static func isSummer2025Active() -> Bool {
-		let saleStartComponents = DateComponents(year: 2025, month: 6, day: 1)
-		let saleEndComponents = DateComponents(year: 2025, month: 6, day: 30)
+	static func isAutumn2025Active() -> Bool {
+		let saleStartComponents = DateComponents(year: 2025, month: 9, day: 22)
+		let saleEndComponents = DateComponents(year: 2025, month: 9, 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 shouldShowSummer2025Banner() -> Bool {
+	func shouldShowAutumn2025Banner() -> Bool {
 		#if !ALWAYS_PREMIUM
-		return SalePromo.isSummer2025Active() && !(cryptomatorSettings.fullVersionUnlocked || cryptomatorSettings.hasRunningSubscription) && !cryptomatorSettings.summer2025BannerDismissed
+		return SalePromo.isAutumn2025Active() && !(cryptomatorSettings.fullVersionUnlocked || cryptomatorSettings.hasRunningSubscription) && !cryptomatorSettings.autumn2025BannerDismissed
 		#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 summer2025BannerView: UIView?
+	private var autumn2025BannerView: 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?.dismissSummer2025Banner()
+			self?.dismissAutumn2025Banner()
 		}
-		if SalePromo.shared.shouldShowSummer2025Banner() {
-			showSummer2025Banner()
+		if SalePromo.shared.shouldShowAutumn2025Banner() {
+			showAutumn2025Banner()
 		}
 		#endif
 	}
@@ -126,21 +126,21 @@ class VaultListViewController: ListViewController<VaultCellViewModel> {
 	// MARK: - Sale Promo Banner
 
 	#if !ALWAYS_PREMIUM
-	private func showSummer2025Banner() {
+	private func showAutumn2025Banner() {
 		let banner = UIView()
 		banner.backgroundColor = UIColor.cryptomatorPrimary
 		banner.translatesAutoresizingMaskIntoConstraints = false
 		banner.layer.cornerRadius = 12
 		banner.layer.masksToBounds = true
 
 		let emojiLabel = UILabel()
-		emojiLabel.text = SalePromo.summer2025Emoji
+		emojiLabel.text = SalePromo.autumn2025Emoji
 		emojiLabel.translatesAutoresizingMaskIntoConstraints = false
 		emojiLabel.setContentHuggingPriority(.required, for: .horizontal)
 		emojiLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
 
 		let textLabel = UILabel()
-		textLabel.text = "Lifetime License is \(SalePromo.summer2025Discount)!"
+		textLabel.text = "Lifetime License is \(SalePromo.autumn2025Discount)!"
 		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(dismissSummer2025Banner), for: .touchUpInside)
+		dismissButton.addTarget(self, action: #selector(dismissAutumn2025Banner), 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(summer2025BannerTapped))
+		let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(autumn2025BannerTapped))
 		banner.addGestureRecognizer(tapGestureRecognizer)
 
 		view.addSubview(banner)
@@ -183,20 +183,20 @@ class VaultListViewController: ListViewController<VaultCellViewModel> {
 			banner.heightAnchor.constraint(equalToConstant: 50)
 		])
 
-		summer2025BannerView = banner
+		autumn2025BannerView = banner
 	}
 
-	@objc private func dismissSummer2025Banner() {
+	@objc private func dismissAutumn2025Banner() {
 		UIView.animate(withDuration: 0.3, animations: {
-			self.summer2025BannerView?.alpha = 0
+			self.autumn2025BannerView?.alpha = 0
 		}, completion: { _ in
-			self.summer2025BannerView?.removeFromSuperview()
-			self.summer2025BannerView = nil
+			self.autumn2025BannerView?.removeFromSuperview()
+			self.autumn2025BannerView = nil
 		})
-		CryptomatorUserDefaults.shared.summer2025BannerDismissed = true
+		CryptomatorUserDefaults.shared.autumn2025BannerDismissed = true
 	}
 
-	@objc private func summer2025BannerTapped() {
+	@objc private func autumn2025BannerTapped() {
 		coordinator?.showPurchase()
 	}
 	#endif