Cleanup proxy code

fixes #11

Author: alindt

app/html/settings.html

@@ -140,13 +140,18 @@ <h4 class="teal-text text-lighten-1"><script> document.write(_("Settings")); </s
       </p>
 
       <div id="proxies" class="row">
-        <div class="input-field col s6">
-          <input id="httpProxy" type="text" class="validate">
-          <span id="httpProxy_label" for="httpProxy" data-error="This field is required if you are using a proxy"><script> document.write(_("HTTP Proxy")); </script></span>
+        <div class="input-field col">
+          <select id="proxyType" class="browser-default">
+            <option value="" disabled selected>Proxy type</option>
+            <option value="http">HTTP</option>
+            <option value="https">HTTPS</option>
+            <option value="socks">SOCKS</option>
+            <option value="socks4">SOCKS4</option>
+            <option value="socks5">SOCKS5</option>
+          </select>
         </div>
-        <div class="input-field col s6">
-          <input id="httpsProxy" type="text" placeholder="Leave blank to use the same" class="validate">
-          <span id="httpsProxy_label" for="httpsProxy" ><script> document.write(_("HTTPS Proxy")); </script></span>
+        <div class="input-field col s8">
+          <input id="proxyURI" type="text" placeholder="<IP|URL>:PORT" class="validate">
         </div>
       </div>
 

app/js/views/settings.js

@@ -31,8 +31,8 @@ var SettingsView = {
 
     $('#useProxy').on('change', () => {
       $('#proxies').toggle()
-      $('#httpProxy').prop('disabled', !($('#useProxy').is(':checked')))
-      $('#httpsProxy').prop('disabled', !($('#useProxy').is(':checked')))
+      $('#proxyType').prop('disabled', !($('#useProxy').is(':checked')))
+      $('#proxyURI').prop('disabled', !($('#useProxy').is(':checked')))
     })
 
     $('#custombackground_enable').on('change', () => {
@@ -79,10 +79,8 @@ var SettingsView = {
 
     $('#useProxy').attr('checked', config.get('useProxy'))
     if ($('#useProxy').is(':checked')) { $('#proxies').show() } else { $('#proxies').hide() }
-    $('#httpProxy').val(config.get('httpProxy'))
-    $('#httpsProxy').val(config.get('httpsProxy'))
-    $('#httpProxy').prop('disabled', !($('#useProxy').is(':checked')))
-    $('#httpsProxy').prop('disabled', !($('#useProxy').is(':checked')))
+    $('#proxyType').val(config.get('proxyType'))
+    $('#proxyURI').val(config.get('proxyURI'))
 
     $('#customcss_enable').attr('checked', config.get('customcss') !== undefined)
     if ($('#customcss_enable').is(':checked')) {
@@ -134,14 +132,14 @@ var SettingsView = {
       config.unSet('thumbSize')
     }
 
-    if ($('#useProxy').is(':checked')) {
+    if ($('#proxyType').val() != null && $('#proxyURI').val() !== '') {
       config.set('useProxy', $('#useProxy').is(':checked'))
-      config.set('httpProxy', $('#httpProxy').val())
-      config.set('httpsProxy', $('#httpsProxy').val())
+      config.set('proxyType', $('#proxyType').val())
+      config.set('proxyURI', $('#proxyURI').val())
     } else {
-      config.unSet('useProxy')
-      config.unSet('httpProxy')
-      config.unSet('httpsProxy')
+      config.set('useProxy', false)
+      config.unSet('proxyType')
+      config.unSet('proxyURI')
     }
 
     config.saveConfiguration()

app/main.js

@@ -277,18 +277,6 @@
         }
       })
 
-      if (config.get('useProxy')) {
-        var session = whatsUpp.window.webContents.session
-        var httpProxy = config.get('httpProxy')
-        var httpsProxy = config.get('httpsProxy') || httpProxy
-        if (httpProxy) {
-          log.info('Proxy configured: ' + 'http=' + httpProxy + ';https=' + httpsProxy)
-          session.setProxy('http=' + httpProxy + ';https=' + httpsProxy, function () {})
-        } else {
-          log.info('No proxy')
-        }
-      }
-
       // OSX Dock menu
       if (process.platform === 'darwin') {
         const dockMenu = AppMenu.buildFromTemplate([
@@ -611,15 +599,6 @@
         })
       })
 
-      if (config.get('useProxy')) {
-        var session = whatsUpp.window.webContents.session
-        var httpProxy = config.get('httpProxy')
-        var httpsProxy = config.get('httpsProxy') || httpProxy
-        if (httpProxy) {
-          session.setProxy('http=' + httpProxy + ';https=' + httpsProxy, () => {})
-        }
-      }
-
       if (config.get('startminimized') !== true) {
         whatsUpp.window.show()
       }
@@ -986,6 +965,16 @@
     var ua = AppSession.defaultSession.getUserAgent().replace(r, '')
     AppSession.defaultSession.setUserAgent(ua)
 
+    if (config.get('useProxy')) {
+      var proxyType = config.get('proxyType')
+      var proxyURI = config.get('proxyURI')
+      var proxy = proxyType + '://' + proxyURI
+      log.info('Proxy configured: ' + proxy)
+      AppSession.defaultSession.setProxy({ proxyRules: proxy }, function () {})
+    } else {
+      log.info('No proxy')
+    }
+
     whatsUpp.init()
     // setting of globalShortcut
     if (config.get('globalshortcut') === true) {