diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2020-01-07 13:14:43 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2020-01-08 15:02:46 +0100 |
| commit | ef6cca27616b113e805333b35d3059d507edee32 (patch) | |
| tree | 26224a293472d4723bf4d7c71886589b2cfb00ac | |
| parent | 94e03486f4fffc636c01edb371ed474f236d92e4 (diff) | |
| download | mullvadvpn-ef6cca27616b113e805333b35d3059d507edee32.tar.xz mullvadvpn-ef6cca27616b113e805333b35d3059d507edee32.zip | |
Make formattedRemainingTime fallible
| -rw-r--r-- | ios/MullvadVPN/AccountExpiry.swift | 4 | ||||
| -rw-r--r-- | ios/MullvadVPN/SettingsAccountCell.swift | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ios/MullvadVPN/AccountExpiry.swift b/ios/MullvadVPN/AccountExpiry.swift index 493de6dc5b..aa4f4c5c06 100644 --- a/ios/MullvadVPN/AccountExpiry.swift +++ b/ios/MullvadVPN/AccountExpiry.swift @@ -28,8 +28,8 @@ class AccountExpiry { return date < Date() } - var formattedRemainingTime: String { - return relativeFormatter.string(from: Date(), to: date)! + var formattedRemainingTime: String? { + return relativeFormatter.string(from: Date(), to: date) } var formattedDate: String { diff --git a/ios/MullvadVPN/SettingsAccountCell.swift b/ios/MullvadVPN/SettingsAccountCell.swift index 755c57d87d..ce5705448e 100644 --- a/ios/MullvadVPN/SettingsAccountCell.swift +++ b/ios/MullvadVPN/SettingsAccountCell.swift @@ -27,11 +27,14 @@ class SettingsAccountCell: SettingsCell { expiryLabel.text = NSLocalizedString("OUT OF TIME", comment: "") expiryLabel.textColor = .dangerColor } else { - let remainingTime = accountExpiry.formattedRemainingTime - let localizedString = NSLocalizedString("%@ left", tableName: "Settings", comment: "") - let formattedString = String(format: localizedString, remainingTime) + if let remainingTime = accountExpiry.formattedRemainingTime { + let localizedString = NSLocalizedString("%@ left", comment: "") + let formattedString = String(format: localizedString, remainingTime) - expiryLabel.text = formattedString.uppercased() + expiryLabel.text = formattedString.uppercased() + } else { + expiryLabel.text = "" + } expiryLabel.textColor = .white } } else { |