diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2023-10-17 09:04:42 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2023-10-17 09:04:42 +0200 |
| commit | 391268b6e6b864a5f6eeee3c42872156e49cd77f (patch) | |
| tree | e101a6ebed0d4bf50186443e8c0286ab9fd8eb73 | |
| parent | 9ea790f2e6ac363f59fceec5ae5a25aad6af06f4 (diff) | |
| parent | d90382708b19e7e03aba2641688ba5655d8ffdd6 (diff) | |
| download | mullvadvpn-391268b6e6b864a5f6eeee3c42872156e49cd77f.tar.xz mullvadvpn-391268b6e6b864a5f6eeee3c42872156e49cd77f.zip | |
Merge branch 'stop-showing-the-changelog-to-users-when-it-is-empty-ios-346'
| -rw-r--r-- | ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift | 9 | ||||
| -rw-r--r-- | ios/MullvadVPN/View controllers/ChangeLog/ChangeLogInteractor.swift | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift b/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift index a58603fb04..f5fce3f250 100644 --- a/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift +++ b/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift @@ -326,7 +326,7 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo } // Change log can be presented simultaneously with other routes. - if !appPreferences.isSeenLatestChanges { + if !appPreferences.hasSeenLastChanges { routes.append(.changelog) } @@ -995,12 +995,13 @@ extension DeviceState { } fileprivate extension AppPreferencesDataSource { - var isSeenLatestChanges: Bool { - self.lastSeenChangeLogVersion == Bundle.main.shortVersion + var hasSeenLastChanges: Bool { + !ChangeLogInteractor().hasNewChanges || + (lastSeenChangeLogVersion == Bundle.main.shortVersion) } mutating func markChangeLogSeen() { - self.lastSeenChangeLogVersion = Bundle.main.shortVersion + lastSeenChangeLogVersion = Bundle.main.shortVersion } // swiftlint:disable:next file_length diff --git a/ios/MullvadVPN/View controllers/ChangeLog/ChangeLogInteractor.swift b/ios/MullvadVPN/View controllers/ChangeLog/ChangeLogInteractor.swift index 3e5a85007f..571eeaf756 100644 --- a/ios/MullvadVPN/View controllers/ChangeLog/ChangeLogInteractor.swift +++ b/ios/MullvadVPN/View controllers/ChangeLog/ChangeLogInteractor.swift @@ -12,6 +12,11 @@ import MullvadLogging final class ChangeLogInteractor { private let logger = Logger(label: "ChangeLogInteractor") private var items: [String] = [] + + var hasNewChanges: Bool { + !items.isEmpty + } + var viewModel: ChangeLogViewModel { return ChangeLogViewModel( body: items |
