diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-10-12 13:36:19 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-10-12 13:36:19 +0200 |
| commit | a5a93f6ca219cb51db5b5ae853e703c53163b8e5 (patch) | |
| tree | 71c75073ed1393b7ddb8acf6cbc990717f6a99d0 | |
| parent | 061ec7fb5760d32c906733353bfbd10c9529ea04 (diff) | |
| parent | 8523ccad75d07f8775084b62d7ae6ad5b7427bfe (diff) | |
| download | mullvadvpn-a5a93f6ca219cb51db5b5ae853e703c53163b8e5.tar.xz mullvadvpn-a5a93f6ca219cb51db5b5ae853e703c53163b8e5.zip | |
Merge branch 'adjust-mssfix-range'
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | gui/packages/desktop/src/renderer/components/AdvancedSettings.js | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d2d8451e3c..d4f9f346b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,8 +30,9 @@ Line wrap the file at 100 chars. Th might have security issues. ### Fixed -- Place Mssfix setting inside scrollable area +- Place Mssfix setting inside scrollable area. - Pick new random relay for each reconnect attempt instead of just retrying with the same one. +- Fix so mssfix can be unset. Previously emptying the textbox did nothing. #### Linux - The app will have it's window resized correctly when display scaling settings are changed. This diff --git a/gui/packages/desktop/src/renderer/components/AdvancedSettings.js b/gui/packages/desktop/src/renderer/components/AdvancedSettings.js index 8b88cf9dfe..0c00886e68 100644 --- a/gui/packages/desktop/src/renderer/components/AdvancedSettings.js +++ b/gui/packages/desktop/src/renderer/components/AdvancedSettings.js @@ -17,7 +17,7 @@ import styles from './AdvancedSettingsStyles'; import Img from './Img'; const MIN_MSSFIX_VALUE = 1000; -const MAX_MSSFIX_VALUE = 1500; +const MAX_MSSFIX_VALUE = 1450; type Props = { enableIpv6: boolean, @@ -116,7 +116,7 @@ export class AdvancedSettings extends Component<Props, State> { <Cell.Input keyboardType={'numeric'} maxLength={5} - placeholder={'None'} + placeholder={'Default'} value={this.state.editedMssfix} style={mssfixStyle} onChangeText={this._onMssfixChange} @@ -124,7 +124,9 @@ export class AdvancedSettings extends Component<Props, State> { onBlur={this._onMssfixBlur} /> </Cell.Container> - <Cell.Footer>Change OpenVPN MSS value</Cell.Footer> + <Cell.Footer> + Set OpenVPN MSS value. Valid range: {MIN_MSSFIX_VALUE} - {MAX_MSSFIX_VALUE}. + </Cell.Footer> </NavigationScrollbars> </View> </NavigationContainer> @@ -179,7 +181,7 @@ export class AdvancedSettings extends Component<Props, State> { _mssfixIsValid(): boolean { const mssfix = this.state.editedMssfix; - return mssfix >= MIN_MSSFIX_VALUE && mssfix <= MAX_MSSFIX_VALUE; + return mssfix === null || (mssfix >= MIN_MSSFIX_VALUE && mssfix <= MAX_MSSFIX_VALUE); } } |