Skip to content

Show purchase status in settings #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 25, 2025
Merged

Show purchase status in settings #426

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3703075
Show purchase status and restore option in settings
iammajid Nov 6, 2025
22a98a5
Remove restore button for subscription users
iammajid Nov 11, 2025
b295ee2
Remove restore purchase button from settings
iammajid Nov 12, 2025
e94263d
Improve purchase status display in settings
iammajid Nov 21, 2025
5ed8709
Merge branch 'develop' into feature/purchase-status
iammajid Nov 22, 2025
d6c38e6
Fix memory leak in PurchaseStatusCell
iammajid Nov 22, 2025
6e48f43
Add ShareVaultViewController to build target
iammajid Nov 24, 2025
7098fe5
Fix unnecessary diff
tobihagemann Nov 24, 2025
a24cc04
Replace PurchaseStatusCell with ButtonCellViewModel
tobihagemann Nov 24, 2025
6ecbdad
Refactor settings to use unlockFullVersion terminology
tobihagemann Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Cryptomator/Settings/SettingsViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,20 @@ class SettingsViewModel: TableViewModel<SettingsSection> {
}

private var aboutSectionElements: [TableViewCellViewModel] {
var elements = [ButtonCellViewModel.createDisclosureButton(action: SettingsButtonAction.showAbout, title: LocalizedString.getValue("settings.aboutCryptomator"))]
var elements: [TableViewCellViewModel] = [ButtonCellViewModel.createDisclosureButton(action: SettingsButtonAction.showAbout, title: LocalizedString.getValue("settings.aboutCryptomator"))]

if cryptomatorSettings.hasRunningSubscription {
elements.append(.init(action: .showManageSubscriptions, title: LocalizedString.getValue("settings.manageSubscriptions")))
elements.append(.init(action: .restorePurchase, title: LocalizedString.getValue("purchase.restorePurchase.button")))
} else if !cryptomatorSettings.fullVersionUnlocked {
elements.append(ButtonCellViewModel<SettingsButtonAction>(action: .showManageSubscriptions, title: LocalizedString.getValue("settings.manageSubscriptions")))
} else if cryptomatorSettings.fullVersionUnlocked {
let statusCell = BindableTableViewCellViewModel(
title: LocalizedString.getValue("settings.fullVersionStatus"),
selectionStyle: .none,
accessoryType: .checkmark
)
elements.append(statusCell)
} else {
elements.append(ButtonCellViewModel.createDisclosureButton(action: SettingsButtonAction.showUnlockFullVersion, title: LocalizedString.getValue("settings.unlockFullVersion")))
elements.append(ButtonCellViewModel<SettingsButtonAction>(action: .restorePurchase, title: LocalizedString.getValue("purchase.restorePurchase.button")))
}
return elements
}
Expand Down
1 change: 1 addition & 0 deletions SharedResources/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@
"settings.sendLogFile" = "Send Log File";
"settings.shortcutsGuide" = "Shortcuts Guide";
"settings.unlockFullVersion" = "Unlock Full Version";
"settings.fullVersionStatus" = "Full Version";

"sharePoint.enterURL.title" = "Enter SharePoint URL";
"sharePoint.enterURL.placeholder" = "SharePoint Site URL";
Expand Down
Loading