Bump version

.github/faq.md

@@ -3,9 +3,8 @@
 Cannot connect to server:
 
 1. Stop battery saver if it's active;
-2. If an upgrade breaks anything, do a manual reset first by pressing Reset at the end of the list;
+2. Check your config;
-3. Check your config;
+3. Wipe app data.
-4. Wipe app data.
 
 Crash: [Submit an issue](https://github.com/shadowsocks/shadowsocks-android/issues/new) with logcat attached, or submit a crash report to Google Play. Then, try wiping app data.
 

mobile/build.sbt

@@ -4,8 +4,8 @@ enablePlugins(AndroidGms)
 android.useSupportVectors
 
 name := "shadowsocks"
-version := "4.3.1"
+version := "4.3.3"
-versionCode := Some(197)
+versionCode := Some(199)
 
 proguardOptions ++=
   "-dontwarn com.google.android.gms.internal.**" ::

mobile/src/main/assets/acl/bypass-china.acl

@@ -4424,7 +4424,14 @@
 223.255.236.0/22
 223.255.252.0/23
 
-[white_list]
+[proxy_list]
+# manhuaren
+mangaapi.manhuaren.com
+# Telegram IPs$
+91.108.4.0/22
+91.108.56.0/22
+109.239.140.0/24
+149.154.160.0/20
 ^(.*\.)?4tern\.com$
 ^(.*\.)?adorama\.com$
 ^(.*\.)?akiba-web\.com$
@@ -4603,6 +4610,7 @@
 ^(.*\.)?freewww\.info$
 ^(.*\.)?ftp1\.biz$
 ^(.*\.)?ftpserver\.biz$
+^(.*\.)?gamer\.com\.tw$
 ^(.*\.)?gettrials\.com$
 ^(.*\.)?got-game\.org$
 ^(.*\.)?gr8domain\.biz$
@@ -4667,6 +4675,7 @@
 ^(.*\.)?organiccrap\.com$
 ^(.*\.)?otzo\.com$
 ^(.*\.)?ourhobby\.com$
+^(.*\.)?pixiv\.net$
 ^(.*\.)?pcanywhere\.net$
 ^(.*\.)?port25\.biz$
 ^(.*\.)?qhigh\.com$
@@ -4733,7 +4742,7 @@
 ^(.*\.)?android\.com$
 ^(.*\.)?androidify\.com$
 ^(.*\.)?appspot\.com$
-^(.*\.)?blogspot(\.[^.]{2,4}){1,2}$
+^(.*\.)?blogspot(\.(?!-)[a-zA-Z0-9-]{1,63}(?<!-)){1,2}$
 ^(.*\.)?certificate-transparency\.org$
 ^(.*\.)?chrome\.com$
 ^(.*\.)?chromecast\.com$
@@ -4756,8 +4765,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google(\.[^.]{2,4}){1,2}$
+^(.*\.)?google(\.(?!-)[a-zA-Z0-9-]{1,63}(?<!-)){1,2}$
-^(.*\.)?googleapis(\.[^.]{2,4}){1,2}$
+^(.*\.)?googleapis(\.(?!-)[a-zA-Z0-9-]{1,63}(?<!-)){1,2}$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$
@@ -4815,7 +4824,6 @@
 ^(.*\.)?zynamics\.com$
 ^(.*\.)?kat\.cr$
 ^(.*\.)?naughtyamerica\.com$
-^(.*\.)?v2ex\.com$
 ^(.*\.)?0to255\.com$
 ^(.*\.)?100ke\.org$
 ^(.*\.)?1000giri\.net$

mobile/src/main/assets/acl/bypass-lan-china.acl

@@ -4439,6 +4439,13 @@
 223.255.252.0/23
 
 [proxy_list]
+# manhuaren
+mangaapi.manhuaren.com
+# Telegram IPs$
+91.108.4.0/22
+91.108.56.0/22
+109.239.140.0/24
+149.154.160.0/20
 ^(.*\.)?4tern\.com$
 ^(.*\.)?adorama\.com$
 ^(.*\.)?akiba-web\.com$
@@ -4617,6 +4624,7 @@
 ^(.*\.)?freewww\.info$
 ^(.*\.)?ftp1\.biz$
 ^(.*\.)?ftpserver\.biz$
+^(.*\.)?gamer\.com\.tw$
 ^(.*\.)?gettrials\.com$
 ^(.*\.)?got-game\.org$
 ^(.*\.)?gr8domain\.biz$
@@ -4681,6 +4689,7 @@
 ^(.*\.)?organiccrap\.com$
 ^(.*\.)?otzo\.com$
 ^(.*\.)?ourhobby\.com$
+^(.*\.)?pixiv\.net$
 ^(.*\.)?pcanywhere\.net$
 ^(.*\.)?port25\.biz$
 ^(.*\.)?qhigh\.com$
@@ -4747,7 +4756,7 @@
 ^(.*\.)?android\.com$
 ^(.*\.)?androidify\.com$
 ^(.*\.)?appspot\.com$
-^(.*\.)?blogspot(\.[^.]{2,4}){1,2}$
+^(.*\.)?blogspot(\.(?!-)[a-zA-Z0-9-]{1,63}(?<!-)){1,2}$
 ^(.*\.)?certificate-transparency\.org$
 ^(.*\.)?chrome\.com$
 ^(.*\.)?chromecast\.com$
@@ -4770,8 +4779,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google(\.[^.]{2,4}){1,2}$
+^(.*\.)?google(\.(?!-)[a-zA-Z0-9-]{1,63}(?<!-)){1,2}$
-^(.*\.)?googleapis(\.[^.]{2,4}){1,2}$
+^(.*\.)?googleapis(\.(?!-)[a-zA-Z0-9-]{1,63}(?<!-)){1,2}$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$
@@ -4829,7 +4838,6 @@
 ^(.*\.)?zynamics\.com$
 ^(.*\.)?kat\.cr$
 ^(.*\.)?naughtyamerica\.com$
-^(.*\.)?v2ex\.com$
 ^(.*\.)?0to255\.com$
 ^(.*\.)?100ke\.org$
 ^(.*\.)?1000giri\.net$

mobile/src/main/res/drawable-v21/background_profile.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/material_primary_300" />
+        </shape>
+    </item>
+    <item>
+        <selector android:enterFadeDuration="@android:integer/config_mediumAnimTime"
+                  android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+            <item android:state_selected="true">
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/material_green_700" />
+                </shape>
+            </item>
+        </selector>
+    </item>
+    <item android:left="8dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+    <item android:drawable="?android:attr/selectableItemBackground"/>
+</layer-list>

mobile/src/main/res/drawable/background_profile.xml

@@ -20,5 +20,13 @@
             <solid android:color="@android:color/white" />
         </shape>
     </item>
-    <item android:drawable="?android:attr/selectableItemBackground"/>
+    <item>
+        <selector>
+            <item android:state_pressed="true">
+                <shape android:shape="rectangle">
+                    <solid android:color="#12000000" />
+                </shape>
+            </item>
+        </selector>
+    </item>
 </layer-list>

mobile/src/main/scala/com/github/shadowsocks/QuickToggleShortcut.scala

@@ -26,14 +26,13 @@ import android.content.pm.ShortcutManager
 import android.os.{Build, Bundle}
 import android.support.v4.content.pm.{ShortcutInfoCompat, ShortcutManagerCompat}
 import android.support.v4.graphics.drawable.IconCompat
-import android.support.v7.app.AppCompatActivity
 import com.github.shadowsocks.bg.ServiceState
 import com.github.shadowsocks.utils.Utils
 
 /**
   * @author Mygod
   */
-class QuickToggleShortcut extends AppCompatActivity with ServiceBoundContext {
+class QuickToggleShortcut extends Activity with ServiceBoundContext {
   override def onCreate(savedInstanceState: Bundle) {
     super.onCreate(savedInstanceState)
     getIntent.getAction match {