diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-10-05 12:14:48 +0200 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-10-05 12:21:08 +0200 |
| commit | b989b7efec1d44f23765de86cdd50a1751f138cb (patch) | |
| tree | 631ae8a141d1d2303a1c4ae3e99da27625d760c6 /app | |
| parent | e73d32044663ae6256de5089eb227dc00b3ff9bc (diff) | |
| download | mullvadvpn-b989b7efec1d44f23765de86cdd50a1751f138cb.tar.xz mullvadvpn-b989b7efec1d44f23765de86cdd50a1751f138cb.zip | |
Remove the auto-secure setting
Diffstat (limited to 'app')
| -rw-r--r-- | app/components/Settings.js | 12 | ||||
| -rw-r--r-- | app/containers/SettingsPage.js | 4 | ||||
| -rw-r--r-- | app/redux/settings/reducers.js | 2 |
3 files changed, 1 insertions, 17 deletions
diff --git a/app/components/Settings.js b/app/components/Settings.js index 7e71c8dbd2..9dddb2267d 100644 --- a/app/components/Settings.js +++ b/app/components/Settings.js @@ -3,7 +3,6 @@ import moment from 'moment'; import React, { Component } from 'react'; import { If, Then, Else } from 'react-if'; import { Layout, Container, Header } from './Layout'; -import Switch from './Switch'; import CustomScrollbars from './CustomScrollbars'; import type { AccountReduxState } from '../redux/account/reducers'; @@ -24,7 +23,6 @@ export default class Settings extends Component { props: SettingsProps; onClose = () => this.props.onClose(); - onAutoSecure = (autoSecure: boolean) => this.props.onUpdateSettings({ autoSecure }); onExternalLink(type: string) { this.props.onExternalLink(type); @@ -76,15 +74,7 @@ export default class Settings extends Component { </div> <div className="settings__cell-spacer"></div> - <div className="settings__cell"> - <div className="settings__cell-label">Auto-connect</div> - <div className="settings__cell-value"> - <Switch className="settings__autosecure" onChange={ this.onAutoSecure } isOn={ this.props.settings.autoSecure } /> - </div> - </div> - <div className="settings__cell-footer"> - When this device connects to the internet, Mullvad VPN will automatically secure your connection - </div> + <div className="settings__cell-footer"></div> </div> </Then> </If> diff --git a/app/containers/SettingsPage.js b/app/containers/SettingsPage.js index 6152774c4b..4f5ef06968 100644 --- a/app/containers/SettingsPage.js +++ b/app/containers/SettingsPage.js @@ -1,8 +1,6 @@ import { connect } from 'react-redux'; -import { bindActionCreators } from 'redux'; import { push } from 'react-router-redux'; import Settings from '../components/Settings'; -import settingsActions from '../redux/settings/actions'; import { remote, shell } from 'electron'; import { links } from '../config'; @@ -11,13 +9,11 @@ const mapStateToProps = (state) => { }; const mapDispatchToProps = (dispatch, _props) => { - const { updateSettings } = bindActionCreators(settingsActions, dispatch); return { onQuit: () => remote.app.quit(), onClose: () => dispatch(push('/connect')), onViewAccount: () => dispatch(push('/settings/account')), onExternalLink: (type) => shell.openExternal(links[type]), - onUpdateSettings: updateSettings }; }; diff --git a/app/redux/settings/reducers.js b/app/redux/settings/reducers.js index 5594663dce..da23a5a6ce 100644 --- a/app/redux/settings/reducers.js +++ b/app/redux/settings/reducers.js @@ -5,12 +5,10 @@ import { defaultServer } from '../../config'; import type { ReduxAction } from '../store'; export type SettingsReduxState = { - autoSecure: boolean, preferredServer: string }; const initialState: SettingsReduxState = { - autoSecure: true, preferredServer: defaultServer }; |
