summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2018-12-06 12:36:30 -0200
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2018-12-11 11:24:41 -0200
commit5b2f1b8808c57f451ee6a6eef15ba92da25329fd (patch)
tree131731e3406ddfc4bf55f044a8344e191e7a7dd9
parent5990a1c333c9c698ef1b2d50e3c0ff7cf2630e94 (diff)
downloadmullvadvpn-5b2f1b8808c57f451ee6a6eef15ba92da25329fd.tar.xz
mullvadvpn-5b2f1b8808c57f451ee6a6eef15ba92da25329fd.zip
Add block when disconnected setting to redux state
-rw-r--r--gui/packages/desktop/src/renderer/app.js1
-rw-r--r--gui/packages/desktop/src/renderer/redux/settings/actions.js16
-rw-r--r--gui/packages/desktop/src/renderer/redux/settings/reducers.js8
3 files changed, 25 insertions, 0 deletions
diff --git a/gui/packages/desktop/src/renderer/app.js b/gui/packages/desktop/src/renderer/app.js
index 6a806f0e6b..2f3d8987db 100644
--- a/gui/packages/desktop/src/renderer/app.js
+++ b/gui/packages/desktop/src/renderer/app.js
@@ -474,6 +474,7 @@ export default class AppRenderer {
reduxSettings.updateAllowLan(newSettings.allowLan);
reduxSettings.updateAutoConnect(newSettings.autoConnect);
reduxSettings.updateEnableIpv6(newSettings.tunnelOptions.enableIpv6);
+ reduxSettings.updateBlockWhenDisconnected(newSettings.blockWhenDisconnected);
reduxSettings.updateOpenVpnMssfix(newSettings.tunnelOptions.openvpn.mssfix);
this._setRelaySettings(newSettings.relaySettings);
diff --git a/gui/packages/desktop/src/renderer/redux/settings/actions.js b/gui/packages/desktop/src/renderer/redux/settings/actions.js
index edb9f8e756..8a7de02e90 100644
--- a/gui/packages/desktop/src/renderer/redux/settings/actions.js
+++ b/gui/packages/desktop/src/renderer/redux/settings/actions.js
@@ -27,6 +27,11 @@ export type UpdateEnableIpv6Action = {
enableIpv6: boolean,
};
+export type UpdateBlockWhenDisconnectedAction = {
+ type: 'UPDATE_BLOCK_WHEN_DISCONNECTED',
+ blockWhenDisconnected: boolean,
+};
+
export type UpdateOpenVpnMssfixAction = {
type: 'UPDATE_OPENVPN_MSSFIX',
mssfix: ?number,
@@ -38,6 +43,7 @@ export type SettingsAction =
| UpdateAutoConnectAction
| UpdateAllowLanAction
| UpdateEnableIpv6Action
+ | UpdateBlockWhenDisconnectedAction
| UpdateOpenVpnMssfixAction;
function updateRelay(relay: RelaySettingsRedux): UpdateRelayAction {
@@ -77,6 +83,15 @@ function updateEnableIpv6(enableIpv6: boolean): UpdateEnableIpv6Action {
};
}
+function updateBlockWhenDisconnected(
+ blockWhenDisconnected: boolean,
+): UpdateBlockWhenDisconnectedAction {
+ return {
+ type: 'UPDATE_BLOCK_WHEN_DISCONNECTED',
+ blockWhenDisconnected,
+ };
+}
+
function updateOpenVpnMssfix(mssfix: ?number): UpdateOpenVpnMssfixAction {
return {
type: 'UPDATE_OPENVPN_MSSFIX',
@@ -90,5 +105,6 @@ export default {
updateAutoConnect,
updateAllowLan,
updateEnableIpv6,
+ updateBlockWhenDisconnected,
updateOpenVpnMssfix,
};
diff --git a/gui/packages/desktop/src/renderer/redux/settings/reducers.js b/gui/packages/desktop/src/renderer/redux/settings/reducers.js
index eba3341e7a..e94cba5132 100644
--- a/gui/packages/desktop/src/renderer/redux/settings/reducers.js
+++ b/gui/packages/desktop/src/renderer/redux/settings/reducers.js
@@ -49,6 +49,7 @@ export type SettingsReduxState = {
autoConnect: boolean,
allowLan: boolean,
enableIpv6: boolean,
+ blockWhenDisconnected: boolean,
openVpn: {
mssfix: ?number,
},
@@ -66,6 +67,7 @@ const initialState: SettingsReduxState = {
autoConnect: false,
allowLan: false,
enableIpv6: true,
+ blockWhenDisconnected: false,
openVpn: {
mssfix: null,
},
@@ -106,6 +108,12 @@ export default function(
enableIpv6: action.enableIpv6,
};
+ case 'UPDATE_BLOCK_WHEN_DISCONNECTED':
+ return {
+ ...state,
+ blockWhenDisconnected: action.blockWhenDisconnected,
+ };
+
case 'UPDATE_OPENVPN_MSSFIX':
return {
...state,