From 0bdfec10e4a11f44a103c0ac6026ab21fa42b504 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sat, 4 Jun 2016 15:41:36 +0800
Subject: [PATCH] support https and wss scheme

---
 app/langs/zh-CN.json                    | 4 ++++
 app/scripts/config/language-default.js  | 4 ++++
 app/scripts/services/aria2RpcService.js | 2 +-
 app/views/settings-ariang.html          | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/langs/zh-CN.json b/app/langs/zh-CN.json
index 80e1d26..51111d8 100644
--- a/app/langs/zh-CN.json
+++ b/app/langs/zh-CN.json
@@ -88,6 +88,10 @@
     "Minutes": "分",
     "Seconds": "秒",
     "Milliseconds": "毫秒",
+    "Http": "Http",
+    "Https": "Https",
+    "WebSocket": "WebSocket",
+    "WebSocket (Security)": "WebSocket (安全)",
     "Disabled": "禁用",
     "Changes to the settings take effect after refreshing page.": "设置将在页面刷新后生效.",
     "Type is illegal!": "类型错误!",
diff --git a/app/scripts/config/language-default.js b/app/scripts/config/language-default.js
index 56bca69..3d566f0 100644
--- a/app/scripts/config/language-default.js
+++ b/app/scripts/config/language-default.js
@@ -92,6 +92,10 @@
             'Minutes': 'Minutes',
             'Seconds': 'Seconds',
             'Milliseconds': 'Milliseconds',
+            'Http': 'Http',
+            'Https': 'Https',
+            'WebSocket': 'WebSocket',
+            'WebSocket (Security)': 'WebSocket (Security)',
             'Disabled': 'Disabled',
             'Changes to the settings take effect after refreshing page.': 'Changes to the settings take effect after refreshing page.',
             'Type is illegal!': 'Type is illegal!',
diff --git a/app/scripts/services/aria2RpcService.js b/app/scripts/services/aria2RpcService.js
index 20555e1..8b44a93 100644
--- a/app/scripts/services/aria2RpcService.js
+++ b/app/scripts/services/aria2RpcService.js
@@ -38,7 +38,7 @@
                 context.requestBody.params = finalParams;
             }
 
-            if (protocol == 'ws') {
+            if (protocol == 'ws' || protocol == 'wss') {
                 return aria2WebSocketRpcService.request(context);
             } else {
                 return aria2HttpRpcService.request(context);
diff --git a/app/views/settings-ariang.html b/app/views/settings-ariang.html
index 9df8842..aee0182 100644
--- a/app/views/settings-ariang.html
+++ b/app/views/settings-ariang.html
@@ -42,7 +42,9 @@
             <div class="setting-value col-sm-8">
                 <select class="form-control" style="width: 100%;" ng-model="settings.protocol" ng-change="settingService.setProtocol(settings.protocol)">
                     <option value="http" translate>Http</option>
+                    <option value="https" translate>Https</option>
                     <option value="ws" translate>WebSocket</option>
+                    <option value="wss" translate>WebSocket (Security)</option>
                 </select>
             </div>
         </div>