Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket

Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
	web/src/js/connection.js

1 files changed, 17 insertions, 12 deletions

diff --git a/web/src/js/ducks/websocket.js b/web/src/js/ducks/websocket.js
index 0d0556ad..766f7236 100644
--- a/web/src/js/ducks/websocket.js
+++ b/web/src/js/ducks/websocket.js
@@ -1,7 +1,8 @@
 import { ConnectionActions } from '../actions.js'
 import { AppDispatcher } from '../dispatcher.js'
 import * as eventLogActions from './eventLog'
-import * as flowActions from './flows'
+import * as flowsActions from './flows'
+import * as settingsActions from './settings'
 
 export const CONNECT = 'WEBSOCKET_CONNECT'
 export const CONNECTED = 'WEBSOCKET_CONNECTED'
@@ -62,15 +63,8 @@ export function onConnect() {
     // workaround to make sure that our state is already available.
     return dispatch => {
         dispatch({ type: CONNECTED })
-        dispatch(flowActions.fetchFlows()).then(() => ConnectionActions.open())
-    }
-}
-
-export function onDisconnect() {
-    return dispatch => {
-        ConnectionActions.close()
-        dispatch(eventLogActions.addLogEntry('WebSocket connection closed.'))
-        dispatch({ type: DISCONNECTED })
+        dispatch(settingsActions.fetchSettings())
+        dispatch(flowsActions.fetchFlows()).then(() => ConnectionActions.open())
     }
 }
 
@@ -85,8 +79,11 @@ export function onMessage(msg) {
             case eventLogActions.UPDATE_LOG:
                 return dispatch(eventLogActions.updateLogEntries(data))
 
-            case flowActions.UPDATE_FLOWS:
-                return dispatch(flowActions.updateFlows(data))
+            case flowsActions.UPDATE_FLOWS:
+                return dispatch(flowsActions.updateFlows(data))
+
+            case settingsActions.UPDATE_SETTINGS:
+                return dispatch(settingsActions.updateSettings(message))
 
             default:
                 console.warn('unknown message', data)
@@ -96,6 +93,14 @@ export function onMessage(msg) {
     }
 }
 
+export function onDisconnect() {
+    return dispatch => {
+        ConnectionActions.close()
+        dispatch(eventLogActions.addLogEntry('WebSocket connection closed.'))
+        dispatch({ type: DISCONNECTED })
+    }
+}
+
 export function onError(error) {
     // @todo let event log subscribe WebSocketActions.ERROR
     return dispatch => {