diff options
| author | Andrej Mihajlov <and@codeispoetry.ru> | 2017-02-21 20:07:36 +0000 |
|---|---|---|
| committer | Andrej Mihajlov <and@codeispoetry.ru> | 2017-02-21 20:07:36 +0000 |
| commit | 5383fd835bc9f6c658237717c18ac962c643ab4e (patch) | |
| tree | 91f5740705c7b00fad31053f1320a71a4215623c | |
| parent | 177657c401b01f7facece15779768bff2ea95fab (diff) | |
| download | mullvadvpn-5383fd835bc9f6c658237717c18ac962c643ab4e.tar.xz mullvadvpn-5383fd835bc9f6c658237717c18ac962c643ab4e.zip | |
Use defaultServer instead
| -rw-r--r-- | app/constants.js | 3 | ||||
| -rw-r--r-- | app/reducers/settings.js | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/app/constants.js b/app/constants.js index 76a69ff558..ad4d2a51d8 100644 --- a/app/constants.js +++ b/app/constants.js @@ -21,10 +21,11 @@ module.exports = { 'ro.mullvad.net': { name: 'Romania' }, 'sg.mullvad.net': { name: 'Singapore' }, 'es.mullvad.net': { name: 'Spain' }, - 'se1.mullvad.net': { name: 'Sweden', isDefault: true }, + 'se1.mullvad.net': { name: 'Sweden' }, 'ch.mullvad.net': { name: 'Switzerland' }, 'uk.mullvad.net': { name: 'United Kingdom' }, 'us1.mullvad.net': { name: 'USA' } }, + defaultServer: 'nearest', // can be nearest, fastest or any of keys from .servers LoginState, ConnectionState }; diff --git a/app/reducers/settings.js b/app/reducers/settings.js index 6436b2c560..4e1bf4e4f0 100644 --- a/app/reducers/settings.js +++ b/app/reducers/settings.js @@ -1,12 +1,7 @@ import { handleActions } from 'redux-actions'; - -import { servers } from '../constants'; - +import { defaultServer } from '../constants'; import actions from '../actions/settings'; -const addrs = Object.keys(servers); -const defaultServer = addrs.find((k) => servers[k].isDefault) || servers[addrs[0]] || {}; - const initialState = { autoSecure: false, preferredServer: defaultServer |