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

Move IP Overrides into VPN Settings menu #5971

Conversation

rablador
Copy link
Contributor

@rablador rablador commented Mar 18, 2024

Currently resides in top level menu under settings, but should reside under submenu item VPN Settings.


This change is Reviewable

@rablador rablador added the iOS Issues related to iOS label Mar 18, 2024
@rablador rablador force-pushed the move-the-ip-overrides-in-the-vpn-settings-instead-of-it-ios-557 branch 2 times, most recently from 23b3fef to be56075 Compare March 18, 2024 13:07
@rablador rablador requested review from buggmagnet and mojganii March 18, 2024 13:07
Copy link
Contributor Author

@rablador rablador left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 25 files reviewed, 3 unresolved discussions


ios/MullvadSettings/SettingsManager.swift line 147 at r1 (raw file):

        logger.debug("Reset store.")

        let keys = completely ? SettingsKey.allCases : [.settings, .deviceState, .apiAccessMethods, .ipOverrides]

This has apparently been missed.


ios/MullvadVPN/Coordinators/Settings/IPOverride/IPOverrideViewController.swift line 150 at r1 (raw file):

            On some networks, where various types of censorship are being used, our server IP addresses are \
            sometimes blocked.
            To circumvent this you can import a file or a text, provided by our support team, \

Removed some spaces that would make alert text look bad.


ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsViewController.swift line 137 at r1 (raw file):

                    value: """
                    The automatic setting will randomly choose from the valid port ranges shown below.
                    The custom port can be any value inside the valid ranges:

Removed some spaces that would make alert text look bad.

@rablador rablador force-pushed the move-the-ip-overrides-in-the-vpn-settings-instead-of-it-ios-557 branch from be56075 to c583c80 Compare March 18, 2024 14:00
Copy link
Contributor

@acb-mv acb-mv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 9 of 22 files at r1, 16 of 16 files at r2, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions

Copy link
Contributor

@buggmagnet buggmagnet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 9 of 22 files at r1, 16 of 16 files at r2, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions

@buggmagnet buggmagnet force-pushed the move-the-ip-overrides-in-the-vpn-settings-instead-of-it-ios-557 branch from c583c80 to 1ddc41a Compare March 19, 2024 12:30
@buggmagnet buggmagnet merged commit 0216554 into main Mar 19, 2024
5 of 7 checks passed
@buggmagnet buggmagnet deleted the move-the-ip-overrides-in-the-vpn-settings-instead-of-it-ios-557 branch March 19, 2024 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
iOS Issues related to iOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants