update

bannedbook · Jun 2, 2020 · 5a96f42 · 5a96f42
1 parent 0604127
commit 5a96f42
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/V2rayNG/app/build.gradle b/V2rayNG/app/build.gradle
@@ -17,8 +17,8 @@ android {
         minSdkVersion 17
         targetSdkVersion Integer.parseInt("$targetSdkVer")
         multiDexEnabled true
-        versionCode 220
-        versionName "2.0.6"
+        versionCode 230
+        versionName "2.0.7"
     }
 
     signingConfigs {
@@ -60,8 +60,8 @@ android {
         abi {
             enable true
             reset()
-            //include 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' //select ABIs to build APKs for
-            include 'armeabi-v7a', 'arm64-v8a'
+            include 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+            //include 'armeabi-v7a', 'arm64-v8a' //select ABIs to build APKs for
             universalApk true //generate an additional APK that contains all the ABIs
         }
     }

diff --git a/V2rayNG/app/libs/libv2ray.aar b/V2rayNG/app/libs/libv2ray.aar
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
@@ -291,6 +291,9 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         }
 
         R.id.real_ping_all -> {
+            if (isRunning) {
+                Utils.stopVService(this)
+            }
             for (k in 0 until configs.vmess.count()) {
                 configs.vmess[k].testResult = ""
                 adapter.updateConfigList()
@@ -322,6 +325,9 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         }
 
         R.id.retest_invalid_servers -> {
+            if (isRunning) {
+                Utils.stopVService(this)
+            }
             doAsync{
                 for (k in configs.vmess.count()-1 downTo 0) {
                     try {
@@ -700,7 +706,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe {
                         if (fabProgressCircle.isShown) {
-                            fabProgressCircle.hide()
+                            fabProgressCircle?.hide()
                         }
                     }
         } catch (e: Exception) {

diff --git a/gitupdate.bat b/gitupdate.bat
@@ -3,6 +3,6 @@ git pull origin master
 git add -A
 git commit -m "update"
 git push origin master
-git tag -a v2.0.6 -m "release v2.0.6"
+git tag -a v2.0.7 -m "release v2.0.7"
 git push origin --tags
 pause