v2.0.1

bannedbook · Jan 17, 2020 · 5171a61 · 5171a61
1 parent 3cd67f7
commit 5171a61
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 17 deletions.
diff --git a/V2rayNG/app/src/main/AndroidManifest.xml b/V2rayNG/app/src/main/AndroidManifest.xml
@@ -8,7 +8,6 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <!-- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> -->
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
     <application

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt
@@ -236,7 +236,10 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 //            startActivity<SubSettingActivity>()
 //            true
 //        }
-
+        R.id.servers_update -> {
+            importConfigViaBuildinSub()
+            true
+        }
         R.id.sub_update -> {
             importConfigViaSub()
             true

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
@@ -407,6 +407,7 @@ object Utils {
             conn = url.openConnection(
                 Proxy(Proxy.Type.HTTP,
                 InetSocketAddress("127.0.0.1", port + 1))) as HttpURLConnection
+            conn.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36");
             conn.connectTimeout = 30000
             conn.readTimeout = 30000
             conn.setRequestProperty("Connection", "close")

diff --git a/V2rayNG/app/src/main/res/drawable/ic_baseline_autorenew.xml b/V2rayNG/app/src/main/res/drawable/ic_baseline_autorenew.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,6v3l4,-4 -4,-4v3c-4.42,0 -8,3.58 -8,8 0,1.57 0.46,3.03 1.24,4.26L6.7,14.8c-0.45,-0.83 -0.7,-1.79 -0.7,-2.8 0,-3.31 2.69,-6 6,-6zM18.76,7.74L17.3,9.2c0.44,0.84 0.7,1.79 0.7,2.8 0,3.31 -2.69,6 -6,6v-3l-4,4 4,4v-3c4.42,0 8,-3.58 8,-8 0,-1.57 -0.46,-3.03 -1.24,-4.26z" />
+</vector>
diff --git a/V2rayNG/app/src/main/res/menu/menu_main.xml b/V2rayNG/app/src/main/res/menu/menu_main.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/servers_update"
+        android:icon="@drawable/ic_baseline_autorenew"
+        android:title="@string/update_builtin_servers"
+        app:showAsAction="always" />
     <item
         android:icon="@drawable/ic_add_white_24dp"
         android:title="@string/menu_item_add_config"

diff --git a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
@@ -199,11 +199,6 @@
     </body>
     </html>
   ]]></string>
-    <string-array name="builtinSubUrls">
-        <item>https://gitlab.com/bobmolen/cloud/raw/master/v2.py</item>
-        <item>https://bannedbook.github.io/fanqiang/v2.py</item>
-        <item>https://storage.googleapis.com/jwnews/v2.py</item>
-        <item>https://raw.githubusercontent.com/bannedbook/fanqiang/master/docs/v2.py</item>
-    </string-array>
+    <item>your_url</item>
     <string name="update_builtin_servers">更新内置VPN服务器</string>
 </resources>
diff --git a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
@@ -200,10 +200,6 @@
     </body>
     </html>
   ]]></string>
-    <string-array name="builtinSubUrls">
-        <item>https://bannedbook.github.io/fanqiang/v2.py</item>
-        <item>https://raw.githubusercontent.com/bannedbook/fanqiang/master/docs/v2.py</item>
-        <item>https://gitlab.com/bobmolen/cloud/raw/master/v2.py</item>
-    </string-array>
+    <item>your_url</item>
     <string name="update_builtin_servers">更新內置VPN伺服器</string>
 </resources>
diff --git a/V2rayNG/app/src/main/res/values/strings.xml b/V2rayNG/app/src/main/res/values/strings.xml
@@ -190,9 +190,7 @@
   <string name="recommended_site_1"></string>
   <string name="recommended_site_2"></string>
   <string-array name="builtinSubUrls">
-    <item>https://bannedbook.github.io/fanqiang/v2.py</item>
-    <item>https://raw.githubusercontent.com/bannedbook/fanqiang/master/docs/v2.py</item>
-    <item>https://gitlab.com/bobmolen/cloud/raw/master/v2.py</item>
+    <item>your_url</item>
   </string-array>
   <string name="update_builtin_servers">Update builtin servers</string>
 </resources>
diff --git a/gitupdate.bat b/gitupdate.bat
@@ -1,6 +1,8 @@
 git config --global core.autocrlf true
 git pull origin master
 git add -A
-git commit -m "update"
+git commit -m "v2.0.1"
 git push origin master
+git tag -a v2.0.1 -m "release v2.0.1"
+git push origin --tags
 pause