Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
bannedbook committed Jul 20, 2020
1 parent c3e4c79 commit 96a0c1b
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ buildscript {
androidTestVersion = '1.2.0'
androidEspressoVersion = '3.2.0'
versionCode = 5000968
versionName = '5.1.20-nightly'
versionName = '5.1.21-nightly'
resConfigs = ['ar', 'es', 'fa', 'fr', 'ja', 'ko', 'ru', 'tr', 'zh-rCN', 'zh-rTW']
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ data class Profile(
var password: String = "",
var method: String = "aes-256-cfb",

var route: String = "all", //""bypass-lan-china"
var route: String = "bypass-lan-china", // "all"
var remoteDns: String = "1.1.1.1",
var proxyApps: Boolean = false,
var bypass: Boolean = false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ object V2rayConfigUtil {

v2rayConfig.routing.domainStrategy = VpnEncrypt.PREF_ROUTING_DOMAIN_STRATEGY
//val routingMode = Core.defaultDPreference.getPrefString(vmess.route, "0")
var routingMode = "0" // vmess.route //强制全局模式,"3"时启动很慢
var routingMode = vmess.route //强制全局模式,"3"时启动很慢
if (isTest)routingMode="0" //测试时强制全局模式,"3"时启动很慢

// Hardcode googleapis.cn
Expand Down
2 changes: 1 addition & 1 deletion gitupdate.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ git pull origin master
git add -A
git commit -m "update"
git push origin master
git tag -a v5.1.20 -m "release v5.1.20"
git tag -a v5.1.21 -m "release v5.1.21"
git push origin --tags
pause
Binary file modified libv2ray/libv2ray.aar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
if (profileTypeValue=="vmess"){
route.setEntries(R.array.route_entry_v2ray)
route.setEntryValues(R.array.route_value_v2ray)
route.value="all"
route.isEnabled=false
//route.value="all"
route.isEnabled=true
encMethod.setEntries(R.array.vmess_enc_method)
encMethod.setEntryValues(R.array.vmess_enc_method)
var encMethodList = resources.getStringArray(R.array.vmess_enc_method)
Expand Down Expand Up @@ -133,7 +133,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
pluginCategory = findPreference("pluginCategory")!!
v2rayMoreCat = findPreference("v2ray_more_cat")!!

if (profile.profileType=="vmess")profile.route="all" //暂且强制v2ray全局路由模式
//if (profile.profileType=="vmess")profile.route="all" //暂且强制v2ray全局路由模式

switchVmessSS(profile.profileType)
profileType.setOnPreferenceChangeListener { _, newValue ->
Expand Down
9 changes: 9 additions & 0 deletions mobile/src/main/res/menu/udp_fallback_menu.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_apply_all"
android:alphabeticShortcut="a"
android:title="@string/action_apply_all"
app:alphabeticModifiers="CTRL|SHIFT"
app:showAsAction="never" />
</menu>

0 comments on commit 96a0c1b

Please sign in to comment.