From ef707e4383a0d430775c8ac9b660c334e87e40ec Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Thu, 15 Dec 2016 20:54:09 +0800
Subject: [PATCH 1/8] Refine ACL

---
 src/main/assets/acl/bypass-china.acl     | 2 +-
 src/main/assets/acl/bypass-lan-china.acl | 4 ++--
 src/main/assets/acl/china-list.acl       | 2 +-
 src/main/assets/acl/gfwlist.acl          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/assets/acl/bypass-china.acl b/src/main/assets/acl/bypass-china.acl
index a8a00b0e..bc936383 100644
--- a/src/main/assets/acl/bypass-china.acl
+++ b/src/main/assets/acl/bypass-china.acl
@@ -1,6 +1,6 @@
 [proxy_all]
 
-[black_list]
+[bypass_list]
 1.0.1.0/24
 1.0.2.0/23
 1.0.8.0/21
diff --git a/src/main/assets/acl/bypass-lan-china.acl b/src/main/assets/acl/bypass-lan-china.acl
index 7df7473f..56fbed49 100644
--- a/src/main/assets/acl/bypass-lan-china.acl
+++ b/src/main/assets/acl/bypass-lan-china.acl
@@ -1,6 +1,6 @@
 [proxy_all]
 
-[black_list]
+[bypass_list]
 0.0.0.0/8
 10.0.0.0/8
 100.64.0.0/10
@@ -4438,7 +4438,7 @@
 223.255.236.0/22
 223.255.252.0/23
 
-[white_list]
+[proxy_list]
 ^(.*\.)?4tern\.com$
 ^(.*\.)?adorama\.com$
 ^(.*\.)?akiba-web\.com$
diff --git a/src/main/assets/acl/china-list.acl b/src/main/assets/acl/china-list.acl
index 03dc31fd..2fcc2066 100644
--- a/src/main/assets/acl/china-list.acl
+++ b/src/main/assets/acl/china-list.acl
@@ -1,6 +1,6 @@
 [bypass_all]
 
-[white_list]
+[proxy_list]
 1.0.1.0/24
 1.0.2.0/23
 1.0.8.0/21
diff --git a/src/main/assets/acl/gfwlist.acl b/src/main/assets/acl/gfwlist.acl
index 4b1d2adc..dc0790c1 100644
--- a/src/main/assets/acl/gfwlist.acl
+++ b/src/main/assets/acl/gfwlist.acl
@@ -2,7 +2,7 @@
 # updated on 2016-09-08 12:09:55$
 [bypass_all]
 
-[white_list]
+[proxy_list]
 # Telegram IPs$
 91.108.4.0/22
 91.108.56.0/22

From 4aea4a1db545e63116c8cca076724e1e4d1d9e1d Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Fri, 16 Dec 2016 15:21:16 +0800
Subject: [PATCH 2/8] Fix #1014

---
 src/main/assets/acl/gfwlist.acl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/assets/acl/gfwlist.acl b/src/main/assets/acl/gfwlist.acl
index dc0790c1..599d1666 100644
--- a/src/main/assets/acl/gfwlist.acl
+++ b/src/main/assets/acl/gfwlist.acl
@@ -340,7 +340,7 @@
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
 ^(.*\.)?google(\..*)?$
-^(.*\.)?googleapis\.com$
+^(.*\.)?googleapis(\..*)?$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$

From c6b88cf73d39639d3fd020e9744aac06ac94077f Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Fri, 16 Dec 2016 20:09:33 +0800
Subject: [PATCH 3/8] Refine #1014

---
 src/main/assets/acl/bypass-china.acl     | 4 ++--
 src/main/assets/acl/bypass-lan-china.acl | 4 ++--
 src/main/assets/acl/gfwlist.acl          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/assets/acl/bypass-china.acl b/src/main/assets/acl/bypass-china.acl
index bc936383..8b436380 100644
--- a/src/main/assets/acl/bypass-china.acl
+++ b/src/main/assets/acl/bypass-china.acl
@@ -4756,8 +4756,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google(\..*)?$
-^(.*\.)?googleapis\.com$
+^(.*\.)?google(\..*)$
+^(.*\.)?googleapis(\..*)$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$
diff --git a/src/main/assets/acl/bypass-lan-china.acl b/src/main/assets/acl/bypass-lan-china.acl
index 56fbed49..2c7bb985 100644
--- a/src/main/assets/acl/bypass-lan-china.acl
+++ b/src/main/assets/acl/bypass-lan-china.acl
@@ -4770,8 +4770,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google(\..*)?$
-^(.*\.)?googleapis\.com$
+^(.*\.)?google(\..*)$
+^(.*\.)?googleapis(\..*)$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$
diff --git a/src/main/assets/acl/gfwlist.acl b/src/main/assets/acl/gfwlist.acl
index 599d1666..2cbeb877 100644
--- a/src/main/assets/acl/gfwlist.acl
+++ b/src/main/assets/acl/gfwlist.acl
@@ -339,8 +339,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google(\..*)?$
-^(.*\.)?googleapis(\..*)?$
+^(.*\.)?google(\..*)$
+^(.*\.)?googleapis(\..*)$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$

From 325e28f562eba1f8a2cb336536047b3996f34578 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Fri, 16 Dec 2016 20:25:27 +0800
Subject: [PATCH 4/8] Refine #1014 again

---
 src/main/assets/acl/bypass-china.acl     | 4 ++--
 src/main/assets/acl/bypass-lan-china.acl | 4 ++--
 src/main/assets/acl/gfwlist.acl          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/assets/acl/bypass-china.acl b/src/main/assets/acl/bypass-china.acl
index 8b436380..9c6dfe0f 100644
--- a/src/main/assets/acl/bypass-china.acl
+++ b/src/main/assets/acl/bypass-china.acl
@@ -4756,8 +4756,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google(\..*)$
-^(.*\.)?googleapis(\..*)$
+^(.*\.)?google\..*$
+^(.*\.)?googleapis\..*$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$
diff --git a/src/main/assets/acl/bypass-lan-china.acl b/src/main/assets/acl/bypass-lan-china.acl
index 2c7bb985..b993db20 100644
--- a/src/main/assets/acl/bypass-lan-china.acl
+++ b/src/main/assets/acl/bypass-lan-china.acl
@@ -4770,8 +4770,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google(\..*)$
-^(.*\.)?googleapis(\..*)$
+^(.*\.)?google\..*$
+^(.*\.)?googleapis\..*$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$
diff --git a/src/main/assets/acl/gfwlist.acl b/src/main/assets/acl/gfwlist.acl
index 2cbeb877..69e36027 100644
--- a/src/main/assets/acl/gfwlist.acl
+++ b/src/main/assets/acl/gfwlist.acl
@@ -339,8 +339,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google(\..*)$
-^(.*\.)?googleapis(\..*)$
+^(.*\.)?google\..*$
+^(.*\.)?googleapis\..*$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$

From 0c930b3650a00aec71faf37adf13dbeb0af9f5b8 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Sat, 17 Dec 2016 07:27:16 +0800
Subject: [PATCH 5/8] Refine regex

---
 src/main/assets/acl/bypass-china.acl     | 4 ++--
 src/main/assets/acl/bypass-lan-china.acl | 4 ++--
 src/main/assets/acl/gfwlist.acl          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/assets/acl/bypass-china.acl b/src/main/assets/acl/bypass-china.acl
index 9c6dfe0f..078d76e0 100644
--- a/src/main/assets/acl/bypass-china.acl
+++ b/src/main/assets/acl/bypass-china.acl
@@ -4756,8 +4756,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google\..*$
-^(.*\.)?googleapis\..*$
+^(.*\.)?google(\.[^.]{2,4}){1,2}$
+^(.*\.)?googleapis(\.[^.]{2,4}){1,2}$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$
diff --git a/src/main/assets/acl/bypass-lan-china.acl b/src/main/assets/acl/bypass-lan-china.acl
index b993db20..f7523dda 100644
--- a/src/main/assets/acl/bypass-lan-china.acl
+++ b/src/main/assets/acl/bypass-lan-china.acl
@@ -4770,8 +4770,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google\..*$
-^(.*\.)?googleapis\..*$
+^(.*\.)?google(\.[^.]{2,4}){1,2}$
+^(.*\.)?googleapis(\.[^.]{2,4}){1,2}$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$
diff --git a/src/main/assets/acl/gfwlist.acl b/src/main/assets/acl/gfwlist.acl
index 69e36027..f513f05f 100644
--- a/src/main/assets/acl/gfwlist.acl
+++ b/src/main/assets/acl/gfwlist.acl
@@ -339,8 +339,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google\..*$
-^(.*\.)?googleapis\..*$
+^(.*\.)?google(\.[^.]{2,4}){1,2}$
+^(.*\.)?googleapis(\.[^.]{2,4}){1,2}$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$

From d1e914ce85415e59cd7e59aa260d174242e69abd Mon Sep 17 00:00:00 2001
From: sunsysjp <sunsysjp@gmail.com>
Date: Fri, 16 Dec 2016 20:17:31 +0800
Subject: [PATCH 6/8] Update Japanese translation

Alter the wording

20:15 16/12/2016
---
 src/main/res/values-ja/strings.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index a4addc47..a38dc7b2 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -18,8 +18,8 @@
   <string name="http_proxy_summary">ローカル HTTP プロキシ</string>
   <string name="dns_proxy">DNS プロキシ</string>
   <string name="dns_proxy_summary">DNS解析をリモートサーバーにリダイレクト</string>
-  <string name="auto_set_gfwlist">中国本土のアドレスをプロキシ</string>
-  <string name="auto_set_gfwlist_summary">中国本土のアドレスを迂回</string>
+  <string name="auto_set_gfwlist">CHN Route</string>
+  <string name="auto_set_gfwlist_summary">中国本土のサイトをすべて迂回する</string>
   <string name="route_list">プロキシ方式</string>
   <string name="proxied_apps">アプリ別のプロキシを使用</string>
   <string name="proxied_apps_summary">アプリ別でプロキシを指定、Android 4.x では必ずNATモードを使用して下さい</string>
@@ -41,15 +41,15 @@
   <string name="quick_switch">切り替え</string>
   <string name="stopping">停止中……</string>
   <string name="vpn_error">バックグランドサービスの起動に失敗しました：%s</string>
-  <string name="reboot_required">VPNサービスの起動に失敗しました、デバイスの再起動が必要かもしれません。</string>
+  <string name="reboot_required">VPNサービスの起動に失敗しました、デバイスの再起動を試みて下さい</string>
   <string name="close">閉じる</string>
-  <string name="proxy_empty">サーバアドレスやパスワードを入力する必要があります</string>
+  <string name="proxy_empty">サーバアドレスやパスワードの入力が必要です</string>
   <string name="connect">接続</string>
   <string name="initializing">初期化中……</string>
   <string name="recovering">リセット中……</string>
   <string name="loading">読み込み中……</string>
   <string name="profiles">プロファイル</string>
-  <string name="settings">オプションの設定</string>
+  <string name="settings">オプション設定</string>
   <string name="remove_profile">このプロファイルを削除「%s」?</string>
   <string name="recovery">リセット</string>
   <string name="recovery_summary">すべてのバックグラウンドサービスをリセット</string>
@@ -85,17 +85,17 @@
 
   <string name="connection_test_pending">接続状況確認</string>
   <string name="connection_test_testing">テスト中...</string>
-  <string name="connection_test_available">成功: %d msの遅延</string>
+  <string name="connection_test_available">成功: %dmsの遅延</string>
   <string name="connection_test_fail">インターネット利用不可</string>
   <string name="connection_test_error">失敗しました：%s</string>
   <string name="connection_test_error_status_code">ステータスコード無効（#%d）</string>
 
   <!-- profile -->
   <string name="profile_manager_dialog">プロファイル</string>
-  <string name="profile_manager_dialog_content">&#8226; タッチしてプロファイルを選択；\n&#8226; 左或いは右にフリックで削除；\n&#8226;
+  <string name="profile_manager_dialog_content">&#8226; タッチしてプロファイルを選択；\n&#8226; 左或いは右にスワイプして削除；\n&#8226;
     長押し後にドラッグで順序を変更</string>
   <string name="gotcha">承知</string>
-  <string name="copy_url">URL をコピー</string>
+  <string name="copy_url">URLをコピー</string>
   <string name="add_profile_dialog">シャドーソックスにプロファイルを追加しますか</string>
   <string name="add_profile_methods_scan_qr_code">QRコードを読み取る</string>
   <string name="add_profile_methods_manual_settings">手動でセットアップ</string>
@@ -105,11 +105,11 @@
 
   <string-array name="route_entry">
     <item>すべて</item>
-    <item>LANアドレスはプロキシを経由しない</item>
-    <item>中国本土アドレスはプロキシを経由しない</item>
-    <item>LAN及び中国本土のアドレスはプロキシを経由しない</item>
-    <item>中国本土からのアクセスができないアドレスのみプロキシを経由する</item>
-    <item>中国本土のアドレスのみプロキシを経由する</item>
+    <item>LANアドレスを迂回する</item>
+    <item>中国本土のアドレスを迂回する</item>
+    <item>LAN及び中国本土のアドレスを迂回する</item>
+    <item>中国本土からアクセス不可なアドレス以外を迂回する</item>
+    <item>中国本土のアドレス以外を迂回する</item>
   </string-array>
 
   <string name="action_apply_all">設定をすべてのプロファイルに適応する</string>

From 72e137bab3048b7fd678ff258e18932bcbbd4dd8 Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Sat, 24 Dec 2016 12:53:52 -0600
Subject: [PATCH 7/8] Update ACL URL

---
 src/main/scala/com/github/shadowsocks/job/AclSyncJob.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/com/github/shadowsocks/job/AclSyncJob.scala b/src/main/scala/com/github/shadowsocks/job/AclSyncJob.scala
index 8e3c8d4b..3af59e8a 100644
--- a/src/main/scala/com/github/shadowsocks/job/AclSyncJob.scala
+++ b/src/main/scala/com/github/shadowsocks/job/AclSyncJob.scala
@@ -51,7 +51,7 @@ class AclSyncJob(route: String) extends Job {
     try {
       //noinspection JavaAccessorMethodCalledAsEmptyParen
       IOUtils.writeString(app.getApplicationInfo.dataDir + '/' + filename, autoClose(
-        new URL("https://raw.githubusercontent.com/shadowsocks/shadowsocks-android/master/src/main/assets/acl/" +
+        new URL("https://shadowsocks.org/acl/android/v1/" +
           filename).openConnection().getInputStream())(IOUtils.readString))
       Result.SUCCESS
     } catch {

From 5596b8ac49da78035e7d3593fd76a6c072264bea Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Tue, 27 Dec 2016 15:58:20 +0800
Subject: [PATCH 8/8] Update GFWList

---
 src/main/assets/acl/bypass-china.acl     | 2 +-
 src/main/assets/acl/bypass-lan-china.acl | 2 +-
 src/main/assets/acl/gfwlist.acl          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/assets/acl/bypass-china.acl b/src/main/assets/acl/bypass-china.acl
index 078d76e0..66436872 100644
--- a/src/main/assets/acl/bypass-china.acl
+++ b/src/main/assets/acl/bypass-china.acl
@@ -4733,7 +4733,7 @@
 ^(.*\.)?android\.com$
 ^(.*\.)?androidify\.com$
 ^(.*\.)?appspot\.com$
-^(.*\.)?blogspot\.com$
+^(.*\.)?blogspot(\.[^.]{2,4}){1,2}$
 ^(.*\.)?certificate-transparency\.org$
 ^(.*\.)?chrome\.com$
 ^(.*\.)?chromecast\.com$
diff --git a/src/main/assets/acl/bypass-lan-china.acl b/src/main/assets/acl/bypass-lan-china.acl
index f7523dda..ac3e14b9 100644
--- a/src/main/assets/acl/bypass-lan-china.acl
+++ b/src/main/assets/acl/bypass-lan-china.acl
@@ -4747,7 +4747,7 @@
 ^(.*\.)?android\.com$
 ^(.*\.)?androidify\.com$
 ^(.*\.)?appspot\.com$
-^(.*\.)?blogspot\.com$
+^(.*\.)?blogspot(\.[^.]{2,4}){1,2}$
 ^(.*\.)?certificate-transparency\.org$
 ^(.*\.)?chrome\.com$
 ^(.*\.)?chromecast\.com$
diff --git a/src/main/assets/acl/gfwlist.acl b/src/main/assets/acl/gfwlist.acl
index f513f05f..8939b57e 100644
--- a/src/main/assets/acl/gfwlist.acl
+++ b/src/main/assets/acl/gfwlist.acl
@@ -316,7 +316,7 @@
 ^(.*\.)?android\.com$
 ^(.*\.)?androidify\.com$
 ^(.*\.)?appspot\.com$
-^(.*\.)?blogspot\.com$
+^(.*\.)?blogspot(\.[^.]{2,4}){1,2}$
 ^(.*\.)?certificate-transparency\.org$
 ^(.*\.)?chrome\.com$
 ^(.*\.)?chromecast\.com$