Skip to content
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.

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

Update logic for showing DAITA filter pill #6944

Merged
merged 1 commit into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions ios/MullvadVPN.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2811,6 +2811,7 @@
7A42DEC82A05164100B209BE /* SettingsInputCell.swift */,
58677711290976FB006F721F /* SettingsInteractor.swift */,
5867770F290975E8006F721F /* SettingsInteractorFactory.swift */,
F041BE4E2C983C2B0083EC28 /* SettingsPromptAlertItem.swift */,
58ACF64A26553C3F00ACE4B7 /* SettingsSwitchCell.swift */,
58CCA01122424D11004F3011 /* SettingsViewController.swift */,
7A27E3CA2CAE86170088BCFF /* SettingsViewModel.swift */,
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/Coordinators/LocationCoordinator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class LocationCoordinator: Coordinator, Presentable, Presenting {
customListRepository: customListRepository,
constraints: tunnelManager.settings.relayConstraints,
multihopEnabled: tunnelManager.settings.tunnelMultihopState.isEnabled,
daitaEnabled: tunnelManager.settings.daita.daitaState.isEnabled,
daitaSettings: tunnelManager.settings.daita,
startContext: startContext
)
locationViewControllerWrapper.delegate = self
Expand Down
6 changes: 4 additions & 2 deletions ios/MullvadVPN/View controllers/Alert/AlertPresenter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
import Routing

struct AlertPresenter {
let context: any Presenting
weak var context: (any Presenting)?

func showAlert(presentation: AlertPresentation, animated: Bool) {
guard let context else { return }

context.applicationRouter?.presentAlert(
route: .alert(presentation.id),
animated: animated,
Expand All @@ -20,7 +22,7 @@ struct AlertPresenter {
}

func dismissAlert(presentation: AlertPresentation, animated: Bool) {
context.applicationRouter?.dismiss(.alert(presentation.id), animated: animated)
context?.applicationRouter?.dismiss(.alert(presentation.id), animated: animated)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ final class LocationViewController: UIViewController {
private var relaysWithLocation: LocationRelays?
private var filter = RelayFilter()
private var selectedRelays: RelaySelection
private var daitaEnabled: Bool
private var shouldFilterDaita: Bool
weak var delegate: LocationViewControllerDelegate?
var customListRepository: CustomListRepositoryProtocol

Expand All @@ -35,17 +35,17 @@ final class LocationViewController: UIViewController {
}

var filterViewShouldBeHidden: Bool {
!daitaEnabled && (filter.ownership == .any) && (filter.providers == .any)
!shouldFilterDaita && (filter.ownership == .any) && (filter.providers == .any)
}

init(
customListRepository: CustomListRepositoryProtocol,
selectedRelays: RelaySelection,
daitaEnabled: Bool = false
shouldFilterDaita: Bool
) {
self.customListRepository = customListRepository
self.selectedRelays = selectedRelays
self.daitaEnabled = daitaEnabled
self.shouldFilterDaita = shouldFilterDaita

super.init(nibName: nil, bundle: nil)
}
Expand Down Expand Up @@ -154,7 +154,7 @@ final class LocationViewController: UIViewController {
topContentView.addArrangedSubview(searchBar)

filterView.isHidden = filterViewShouldBeHidden
filterView.setDaita(daitaEnabled)
filterView.setDaita(shouldFilterDaita)

filterView.didUpdateFilter = { [weak self] in
self?.delegate?.didUpdateFilter(filter: $0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@ final class LocationViewControllerWrapper: UIViewController {
private var selectedExit: UserSelectedRelays?
private let multihopEnabled: Bool
private var multihopContext: MultihopContext = .exit
private let daitaEnabled: Bool
private let daitaSettings: DAITASettings

weak var delegate: LocationViewControllerWrapperDelegate?

init(
customListRepository: CustomListRepositoryProtocol,
constraints: RelayConstraints,
multihopEnabled: Bool,
daitaEnabled: Bool,
daitaSettings: DAITASettings,
startContext: MultihopContext
) {
self.multihopEnabled = multihopEnabled
self.daitaEnabled = daitaEnabled
self.daitaSettings = daitaSettings
multihopContext = startContext

selectedEntry = constraints.entryLocations.value
Expand All @@ -73,13 +73,16 @@ final class LocationViewControllerWrapper: UIViewController {
entryLocationViewController = LocationViewController(
customListRepository: customListRepository,
selectedRelays: RelaySelection(),
daitaEnabled: multihopEnabled && daitaEnabled
shouldFilterDaita: daitaSettings.daitaState.isEnabled
&& daitaSettings.directOnlyState.isEnabled
)

exitLocationViewController = LocationViewController(
customListRepository: customListRepository,
selectedRelays: RelaySelection(),
daitaEnabled: !multihopEnabled && daitaEnabled
shouldFilterDaita: !multihopEnabled
&& daitaSettings.daitaState.isEnabled
&& daitaSettings.directOnlyState.isEnabled
)

super.init(nibName: nil, bundle: nil)
Expand Down Expand Up @@ -109,7 +112,7 @@ final class LocationViewControllerWrapper: UIViewController {

func setRelaysWithLocation(_ relaysWithLocation: LocationRelays, filter: RelayFilter) {
var daitaFilteredRelays = relaysWithLocation
if daitaEnabled {
if daitaSettings.daitaState.isEnabled && daitaSettings.directOnlyState.isEnabled {
daitaFilteredRelays.relays = relaysWithLocation.relays.filter { relay in
relay.daita == true
}
Expand Down
65 changes: 56 additions & 9 deletions ios/MullvadVPN/View controllers/Settings/SettingsDataSource.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,17 @@ final class SettingsDataSource: UITableViewDiffableDataSource<SettingsDataSource
}
}

private enum HeaderFooterReuseIdentifier: String, CaseIterable {
private enum HeaderFooterReuseIdentifier: String, CaseIterable, HeaderFooterIdentifierProtocol {
case primary
case spacer

var reusableViewClass: AnyClass {
EmptyTableViewHeaderFooterView.self
var headerFooterClass: AnyClass {
switch self {
case .primary:
UITableViewHeaderFooterView.self
case .spacer:
EmptyTableViewHeaderFooterView.self
}
}
}

Expand All @@ -38,6 +44,20 @@ final class SettingsDataSource: UITableViewDiffableDataSource<SettingsDataSource
case main
case version
case problemReport

var sectionFooter: String? {
switch self {
case .daita:
NSLocalizedString(
"SETTINGS_DAITA_SECTION_FOOTER",
tableName: "Settings",
value: "Makes it possible to use DAITA with any server and is automatically enabled.",
comment: ""
)
default:
nil
}
}
}

enum Item: String {
Expand Down Expand Up @@ -130,16 +150,43 @@ final class SettingsDataSource: UITableViewDiffableDataSource<SettingsDataSource
)
}

func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
nil
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
let sectionIdentifier = snapshot().sectionIdentifiers[section]

return switch sectionIdentifier {
case .main:
0
case .daita, .version, .problemReport:
UITableView.automaticDimension
}
}

func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
return UIMetrics.TableView.sectionSpacing
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
let sectionIdentifier = snapshot().sectionIdentifiers[section]
guard let sectionFooterText = sectionIdentifier.sectionFooter else { return nil }

guard let headerView = tableView
.dequeueReusableView(withIdentifier: HeaderFooterReuseIdentifier.primary)
else { return nil }

var contentConfiguration = UIListContentConfiguration.mullvadGroupedFooter(tableStyle: .plain)
contentConfiguration.text = sectionFooterText

headerView.contentConfiguration = contentConfiguration
// headerView.directionalLayoutMargins = UIMetrics.SettingsCell.apiAccessInsetLayoutMargins

return headerView
}

func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
0
let sectionIdentifier = snapshot().sectionIdentifiers[section]

return switch sectionIdentifier {
case .daita:
UITableView.automaticDimension
case .main, .version, .problemReport:
0
}
}

// MARK: - Private
Expand All @@ -154,7 +201,7 @@ final class SettingsDataSource: UITableViewDiffableDataSource<SettingsDataSource

HeaderFooterReuseIdentifier.allCases.forEach { reuseIdentifier in
tableView?.register(
reuseIdentifier.reusableViewClass,
reuseIdentifier.headerFooterClass,
forHeaderFooterViewReuseIdentifier: reuseIdentifier.rawValue
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ final class SettingsInteractor {
var tunnelSettings = tunnelSettings
tunnelSettings.daita = settings

guard let selectedRelays = try? tunnelManager.selectRelays(tunnelSettings: tunnelSettings) else { return nil }
return tunnelSettings.tunnelMultihopState.isEnabled ? .multihop : .singlehop
// Return error if no relays could be selected.
guard (try? tunnelManager.selectRelays(tunnelSettings: tunnelSettings)) != nil else {
return tunnelSettings.tunnelMultihopState.isEnabled ? .multihop : .singlehop
}

return nil
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//
// SettingsPromptAlertItem.swift
// MullvadVPN
//
// Created by Mojgan on 2024-09-16.
// Copyright © 2024 Mullvad VPN AB. All rights reserved.
//

import Foundation
enum DAITASettingsPromptItem: CustomStringConvertible {
case daitaSettingIncompatibleWithSinglehop
case daitaSettingIncompatibleWithMultihop

var description: String {
switch self {
case .daitaSettingIncompatibleWithSinglehop:
"""
DAITA isn’t available on the current server. After enabling, please go to the Switch \
location view and select a location that supports DAITA.
Attention: Since this increases your total network traffic, be cautious if you have a \
limited data plan. It can also negatively impact your network speed and battery usage.
"""
case .daitaSettingIncompatibleWithMultihop:
"""
DAITA isn’t available on the current entry server. After enabling, please go to the Switch \
location view and select an entry location that supports DAITA.
Attention: Since this increases your total network traffic, be cautious if you have a \
limited data plan. It can also negatively impact your network speed and battery usage.
"""
}
}
}
Loading