From 82103d286d78233b0e3da9e195cf7b435a7253d1 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Mon, 31 Oct 2016 09:26:13 +0800
Subject: [PATCH] Fix #961

---
 src/main/assets/acl/bypass-china.acl     | 21 +--------------------
 src/main/assets/acl/bypass-lan-china.acl | 21 +--------------------
 src/main/assets/acl/gfwlist.acl          | 21 +--------------------
 src/main/res/values/configs.xml          |  2 +-
 4 files changed, 4 insertions(+), 61 deletions(-)

diff --git a/src/main/assets/acl/bypass-china.acl b/src/main/assets/acl/bypass-china.acl
index 8816d481..41fa4cac 100644
--- a/src/main/assets/acl/bypass-china.acl
+++ b/src/main/assets/acl/bypass-china.acl
@@ -4756,26 +4756,7 @@
 (.*\.)?gmail\.com
 (.*\.)?gmodules\.com
 (.*\.)?goo\.gl
-(.*\.)?google\.ae
-(.*\.)?google\.am
-(.*\.)?google\.cat
-(.*\.)?google\.cd
-(.*\.)?google\.ci
-(.*\.)?google\.co\.kr
-(.*\.)?google\.co\.ma
-(.*\.)?google\.com
-(.*\.)?google\.dk
-(.*\.)?google\.es
-(.*\.)?google\.fi
-(.*\.)?google\.gg
-(.*\.)?google\.ie
-(.*\.)?google\.is
-(.*\.)?google\.it
-(.*\.)?google\.nl
-(.*\.)?google\.no
-(.*\.)?google\.sk
-(.*\.)?google\.sm
-(.*\.)?google\.tk
+(.*\.)?google(\..*)?
 (.*\.)?googleapis\.com
 (.*\.)?googleapps\.com
 (.*\.)?googleartproject\.com
diff --git a/src/main/assets/acl/bypass-lan-china.acl b/src/main/assets/acl/bypass-lan-china.acl
index cf6c6bbd..ed89b1c5 100644
--- a/src/main/assets/acl/bypass-lan-china.acl
+++ b/src/main/assets/acl/bypass-lan-china.acl
@@ -4770,26 +4770,7 @@
 (.*\.)?gmail\.com
 (.*\.)?gmodules\.com
 (.*\.)?goo\.gl
-(.*\.)?google\.ae
-(.*\.)?google\.am
-(.*\.)?google\.cat
-(.*\.)?google\.cd
-(.*\.)?google\.ci
-(.*\.)?google\.co\.kr
-(.*\.)?google\.co\.ma
-(.*\.)?google\.com
-(.*\.)?google\.dk
-(.*\.)?google\.es
-(.*\.)?google\.fi
-(.*\.)?google\.gg
-(.*\.)?google\.ie
-(.*\.)?google\.is
-(.*\.)?google\.it
-(.*\.)?google\.nl
-(.*\.)?google\.no
-(.*\.)?google\.sk
-(.*\.)?google\.sm
-(.*\.)?google\.tk
+(.*\.)?google(\..*)?
 (.*\.)?googleapis\.com
 (.*\.)?googleapps\.com
 (.*\.)?googleartproject\.com
diff --git a/src/main/assets/acl/gfwlist.acl b/src/main/assets/acl/gfwlist.acl
index d1ece135..e4f95fed 100644
--- a/src/main/assets/acl/gfwlist.acl
+++ b/src/main/assets/acl/gfwlist.acl
@@ -338,26 +338,7 @@
 (.*\.)?gmail\.com
 (.*\.)?gmodules\.com
 (.*\.)?goo\.gl
-(.*\.)?google\.ae
-(.*\.)?google\.am
-(.*\.)?google\.cat
-(.*\.)?google\.cd
-(.*\.)?google\.ci
-(.*\.)?google\.co\.kr
-(.*\.)?google\.co\.ma
-(.*\.)?google\.com
-(.*\.)?google\.dk
-(.*\.)?google\.es
-(.*\.)?google\.fi
-(.*\.)?google\.gg
-(.*\.)?google\.ie
-(.*\.)?google\.is
-(.*\.)?google\.it
-(.*\.)?google\.nl
-(.*\.)?google\.no
-(.*\.)?google\.sk
-(.*\.)?google\.sm
-(.*\.)?google\.tk
+(.*\.)?google(\..*)?
 (.*\.)?googleapis\.com
 (.*\.)?googleapps\.com
 (.*\.)?googleartproject\.com
diff --git a/src/main/res/values/configs.xml b/src/main/res/values/configs.xml
index d9498c59..d2bca0f0 100644
--- a/src/main/res/values/configs.xml
+++ b/src/main/res/values/configs.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="black_list" translatable="false">".appspot.com",".blogspot.com",".blogspot.kr",".blogspot.sg",".cdninstagram.com",".connect.facebook.net",".facebook.br",".facebook.com",".facebook.hu",".facebook.nl",".facebook.se",".fbcdn.net",".google.co.kr",".google.com",".google.com",".google.com.hk",".google.com.sg",".google.com.tw",".googleapis.com",".googleapps.com",".googleartproject.com",".googleblog.com",".googlecode.com",".googlecommerce.com",".googledomains.com",".googledrive.com",".googleearth.com",".googlegroups.com",".googlehosted.com",".googleideas.com",".googlelabs.com",".googlemail.com",".googleplay.com",".googleplus.com",".googlesile.com",".googlesource.com",".googleusercontent.com",".googlevideo.com",".googlezip.net",".gstatic.com",".yahoo.com",".igoogle.com",".instagram.com",".institut-tibetain.org",".nic.google",".registry.google",".thinkwithgoogle.com",".withgoogle.com",".youtube-nocookie.com",".youtube.com",".gvt1.com",".gvt2.com",".gvt3.com",".1e100.net"</string>
+  <string name="black_list" translatable="false">".appspot.com",".blogspot.com",".blogspot.kr",".blogspot.sg",".cdninstagram.com",".connect.facebook.net",".facebook.br",".facebook.com",".facebook.hu",".facebook.nl",".facebook.se",".fbcdn.net",".google.co.jp",".google.co.kr",".google.com",".google.com",".google.com.hk",".google.com.sg",".google.com.tw",".googleapis.com",".googleapps.com",".googleartproject.com",".googleblog.com",".googlecode.com",".googlecommerce.com",".googledomains.com",".googledrive.com",".googleearth.com",".googlegroups.com",".googlehosted.com",".googleideas.com",".googlelabs.com",".googlemail.com",".googleplay.com",".googleplus.com",".googlesile.com",".googlesource.com",".googleusercontent.com",".googlevideo.com",".googlezip.net",".gstatic.com",".yahoo.com",".igoogle.com",".instagram.com",".institut-tibetain.org",".nic.google",".registry.google",".thinkwithgoogle.com",".withgoogle.com",".youtube-nocookie.com",".youtube.com",".gvt1.com",".gvt2.com",".gvt3.com",".1e100.net"</string>
 </resources>