Merge pull request #1555 from yuhan6665/ss-fix

Fix ss2022 import for multi clients format

AndroidLibV2rayLite/go.mod

@@ -1,9 +1,49 @@
 module github.com/2dust/AndroidLibV2rayLite
 
-go 1.16
+go 1.18
 
 require (
-	github.com/xtls/xray-core v1.5.2
-	golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08
-	golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d
+	github.com/xtls/xray-core v1.5.7
+	golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd
+	golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68
+)
+
+require (
+	github.com/cheekybits/genny v1.0.0 // indirect
+	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
+	github.com/francoispqt/gojay v1.2.13 // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.12 // indirect
+	github.com/lucas-clemente/quic-go v0.27.1 // indirect
+	github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
+	github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect
+	github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pires/go-proxyproto v0.6.2 // indirect
+	github.com/refraction-networking/utls v1.1.0 // indirect
+	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
+	github.com/sagernet/sing v0.0.0-20220605012533-e0f722558141 // indirect
+	github.com/sagernet/sing-shadowsocks v0.0.0-20220605012719-1e22882ea853 // indirect
+	github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb // indirect
+	github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e // indirect
+	github.com/xtls/go v0.0.0-20210920065950-d4af136d3672 // indirect
+	go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd // indirect
+	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
+	golang.org/x/net v0.0.0-20220531201128-c960675eff93 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/tools v0.1.11-0.20220325154526-54af36eca237 // indirect
+	golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
+	google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58 // indirect
+	google.golang.org/grpc v1.47.0 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	lukechampine.com/blake3 v1.1.7 // indirect
 )

AndroidLibV2rayLite/go.sum

@@ -1,100 +1,63 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.37.0 h1:69FNAINiZfsEuwH3fKq8QrAAnHz+2m4XL4kVYi5BX0Q=
 cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo=
-dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3 h1:hJiie5Bf3QucGRa4ymsAUOxyhYwGEz1xrsVk0P8erlw=
 dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU=
-dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0 h1:SPOUaucgtVls75mg+X7CXigS71EnsfVUK/2CgVrwqgw=
 dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
-dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412 h1:GvWw74lx5noHocd+f6HBMXK6DuggBB1dhVkuGZbv7qM=
 dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
-dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c h1:ivON6cwHK1OH26MZyWDCnbTRZZf0IhNsENoNAKFS1g4=
 dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
-git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999 h1:OR8VhtwhcAI3U48/rzBsVOuHi0zDPzYI1xASVcdSgR8=
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625 h1:ckJgFhFWywOx+YLEMIJsTb+NV6NexWICk5+AMSuz3ss=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
-github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23 h1:D21IyuvjDCshj1/qq+pCNd3VZOAEI9jy6Bi131YlXgI=
 github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
-github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
 github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
-github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 h1:hzAQntlaYRkVSFEfj9OTWlVV1H155FMD8BTKktLv0QI=
 github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 h1:zH8ljVhhq7yC0MIeUL/IviMtY8hx2mK8cN9wEYb8ggw=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d h1:t5Wuyh53qYyg9eqn4BbnlIT+vmhyww0TatL+zT3uWgI=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-metro v0.0.0-20200812162917-85c65e2d0165/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
-github.com/dgryski/go-metro v0.0.0-20211015221634-2661b20a2446 h1:QnWGyQI3H080vbC9E4jlr6scOYEnALtvV/69oATYzOo=
-github.com/dgryski/go-metro v0.0.0-20211015221634-2661b20a2446/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
+github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 h1:y7y0Oa6UawqTFPCDw9JG6pdKt4F9pAhHv0B7FMGaGD0=
+github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021 h1:fP+fF0up6oPY49OrjPrhIJ8yQfdIM85NXMLkMg1EXVs=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
-github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
 github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
-github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
+github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
+github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew=
 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
-github.com/gliderlabs/ssh v0.1.1 h1:j3L6gSLQalDETeEg/Jg0mGY0/y/N6zI2xX1978P0Uqw=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/lint v0.0.0-20180702182130-06c8688daad7 h1:2hRPrmiwPrp3fQX967rNJIhQPtiGXdlQWAxKbKw3VHA=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -116,7 +79,6 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -125,77 +87,52 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
-github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57 h1:eqyIo2HjKhKe/mJzTG8n4VqvLXIOEG+SLdDqX7xGtkY=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go v2.0.0+incompatible h1:j0GKcs05QVmm7yesiZq2+9cxHkNK9YM6zKx4D2qucQU=
 github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
-github.com/googleapis/gax-go/v2 v2.0.3 h1:siORttZ36U2R/WjiJuDz8znElWBiAlO9rVt+mqJt0Cc=
 github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/h12w/go-socks5 v0.0.0-20200522160539-76189e178364 h1:5XxdakFhqd9dnXoAZy1Mb2R/DZ6D1e+0bGC/JhucGYI=
-github.com/h12w/go-socks5 v0.0.0-20200522160539-76189e178364/go.mod h1:eDJQioIyy4Yn3MVivT7rv/39gAJTrA7lgmYr8EW950c=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1 h1:ujPKutqRlJtcfWk6toYVYagwra7HQHbXOaS171b4Tg8=
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
-github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024 h1:rBMNdlhTLzJjJSDIjNEXX1Pz3Hmwmz91v+zycvx9PJc=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.0.12 h1:p9dKCg8i4gmOxtv35DvrYoWqYzQrvEVdjQ762Y0OqZE=
+github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.3 h1:/Um6a/ZmD5tF7peoOJ5oN5KMQ0DrGVQSXLNwyckutPk=
 github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g=
-github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
-github.com/lunixbochs/vtclean v1.0.0 h1:xu2sLAri4lGiovBDQKxl5mrXyESr3gUr5m5SM5+LVb8=
+github.com/lucas-clemente/quic-go v0.27.1 h1:sOw+4kFSVrdWOYmUjufQ9GBVPqZ+tu+jMtXxXNmRJyk=
+github.com/lucas-clemente/quic-go v0.27.1/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
 github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
-github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe h1:W/GaMY0y69G4cFlmsC6B9sbuo2fP8OFP1ABjt4kPz+w=
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
 github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
-github.com/marten-seemann/qtls-go1-15 v0.1.4 h1:RehYMOyRW8hPVEja1KBVsFVNSm35Jj9Mvs5yNoZZ28A=
-github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
-github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
-github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
-github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk=
-github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/marten-seemann/qtls-go1-16 v0.1.5 h1:o9JrYPPco/Nukd/HpOHMHZoBDXQqoNtUCmny98/1uqQ=
+github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
+github.com/marten-seemann/qtls-go1-17 v0.1.1 h1:DQjHPq+aOzUeh9/lixAGunn6rIOQyWChPSI4+hgW7jc=
+github.com/marten-seemann/qtls-go1-17 v0.1.1/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
+github.com/marten-seemann/qtls-go1-18 v0.1.1 h1:qp7p7XXUFL7fpBvSS1sWD+uSqPvzNQK43DH+/qEkj0Y=
+github.com/marten-seemann/qtls-go1-18 v0.1.1/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/microcosm-cc/bluemonday v1.0.1 h1:SIYunPjnlXcW+gVfvm0IlSeR5U3WZUOLfVmqg85Go44=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
-github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
-github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/miekg/dns v1.1.49 h1:qe0mQU3Z/XpFeE+AEBo2rqaS1IPBJ3anmqZ4XiZJVG8=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86 h1:D6paGObi5Wud7xg83MaEFyjxQB1W5bz5d0IFppr+ymk=
 github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
-github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab h1:eFXv9Nu1lGbrNbj619aWwZfVF5HBrm9Plte8aNptuTI=
 github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
@@ -211,123 +148,79 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
 github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
-github.com/openzipkin/zipkin-go v0.1.1 h1:A/ADD6HaPnAKj3yS7HjGHRK77qi41Hi0DirOOIQAeIw=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
-github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
-github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc=
-github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
-github.com/pires/go-proxyproto v0.6.1 h1:EBupykFmo22SDjv4fQVQd2J9NOoLPmyZA/15ldOGkPw=
-github.com/pires/go-proxyproto v0.6.1/go.mod h1:Odh9VFOZJCf9G8cLW5o435Xf1J95Jw9Gw5rnCjcwzAY=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
+github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/pires/go-proxyproto v0.6.2 h1:KAZ7UteSOt6urjme6ZldyFm4wDe/z0ZUP0Yv0Dos0d8=
+github.com/pires/go-proxyproto v0.6.2/go.mod h1:Odh9VFOZJCf9G8cLW5o435Xf1J95Jw9Gw5rnCjcwzAY=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.8.0 h1:1921Yw9Gc3iSc4VQh3PIoOqgPCZS7G/4xQNVUp8Mda8=
 github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e h1:n/3MEhJQjQxrOUCzh1Y3Re6aJUUWRp2M9+Oc3eVn/54=
 github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273 h1:agujYaXJSxSo18YNX3jzl+4G6Bstwt+kqv47GS12uL0=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/refraction-networking/utls v1.0.0 h1:6XQHSjDmeBCF9sPq8p2zMVGq7Ud3rTD2q88Fw8Tz1tA=
-github.com/refraction-networking/utls v1.0.0/go.mod h1:tz9gX959MEFfFN5whTIocCLUG57WiILqtdVxI8c6Wj0=
+github.com/refraction-networking/utls v1.1.0 h1:dKXJwSqni/t5csYJ+aQcEgqB7AMWYi6EUc9u3bEmjX0=
+github.com/refraction-networking/utls v1.1.0/go.mod h1:tz9gX959MEFfFN5whTIocCLUG57WiILqtdVxI8c6Wj0=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s=
-github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/seiflotfy/cuckoofilter v0.0.0-20201222105146-bc6005554a0c h1:pqy40B3MQWYrza7YZXOXgl0Nf0QGFqrOC0BKae1UNAA=
-github.com/seiflotfy/cuckoofilter v0.0.0-20201222105146-bc6005554a0c/go.mod h1:bR6DqgcAl1zTcOX8/pE2Qkj9XO00eCNqmKb7lXP8EAg=
-github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
+github.com/sagernet/sing v0.0.0-20220605012533-e0f722558141 h1:YN9EeHRIFYKei1woz2OucLTSpiNrULAHH+jl6upDemQ=
+github.com/sagernet/sing v0.0.0-20220605012533-e0f722558141/go.mod h1:w2HnJzXKHpD6F5Z/9XlSD4qbcpHY2RSZuQnFzqgELMg=
+github.com/sagernet/sing-shadowsocks v0.0.0-20220605012719-1e22882ea853 h1:t1pn8v3kPvlaST/fY7GsPV8yIUFJDXzNcmSYQ+nrbEM=
+github.com/sagernet/sing-shadowsocks v0.0.0-20220605012719-1e22882ea853/go.mod h1:Afu8UIFlEwxTnlidTMSWqWHIduAWOrwY0tFr2LxBACQ=
+github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb h1:XfLJSPIOUX+osiMraVgIrMR27uMXnRJWGm1+GL8/63U=
+github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb/go.mod h1:bR6DqgcAl1zTcOX8/pE2Qkj9XO00eCNqmKb7lXP8EAg=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4 h1:Fth6mevc5rX7glNLpbAMJnqKlfIkcTjZCSHEeqvKbcI=
 github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
-github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48 h1:vabduItPAIz9px5iryD5peyx7O3Ya8TBThapgXim98o=
 github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
-github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470 h1:qb9IthCFBmROJ6YBS31BEMeSYjOscSiG+EO+JVNTz64=
 github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0=
-github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e h1:MZM7FHLqUHYI0Y/mQAt3d2aYa0SiNms/hFqC9qJYolM=
 github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
-github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041 h1:llrF3Fs4018ePo4+G/HV/uQUqEI1HMDjCeOf2V6puPc=
 github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
-github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d h1:Yoy/IzG4lULT6qZg62sVC+qyBL8DQkmD2zv6i7OImrc=
 github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
-github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c h1:UOk+nlt1BJtTcH15CT7iNO7YVWTfTv/DNwEAQHLIaDQ=
 github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI=
-github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b h1:vYEG87HxbU6dXj5npkeulCS96Dtz5xg3jcfCgpcvbIw=
 github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU=
-github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20 h1:7pDq9pAMCQgRohFmd25X8hIH8VxmT3TaDm+r9LHxgBk=
 github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag=
-github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9 h1:MPblCbqA5+z6XARjScMfz1TqtJC7TuTRj0U9VqIBs6k=
 github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg=
-github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50 h1:crYRwvwjdVh1biHzzciFHe8DrZcYrVcZFlJtykhRctg=
 github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw=
-github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc h1:eHRtZoIi6n9Wo1uR+RU44C247msLWwyA89hVKwRLkMk=
 github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y=
-github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371 h1:SWV2fHctRpRrp49VXJ6UZja7gU9QLHwRpIPBN89SKEo=
 github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
-github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9 h1:fxoFD0in0/CBzXoyNhMTjvBZYW6ilSnTw7N7y/8vkmM=
 github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q=
-github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191 h1:T4wuULTrzCKMFlg3HmKHgXAF8oStFb/+lOIupLV2v+o=
 github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ=
-github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241 h1:Y+TeIabU8sJD10Qwd/zMty2/LEaT9GNDaA6nyZf+jgo=
 github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I=
-github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122 h1:TQVQrsyNaimGwF7bIhzoVC9QkKm4KsWd8cECGzFx8gI=
 github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0=
-github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2 h1:bu666BQci+y4S0tVRVjsHUeRon6vUXmsGBwdowgMrg4=
 github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
-github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82 h1:LneqU9PHDsg/AkPDU3AkqMxnMYL+imaqkpflHu73us8=
 github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk=
-github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 h1:/vdW8Cb7EXrkqWGufVMES1OH2sU9gKVb2n9/1y5NMBY=
 github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537 h1:YGaxtkYjb8mnTvtufv2LKLwCQu2/C7qFB7UtrOlTWOY=
 github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
-github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133 h1:JtcyT0rk/9PKOdnKQzuDR+FSjh7SGtJwpgVpfZBRKlQ=
 github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
-github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d h1:yKm7XZV6j9Ev6lojP2XaIshpT4ymkqhMeSghO5Ps00E=
 github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
-github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e h1:qpG93cPwA5f7s/ZPBJnGOYQNK/vKsaDaseuKT5Asee8=
 github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As=
-github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 h1:UyzmZLoiDWMRywV4DUYb9Fbt8uiOSooupjTq10vpvnU=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e h1:5QefA066A1tF8gHIiADmOVOV5LS43gt3ONnlEl3xkwI=
 github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e/go.mod h1:5t19P9LBIrNamL6AcMQOncg/r10y3Pc01AbHeMhwlpU=
-github.com/viant/assertly v0.4.8 h1:5x1GzBaRteIwTr5RAGFVG14uNeRFxVNbXPWrK2qAgpc=
 github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
-github.com/viant/toolbox v0.24.0 h1:6TteTDQ68CjgcCe8wH3D3ZhUQQOJXMTbj/D9rkk2a1k=
 github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
 github.com/xtls/go v0.0.0-20210920065950-d4af136d3672 h1:4mkzGhKqt3JO1BWYjtD3iRFyAx4ow67hmSqOcGjuxqQ=
 github.com/xtls/go v0.0.0-20210920065950-d4af136d3672/go.mod h1:YGGVbz9cOxyKFUmhW7LGaLZaMA0cPlHJinvAmVxEMSU=
-github.com/xtls/xray-core v1.5.2 h1:gaA3vHwXdfF5y8q++l/l94fgHzx5Yj2anonDG/16t3A=
-github.com/xtls/xray-core v1.5.2/go.mod h1:mqmSR72VHg0JUCnF8DWnAOTTrmnmrAYR8NWS+Cyg+F4=
+github.com/xtls/xray-core v1.5.7 h1:xQqUpRtzVHL/to2sDmvgn9GelD0jIwC0I8B36hbDgDo=
+github.com/xtls/xray-core v1.5.7/go.mod h1:H4q5qoCwtsYeF06Zsb0tk8oV8UuaQ9NdnOaPv49Cj7I=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.1 h1:/vn0k+RBvwlxEmP5E7SZMqNxPhfMVFEJiykr15/0XKM=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.opencensus.io v0.18.0 h1:Mk5rgZcggtbvtAun5aJzAtjKKN/t0R3jJPlWILlv938=
+github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
-go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.starlark.net v0.0.0-20211203141949-70c0e40ae128 h1:bxH+EXOo87zEOwKDdZ8Tevgi6irRbqheRm/fr293c58=
-go.starlark.net v0.0.0-20211203141949-70c0e40ae128/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0=
-go4.org v0.0.0-20180809161055-417644f6feb5 h1:+hE86LblG4AyDgwMCLTE6FOlM9+qjHSYS+rKqxUVdsM=
+go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd h1:Uo/x0Ir5vQJ+683GXB9Ug+4fcjsbp7z7Ul8UaZbhsRM=
+go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
-golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d h1:E2M5QgjZ/Jg+ObCQAudsXxuTsLj7Nl5RV/lZcQZmKSo=
 golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
 golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -336,30 +229,24 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b h1:QAqMVf3pSa6eeTsuklijukjXBlj7Es2QQplab+/RbQ4=
-golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 h1:estk1glOnSVeJ9tdEZZc5mAMDZk5lNJNyJ6DvrBkTEU=
 golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08 h1:h+GZ3ubjuWaQjGe8owMGcmMVCqs0xYJtRG5y2bpHaqU=
-golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
+golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd h1:x1GptNaTtxPAlTVIAJk61fuXg0y17h09DTxyb+VNC/k=
+golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd/go.mod h1:pe2sM7Uk+2Su1y7u/6Z8KJ24D7lepUjFZbhFOrmDfuQ=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
+golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -375,20 +262,16 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY=
-golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220531201128-c960675eff93 h1:MYimHLfoXEpOhqd/zgoA/uoXzHB86AEky4LAx5ij9xA=
+golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852 h1:xYq6+9AtI+xP3M4r0N1hCkHrInHDBohhquRgx9Kk6gI=
 golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -396,8 +279,8 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -413,17 +296,15 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d h1:1oIt9o40TWWI9FUaveVpUvBe13FNqBNVXy3ue2fcfkw=
-golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68 h1:z8Hj/bl9cOV2grsOpEaQFUaly0JWN3i97mo3jXKJNp0=
+golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -434,7 +315,6 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -446,24 +326,23 @@ golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w=
-golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
+golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
+golang.org/x/tools v0.1.11-0.20220325154526-54af36eca237 h1:mAhaIX1KEgotq+ju3XYdXUHvll7bzJDTgiDzIAKDdPc=
+golang.org/x/tools v0.1.11-0.20220325154526-54af36eca237/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
-google.golang.org/api v0.1.0 h1:K6z2u68e86TPdSdefXdzvXgR1zEMa+459vBSfWYAZkI=
 google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -473,8 +352,8 @@ google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRn
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58 h1:a221mAAEAzq4Lz6ZWRkcS8ptb2mxoxYSt4N68aRyQHM=
+google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
@@ -484,9 +363,9 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM=
-google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
+google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8=
+google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -498,14 +377,13 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
@@ -518,18 +396,13 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-grpc.go4.org v0.0.0-20170609214715-11d0a25b4919 h1:tmXTu+dfa+d9Evp8NpJdgOy6+rt8/x4yG7qPBrtNfLY=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
-h12.io/socks v1.0.3 h1:Ka3qaQewws4j4/eDQnOdpr4wXsC//dXtWvftlIcCQUo=
-h12.io/socks v1.0.3/go.mod h1:AIhxy1jOId/XCz9BO+EIgNL2rQiPTBNnOfnVnQ+3Eck=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-sourcegraph.com/sourcegraph/go-diff v0.5.0 h1:eTiIR0CoWjGzJcnQ3OkhIl/b9GJovq4lSAVRt0ZFEG8=
+lukechampine.com/blake3 v1.1.7 h1:GgRMhmdsuK8+ii6UZFDL8Nb+VyMwadAgcJyfYHxG6n0=
+lukechampine.com/blake3 v1.1.7/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=
 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
-sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4 h1:JPJh2pk3+X4lXAkZIk2RuE/7/FoK9maXw+TNPJhVS/c=
 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=

ExtRes/values-vi/strings.xml

@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_widget_name">Kết nối ngay</string>
+    <string name="app_tile_name">Kết nối ngay</string>
+    <string name="app_tile_first_use">Vui lòng thêm một cấu hình vào v2rayNG để sử dụng.</string>
+    <string name="navigation_drawer_open">Mở menu ứng dụng</string>
+    <string name="navigation_drawer_close">Đóng menu ứng dụng</string>
+    <string name="migration_success">Đã chuyển dữ liệu!</string>
+    <string name="migration_fail">Không thể chuyển dữ liệu!</string>
+
+    <!-- Notifications -->
+    <string name="notification_action_stop_v2ray">Ngắt kết nối v2rayNG</string>
+    <string name="toast_permission_denied">Vui lòng cấp quyền cần thiết cho v2rayNG. Bạn đã từ chối các quyền cần thiết như Camera hay Bộ nhớ.</string>
+    <string name="notification_action_more">Nhấn để biết thêm</string>
+    <string name="toast_services_start">Đang bắt đầu dịch vụ v2rayNG.</string>
+    <string name="toast_services_stop">Đã dừng dịch vụ v2rayNG.</string>
+    <string name="toast_services_success">Đã bắt đầu dịch vụ v2rayNG.</string>
+    <string name="toast_services_failure">Không thể bắt đầu dịch vụ, hãy thử kiểm tra lại cấu hình hoặc khởi động lại thiết bị.</string>
+
+    <!--ServerActivity-->
+    <string name="title_server">V2RayNG App :3</string>
+    <string name="menu_item_add_config">Thêm cấu hình</string>
+    <string name="menu_item_save_config">Lưu cấu hình</string>
+    <string name="menu_item_del_config">Xoá cấu hình</string>
+    <string name="menu_item_import_config_qrcode">Nhập cấu hình từ mã QR</string>
+    <string name="menu_item_import_config_clipboard">Nhập cấu hình từ bộ nhớ tạm thời</string>
+    <string name="menu_item_import_config_manually_vmess">Nhập thủ công [Vmess]</string>
+    <string name="menu_item_import_config_manually_vless">Nhập thủ công [VLESS]</string>
+    <string name="menu_item_import_config_manually_ss">Nhập thủ công [Shadowsocks]</string>
+    <string name="menu_item_import_config_manually_socks">Nhập thủ công [Socks]</string>
+    <string name="menu_item_import_config_manually_trojan">Nhập thủ công [Trojan]</string>
+    <string name="menu_item_import_config_custom">Nâng cao / Cấu hình tùy chỉnh</string>
+    <string name="menu_item_import_config_custom_clipboard">Nhập cấu hình tùy chỉnh từ bộ nhớ tạm thời</string>
+    <string name="menu_item_import_config_custom_local">Nhập cấu hình tùy chỉnh từ Tệp</string>
+    <string name="menu_item_import_config_custom_url">Nhập cấu hình tùy chỉnh từ URL</string>
+    <string name="menu_item_import_config_custom_url_scan">Nhập cấu hình tùy chỉnh quét URL</string>
+    <string name="del_config_comfirm">Bạn có muốn xóa cấu hình ?</string>
+    <string name="server_lab_remarks">Tên cấu hình</string>
+    <string name="server_lab_address">Địa chỉ</string>
+    <string name="server_lab_port">Cổng</string>
+    <string name="server_lab_id">Địa chỉ ID</string>
+    <string name="server_lab_alterid">alterId</string>
+    <string name="server_lab_security">Bảo mật</string>
+    <string name="server_lab_network">Kiểu kết nối</string>
+    <string name="server_lab_more_function">Nâng cao</string>
+    <string name="server_lab_head_type">Kiểu Head</string>
+    <string name="server_lab_mode_type">Chế độ gRPC</string>
+    <string name="server_lab_request_host">Yêu cầu host(host/ws host/h2 host)/Bảo mật QUIC</string>
+    <string name="server_lab_path">Đường dẫn (ws path/h2 path)/QUIC key/kcp seed/gRPC serviceName</string>
+    <string name="server_lab_stream_security">tls</string>
+    <string name="server_lab_allow_insecure">allowInsecure</string>
+    <string name="server_lab_sni">Địa chỉ SNI</string>
+    <string name="server_lab_address3">Địa chỉ</string>
+    <string name="server_lab_port3">Cổng</string>
+    <string name="server_lab_id3">Mật khẩu</string>
+    <string name="server_lab_security3">Bảo mật</string>
+    <string name="server_lab_id4">Mật khẩu(Bổ sung)</string>
+    <string name="server_lab_security4">Tên người dùng(Bổ sung)</string>
+    <string name="server_lab_encryption">Mã hoá</string>
+    <string name="server_lab_flow">flow</string>
+    <string name="toast_success">Đã thực hiện thành công thao tác của bạn, Nếu có gì đó không ổn, hãy thao tác lại.</string>
+    <string name="toast_failure">Đã xảy ra lỗi, hãy thử kiểm tra lại hoặc thử lại.</string>
+    <string name="toast_none_data">Không có gì ở đây</string>
+    <string name="toast_incorrect_protocol">Không đúng protocol</string>
+    <string name="toast_decoding_failed">Không thể decode</string>
+    <string name="title_file_chooser">Vui lòng chọn tệp cấu hình</string>
+    <string name="toast_require_file_manager">Vui lòng cài đặt trình quản lý tệp để tiếp tục.</string>
+    <string name="server_customize_config">Cấu hình tùy chỉnh</string>
+    <string name="toast_config_file_invalid">Cấu hình không hợp lệ</string>
+    <string name="server_lab_content">Nội dung</string>
+    <string name="toast_none_data_clipboard">Không có dữ liệu nào trong bộ nhớ tạm thời</string>
+    <string name="toast_invalid_url">URL không hợp lệ hoặc không có gì</string>
+    <string name="server_lab_need_inbound">Vui lòng đảm bảo cấu hình tùy chỉnh này không bị lỗi trước khi sử dụng. v2rayNG được Dịch Tiếng Việt bởi CuynuTT😘</string>
+    <string name="toast_malformed_josn">Cấu hình không hợp lệ </string>
+    <string name="server_lab_request_host6">Host(SNI)(Bổ sung)</string>
+    <string name="toast_asset_copy_failed">Không thể sao chép tệp tin, hãy dùng trình quản lý tệp</string>
+    <string name="menu_item_add_file">Thêm tệp</string>
+    <string name="menu_item_download_file">Tải xuống tệp tin</string>
+
+    <!-- PerAppProxyActivity -->
+    <string name="msg_dialog_progress">Đang tải...</string>
+    <string name="menu_item_search">Tìm kiếm</string>
+    <string name="menu_item_select_all">Chọn tất cả</string>
+    <string name="msg_enter_keywords">Nhập từ khoá</string>
+    <string name="switch_bypass_apps_mode">Bỏ qua kết nối VPN</string>
+    <string name="menu_item_select_proxy_app">Tự động chọn ứng dụng Proxy</string>
+    <string name="msg_downloading_content">Đang tải xuống nội dung...</string>
+    <string name="menu_item_export_proxy_app">Xuất và sao chép</string>
+    <string name="menu_item_import_proxy_app">Nhập từ bộ nhớ tạm thời</string>
+
+
+    <!-- Preferences -->
+    <string name="title_settings">Cài đặt</string>
+    <string name="title_advanced">Cài đặt nâng cao</string>
+    <string name="title_vpn_settings">Cài đặt cho VPN</string>
+    <string name="title_pref_per_app_proxy">Proxy cho ứng dụng</string>
+    <string name="summary_pref_per_app_proxy">Chung: Ứng dụng đã chọn sẽ kết nối Proxy, Chưa lựa chọn sẽ kết nối trực tiếp; \nBỏ qua kết nối: Ứng dụng được chọn sẽ trực tiếp kết nối, không lựa chọn Proxy. \nLựa chọn để tự động chọn ứng dụng Proxy trong Menu.</string>
+
+    <string name="title_pref_mux_enabled">Cho phép Mux</string>
+    <string name="summary_pref_mux_enabled">Bật lên có thể làm tăng tốc độ mạng và chuyển mạng nhanh hơn.</string>
+
+    <string name="title_pref_speed_enabled">Cho phép hiển thị tốc độ mạng</string>
+    <string name="summary_pref_speed_enabled">Hiển thị tốc độ mạng hiện tại trên thanh thông báo.\nBiểu tượng trên thanh trạng thái có thể thay đổi tùy vào mức sử dụng.</string>
+
+    <string name="title_pref_sniffing_enabled">Cho phép Sniffing</string>
+    <string name="summary_pref_sniffing_enabled">Thử chuyển kết nối hiện tại của bạn qua trung gian để trung gian xử lý kết nối về lại cho bạn (Mặc định là bật, hãy tắt nó nếu kết nối không ổn định.)</string>
+
+    <string name="title_pref_local_dns_enabled">Cho phép DNS cục bộ</string>
+    <string name="summary_pref_local_dns_enabled">DNS được xử lý bởi mô đun của lõi DNS.
+(Khuyến cáo, nếu cần lộ trình Bẻ khoá LAN và
+        địa chỉ mainland)</string>
+
+    <string name="title_pref_fake_dns_enabled">Cho phép DNS giả</string>
+    <string name="summary_pref_fake_dns_enabled">DNS cục bộ trả về địa chỉ IP giả (Nhanh hơn, nhưng có thể không hoạt động với một số ứng dụng)</string>
+
+    <string name="title_pref_prefer_ipv6">Ưu tiên IPv6</string>
+    <string name="summary_pref_prefer_ipv6">Ưu tiên sử dụng địa chỉ IPv6 cho kết nối và lộ trình.</string>
+
+    <string name="title_pref_routing">Lộ trình</string>
+    <string name="title_pref_routing_domain_strategy">Tùy chọn tên miền</string>
+    <string name="title_pref_routing_mode">Tùy chỉnh quy tắc lộ trình</string>
+    <string name="title_pref_routing_custom">Tùy chỉnh lộ trình</string>
+
+    <string name="title_pref_remote_dns">Điều khiển DNS (Bổ sung)</string>
+    <string name="summary_pref_remote_dns">DNS</string>
+
+    <string name="title_pref_vpn_dns">VPN DNS (Chỉ IPv4/v6)</string>
+
+    <string name="title_pref_domestic_dns">Domestic DNS (Bổ sung)</string>
+    <string name="summary_pref_domestic_dns">DNS</string>
+
+    <string name="title_pref_proxy_sharing_enabled">Cho phép kết nối từ mạng LAN</string>
+    <string name="summary_pref_proxy_sharing_enabled">Các thiết bị khác có thể kết nối đến proxy bởi địa chỉ IP thông qua socks/http, Chỉ bật khi bạn tin tưởng kết nối để tránh kết nối lạ.</string>
+    <string name="toast_warning_pref_proxysharing_short">Cho phép kết nối từ mạng LAN, Đảm bảo rằng bạn tin tưởng kết nối hiện tại.</string>
+
+    <string name="title_pref_allow_insecure">Cho phép đặt lại allowInsecure</string>
+    <string name="summary_pref_allow_insecure">Khi kết nối TLS, đặt cài đặt allowInsecure thành mặc định</string>
+
+    <string name="title_pref_socks_port">Cổng Proxy SOCKS5</string>
+    <string name="summary_pref_socks_port">Cổng Proxy SOCKS5</string>
+
+    <string name="title_pref_http_port">Cổng Proxy HTTP</string>
+    <string name="summary_pref_http_port">Cổng Proxy HTTP</string>
+
+    <string name="title_pref_local_dns_port">Cổng DNS cục bộ</string>
+    <string name="summary_pref_local_dns_port">Cổng DNS cục bộ</string>
+
+    <string name="title_pref_confirm_remove">Hiển thị thông báo xác nhận xoá cấu hình</string>
+    <string name="summary_pref_confirm_remove">Hiển thị thông báo xác nhận xoá cấu hình khi bạn xoá một cấu hình.</string>
+
+    <string name="title_pref_feedback">Phản hồi lỗi</string>
+    <string name="summary_pref_feedback">Phản hồi cải tiến hoặc bug lên GitHub</string>
+    <string name="summary_pref_tg_group">Tham gia nhóm Telegram</string>
+    <string name="toast_tg_app_not_found">Không tìm thấy ứng dụng Telegram</string>
+
+    <string name="title_pref_promotion">Quảng cáo Server</string>
+    <string name="summary_pref_promotion">Quảng cáo,nhấn để biết thêm(Ủng hộ có thể được gỡ bỏ)</string>
+
+    <string name="title_core_loglevel">Mức độ nhật ký</string>
+    <string name="title_mode">Chế độ kết nối</string>
+    <string name="title_mode_help">Nhấn vào đây nếu bạn cần trợ giúp</string>
+    <string name="title_language">Ngôn ngữ ứng dụng</string>
+
+    <string name="title_logcat">Nhật ký hoạt động</string>
+    <string name="logcat_copy">Sao chép nhật ký</string>
+    <string name="logcat_clear">Xoá nhật ký</string>
+    <string name="title_service_restart">Kết nối lại v2rayNG</string>
+    <string name="title_del_all_config">Xoá tất cả cấu hình</string>
+    <string name="title_del_invalid_config">Xoá cấu hình lỗi (Kiểm tra trước)</string>
+    <string name="title_export_all">Xuất và sao chép tất cả cấu hình</string>
+    <string name="title_sub_setting">Các gói đăng ký</string>
+    <string name="sub_setting_remarks">Tên các gói đăng ký</string>
+    <string name="sub_setting_url">URL gói đăng ký</string>
+    <string name="sub_setting_enable">Sử dụng gói đăng ký này</string>
+    <string name="title_sub_update">Cập nhật các gói đăng ký</string>
+    <string name="title_ping_all_server">Ping tất cả máy chủ</string>
+    <string name="title_real_ping_all_server">Kiểm tra máy chủ</string>
+    <string name="title_user_asset_setting">Tệp Geo assets</string>
+    <string name="title_sort_by_test_results">Sắp xếp lại theo lần kiểm tra cuối cùng</string>
+    <string name="title_filter_config">Lọc cấu hình theo các gói đăng ký</string>
+    <string name="filter_config_all">Hiển thị tất cả các gói đăng ký</string>
+
+    <string name="tasker_start_service">Bắt đầu dịch vụ</string>
+    <string name="tasker_setting_confirm">Xác nhận</string>
+
+    <string name="routing_settings_title">Cài đặt lộ trình</string>
+    <string name="routing_settings_tips">Được phân cách bằng dấu chấm phẩy(,),Hãy nhớ nó để lưu lại.</string>
+    <string name="routing_settings_save">Lưu lại</string>
+    <string name="routing_settings_delete">Xoá</string>
+    <string name="routing_settings_scan_replace">Dò và thay thế</string>
+    <string name="routing_settings_scan_append">Dò và nối</string>
+    <string name="routing_settings_default_rules">Đặt luật lệ lộ trình mặc định</string>
+
+    <string name="connection_test_pending">Kiểm tra kết nối</string>
+    <string name="connection_test_testing">Đang kiểm tra kết nối mạng…</string>
+    <string name="connection_test_available">Đã kiểm tra kết nối mạng thành công, Ping hiện tại là %d</string>
+    <string name="connection_test_error">Lỗi kết nối mạng hãy thử đổi cấu hình hoặc kiểm tra lại. Mã lỗi: %s</string>
+    <string name="connection_test_fail">Không có kết nối mạng</string>
+    <string name="connection_test_error_status_code">Mã lỗi: #%d</string>
+    <string name="connection_connected">Đã kết nối, hãy nhấn vào đây để kiểm tra kết nối mạng.</string>
+    <string name="connection_not_connected">Chưa kết nối, hãy thêm một cấu hình để kết nối. Đừng để bị lừa đảo bởi cấu hình mất tiền,Dịch TV bởi CuynuTT😘</string>
+
+    <string-array name="share_method">
+        <item>Xuất ra mã QR (Chụp màn hình để lưu)</item>
+        <item>Sao chép cấu hình này</item>
+        <item>Sao chép thành cấu hình tùy chỉnh</item>
+    </string-array>
+
+    <string-array name="routing_tag">
+        <item>proxy URL hoặc IP</item>
+        <item>direct URL hoặc IP</item>
+        <item>URL đã chặn hoặc IP</item>
+    </string-array>
+
+    <string-array name="routing_mode">
+        <item>Proxy Global</item>
+        <item>Bẻ khoá địa chỉ LAN rồi proxy</item>
+        <item>Bẻ khoá địa chỉ mainland rồi proxy</item>
+        <item>Bẻ khoá LAN và địa chỉ mainland rồi proxy</item>
+        <item>Trực tiếp Global</item>
+    </string-array>
+
+    <string-array name="mode_entries">
+        <item>Chế độ VPN</item>
+        <item>Chế độ Proxy</item>
+    </string-array>
+
+</resources>

ExtRes/values-zh-rCN/strings.xml

@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_widget_name">开关</string>
+    <string name="app_tile_name">开关</string>
+    <string name="app_tile_first_use">初次使用此功能请先用APP添加配置</string>
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="migration_success">数据迁移成功!</string>
+    <string name="migration_fail">数据迁移失败啦!</string>
+
+    <!-- Notifications -->
+    <string name="notification_action_stop_v2ray">停止</string>
+    <string name="toast_permission_denied">无法取得权D:\vssHotel\SourceCode\Hotel.root\Hotel\Clubank.Hotel\FrontCounter\CheckoutListForm.cs限</string>
+    <string name="notification_action_more">点击了解更多</string>
+    <string name="toast_services_start">启动服务中</string>
+    <string name="toast_services_stop">关闭中</string>
+    <string name="toast_services_success">启动服务成功</string>
+    <string name="toast_services_failure">启动服务失败</string>
+
+    <!--ServerActivity-->
+    <string name="title_server">配置文件</string>
+    <string name="menu_item_add_config">添加配置</string>
+    <string name="menu_item_save_config">保存配置</string>
+    <string name="menu_item_del_config">删除配置</string>
+    <string name="menu_item_import_config_qrcode">扫描二维码</string>
+    <string name="menu_item_import_config_clipboard">从剪贴板导入</string>
+    <string name="menu_item_import_config_manually_vmess">手动输入[Vmess]</string>
+    <string name="menu_item_import_config_manually_vless">手动输入[VLESS]</string>
+    <string name="menu_item_import_config_manually_ss">手动输入[Shadowsocks]</string>
+    <string name="menu_item_import_config_manually_socks">手动输入[Socks]</string>
+    <string name="menu_item_import_config_manually_trojan">手动输入[Trojan]</string>
+    <string name="menu_item_import_config_custom">自定义配置</string>
+    <string name="menu_item_import_config_custom_clipboard">从剪贴板导入自定义配置</string>
+    <string name="menu_item_import_config_custom_local">从本地导入自定义配置</string>
+    <string name="menu_item_import_config_custom_url">剪贴板URL导入自定义配置</string>
+    <string name="menu_item_import_config_custom_url_scan">扫描URL导入自定义配置</string>
+    <string name="del_config_comfirm">确认删除？</string>
+    <string name="server_lab_remarks">别名(remarks)</string>
+    <string name="server_lab_address">地址(address)</string>
+    <string name="server_lab_port">端口(port)</string>
+    <string name="server_lab_id">用户ID(id)</string>
+    <string name="server_lab_alterid">额外ID(alterId)</string>
+    <string name="server_lab_security">加密方式(security)</string>
+    <string name="server_lab_network">传输协议(network)</string>
+    <string name="server_lab_more_function">底层传输方式(transport)</string>
+    <string name="server_lab_head_type">伪装类型(type)</string>
+    <string name="server_lab_mode_type">gRPC 传输模式 (mode)</string>
+    <string name="server_lab_request_host">伪装域名(host)(host/ws host/h2 host)/QUIC 加密方式</string>
+    <string name="server_lab_path">path(ws path/h2 path)/QUIC 加密密钥/kcp seed/gRPC serviceName</string>
+    <string name="server_lab_stream_security">传输层安全(tls)</string>
+    <string name="server_lab_allow_insecure">跳过证书验证(allowInsecure)</string>
+    <string name="server_lab_sni">SNI</string>
+    <string name="server_lab_address3">服务器地址</string>
+    <string name="server_lab_port3">服务器端口</string>
+    <string name="server_lab_id3">密码</string>
+    <string name="server_lab_security3">加密方式</string>
+    <string name="server_lab_id4">密码(可选)</string>
+    <string name="server_lab_security4">用户名(可选)</string>
+    <string name="server_lab_encryption">加密(encryption)</string>
+    <string name="server_lab_flow">流控(flow)</string>
+    <string name="toast_success">成功</string>
+    <string name="toast_failure">失败</string>
+    <string name="toast_none_data">没有数据</string>
+    <string name="toast_incorrect_protocol">不正确的协议</string>
+    <string name="toast_decoding_failed">解码失败</string>
+    <string name="title_file_chooser">选择一个配置文件</string>
+    <string name="toast_require_file_manager">请安装一个文件管理器</string>
+    <string name="server_customize_config">自定义配置</string>
+    <string name="toast_config_file_invalid">无效的配置文件</string>
+    <string name="server_lab_content">内容</string>
+    <string name="toast_none_data_clipboard">剪贴板中没有数据</string>
+    <string name="toast_invalid_url">无效的网址</string>
+    <string name="server_lab_need_inbound">确保inbounds port和设置中的一致</string>
+    <string name="toast_malformed_josn">配置格式错误</string>
+    <string name="server_lab_request_host6">Host(SNI)(可选)</string>
+    <string name="toast_asset_copy_failed">失败, 请使用文件管理器</string>
+    <string name="menu_item_add_file">添加文件</string>
+    <string name="menu_item_download_file">下载文件</string>
+
+
+    <!-- PerAppProxyActivity -->
+    <string name="msg_dialog_progress">正在加载</string>
+    <string name="menu_item_search">搜索</string>
+    <string name="menu_item_select_all">全选</string>
+    <string name="msg_enter_keywords">输入关键字</string>
+    <string name="switch_bypass_apps_mode">绕行模式</string>
+    <string name="menu_item_select_proxy_app">自动选中需代理应用</string>
+    <string name="msg_downloading_content">正在下载内容</string>
+    <string name="menu_item_export_proxy_app">导出至剪贴板</string>
+    <string name="menu_item_import_proxy_app">从剪贴板导入</string>
+
+    <!-- Preferences -->
+    <string name="title_settings">设置</string>
+    <string name="title_advanced">进阶设置</string>
+    <string name="title_vpn_settings">VPN 设置</string>
+    <string name="title_pref_per_app_proxy">分应用代理</string>
+    <string name="summary_pref_per_app_proxy">常规:勾选的App被代理,未勾选的直连;\n绕行模式:勾选的App直连,未勾选的被代理.\n不明白者在菜单中选择自动选中需代理应用</string>
+
+    <string name="title_pref_mux_enabled">启用Mux多路复用</string>
+    <string name="summary_pref_mux_enabled">开启可能会加速,关闭可能会减少断流</string>
+
+    <string name="title_pref_speed_enabled">启用速度显示</string>
+    <string name="summary_pref_speed_enabled">在通知中显示当前速度\n小图标显示流量的路由情况</string>
+
+    <string name="title_pref_sniffing_enabled">启用流量探测</string>
+    <string name="summary_pref_sniffing_enabled">从流量中探测域名 (默认启用)</string>
+
+    <string name="title_pref_local_dns_enabled">启用本地DNS</string>
+    <string name="summary_pref_local_dns_enabled">DNS 请求导入 core 由 DNS 模块处理（推荐启用 如果需要路由绕过局域网及大陆地址)</string>
+
+    <string name="title_pref_fake_dns_enabled">启用虚拟DNS</string>
+    <string name="summary_pref_fake_dns_enabled">本地返回虚构解析结果 (减低延时 但个别应用可能无法使用)</string>
+
+    <string name="title_pref_prefer_ipv6">IPv6优先</string>
+    <string name="summary_pref_prefer_ipv6">App优先使用IPv6地址连接服务器,同时开启VPN的IPv6路由</string>
+
+    <string name="title_pref_routing">路由设置</string>
+    <string name="title_pref_routing_domain_strategy">域名策略</string>
+    <string name="title_pref_routing_mode">预定义规则</string>
+    <string name="title_pref_routing_custom">自定义规则</string>
+
+    <string name="title_pref_remote_dns">远程DNS (可选)</string>
+    <string name="summary_pref_remote_dns">DNS</string>
+
+    <string name="title_pref_vpn_dns">VPN DNS (仅支持 IPv4/v6)</string>
+
+    <string name="title_pref_domestic_dns">境内DNS (可选)</string>
+    <string name="summary_pref_domestic_dns">DNS</string>
+
+    <string name="title_pref_proxy_sharing_enabled">允许来自局域网的连接</string>
+    <string name="summary_pref_proxy_sharing_enabled">其他设备可以使用socks/http协议通过您的IP地址连接到代理,仅在受信任的网络中启用以避免未经授权的连接</string>
+    <string name="toast_warning_pref_proxysharing_short">允许来自局域网的连接，请确保处于受信网络</string>
+
+    <string name="title_pref_allow_insecure">跳过证书验证(allowInsecure)</string>
+    <string name="summary_pref_allow_insecure">传输层安全选tls时，默认跳过证书验证(allowInsecure)</string>
+
+    <string name="title_pref_socks_port">SOCKS5代理端口</string>
+    <string name="summary_pref_socks_port">SOCKS5代理端口</string>
+
+    <string name="title_pref_http_port">HTTP代理端口</string>
+    <string name="summary_pref_http_port">HTTP代理端口</string>
+
+    <string name="title_pref_local_dns_port">本地DNS端口</string>
+    <string name="summary_pref_local_dns_port">本地DNS端口</string>
+
+    <string name="title_pref_confirm_remove">删除配置文件确认</string>
+    <string name="summary_pref_confirm_remove">删除配置文件是否需要用户二次确认</string>
+
+    <string name="title_pref_feedback">反馈</string>
+    <string name="summary_pref_feedback">反馈改进或漏洞至 GitHub</string>
+    <string name="summary_pref_tg_group">加入Telegram Group</string>
+    <string name="toast_tg_app_not_found">未找到Telegram app</string>
+
+    <string name="title_pref_promotion">推广</string>
+    <string name="summary_pref_promotion">一些推广,点击查看详情(捐赠可去除)</string>
+
+    <string name="title_core_loglevel">日志级别</string>
+    <string name="title_mode">模式</string>
+    <string name="title_mode_help">点此查看更多帮助</string>
+    <string name="title_language">语言</string>
+
+    <string name="title_logcat">Logcat</string>
+    <string name="logcat_copy">复制</string>
+    <string name="logcat_clear">清除</string>
+    <string name="title_service_restart">服务重启</string>
+    <string name="title_del_all_config">删除全部配置</string>
+    <string name="title_del_invalid_config">删除无效配置(先测试)</string>
+    <string name="title_export_all">导出全部(非自定义)配置至剪贴板</string>
+    <string name="title_sub_setting">订阅分组设置</string>
+    <string name="sub_setting_remarks">备注</string>
+    <string name="sub_setting_url">可选地址(url)</string>
+    <string name="sub_setting_enable">启用更新</string>
+    <string name="title_sub_update">更新订阅</string>
+    <string name="title_ping_all_server">测试全部配置Tcping</string>
+    <string name="title_real_ping_all_server">测试全部配置真连接</string>
+    <string name="title_user_asset_setting">Geo 资源文件</string>
+    <string name="title_sort_by_test_results">按测试结果排序</string>
+    <string name="title_filter_config">过滤配置文件</string>
+    <string name="filter_config_all">所有订阅分组</string>
+
+    <string name="tasker_start_service">启动服务</string>
+    <string name="tasker_setting_confirm">确定</string>
+
+    <string name="routing_settings_title">路由设置</string>
+    <string name="routing_settings_tips">用逗号(,)隔开,可以一行多个,记得保存</string>
+    <string name="routing_settings_save">保存</string>
+    <string name="routing_settings_delete">清空</string>
+    <string name="routing_settings_scan_replace">扫描并替换</string>
+    <string name="routing_settings_scan_append">扫描并追加</string>
+    <string name="routing_settings_default_rules">设置默认路由规则</string>
+
+    <string name="connection_test_pending">"检查网络连接"</string>
+    <string name="connection_test_testing">"测试中…"</string>
+    <string name="connection_test_available">"连接成功：延时 %d 毫秒"</string>
+    <string name="connection_test_error">"失败：%s"</string>
+    <string name="connection_test_fail">"无互联网连接"</string>
+    <string name="connection_test_error_status_code">"状态码无效（#%d）"</string>
+    <string name="connection_connected">"已连接，点击测试连接"</string>
+    <string name="connection_not_connected">"未连接"</string>
+
+    <string-array name="share_method">
+        <item>二维码</item>
+        <item>导出至剪贴板</item>
+        <item>导出完整配置至剪贴板</item>
+    </string-array>
+    share_method
+    <string-array name="routing_tag">
+        <item>代理的网址或IP</item>
+        <item>直连的网址或IP</item>
+        <item>阻止的网址或IP</item>
+    </string-array>
+
+    <string-array name="routing_mode">
+        <item>全局代理</item>
+        <item>绕过局域网地址而后代理</item>
+        <item>绕过大陆地址而后代理</item>
+        <item>绕过局域网及大陆地址而后代理</item>
+        <item>全局直连</item>
+    </string-array>
+
+    <string-array name="mode_entries">
+        <item>VPN</item>
+        <item>仅代理</item>
+    </string-array>
+
+</resources>

ExtRes/values-zh-rTW/strings.xml

@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_widget_name">開關</string>
+    <string name="app_tile_name">開關</string>
+    <string name="app_tile_first_use">首次使用此功能，請使用此應用程式新增伺服器</string>
+    <string name="navigation_drawer_open">開啟導覽匣</string>
+    <string name="navigation_drawer_close">關閉導覽匣</string>
+    <string name="migration_success">資料遷移成功！</string>
+    <string name="migration_fail">資料遷移失敗！</string>
+
+    <!-- Notifications -->
+    <string name="notification_action_stop_v2ray">停止</string>
+    <string name="toast_permission_denied">無法取得此權限</string>
+    <string name="notification_action_more">瞭解更多</string>
+    <string name="toast_services_start">啟動服務</string>
+    <string name="toast_services_stop">停止服務</string>
+    <string name="toast_services_success">啟動服務成功</string>
+    <string name="toast_services_failure">啟動服務失敗</string>
+
+    <!--ServerActivity-->
+    <string name="title_server">組態檔案</string>
+    <string name="menu_item_add_config">新增組態</string>
+    <string name="menu_item_save_config">儲存組態</string>
+    <string name="menu_item_del_config">刪除組態</string>
+    <string name="menu_item_import_config_qrcode">從 QR Code 匯入組態</string>
+    <string name="menu_item_import_config_clipboard">從剪貼簿匯入組態</string>
+    <string name="menu_item_import_config_manually_vmess">手動鍵入 [Vmess]</string>
+    <string name="menu_item_import_config_manually_vless">手動鍵入 [VLESS]</string>
+    <string name="menu_item_import_config_manually_ss">手動鍵入 [Shadowsocks]</string>
+    <string name="menu_item_import_config_manually_socks">手動鍵入 [Socks]</string>
+    <string name="menu_item_import_config_manually_trojan">手動鍵入 [Trojan]</string>
+    <string name="menu_item_import_config_custom">自訂組態</string>
+    <string name="menu_item_import_config_custom_clipboard">從剪貼簿匯入自訂組態</string>
+    <string name="menu_item_import_config_custom_local">從 URL 匯入自訂組態</string>
+    <string name="menu_item_import_config_custom_url">從 URL 匯入自訂組態</string>
+    <string name="menu_item_import_config_custom_url_scan">掃描 URL 匯入自訂組態</string>
+    <string name="del_config_comfirm">確定刪除？</string>
+    <string name="server_lab_remarks">備註</string>
+    <string name="server_lab_address">位址</string>
+    <string name="server_lab_port">埠</string>
+    <string name="server_lab_id">使用者 ID</string>
+    <string name="server_lab_alterid">alterId</string>
+    <string name="server_lab_security">安全性</string>
+    <string name="server_lab_network">網路</string>
+    <string name="server_lab_more_function">底層傳輸方式 (transport)</string>
+    <string name="server_lab_head_type">標頭類型</string>
+    <string name="server_lab_mode_type">gRPC 傳輸模式 (mode)</string>
+    <string name="server_lab_request_host">要求主機 (host)(host/ws host/h2 host)/QUIC 加密方式</string>
+    <string name="server_lab_path">path(ws path/h2 path)/QUIC 加密金鑰/kcp seed/gRPC serviceName</string>
+    <string name="server_lab_stream_security">傳輸層安全 (tls)</string>
+    <string name="server_lab_allow_insecure">跳過憑證驗證 (allowInsecure)</string>
+    <string name="server_lab_sni">SNI</string>
+    <string name="server_lab_address3">伺服器位址</string>
+    <string name="server_lab_port3">伺服器埠</string>
+    <string name="server_lab_id3">密碼</string>
+    <string name="server_lab_security3">加密方式</string>
+    <string name="server_lab_id4">密碼 (可選)</string>
+    <string name="server_lab_security4">使用者名稱 (可選)</string>
+    <string name="server_lab_encryption">加密 (encryption)</string>
+    <string name="server_lab_flow">流程 (flow)</string>
+    <string name="toast_success">成功</string>
+    <string name="toast_failure">失敗</string>
+    <string name="toast_none_data">無資料</string>
+    <string name="toast_incorrect_protocol">通訊協定不正確</string>
+    <string name="toast_decoding_failed">解碼失敗</string>
+    <string name="title_file_chooser">選取一個組態檔</string>
+    <string name="toast_require_file_manager">請安裝檔案總管。</string>
+    <string name="server_customize_config">自訂組態</string>
+    <string name="toast_config_file_invalid">無效組態</string>
+    <string name="server_lab_content">內容</string>
+    <string name="toast_none_data_clipboard">剪貼簿內無資料</string>
+    <string name="toast_invalid_url">URL 無效</string>
+    <string name="server_lab_need_inbound">​​確保 inbounds port 和設定中的一致</string>
+    <string name="toast_malformed_josn">組態格式不正確</string>
+    <string name="server_lab_request_host6">Host(SNI)(可選)</string>
+    <string name="toast_asset_copy_failed">失敗，請使用檔案總管</string>
+    <string name="menu_item_add_file">新增檔案</string>
+    <string name="menu_item_download_file">下載檔案</string>
+
+    <!-- PerAppProxyActivity -->
+    <string name="msg_dialog_progress">載入</string>
+    <string name="menu_item_search">搜尋</string>
+    <string name="menu_item_select_all">全選</string>
+    <string name="msg_enter_keywords">輸入關鍵字</string>
+    <string name="switch_bypass_apps_mode">略過模式</string>
+    <string name="menu_item_select_proxy_app">自動選中需 Proxy 應用</string>
+    <string name="msg_downloading_content">正在下載內容</string>
+    <string name="menu_item_export_proxy_app">匯出至剪貼簿</string>
+    <string name="menu_item_import_proxy_app">從剪貼簿匯入</string>
+
+
+    <!-- Preferences -->
+    <string name="title_settings">設定</string>
+    <string name="title_advanced">進階</string>
+    <string name="title_vpn_settings">VPN 設定</string>
+    <string name="title_pref_per_app_proxy">Proxy 個別應用程式</string>
+    <string name="summary_pref_per_app_proxy">常規：勾選的 App 啟用 Proxy，未勾選的直接連線；\n繞行模式：勾選的 App 直接連線，未勾選的啟用 Proxy。\n可在選單中選擇自動選中需 Proxy 應用</string>
+
+    <string name="title_pref_mux_enabled">啟用 Mux</string>
+    <string name="summary_pref_mux_enabled">啟用或許會加快網路速度，切換或許會閃爍</string>
+
+    <string name="title_pref_speed_enabled">啟用速度顯示</string>
+    <string name="summary_pref_speed_enabled">在通知中顯示當前速度\n小圖示顯示流量的轉送狀況</string>
+
+    <string name="title_pref_sniffing_enabled">啟用流量監聽</string>
+    <string name="summary_pref_sniffing_enabled">從流量中監聽網域 (預設啟用)</string>
+
+    <string name="title_pref_local_dns_enabled">啟用本機 DNS</string>
+    <string name="summary_pref_local_dns_enabled">DNS 請求匯入 core 由 DNS 模塊處理 (建議啟用，如果需要轉送略過區域網路及中國大陸)</string>
+
+    <string name="title_pref_fake_dns_enabled">啟用假 DNS</string>
+    <string name="summary_pref_fake_dns_enabled">本機退回假解析結果 (減低延時，但個別應用可能無法使用)</string>
+
+    <string name="title_pref_prefer_ipv6">IPv6 偏好</string>
+    <string name="summary_pref_prefer_ipv6">App 優先使用 IPv6 位址連線伺服器，同时開啟 VPN 的 IPv6 路由</string>
+
+    <string name="title_pref_routing">轉送設定</string>
+    <string name="title_pref_routing_domain_strategy">網域策略</string>
+    <string name="title_pref_routing_mode">轉送模式</string>
+    <string name="title_pref_routing_custom">自訂轉送</string>
+
+    <string name="title_pref_remote_dns">遠端 DNS (可選)</string>
+    <string name="summary_pref_remote_dns">DNS</string>
+
+    <string name="title_pref_vpn_dns">VPN DNS (僅支援 IPv4/v6)</string>
+
+    <string name="title_pref_domestic_dns">國內 DNS (可選)</string>
+    <string name="summary_pref_domestic_dns">DNS</string>
+
+    <string name="title_pref_proxy_sharing_enabled">允許來自區域網路的連線</string>
+    <string name="summary_pref_proxy_sharing_enabled">其他裝置可以使用 socks/http 協定透過您的 IP 位址連線到 Proxy，僅在受信任的網路中啟用以避免未經授權的連線</string>
+    <string name="toast_warning_pref_proxysharing_short">允許來自區域網路的連線，請確保處於受信網路</string>
+
+    <string name="title_pref_allow_insecure">跳過憑證驗證 (allowInsecure)</string>
+    <string name="summary_pref_allow_insecure">傳輸層安全選 tls 時，預設跳過憑證驗證 (allowInsecure)</string>
+
+    <string name="title_pref_socks_port">SOCKS5 Proxy 埠</string>
+    <string name="summary_pref_socks_port">SOCKS5 Proxy 埠</string>
+
+    <string name="title_pref_http_port">HTTP Proxy 埠</string>
+    <string name="summary_pref_http_port">HTTP Proxy 埠</string>
+
+    <string name="title_pref_local_dns_port">本機 DNS 埠</string>
+    <string name="summary_pref_local_dns_port">本機 DNS 埠</string>
+
+    <string name="title_pref_confirm_remove">刪除配置文件確認</string>
+    <string name="summary_pref_confirm_remove">刪除配置文件是否需要用戶二次確認</string>
+
+    <string name="title_pref_feedback">意見回饋</string>
+    <string name="summary_pref_feedback">前往 GitHub 回報錯誤</string>
+    <string name="summary_pref_tg_group">加入 Telegram 群組</string>
+    <string name="toast_tg_app_not_found">未找到 Telegram 應用程式</string>
+
+    <string name="title_pref_promotion">推廣</string>
+    <string name="summary_pref_promotion">一些推廣，輕觸以檢視 (捐贈可去除)</string>
+
+    <string name="title_core_loglevel">記錄層級</string>
+    <string name="title_mode">模式</string>
+    <string name="title_mode_help">輕觸以檢視說明</string>
+    <string name="title_language">語言</string>
+
+    <string name="title_logcat">Logcat</string>
+    <string name="logcat_copy">複製</string>
+    <string name="logcat_clear">清除</string>
+    <string name="title_service_restart">服務重啟</string>
+    <string name="title_del_all_config">刪除全部組態</string>
+    <string name="title_del_invalid_config">刪除無效組態 (先偵測)</string>
+    <string name="title_export_all">匯出全部 (非自訂) 組態至剪貼簿</string>
+    <string name="title_sub_setting">訂閱分組設定</string>
+    <string name="sub_setting_remarks">備註</string>
+    <string name="sub_setting_url">Optional URL</string>
+    <string name="sub_setting_enable">啟用更新</string>
+    <string name="title_sub_update">更新訂閱</string>
+    <string name="title_ping_all_server">偵測所有組態 Tcping</string>
+    <string name="title_real_ping_all_server">偵測所有組態真延遲</string>
+    <string name="title_user_asset_setting">Geo 資源檔案</string>
+    <string name="title_sort_by_test_results">依偵測結果排序</string>
+    <string name="title_filter_config">過濾組態</string>
+    <string name="filter_config_all">所有訂閱分組</string>
+
+    <string name="tasker_start_service">啟動服務</string>
+    <string name="tasker_setting_confirm">確定</string>
+
+    <string name="routing_settings_title">轉送設定</string>
+    <string name="routing_settings_tips">以半形逗號「,」分隔，並手動儲存</string>
+    <string name="routing_settings_save">儲存</string>
+    <string name="routing_settings_delete">清除</string>
+    <string name="routing_settings_scan_replace">掃描並取代</string>
+    <string name="routing_settings_scan_append">掃描並附加</string>
+    <string name="routing_settings_default_rules">設定預設轉送規則</string>
+
+    <string name="connection_test_pending">"測試連線能力"</string>
+    <string name="connection_test_testing">"測試中……"</string>
+    <string name="connection_test_available">"成功：%d ms延遲"</string>
+    <string name="connection_test_error">"測試網際網路連線失敗：%s"</string>
+    <string name="connection_test_fail">"無法使用網際網路"</string>
+    <string name="connection_test_error_status_code">"錯誤碼：(#%d)"</string>
+    <string name="connection_connected">"已連線，輕觸以檢查連線能力"</string>
+    <string name="connection_not_connected">"未連線"</string>
+
+    <string-array name="share_method">
+        <item>QR Code</item>
+        <item>匯出至剪貼簿</item>
+        <item>匯出完整組態至剪貼簿</item>
+    </string-array>
+
+    <string-array name="routing_tag">
+        <item>Proxy URL 或 IP</item>
+        <item>直接連線 URL 或 IP</item>
+        <item>已封鎖的 URL 或 IP</item>
+    </string-array>
+
+    <string-array name="routing_mode">
+        <item>全域 Proxy</item>
+        <item>略過區域網路的 Proxy</item>
+        <item>略過中國大陸的 Proxy</item>
+        <item>略過區域網路及中國大陸的 Proxy</item>
+        <item>直接連線</item>
+    </string-array>
+
+    <string-array name="mode_entries">
+        <item>VPN</item>
+        <item>僅 Proxy</item>
+    </string-array>
+
+</resources>

ExtRes/values/strings.xml

@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">v2rayNG</string>
+    <string name="app_widget_name">Switch</string>
+    <string name="app_tile_name">Switch</string>
+    <string name="app_tile_first_use">First use of this feature, please use the app to add server</string>
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="migration_success">Data migration success!</string>
+    <string name="migration_fail">Data migration failed!</string>
+
+    <!-- Notifications -->
+    <string name="notification_action_stop_v2ray">Stop</string>
+    <string name="toast_permission_denied">Unable to obtain the permission</string>
+    <string name="notification_action_more">click for more</string>
+    <string name="toast_services_start">Start Services</string>
+    <string name="toast_services_stop">Stop Services</string>
+    <string name="toast_services_success">Start Services Success</string>
+    <string name="toast_services_failure">Start Services Failure</string>
+
+    <!--ServerActivity-->
+    <string name="title_server">Configuration file</string>
+    <string name="menu_item_add_config">Add config</string>
+    <string name="menu_item_save_config">Save config</string>
+    <string name="menu_item_del_config">Delete config</string>
+    <string name="menu_item_import_config_qrcode">Import config from QRcode</string>
+    <string name="menu_item_import_config_clipboard">Import config from Clipboard</string>
+    <string name="menu_item_import_config_manually_vmess">Type manually[Vmess]</string>
+    <string name="menu_item_import_config_manually_vless">Type manually[VLESS]</string>
+    <string name="menu_item_import_config_manually_ss">Type manually[Shadowsocks]</string>
+    <string name="menu_item_import_config_manually_socks">Type manually[Socks]</string>
+    <string name="menu_item_import_config_manually_trojan">Type manually[Trojan]</string>
+    <string name="menu_item_import_config_custom">custom config</string>
+    <string name="menu_item_import_config_custom_clipboard">Import custom config from Clipboard</string>
+    <string name="menu_item_import_config_custom_local">Import custom config from locally</string>
+    <string name="menu_item_import_config_custom_url">Import custom config from URL</string>
+    <string name="menu_item_import_config_custom_url_scan">Import custom config scan URL</string>
+    <string name="del_config_comfirm">Confirm delete？</string>
+    <string name="server_lab_remarks">remarks</string>
+    <string name="server_lab_address">address</string>
+    <string name="server_lab_port">port</string>
+    <string name="server_lab_id">id</string>
+    <string name="server_lab_alterid">alterId</string>
+    <string name="server_lab_security">security</string>
+    <string name="server_lab_network">Network</string>
+    <string name="server_lab_more_function">Transport</string>
+    <string name="server_lab_head_type">head type</string>
+    <string name="server_lab_mode_type">gRPC mode</string>
+    <string name="server_lab_request_host">request host(host/ws host/h2 host)/QUIC security</string>
+    <string name="server_lab_path">path(ws path/h2 path)/QUIC key/kcp seed/gRPC serviceName</string>
+    <string name="server_lab_stream_security">tls</string>
+    <string name="server_lab_allow_insecure">allowInsecure</string>
+    <string name="server_lab_sni">SNI</string>
+    <string name="server_lab_address3">address</string>
+    <string name="server_lab_port3">port</string>
+    <string name="server_lab_id3">password</string>
+    <string name="server_lab_security3">security</string>
+    <string name="server_lab_id4">Password(Optional)</string>
+    <string name="server_lab_security4">User(Optional)</string>
+    <string name="server_lab_encryption">encryption</string>
+    <string name="server_lab_flow">flow</string>
+    <string name="toast_success">Success</string>
+    <string name="toast_failure">Failure</string>
+    <string name="toast_none_data">There is nothing</string>
+    <string name="toast_incorrect_protocol">Incorrect protocol</string>
+    <string name="toast_decoding_failed">Decoding failed</string>
+    <string name="title_file_chooser">Select a Config File</string>
+    <string name="toast_require_file_manager">Please install a File Manager.</string>
+    <string name="server_customize_config">Customize Config</string>
+    <string name="toast_config_file_invalid">Invalid Config</string>
+    <string name="server_lab_content">Content</string>
+    <string name="toast_none_data_clipboard">There is no data in the clipboard</string>
+    <string name="toast_invalid_url">Invalid URL</string>
+    <string name="server_lab_need_inbound">Ensure inbounds port is consistent with the settings</string>
+    <string name="toast_malformed_josn">Config malformed</string>
+    <string name="server_lab_request_host6">Host(SNI)(Optional)</string>
+    <string name="toast_asset_copy_failed">File copy failed, please use File Manager</string>
+    <string name="menu_item_add_file">Add files</string>
+    <string name="menu_item_download_file">Download files</string>
+
+    <!-- PerAppProxyActivity -->
+    <string name="msg_dialog_progress">Loading</string>
+    <string name="menu_item_search">Search</string>
+    <string name="menu_item_select_all">Select all</string>
+    <string name="msg_enter_keywords">Enter keywords</string>
+    <string name="switch_bypass_apps_mode">Bypass Mode</string>
+    <string name="menu_item_select_proxy_app">Auto select proxy app</string>
+    <string name="msg_downloading_content">Downloading content</string>
+    <string name="menu_item_export_proxy_app">Export to Clipboard</string>
+    <string name="menu_item_import_proxy_app">Import from Clipboard</string>
+
+
+    <!-- Preferences -->
+    <string name="title_settings">Settings</string>
+    <string name="title_advanced">Advanced Settings</string>
+    <string name="title_vpn_settings">VPN Settings</string>
+    <string name="title_pref_per_app_proxy">Per-app proxy</string>
+    <string name="summary_pref_per_app_proxy">General: Checked App is proxy, unchecked direct connection; \nbypass mode: checked app directly connected, unchecked proxy. \nThe option to automatically select the proxy application in the menu</string>
+
+    <string name="title_pref_mux_enabled">Enable Mux</string>
+    <string name="summary_pref_mux_enabled">Enable maybe speed up network and switch network maybe flash</string>
+
+    <string name="title_pref_speed_enabled">Enable speed display</string>
+    <string name="summary_pref_speed_enabled">Display current speed in the notification.\nNotification icon would change based on
+        usage.</string>
+
+    <string name="title_pref_sniffing_enabled">Enable Sniffing</string>
+    <string name="summary_pref_sniffing_enabled">Try sniff domain from the packet (default on)</string>
+
+    <string name="title_pref_local_dns_enabled">Enable local DNS</string>
+    <string name="summary_pref_local_dns_enabled">DNS processed by core‘s DNS module (Recommended, if need routing Bypassing LAN and
+        mainland address)</string>
+
+    <string name="title_pref_fake_dns_enabled">Enable fake DNS</string>
+    <string name="summary_pref_fake_dns_enabled">local DNS returns fake IP address (faster, but it may not work for some apps)</string>
+
+    <string name="title_pref_prefer_ipv6">Prefer IPv6</string>
+    <string name="summary_pref_prefer_ipv6">Prefer IPv6 address and routes</string>
+
+    <string name="title_pref_routing">Routing</string>
+    <string name="title_pref_routing_domain_strategy">Domain strategy</string>
+    <string name="title_pref_routing_mode">Predefined rules</string>
+    <string name="title_pref_routing_custom">Custom rules</string>
+
+    <string name="title_pref_remote_dns">Remote DNS (Optional)</string>
+    <string name="summary_pref_remote_dns">DNS</string>
+
+    <string name="title_pref_vpn_dns">VPN DNS (only IPv4/v6)</string>
+
+    <string name="title_pref_domestic_dns">Domestic DNS (Optional)</string>
+    <string name="summary_pref_domestic_dns">DNS</string>
+
+    <string name="title_pref_proxy_sharing_enabled">Allow connections from the LAN</string>
+    <string name="summary_pref_proxy_sharing_enabled">Other devices can connect to proxy by your ip address through socks/http, Only enable in trusted network to avoid unauthorized connection</string>
+    <string name="toast_warning_pref_proxysharing_short">Allow connections from the LAN, Make sure you are in a trusted network</string>
+
+    <string name="title_pref_allow_insecure">allowInsecure</string>
+    <string name="summary_pref_allow_insecure">When TLS, the default allowInsecure</string>
+
+    <string name="title_pref_socks_port">SOCKS5 proxy port</string>
+    <string name="summary_pref_socks_port">SOCKS5 proxy port</string>
+
+    <string name="title_pref_http_port">HTTP proxy port</string>
+    <string name="summary_pref_http_port">HTTP proxy port</string>
+
+    <string name="title_pref_local_dns_port">Local DNS port</string>
+    <string name="summary_pref_local_dns_port">Local DNS port</string>
+
+    <string name="title_pref_confirm_remove">Delete configuration file confirmation</string>
+    <string name="summary_pref_confirm_remove">Whether to delete the configuration file requires a second confirmation by the user</string>
+
+    <string name="title_pref_feedback">Feedback</string>
+    <string name="summary_pref_feedback">Feedback enhancements or bugs to GitHub</string>
+    <string name="summary_pref_tg_group">Join Telegram Group</string>
+    <string name="toast_tg_app_not_found">Telegram app not found</string>
+
+    <string name="title_pref_promotion">Promotion</string>
+    <string name="summary_pref_promotion">Promotion,click for details(Donation can be removed)</string>
+
+    <string name="title_core_loglevel">Log Level</string>
+    <string name="title_mode">Mode</string>
+    <string name="title_mode_help">Click me for more help</string>
+    <string name="title_language">Language</string>
+
+    <string name="title_logcat">Logcat</string>
+    <string name="logcat_copy">Copy</string>
+    <string name="logcat_clear">Clear</string>
+    <string name="title_service_restart">Service restart</string>
+    <string name="title_del_all_config">Delete all config</string>
+    <string name="title_del_invalid_config">Delete invalid config(Test first)</string>
+    <string name="title_export_all">Export non-custom configs to clipboard</string>
+    <string name="title_sub_setting">Subscription group setting</string>
+    <string name="sub_setting_remarks">remarks</string>
+    <string name="sub_setting_url">Optional URL</string>
+    <string name="sub_setting_enable">enable update</string>
+    <string name="title_sub_update">Update subscription</string>
+    <string name="title_ping_all_server">Tcping all configuration</string>
+    <string name="title_real_ping_all_server">Real delay all configuration</string>
+    <string name="title_user_asset_setting">Geo asset files</string>
+    <string name="title_sort_by_test_results">Sorting by test results</string>
+    <string name="title_filter_config">Filter configuration file</string>
+    <string name="filter_config_all">All subscription groups</string>
+
+    <string name="tasker_start_service">Start Service</string>
+    <string name="tasker_setting_confirm">Confirm</string>
+
+    <string name="routing_settings_title">Routing Settings</string>
+    <string name="routing_settings_tips">Separated by commas(,),remember to save</string>
+    <string name="routing_settings_save">Save</string>
+    <string name="routing_settings_delete">Clear</string>
+    <string name="routing_settings_scan_replace">Scan and replace</string>
+    <string name="routing_settings_scan_append">Scan and append</string>
+    <string name="routing_settings_default_rules"> set default routing rules</string>
+
+    <string name="connection_test_pending">Check Connectivity</string>
+    <string name="connection_test_testing">Testing…</string>
+    <string name="connection_test_available">Success: HTTP connection took %dms</string>
+    <string name="connection_test_error">Fail to detect internet connection: %s</string>
+    <string name="connection_test_fail">Internet Unavailable</string>
+    <string name="connection_test_error_status_code">Error code: #%d</string>
+    <string name="connection_connected">Connected, tap to check connection</string>
+    <string name="connection_not_connected">Not connected</string>
+
+    <string-array name="share_method">
+        <item>QRcode</item>
+        <item>Export to clipboard</item>
+        <item>Export full configuration to clipboard</item>
+    </string-array>
+
+    <string-array name="routing_tag">
+        <item>proxy URL or IP</item>
+        <item>direct URL or IP</item>
+        <item>blocked URL or IP</item>
+    </string-array>
+
+    <string-array name="routing_mode">
+        <item>Global proxy</item>
+        <item>Bypassing the LAN address then proxy</item>
+        <item>Bypass mainland address then proxy</item>
+        <item>Bypassing LAN and mainland address then proxy</item>
+        <item>Global direct</item>
+    </string-array>
+
+    <string-array name="mode_entries">
+        <item>VPN</item>
+        <item>Proxy only</item>
+    </string-array>
+
+</resources>

README.md

@@ -2,8 +2,8 @@
 
 A V2Ray client for Android, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core)
 
-[![API](https://img.shields.io/badge/API-17%2B-yellow.svg?style=flat)](https://developer.android.com/about/versions/jelly-bean#android-4.2)
-[![Kotlin Version](https://img.shields.io/badge/Kotlin-1.5.10-blue.svg)](https://kotlinlang.org)
+[![API](https://img.shields.io/badge/API-21%2B-yellow.svg?style=flat)](https://developer.android.com/about/versions/lollipop)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-1.6.10-blue.svg)](https://kotlinlang.org)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayNG)](https://github.com/2dust/v2rayNG/commits/master)
 [![CodeFactor](https://www.codefactor.io/repository/github/2dust/v2rayng/badge)](https://www.codefactor.io/repository/github/2dust/v2rayng)
 [![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayNG/latest/total?logo=github)](https://github.com/2dust/v2rayNG/releases)
@@ -16,15 +16,12 @@ A V2Ray client for Android, support [Xray core](https://github.com/XTLS/Xray-cor
 ### Usage
 
 #### Geoip and Geosite
-v2rayNG release already embedded domain file `geoip.dat` and `geosite.dat`. However it is (probably) not the latest and not the most complete list.
-For power user, the embedded files can be easily replaced with the following steps:
-1. Launch v2rayNG (v1.4.9+)
-2. Find existing geoip.dat and geosite.dat in `Android/data/com.v2ray.ang/files/assets` (path may differ on some Android device)
-3. Replace them with the latest [domain list](https://github.com/v2fly/domain-list-community) and [ip list](https://github.com/v2fly/geoip)
-4. Enhanced version can be found in this [repo](https://github.com/Loyalsoldier/v2ray-rules-dat) (recommend to use `geosite:geolocation-!cn` for proxy dns and routing)
-5. It is also possible to use third party dat file in the same folder, like [h2y](https://guide.v2fly.org/routing/sitedata.html#%E5%A4%96%E7%BD%AE%E7%9A%84%E5%9F%9F%E5%90%8D%E6%96%87%E4%BB%B6)
+- geoip.dat and geosite.dat files are in `Android/data/com.v2ray.ang/files/assets` (path may differ on some Android device)
+- download feature will get enhanced version in this [repo](https://github.com/Loyalsoldier/v2ray-rules-dat) (Note it need a working proxy)
+- latest official [domain list](https://github.com/v2fly/domain-list-community) and [ip list](https://github.com/v2fly/geoip) can be imported manually
+- possible to use third party dat file in the same folder, like [h2y](https://guide.v2fly.org/routing/sitedata.html#%E5%A4%96%E7%BD%AE%E7%9A%84%E5%9F%9F%E5%90%8D%E6%96%87%E4%BB%B6)
 
-#### See more in our [wiki](https://github.com/2dust/v2rayNG/wiki)
+### More in our [wiki](https://github.com/2dust/v2rayNG/wiki)
 
 ### Development guide
 
@@ -32,4 +29,5 @@ Android project under V2rayNG folder can be compiled directly in Android Studio,
 The aar can be compiled from the Golang project under AndroidLibV2rayLite folder. For a quick start, read guide for [Go Mobile](https://github.com/golang/go/wiki/Mobile)
 and [Makefiles for Go Developers](https://tutorialedge.net/golang/makefiles-for-go-developers/)
 
-v2rayNG can run on Android Emulators, with minimum Android 5.0
+v2rayNG can run on Android Emulators. For WSA, VPN permission need to be granted via
+`appops set [package name] ACTIVATE_VPN allow`

V2rayNG/app/build.gradle

@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion Integer.parseInt("$compileSdkVer")
@@ -13,7 +12,7 @@ android {
 
     defaultConfig {
         applicationId "com.v2ray.ang"
-        minSdkVersion 17
+        minSdkVersion 21
         targetSdkVersion Integer.parseInt("$targetSdkVer")
         multiDexEnabled true
         versionCode 212
@@ -59,7 +58,9 @@ android {
     android.applicationVariants.all { variant ->
         // assign different version code for each output
         variant.outputs.each { output ->
-            output.versionCodeOverride =
+            output.outputFileName = "v2rayNG_" + variant.versionName + "_" + output.getFilter(com.android.build.OutputFile.ABI) + ".apk"
+
+                output.versionCodeOverride =
                     project.ext.versionCodes.get(output.getFilter(com.android.build.OutputFile.ABI), 0) *
                             1000000 + android.defaultConfig.versionCode
         }
@@ -72,13 +73,13 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: [])
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
 
     // Androidx
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
-    implementation "androidx.appcompat:appcompat:1.3.0"
-    implementation "com.google.android.material:material:1.4.0"
+    implementation "androidx.appcompat:appcompat:1.4.1"
+    implementation "com.google.android.material:material:1.5.0"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation "androidx.preference:preference:1.0.0"
     implementation "androidx.recyclerview:recyclerview:1.2.1"
@@ -86,17 +87,16 @@ dependencies {
     implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
 
     // Androidx ktx
-    implementation 'androidx.activity:activity-ktx:1.2.4'
+    implementation 'androidx.activity:activity-ktx:1.4.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
 
     //kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
 
-    implementation 'com.tencent:mmkv-static:1.2.7'
+    implementation 'com.tencent:mmkv-static:1.2.12'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'io.reactivex:rxjava:1.3.4'
     implementation 'io.reactivex:rxandroid:1.2.1'
@@ -105,17 +105,17 @@ dependencies {
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
     implementation 'com.github.jorgecastilloprz:fabprogresscircle:1.01@aar'
     implementation 'me.drakeet.support:toastcompat:1.1.0'
-    implementation 'com.blacksquircle.ui:editorkit:2.0.0'
-    implementation 'com.blacksquircle.ui:language-json:2.0.0'
+    implementation 'com.blacksquircle.ui:editorkit:2.1.1'
+    implementation 'com.blacksquircle.ui:language-base:2.1.1'
+    implementation 'com.blacksquircle.ui:language-json:2.1.1'
 }
 
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url 'https://maven.google.com' }
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlinVersion"
+        maven { url 'https://jitpack.io' }
+        jcenter()
     }
 }

V2rayNG/app/src/main/AndroidManifest.xml

@@ -28,17 +28,17 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
 
-    <uses-sdk tools:overrideLibrary="com.blacksquircle.ui.editorkit, com.blacksquircle.ui.language.json, com.blacksquircle.ui.language.base"/>
-
     <application
         android:name=".AngApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:extractNativeLibs="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true"
+        tools:targetApi="m">
         <activity
+            android:exported="true"
             android:name=".ui.MainActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:launchMode="singleTask">
@@ -59,24 +59,40 @@
                 android:resource="@xml/shortcuts" />
         </activity>
         <activity
+            android:exported="false"
             android:name=".ui.ServerActivity"
             android:windowSoftInputMode="stateUnchanged" />
         <activity
+            android:exported="false"
             android:name=".ui.ServerCustomConfigActivity"
             android:windowSoftInputMode="stateUnchanged" />
-        <activity android:name=".ui.SettingsActivity" />
-        <activity android:name=".ui.PerAppProxyActivity" />
-        <activity android:name=".ui.ScannerActivity" />
-<!--        <activity android:name=".InappBuyActivity" />-->
-        <activity android:name=".ui.LogcatActivity" />
         <activity
+            android:exported="false"
+            android:name=".ui.SettingsActivity" />
+        <activity
+            android:exported="false"
+            android:name=".ui.PerAppProxyActivity" />
+        <activity
+            android:exported="false"
+            android:name=".ui.ScannerActivity" />
+        <activity
+            android:exported="false"
+            android:name=".ui.LogcatActivity" />
+        <activity
+            android:exported="false"
             android:name=".ui.RoutingSettingsActivity"
             android:windowSoftInputMode="stateUnchanged" />
-        <activity android:name=".ui.SubSettingActivity" />
-
-        <activity android:name=".ui.SubEditActivity" />
-        <activity android:name=".ui.ScScannerActivity" />
         <activity
+            android:exported="false"
+            android:name=".ui.SubSettingActivity" />
+        <activity
+            android:exported="false"
+            android:name=".ui.SubEditActivity" />
+        <activity
+            android:exported="false"
+            android:name=".ui.ScScannerActivity" />
+        <activity
+            android:exported="false"
             android:name=".ui.ScSwitchActivity"
             android:excludeFromRecents="true"
             android:process=":RunSoLibV2RayDaemon"
@@ -103,7 +119,9 @@
                 android:process=":RunSoLibV2RayDaemon">
         </service>
 
-        <receiver android:name=".receiver.WidgetProvider"
+        <receiver
+                android:exported="true"
+                android:name=".receiver.WidgetProvider"
                 android:process=":RunSoLibV2RayDaemon">
             <meta-data
                     android:name="android.appwidget.provider"
@@ -116,6 +134,7 @@
         </receiver>
 
         <service
+                android:exported="true"
                 android:name=".service.QSTileService"
                 android:icon="@drawable/ic_v"
                 android:label="@string/app_tile_name"
@@ -127,6 +146,7 @@
         </service>
         <!-- =====================Tasker===================== -->
         <activity
+            android:exported="true"
             android:name=".ui.TaskerActivity"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name">
@@ -135,7 +155,9 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name=".receiver.TaskerReceiver"
+        <receiver
+            android:exported="true"
+            android:name=".receiver.TaskerReceiver"
                 android:process=":RunSoLibV2RayDaemon">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />

V2rayNG/app/src/main/kotlin/com/v2ray/ang/extension/_Ext.kt

@@ -6,6 +6,7 @@ import android.widget.Toast
 import com.v2ray.ang.AngApplication
 import me.drakeet.support.toast.ToastCompat
 import org.json.JSONObject
+import java.net.URI
 import java.net.URLConnection
 
 /**
@@ -15,13 +16,13 @@ import java.net.URLConnection
 val Context.v2RayApplication: AngApplication
     get() = applicationContext as AngApplication
 
-inline fun Context.toast(message: Int): Toast = ToastCompat
+fun Context.toast(message: Int): Toast = ToastCompat
         .makeText(this, message, Toast.LENGTH_SHORT)
         .apply {
             show()
         }
 
-inline fun Context.toast(message: CharSequence): Toast = ToastCompat
+fun Context.toast(message: CharSequence): Toast = ToastCompat
         .makeText(this, message, Toast.LENGTH_SHORT)
         .apply {
             show()
@@ -74,3 +75,6 @@ private fun Float.toShortString(): String {
 
 val URLConnection.responseLength: Long
     get() = if (Build.VERSION.SDK_INT >= 24) contentLengthLong else contentLength.toLong()
+
+val URI.idnHost: String
+    get() = (host!!).replace("[", "").replace("]", "")

V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt

@@ -6,6 +6,7 @@ import android.appwidget.AppWidgetProvider
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.widget.RemoteViews
 import com.v2ray.ang.R
 import com.v2ray.ang.AppConfig
@@ -21,16 +22,33 @@ class WidgetProvider : AppWidgetProvider() {
         updateWidgetBackground(context, appWidgetManager, appWidgetIds, V2RayServiceManager.v2rayPoint.isRunning)
     }
 
+
     private fun updateWidgetBackground(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray, isRunning: Boolean) {
         val remoteViews = RemoteViews(context.packageName, R.layout.widget_switch)
         val intent = Intent(context, WidgetProvider::class.java)
         intent.action = AppConfig.BROADCAST_ACTION_WIDGET_CLICK
-        val pendingIntent = PendingIntent.getBroadcast(context, R.id.layout_switch, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        val pendingIntent = PendingIntent.getBroadcast(
+            context,
+            R.id.layout_switch,
+            intent,
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            } else {
+                PendingIntent.FLAG_UPDATE_CURRENT
+            })
         remoteViews.setOnClickPendingIntent(R.id.layout_switch, pendingIntent)
         if (isRunning) {
-            remoteViews.setInt(R.id.layout_switch, "setBackgroundResource", R.drawable.ic_rounded_corner_theme)
+            remoteViews.setInt(
+                R.id.layout_switch,
+                "setBackgroundResource",
+                R.drawable.ic_rounded_corner_theme
+            )
         } else {
-            remoteViews.setInt(R.id.layout_switch, "setBackgroundResource", R.drawable.ic_rounded_corner_grey)
+            remoteViews.setInt(
+                R.id.layout_switch,
+                "setBackgroundResource",
+                R.drawable.ic_rounded_corner_grey
+            )
         }
 
         for (appWidgetId in appWidgetIds) {

V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt

@@ -237,7 +237,11 @@ object V2RayServiceManager {
         val startMainIntent = Intent(service, MainActivity::class.java)
         val contentPendingIntent = PendingIntent.getActivity(service,
                 NOTIFICATION_PENDING_INTENT_CONTENT, startMainIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            } else {
+                PendingIntent.FLAG_UPDATE_CURRENT
+            })
 
         val stopV2RayIntent = Intent(AppConfig.BROADCAST_ACTION_SERVICE)
         stopV2RayIntent.`package` = ANG_PACKAGE
@@ -245,7 +249,11 @@ object V2RayServiceManager {
 
         val stopV2RayPendingIntent = PendingIntent.getBroadcast(service,
                 NOTIFICATION_PENDING_INTENT_STOP_V2RAY, stopV2RayIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            } else {
+                PendingIntent.FLAG_UPDATE_CURRENT
+            })
 
         val channelId =
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt

@@ -132,8 +132,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
 
         builder.setSession(V2RayServiceManager.currentConfig?.remarks.orEmpty())
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
-                settingsStorage?.decodeBool(AppConfig.PREF_PER_APP_PROXY) == true) {
+        if (settingsStorage?.decodeBool(AppConfig.PREF_PER_APP_PROXY) == true) {
             val apps = settingsStorage?.decodeStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
             val bypassApps = settingsStorage?.decodeBool(AppConfig.PREF_BYPASS_APPS) ?: false
             apps?.forEach {

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/LogcatActivity.kt

@@ -70,7 +70,7 @@ class LogcatActivity : BaseActivity() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_logcat, menu)
         return super.onCreateOptionsMenu(menu)
     }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt

@@ -169,7 +169,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         super.onPause()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_main, menu)
         return true
     }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt

@@ -188,7 +188,7 @@ class PerAppProxyActivity : BaseActivity() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_bypass_list, menu)
         return super.onCreateOptionsMenu(menu)
     }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsFragment.kt

@@ -4,33 +4,37 @@ import android.Manifest
 import android.app.Activity.RESULT_OK
 import android.content.Intent
 import android.os.Bundle
+import android.text.TextUtils
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import android.view.*
-import com.v2ray.ang.R
-import com.v2ray.ang.util.Utils
-import kotlinx.android.synthetic.main.fragment_routing_settings.*
 import android.view.MenuInflater
 import androidx.activity.result.contract.ActivityResultContracts
 import com.tbruyelle.rxpermissions.RxPermissions
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.R
+import com.v2ray.ang.databinding.FragmentRoutingSettingsBinding
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.extension.v2RayApplication
+import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import java.net.URL
 
 class RoutingSettingsFragment : Fragment() {
+    private lateinit var binding: FragmentRoutingSettingsBinding
     companion object {
         private const val routing_arg = "routing_arg"
     }
 
-    val defaultSharedPreferences by lazy { PreferenceManager.getDefaultSharedPreferences(context) }
+    val defaultSharedPreferences by lazy { PreferenceManager.getDefaultSharedPreferences(requireContext()) }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_routing_settings, container, false)
+        binding = FragmentRoutingSettingsBinding.inflate(layoutInflater)
+        return binding.root// inflater.inflate(R.layout.fragment_routing_settings, container, false)
     }
 
     fun newInstance(arg: String): Fragment {
@@ -45,7 +49,7 @@ class RoutingSettingsFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         val content = defaultSharedPreferences.getString(requireArguments().getString(routing_arg), "")
-        et_routing_content.text = Utils.getEditable(content!!)
+        binding.etRoutingContent.text = Utils.getEditable(content!!)
 
         setHasOptionsMenu(true)
     }
@@ -57,13 +61,13 @@ class RoutingSettingsFragment : Fragment() {
 
     override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
         R.id.save_routing -> {
-            val content = et_routing_content.text.toString()
+            val content = binding.etRoutingContent.text.toString()
             defaultSharedPreferences.edit().putString(requireArguments().getString(routing_arg), content).apply()
             activity?.toast(R.string.toast_success)
             true
         }
         R.id.del_routing -> {
-            et_routing_content.text = null
+            binding.etRoutingContent.text = null
             true
         }
         R.id.scan_replace -> {
@@ -81,6 +85,12 @@ class RoutingSettingsFragment : Fragment() {
         else -> super.onOptionsItemSelected(item)
     }
 
+    private fun saveRouting() {
+        val content = binding.etRoutingContent.text.toString()
+        defaultSharedPreferences.edit().putString(requireArguments().getString(routing_arg), content).apply()
+        activity?.toast(R.string.toast_success)
+    }
+
     fun scanQRcode(forReplace: Boolean): Boolean {
 //        try {
 //            startActivityForResult(Intent("com.google.zxing.client.android.SCAN")
@@ -105,14 +115,14 @@ class RoutingSettingsFragment : Fragment() {
     private val scanQRCodeForReplace = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
         if (it.resultCode == RESULT_OK) {
             val content = it.data?.getStringExtra("SCAN_RESULT")
-            et_routing_content.text = Utils.getEditable(content!!)
+            binding.etRoutingContent.text = Utils.getEditable(content!!)
         }
     }
 
     private val scanQRCodeForAppend = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
         if (it.resultCode == RESULT_OK) {
             val content = it.data?.getStringExtra("SCAN_RESULT")
-            et_routing_content.text = Utils.getEditable("${et_routing_content.text},$content")
+            binding.etRoutingContent.text = Utils.getEditable("${binding.etRoutingContent.text},$content")
         }
     }
 
@@ -139,8 +149,14 @@ class RoutingSettingsFragment : Fragment() {
                 ""
             }
             launch(Dispatchers.Main) {
-                et_routing_content.text = Utils.getEditable(content)
-                activity?.toast(R.string.toast_success)
+                val routingList = if (TextUtils.isEmpty(content)) {
+                    Utils.readTextFromAssets(activity?.v2RayApplication!!, "custom_routing_$tag")
+                } else {
+                    content
+                }
+                binding.etRoutingContent.text = Utils.getEditable(routingList)
+                saveRouting()
+                //toast(R.string.toast_success)
             }
         }
         return true

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt

@@ -63,7 +63,7 @@ class ScannerActivity : BaseActivity(), ZXingScannerView.ResultHandler {
         finish()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_scanner, menu)
         return true
     }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt

@@ -6,14 +6,12 @@ import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
+import android.widget.*
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.V2rayConfig
-import com.v2ray.ang.dto.V2rayConfig.Companion.DEFAULT_NETWORK
 import com.v2ray.ang.dto.V2rayConfig.Companion.DEFAULT_PORT
 import com.v2ray.ang.dto.V2rayConfig.Companion.XTLS
 import com.v2ray.ang.extension.toast
@@ -21,19 +19,6 @@ import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.MmkvManager.ID_MAIN
 import com.v2ray.ang.util.MmkvManager.KEY_SELECTED_SERVER
 import com.v2ray.ang.util.Utils
-import kotlinx.android.synthetic.main.activity_server_socks.*
-import kotlinx.android.synthetic.main.activity_server_vmess.*
-import kotlinx.android.synthetic.main.activity_server_vmess.et_address
-import kotlinx.android.synthetic.main.activity_server_vmess.et_id
-import kotlinx.android.synthetic.main.activity_server_vmess.et_path
-import kotlinx.android.synthetic.main.activity_server_vmess.et_port
-import kotlinx.android.synthetic.main.activity_server_vmess.et_remarks
-import kotlinx.android.synthetic.main.activity_server_vmess.et_request_host
-import kotlinx.android.synthetic.main.activity_server_vmess.sp_allow_insecure
-import kotlinx.android.synthetic.main.activity_server_vmess.sp_header_type
-import kotlinx.android.synthetic.main.activity_server_vmess.sp_header_type_title
-import kotlinx.android.synthetic.main.activity_server_vmess.sp_network
-import kotlinx.android.synthetic.main.activity_server_vmess.sp_stream_security
 
 class ServerActivity : BaseActivity() {
 
@@ -76,6 +61,26 @@ class ServerActivity : BaseActivity() {
         resources.getStringArray(R.array.allowinsecures)
     }
 
+    // Kotlin synthetics was used, but since it is removed in 1.8. We switch to old manual approach.
+    // We don't use AndroidViewBinding because, it is better to share similar logics for different
+    // protocols. Use findViewById manually ensures the xml are de-coupled with the activity logic.
+    private val et_remarks: EditText by lazy { findViewById(R.id.et_remarks) }
+    private val et_address: EditText by lazy { findViewById(R.id.et_address) }
+    private val et_port: EditText by lazy { findViewById(R.id.et_port) }
+    private val et_id: EditText by lazy { findViewById(R.id.et_id) }
+    //private val et_alterId: EditText? by lazy { findViewById(R.id.et_alterId) }
+    private val et_security: EditText? by lazy { findViewById(R.id.et_security) }
+    //private val sp_flow: Spinner? by lazy { findViewById(R.id.sp_flow) }
+    private val sp_security: Spinner? by lazy { findViewById(R.id.sp_security) }
+    private val sp_stream_security: Spinner? by lazy { findViewById(R.id.sp_stream_security) }
+    private val sp_allow_insecure: Spinner? by lazy { findViewById(R.id.sp_allow_insecure) }
+    //private val et_sni: EditText? by lazy { findViewById(R.id.et_sni) }
+    private val sp_network: Spinner? by lazy { findViewById(R.id.sp_network) }
+    private val sp_header_type: Spinner? by lazy { findViewById(R.id.sp_header_type) }
+    private val sp_header_type_title: TextView? by lazy { findViewById(R.id.sp_header_type_title) }
+    private val et_request_host: EditText? by lazy { findViewById(R.id.et_request_host) }
+    private val et_path: EditText? by lazy { findViewById(R.id.et_path) }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         title = getString(R.string.title_server)
@@ -100,9 +105,9 @@ class ServerActivity : BaseActivity() {
                     getString(R.string.server_lab_mode_type) else
                     getString(R.string.server_lab_head_type)
                 config?.getProxyOutbound()?.getTransportSettingDetails()?.let { transportDetails ->
-                    sp_header_type.setSelection(Utils.arrayFind(types, transportDetails[0]))
-                    et_request_host.text = Utils.getEditable(transportDetails[1])
-                    et_path.text = Utils.getEditable(transportDetails[2])
+                    sp_header_type?.setSelection(Utils.arrayFind(types, transportDetails[0]))
+                    et_request_host?.text = Utils.getEditable(transportDetails[1])
+                    et_path?.text = Utils.getEditable(transportDetails[2])
                 }
             }
             override fun onNothingSelected(parent: AdapterView<*>?) {
@@ -129,9 +134,9 @@ class ServerActivity : BaseActivity() {
         et_port.text = Utils.getEditable(outbound.getServerPort()?.toString() ?: DEFAULT_PORT.toString())
         et_id.text = Utils.getEditable(outbound.getPassword().orEmpty())
         if (config.configType == EConfigType.SOCKS) {
-            et_security.text = Utils.getEditable(outbound.settings?.servers?.get(0)?.users?.get(0)?.user.orEmpty())
+            et_security?.text = Utils.getEditable(outbound.settings?.servers?.get(0)?.users?.get(0)?.user.orEmpty())
         } else if (config.configType == EConfigType.VLESS) {
-            et_security.text = Utils.getEditable(outbound.getSecurityEncryption().orEmpty())
+            et_security?.text = Utils.getEditable(outbound.getSecurityEncryption().orEmpty())
             val flow = Utils.arrayFind(flows, outbound.settings?.vnext?.get(0)?.users?.get(0)?.flow.orEmpty())
             if (flow >= 0) {
                 //sp_flow.setSelection(flow)
@@ -151,7 +156,7 @@ class ServerActivity : BaseActivity() {
                 if (allowinsecure >= 0) {
                     sp_allow_insecure?.setSelection(allowinsecure)
                 }
-                et_request_host.text = Utils.getEditable(tlsSetting.serverName)
+                et_request_host?.text = Utils.getEditable(tlsSetting.serverName)
             }
         }
         val network = Utils.arrayFind(networks, streamSetting.network)
@@ -214,7 +219,7 @@ class ServerActivity : BaseActivity() {
             saveServers(server, port, config)
         }
         config.outboundBean?.streamSettings?.let {
-            saveStreamSettings(it, config)
+            saveStreamSettings(it)
         }
 
         MmkvManager.encodeServerConfig(editGuid, config)
@@ -228,10 +233,10 @@ class ServerActivity : BaseActivity() {
         vnext.port = port
         vnext.users[0].id = et_id.text.toString().trim()
         if (config.configType == EConfigType.VMESS) {
-            vnext.users[0].security = securitys[sp_security.selectedItemPosition]
+            vnext.users[0].security = securitys[sp_security?.selectedItemPosition ?: 0]
         } else if (config.configType == EConfigType.VLESS) {
-            vnext.users[0].encryption = et_security.text.toString().trim()
-            if (streamSecuritys[sp_stream_security.selectedItemPosition] == XTLS) {
+            vnext.users[0].encryption = et_security?.text.toString().trim()
+            if (streamSecuritys[sp_stream_security?.selectedItemPosition ?: 0] == XTLS) {
 //                vnext.users[0].flow = flows[sp_flow.selectedItemPosition].ifBlank { V2rayConfig.DEFAULT_FLOW }
             } else {
                 vnext.users[0].flow = ""
@@ -244,13 +249,13 @@ class ServerActivity : BaseActivity() {
         server.port = port
         if (config.configType == EConfigType.SHADOWSOCKS) {
             server.password = et_id.text.toString().trim()
-            server.method = shadowsocksSecuritys[sp_security.selectedItemPosition]
+            server.method = shadowsocksSecuritys[sp_security?.selectedItemPosition ?: 0]
         } else if (config.configType == EConfigType.SOCKS) {
-            if (TextUtils.isEmpty(et_security.text) && TextUtils.isEmpty(et_id.text)) {
+            if (TextUtils.isEmpty(et_security?.text) && TextUtils.isEmpty(et_id.text)) {
                 server.users = null
             } else {
                 val socksUsersBean = V2rayConfig.OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()
-                socksUsersBean.user = et_security.text.toString().trim()
+                socksUsersBean.user = et_security?.text.toString().trim()
                 socksUsersBean.pass = et_id.text.toString().trim()
                 server.users = listOf(socksUsersBean)
             }
@@ -259,33 +264,36 @@ class ServerActivity : BaseActivity() {
         }
     }
 
-    private fun saveStreamSettings(streamSetting: V2rayConfig.OutboundBean.StreamSettingsBean, config: ServerConfig) {
-        val network = if (sp_network != null) networks[sp_network.selectedItemPosition] else DEFAULT_NETWORK
-        val type = if (sp_header_type != null) transportTypes(network)[sp_header_type.selectedItemPosition] else ""
-        val requestHost = if (et_request_host != null) et_request_host.text.toString().trim() else ""
-        val path = if (et_path != null) et_path.text.toString().trim() else ""
+    private fun saveStreamSettings(streamSetting: V2rayConfig.OutboundBean.StreamSettingsBean) {
+        val network = sp_network?.selectedItemPosition ?: return
+        val type = sp_header_type?.selectedItemPosition ?: return
+        val requestHost = et_request_host?.text?.toString()?.trim() ?: return
+        val path = et_path?.text?.toString()?.trim() ?: return
+        //val sniField = et_sni?.text?.toString()?.trim() ?: return
+        val allowInsecureField = sp_allow_insecure?.selectedItemPosition ?: return
+        val streamSecurity = sp_stream_security?.selectedItemPosition ?: return
+
         var sni = streamSetting.populateTransportSettings(
-                transport = network,
-                headerType = type,
+                transport = networks[network],
+                headerType = transportTypes(networks[network])[type],
                 host = requestHost,
                 path = path,
                 seed = path,
                 quicSecurity = requestHost,
                 key = path,
-                mode = type,
+                mode = transportTypes(networks[network])[type],
                 serviceName = path
         )
-        val allowInsecure = if (sp_allow_insecure == null || allowinsecures[sp_allow_insecure.selectedItemPosition].isBlank()) {
+        //if (sniField.isNotBlank()) {
+        //    sni = sniField
+        //}
+        val allowInsecure = if (allowinsecures[allowInsecureField].isBlank()) {
             false//settingsStorage?.decodeBool(PREF_ALLOW_INSECURE) ?: false
         } else {
-            allowinsecures[sp_allow_insecure.selectedItemPosition].toBoolean()
+            allowinsecures[allowInsecureField].toBoolean()
         }
-        val defaultTls = if (config.configType == EConfigType.TROJAN) V2rayConfig.TLS else ""
-        streamSetting.populateTlsSettings(
-                if (sp_stream_security != null) streamSecuritys[sp_stream_security.selectedItemPosition] else defaultTls,
-                allowInsecure,
-                sni
-        )
+        streamSetting.populateTlsSettings(streamSecuritys[streamSecurity], allowInsecure, sni)
+
     }
 
     private fun transportTypes(network: String?): Array<out String> {
@@ -315,10 +323,10 @@ class ServerActivity : BaseActivity() {
         return true
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.action_server, menu)
-        val delButton = menu?.findItem(R.id.del_config)
-        val saveButton = menu?.findItem(R.id.save_config)
+        val delButton = menu.findItem(R.id.del_config)
+        val saveButton = menu.findItem(R.id.save_config)
 
         if (editGuid.isNotEmpty()) {
             if (isRunning) {

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt

@@ -113,10 +113,10 @@ class ServerCustomConfigActivity : BaseActivity() {
         return true
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.action_server, menu)
-        val delButton = menu?.findItem(R.id.del_config)
-        val saveButton = menu?.findItem(R.id.save_config)
+        val delButton = menu.findItem(R.id.del_config)
+        val saveButton = menu.findItem(R.id.save_config)
 
         if (editGuid.isNotEmpty()) {
             if (isRunning) {

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt

@@ -203,7 +203,7 @@ class SettingsActivity : BaseActivity() {
 
         override fun onStart() {
             super.onStart()
-            val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity)
+            val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity())
             updateMode(defaultSharedPreferences.getString(AppConfig.PREF_MODE, "VPN"))
             var remoteDnsString = defaultSharedPreferences.getString(AppConfig.PREF_REMOTE_DNS, "")
             domesticDns.summary = defaultSharedPreferences.getString(AppConfig.PREF_DOMESTIC_DNS, "")
@@ -222,10 +222,10 @@ class SettingsActivity : BaseActivity() {
         }
 
         private fun updateMode(mode: String?) {
-            val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity)
+            val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity())
             val vpn = mode == "VPN"
             perAppProxy.isEnabled = vpn
-            perAppProxy.isChecked = PreferenceManager.getDefaultSharedPreferences(activity)
+            perAppProxy.isChecked = PreferenceManager.getDefaultSharedPreferences(requireActivity())
                     .getBoolean(AppConfig.PREF_PER_APP_PROXY, false)
             localDns?.isEnabled = vpn
             fakeDns?.isEnabled = vpn

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubEditActivity.kt

@@ -106,10 +106,10 @@ class SubEditActivity : BaseActivity() {
         return true
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.action_server, menu)
-        del_config = menu?.findItem(R.id.del_config)
-        save_config = menu?.findItem(R.id.save_config)
+        del_config = menu.findItem(R.id.del_config)
+        save_config = menu.findItem(R.id.save_config)
 
         if (editSubId.isEmpty()) {
             del_config?.isVisible = false

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubSettingActivity.kt

@@ -37,10 +37,10 @@ class SubSettingActivity : BaseActivity() {
         adapter.notifyDataSetChanged()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.action_sub_setting, menu)
-        menu?.findItem(R.id.del_config)?.isVisible = false
-        menu?.findItem(R.id.save_config)?.isVisible = false
+        menu.findItem(R.id.del_config)?.isVisible = false
+        menu.findItem(R.id.save_config)?.isVisible = false
 
         return super.onCreateOptionsMenu(menu)
     }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/TaskerActivity.kt

@@ -95,9 +95,9 @@ class TaskerActivity : BaseActivity() {
         finish()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.action_server, menu)
-        val del_config = menu?.findItem(R.id.del_config)
+        val del_config = menu.findItem(R.id.del_config)
         del_config?.isVisible = false
         return super.onCreateOptionsMenu(menu)
     }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt

@@ -18,6 +18,7 @@ import com.v2ray.ang.dto.V2rayConfig.Companion.TLS
 import com.v2ray.ang.util.MmkvManager.KEY_SELECTED_SERVER
 import java.net.URI
 import java.util.*
+import com.v2ray.ang.extension.idnHost
 
 object AngConfigManager {
     private val mainStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
@@ -53,27 +54,31 @@ object AngConfigManager {
     }
 
     private fun copyLegacySettings(sharedPreferences: SharedPreferences) {
-        listOf(AppConfig.PREF_MODE,
-                AppConfig.PREF_REMOTE_DNS,
-                AppConfig.PREF_DOMESTIC_DNS,
-//                AppConfig.PREF_LOCAL_DNS_PORT,
-//                AppConfig.PREF_SOCKS_PORT,
-//                AppConfig.PREF_HTTP_PORT,
-//                AppConfig.PREF_LOGLEVEL,
-                AppConfig.PREF_ROUTING_DOMAIN_STRATEGY,
-                AppConfig.PREF_ROUTING_MODE,
-                AppConfig.PREF_V2RAY_ROUTING_AGENT,
-                AppConfig.PREF_V2RAY_ROUTING_BLOCKED,
-                AppConfig.PREF_V2RAY_ROUTING_DIRECT,).forEach { key ->
+        listOf(
+            AppConfig.PREF_MODE,
+            AppConfig.PREF_REMOTE_DNS,
+            AppConfig.PREF_DOMESTIC_DNS,
+            AppConfig.PREF_LOCAL_DNS_PORT,
+//            AppConfig.PREF_SOCKS_PORT,
+//            AppConfig.PREF_HTTP_PORT,
+//            AppConfig.PREF_LOGLEVEL,
+            AppConfig.PREF_ROUTING_DOMAIN_STRATEGY,
+            AppConfig.PREF_ROUTING_MODE,
+            AppConfig.PREF_V2RAY_ROUTING_AGENT,
+            AppConfig.PREF_V2RAY_ROUTING_BLOCKED,
+            AppConfig.PREF_V2RAY_ROUTING_DIRECT,
+        ).forEach { key ->
             settingsStorage?.encode(key, sharedPreferences.getString(key, null))
         }
-        listOf(AppConfig.PREF_SPEED_ENABLED,
-                AppConfig.PREF_PROXY_SHARING,
-                AppConfig.PREF_LOCAL_DNS_ENABLED,
-//                AppConfig.PREF_ALLOW_INSECURE,
-//                AppConfig.PREF_PREFER_IPV6,
-                AppConfig.PREF_PER_APP_PROXY,
-                AppConfig.PREF_BYPASS_APPS,).forEach { key ->
+        listOf(
+            AppConfig.PREF_SPEED_ENABLED,
+            AppConfig.PREF_PROXY_SHARING,
+            AppConfig.PREF_LOCAL_DNS_ENABLED,
+//            AppConfig.PREF_ALLOW_INSECURE,
+//            AppConfig.PREF_PREFER_IPV6,
+            AppConfig.PREF_PER_APP_PROXY,
+            AppConfig.PREF_BYPASS_APPS,
+        ).forEach { key ->
             settingsStorage?.encode(key, sharedPreferences.getBoolean(key, false))
         }
         settingsStorage?.encode(AppConfig.PREF_SNIFFING_ENABLED, sharedPreferences.getBoolean(AppConfig.PREF_SNIFFING_ENABLED, true))
@@ -167,7 +172,7 @@ object AngConfigManager {
             }
 
             //maybe sub
-            if (str.startsWith(HTTP_PROTOCOL) || str.startsWith(HTTPS_PROTOCOL)) {
+            if (TextUtils.isEmpty(subid) && (str.startsWith(HTTP_PROTOCOL) || str.startsWith(HTTPS_PROTOCOL))) {
                 MmkvManager.importUrlAsSubscription(str)
                 return 0
             }
@@ -213,35 +218,37 @@ object AngConfigManager {
                     }
                 }
             } else if (str.startsWith(EConfigType.SHADOWSOCKS.protocolScheme)) {
-                var result = str.replace(EConfigType.SHADOWSOCKS.protocolScheme, "")
-                val indexSplit = result.indexOf("#")
                 config = ServerConfig.create(EConfigType.SHADOWSOCKS)
-                if (indexSplit > 0) {
-                    try {
-                        config.remarks = Utils.urlDecode(result.substring(indexSplit + 1, result.length))
-                    } catch (e: Exception) {
-                        e.printStackTrace()
+                if (!tryResolveResolveSip002(str, config)) {
+                    var result = str.replace(EConfigType.SHADOWSOCKS.protocolScheme, "")
+                    val indexSplit = result.indexOf("#")
+                    if (indexSplit > 0) {
+                        try {
+                            config.remarks = Utils.urlDecode(result.substring(indexSplit + 1, result.length))
+                        } catch (e: Exception) {
+                            e.printStackTrace()
+                        }
+
+                        result = result.substring(0, indexSplit)
                     }
 
-                    result = result.substring(0, indexSplit)
-                }
+                    //part decode
+                    val indexS = result.indexOf("@")
+                    result = if (indexS > 0) {
+                        Utils.decode(result.substring(0, indexS)) + result.substring(indexS, result.length)
+                    } else {
+                        Utils.decode(result)
+                    }
 
-                //part decode
-                val indexS = result.indexOf("@")
-                result = if (indexS > 0) {
-                    Utils.decode(result.substring(0, indexS)) + result.substring(indexS, result.length)
-                } else {
-                    Utils.decode(result)
-                }
+                    val legacyPattern = "^(.+?):(.*)@(.+?):(\\d+?)/?$".toRegex()
+                    val match = legacyPattern.matchEntire(result) ?: return R.string.toast_incorrect_protocol
 
-                val legacyPattern = "^(.+?):(.*)@(.+?):(\\d+?)/?$".toRegex()
-                val match = legacyPattern.matchEntire(result) ?: return R.string.toast_incorrect_protocol
-
-                config.outboundBean?.settings?.servers?.get(0)?.let { server ->
-                    server.address = match.groupValues[3].removeSurrounding("[", "]")
-                    server.port = match.groupValues[4].toInt()
-                    server.password = match.groupValues[2]
-                    server.method = match.groupValues[1].lowercase()
+                    config.outboundBean?.settings?.servers?.get(0)?.let { server ->
+                        server.address = match.groupValues[3].removeSurrounding("[", "]")
+                        server.port = match.groupValues[4].toInt()
+                        server.password = match.groupValues[2]
+                        server.method = match.groupValues[1].lowercase()
+                    }
                 }
             } else if (str.startsWith(EConfigType.SOCKS.protocolScheme)) {
                 var result = str.replace(EConfigType.SOCKS.protocolScheme, "")
@@ -279,9 +286,9 @@ object AngConfigManager {
             } else if (str.startsWith(EConfigType.TROJAN.protocolScheme)) {
                 val uri = URI(str)
                 config = ServerConfig.create(EConfigType.TROJAN)
-                config.remarks = uri.fragment ?: ""
+                config.remarks = Utils.urlDecode(uri.fragment ?: "")
                 config.outboundBean?.settings?.servers?.get(0)?.let { server ->
-                    server.address = uri.host
+                    server.address = uri.idnHost
                     server.port = uri.port
                     server.password = uri.userInfo
                 }
@@ -298,9 +305,9 @@ object AngConfigManager {
                     .associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
                 config = ServerConfig.create(EConfigType.VLESS)
                 val streamSetting = config.outboundBean?.streamSettings ?: return -1
-                config.remarks = uri.fragment ?: ""
+                config.remarks = Utils.urlDecode(uri.fragment ?: "")
                 config.outboundBean?.settings?.vnext?.get(0)?.let { vnext ->
-                    vnext.address = uri.host
+                    vnext.address = uri.idnHost
                     vnext.port = uri.port
                     vnext.users[0].id = uri.userInfo
                     vnext.users[0].encryption = queryParam["encryption"] ?: "none"
@@ -342,9 +349,9 @@ object AngConfigManager {
                 .associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
 
             val streamSetting = config.outboundBean?.streamSettings ?: return false
-            config.remarks = uri.fragment
+            config.remarks = Utils.urlDecode(uri.fragment ?: "")
             config.outboundBean.settings?.vnext?.get(0)?.let { vnext ->
-                vnext.address = uri.host
+                vnext.address = uri.idnHost
                 vnext.port = uri.port
                 vnext.users[0].id = uuid
                 vnext.users[0].encryption = DEFAULT_SECURITY
@@ -388,6 +395,38 @@ object AngConfigManager {
         return true
     }
 
+    private fun tryResolveResolveSip002(str: String, config: ServerConfig): Boolean {
+        val uri = URI(str.replace(" ", "%20"))
+        config.remarks = Utils.urlDecode(uri.fragment ?: "")
+
+        val method: String
+        val password: String
+        if (uri.userInfo.contains(":")) {
+            val arrUserInfo = uri.userInfo.split(":").map { it.trim() }
+            if (arrUserInfo.count() != 2) {
+                return false
+            }
+            method = arrUserInfo[0]
+            password = Utils.urlDecode(arrUserInfo[1])
+        } else {
+            val base64Decode = Utils.decode(uri.userInfo)
+            val arrUserInfo = base64Decode.split(":").map { it.trim() }
+            if (arrUserInfo.count() != 2 && arrUserInfo.count() != 3) {
+                return false
+            }
+            method = arrUserInfo[0]
+            password = base64Decode.substringAfter(":")
+        }
+
+        config.outboundBean?.settings?.servers?.get(0)?.let { server ->
+            server.address = uri.idnHost
+            server.port = uri.port
+            server.password = password
+            server.method = method
+        }
+        return true
+    }
+
     /**
      * share config
      */
@@ -501,7 +540,7 @@ object AngConfigManager {
 
                     val url = String.format("%s@%s:%s",
                             outbound.getPassword(),
-                            outbound.getServerAddress(),
+                            Utils.getIpv6Address(outbound.getServerAddress()!!),
                             outbound.getServerPort())
                     url + query + remark
                 }
@@ -515,7 +554,7 @@ object AngConfigManager {
                     }
                     val url = String.format("%s@%s:%s",
                             outbound.getPassword(),
-                            outbound.getServerAddress(),
+                            Utils.getIpv6Address(outbound.getServerAddress()!!),
                             outbound.getServerPort())
                     url + query + remark
                 }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt

@@ -477,5 +477,13 @@ object Utils {
             it.bufferedReader().readText()
         }
     }
+
+    fun getIpv6Address(address: String): String {
+        return if (isIpv6Address(address)) {
+            String.format("[%s]", address)
+        } else {
+            address
+        }
+    }
 }
 

V2rayNG/app/src/main/res/layout/preference_with_help_link.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
-        style="@style/Widget.AppCompat.Button.Borderless"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/Widget.AppCompat.Button.Borderless"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:onClick="onModeHelpClicked"
         android:text="@string/title_mode_help"
         android:textAlignment="textStart"
-        android:textStyle="italic" />
+        android:textStyle="italic"
+    tools:ignore="UsingOnClickInXml" />

V2rayNG/app/src/main/res/values-v21/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_pref_per_app_proxy">Set proxy for selected apps</string>
-</resources>

V2rayNG/app/src/main/res/values-v21/styles.xml

@@ -1,8 +0,0 @@
-<resources>
-
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
-</resources>

V2rayNG/app/src/main/res/values-zh-rCN-v21/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_pref_per_app_proxy">为应用程序分别设置代理</string>
-</resources>

V2rayNG/app/src/main/res/values-zh-rCN/strings.xml

@@ -78,7 +78,7 @@
     <string name="title_advanced">进阶设置</string>
     <string name="title_vpn_settings">VPN 设置</string>
     <string name="title_pref_per_app_proxy">分应用代理</string>
-    <string name="summary_pref_per_app_proxy">分应用代理仅支持 Android 5.0 Lollipop 及更高</string>
+    <string name="summary_pref_per_app_proxy">常规:勾选的App被代理,未勾选的直连;\n绕行模式:勾选的App直连,未勾选的被代理.\n不明白者在菜单中选择自动选中需代理应用</string>
 
     <string name="title_pref_mux_enabled">启用Mux多路复用</string>
     <string name="summary_pref_mux_enabled">开启可能会加速,关闭可能会减少断流</string>

V2rayNG/app/src/main/res/values-zh-rTW-v21/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_pref_per_app_proxy">為選擇的應用程式設定 Proxy</string>
-</resources>

V2rayNG/app/src/main/res/values-zh-rTW/strings.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">v2rayNG</string>
-    <string name="app_widget_name">切換</string>
-    <string name="app_tile_name">切換</string>
+    <string name="app_widget_name">開關</string>
+    <string name="app_tile_name">開關</string>
     <string name="app_tile_first_use">首次使用此功能，請使用此應用程式新增組態</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
-    <string name="migration_success">數據遷移成功!</string>
-    <string name="migration_fail">數據遷移失敗啦!</string>
+    <string name="migration_success">資料遷移成功！</string>
+    <string name="migration_fail">資料遷移失敗！</string>
 
     <!-- Notifications -->
     <string name="notification_action_stop_v2ray">停止</string>
@@ -23,11 +23,11 @@
     <string name="menu_item_add_config">新增組態</string>
     <string name="menu_item_save_config">儲存組態</string>
     <string name="menu_item_del_config">刪除組態</string>
-    <string name="menu_item_import_config_qrcode">自 QR 碼匯入組態</string>
+    <string name="menu_item_import_config_qrcode">自 QR Code 匯入組態</string>
     <string name="menu_item_import_config_clipboard">自剪貼簿匯入組態</string>
-    <string name="menu_item_import_config_manually_vmess">手動鍵入[Vmess]</string>
-    <string name="menu_item_import_config_manually_ss">手動鍵入[Shadowsocks]</string>
-    <string name="menu_item_import_config_manually_socks">手動鍵入[Socks]</string>
+    <string name="menu_item_import_config_manually_vmess">手動鍵入 [Vmess]</string>
+    <string name="menu_item_import_config_manually_ss">手動鍵入 [Shadowsocks]</string>
+    <string name="menu_item_import_config_manually_socks">手動鍵入 [Socks]</string>
     <string name="menu_item_import_config_custom">自訂組態</string>
     <string name="menu_item_import_config_custom_clipboard">自剪貼簿匯入自訂組態</string>
     <string name="menu_item_import_config_custom_local">自本機匯入自訂組態</string>
@@ -37,16 +37,16 @@
     <string name="server_lab_remarks">備註</string>
     <string name="server_lab_address">位址</string>
     <string name="server_lab_port">埠</string>
-    <string name="server_lab_id">使用者識別碼</string>
+    <string name="server_lab_id">使用者 ID</string>
     <string name="server_lab_security">安全性</string>
     <string name="server_lab_network">網路</string>
     <string name="server_lab_more_function">更多功能</string>
     <string name="server_lab_head_type">標頭類型</string>
     <string name="server_lab_mode_type">gRPC 傳輸模式 (mode)</string>
-    <string name="server_lab_request_host">要求主機(host)(host/ws host/h2 host)/QUIC加密方式</string>
-    <string name="server_lab_path">path(ws path/h2 path)/QUIC加密密鑰/kcp seed/gRPC serviceName</string>
-    <string name="server_lab_stream_security">傳輸層安全性(tls)</string>
-    <string name="server_lab_allow_insecure">跳過證書驗證(allowInsecure)</string>
+    <string name="server_lab_request_host">要求主機 (host)(host/ws host/h2 host)/QUIC 加密方式</string>
+    <string name="server_lab_path">path(ws path/h2 path)/QUIC 加密金鑰/kcp seed/gRPC serviceName</string>
+    <string name="server_lab_stream_security">傳輸層安全性 (tls)</string>
+    <string name="server_lab_allow_insecure">跳過憑證驗證 (allowInsecure)</string>
     <string name="server_lab_address3">伺服器位址</string>
     <string name="server_lab_port3">伺服器埠</string>
     <string name="server_lab_id3">密碼</string>
@@ -63,121 +63,121 @@
     <string name="server_lab_content">內容</string>
     <string name="toast_none_data_clipboard">剪貼簿內無資料</string>
     <string name="toast_invalid_url">網址無效</string>
-    <string name="server_lab_need_inbound">​​確保inbound有socks=10808,http=10809</string>
+    <string name="server_lab_need_inbound">​​確保 inbound 有 socks=10808,http=10809</string>
 
     <!-- PerAppProxyActivity -->
     <string name="msg_dialog_progress">載入</string>
     <string name="menu_item_select_all">全選</string>
     <string name="msg_enter_keywords">輸入關鍵字</string>
     <string name="switch_bypass_apps_mode">略過模式</string>
-    <string name="menu_item_select_proxy_app">自動選中需代理應用</string>
+    <string name="menu_item_select_proxy_app">自動選中需要 Proxy 的應用</string>
     <string name="msg_downloading_content">正在下載內容</string>
 
 
     <!-- Preferences -->
     <string name="title_settings">設定</string>
-    <string name="title_advanced">進階設定</string>
+    <string name="title_advanced">進階</string>
     <string name="title_vpn_settings">VPN 設定</string>
     <string name="title_pref_per_app_proxy">Proxy 個別應用程式</string>
-    <string name="summary_pref_per_app_proxy">Proxy 個別應用程式模式只支援 Android 5.0 (Lollipop) 或更高</string>
+    <string name="summary_pref_per_app_proxy">常規:勾選的App被代理,未勾選的直連;\n繞行模式:勾選的App直連,未勾選的被代理.\n不明白者在菜單中選擇自動選中需代理應用</string>
 
     <string name="title_pref_mux_enabled">啟用 Mux</string>
-    <string name="summary_pref_mux_enabled">啟用或許會加快網路速度，切換或許會閃爍</string>
+    <string name="summary_pref_mux_enabled">啟用或許會加快網路速度，關閉或許會閃爍</string>
 
     <string name="title_pref_speed_enabled">啟用速度顯示</string>
-    <string name="summary_pref_speed_enabled">在通知中顯示當前速度\n小圖標顯示流量的路由情況</string>
+    <string name="summary_pref_speed_enabled">在通知中顯示當前速度\n小圖示顯示流量的轉送情況</string>
 
-    <string name="title_pref_sniffing_enabled">啟用流量探測</string>
-    <string name="summary_pref_sniffing_enabled">從流量中探測域名 (默認啟用)</string>
+    <string name="title_pref_sniffing_enabled">啟用網路監測</string>
+    <string name="summary_pref_sniffing_enabled">從封包中監測網域 (預設啟用)</string>
 
-    <string name="title_pref_local_dns_enabled">啟用本地DNS</string>
-    <string name="summary_pref_local_dns_enabled">DNS 請求導入 core 由 DNS 模塊處理（推薦啟用 如果需要路由略過局域網及中國大陸）</string>
+    <string name="title_pref_local_dns_enabled">啟用本地 DNS</string>
+    <string name="summary_pref_local_dns_enabled">DNS 請求匯入 core 由 DNS 模塊處理 (建議啟用，可能需要轉送略過局域網及中國大陸)</string>
 
-    <string name="title_pref_fake_dns_enabled">啟用虛擬DNS</string>
-    <string name="summary_pref_fake_dns_enabled">本地返回虛構解析結果 (減低延時 但個別應用可能無法使用)</string>
+    <string name="title_pref_fake_dns_enabled">啟用偽 DNS</string>
+    <string name="summary_pref_fake_dns_enabled">本地返回偽造解析結果 (減低延時，但個別應用可能無法使用)</string>
 
     <string name="title_pref_forward_ipv6">IPv6 路由</string>
-    <string name="summary_pref_forward_ipv6">向遠端重新導向 IPv6 流量（測試）</string>
+    <string name="summary_pref_forward_ipv6">向遠端重新導向 IPv6 流量 (測試)</string>
 
-    <string name="title_pref_routing">路由設置</string>
-    <string name="title_pref_routing_domain_strategy">域名策略</string>
-    <string name="title_pref_routing_mode">路由模式</string>
-    <string name="title_pref_routing_custom">自訂路由</string>
+    <string name="title_pref_routing">轉送設定</string>
+    <string name="title_pref_routing_domain_strategy">網域策略</string>
+    <string name="title_pref_routing_mode">轉送模式</string>
+    <string name="title_pref_routing_custom">自訂轉送</string>
 
-    <string name="title_pref_donate">捐款</string>
-    <string name="summary_pref_donate">向開發人員捐款</string>
+    <string name="title_pref_donate">捐助</string>
+    <string name="summary_pref_donate">向開發人員捐助</string>
     <string name="donate_detail">新增一些實驗性進階功能</string>
 
-    <string name="title_pref_remote_dns">遠端DNS (可選)</string>
+    <string name="title_pref_remote_dns">遠端 DNS (可選)</string>
     <string name="summary_pref_remote_dns">DNS</string>
 
-    <string name="title_pref_vpn_dns">VPN DNS (僅支持 IPv4/v6)</string>
+    <string name="title_pref_vpn_dns">VPN DNS (僅支援 IPv4/v6)</string>
 
-    <string name="title_pref_domestic_dns">境内DNS (可選)</string>
+    <string name="title_pref_domestic_dns">境内 DNS (可選)</string>
     <string name="summary_pref_domestic_dns">DNS</string>
 
-    <string name="title_pref_socks_port">SOCKS5代理連接埠</string>
-    <string name="summary_pref_socks_port">SOCKS5代理連接埠</string>
+    <string name="title_pref_socks_port">SOCKS5 Proxy 埠</string>
+    <string name="summary_pref_socks_port">SOCKS5 Proxy 埠</string>
 
-    <string name="title_pref_http_port">HTTP代理連接埠</string>
-    <string name="summary_pref_http_port">HTTP代理連接埠</string>
+    <string name="title_pref_http_port">HTTP Proxy 埠</string>
+    <string name="summary_pref_http_port">HTTP Proxy 埠</string>
 
-    <string name="title_pref_local_dns_port">本地DNS端口</string>
-    <string name="summary_pref_local_dns_port">本地DNS端口</string>
+    <string name="title_pref_local_dns_port">本地 DNS 埠</string>
+    <string name="summary_pref_local_dns_port">本地 DNS 埠</string>
 
-    <string name="title_pref_feedback">回饋</string>
-    <string name="summary_pref_feedback">回饋提升或前往 GitHub 回報 Bug</string>
-    <string name="summary_pref_tg_group">加入Telegram Group</string>
-    <string name="toast_tg_app_not_found">未找到Telegram app</string>
+    <string name="title_pref_feedback">意見回饋</string>
+    <string name="summary_pref_feedback">前往 GitHub 回報錯誤</string>
+    <string name="summary_pref_tg_group">加入 Telegram 群組</string>
+    <string name="toast_tg_app_not_found">未找到 Telegram 應用程式</string>
 
     <string name="title_pref_promotion">推廣</string>
-    <string name="summary_pref_promotion">一些推廣,點擊查看詳情(捐款可去除)</string>
+    <string name="summary_pref_promotion">一些推廣，輕觸以檢視 (捐贈可去除)</string>
 
     <string name="title_mode">模式</string>
     <string name="title_mode_help">點此查看更多幫助</string>
 
-    <string name="donate_error_setup">錯誤設定:</string>
-    <string name="donate_error_inventory">Error querying inventory</string>
-    <string name="donate_error_purchase1">購買錯誤:</string>
+    <string name="donate_error_setup">錯誤設定：</string>
+    <string name="donate_error_inventory">未查詢到庫存</string>
+    <string name="donate_error_purchase1">購買錯誤：</string>
     <string name="donate_error_purchase2">購買錯誤，真實性驗證失敗。</string>
-    <string name="donate_success_purchase">感謝您的捐款！</string>
-    <string name="donate_item_click">捐款</string>
+    <string name="donate_success_purchase">感謝您的捐助！</string>
+    <string name="donate_item_click">捐助</string>
     <string name="donate_item_paypal">Paypal</string>
 
     <string name="title_logcat">Logcat</string>
     <string name="logcat_copy">複製</string>
     <string name="logcat_delete">刪除</string>
-    <string name="title_export_all">匯出全部(非自訂)配置至剪貼簿</string>
+    <string name="title_export_all">匯出全部 (非自訂) 組態至剪貼簿</string>
     <string name="title_sub_setting">訂閱設定</string>
     <string name="sub_setting_remarks">備註</string>
-    <string name="sub_setting_url">位址(url)</string>
+    <string name="sub_setting_url">位址 (url)</string>
     <string name="title_sub_update">更新訂閱</string>
-    <string name="title_ping_all_server">測試所有配置延遲(Tcping)</string>
+    <string name="title_ping_all_server">測試所有組態延遲 (Tcping)</string>
 
     <string name="tasker_start_service">啟動服務</string>
     <string name="tasker_setting_confirm">確定</string>
 
-    <string name="routing_settings_title">路由設定</string>
-    <string name="routing_settings_tips">以英文逗號「,」分隔，記得儲存唷</string>
+    <string name="routing_settings_title">轉送設定</string>
+    <string name="routing_settings_tips">以半形逗號「,」分隔，記得儲存唷</string>
     <string name="routing_settings_save">儲存</string>
     <string name="routing_settings_delete">清除</string>
     <string name="routing_settings_scan_replace">掃描並取代</string>
     <string name="routing_settings_scan_append">掃描並附加</string>
-    <string name="routing_settings_default_rules">設置預設路由規則</string>
+    <string name="routing_settings_default_rules">設定預設轉送規則</string>
 
     <string name="connection_test_pending">"檢查連線能力"</string>
     <string name="connection_test_testing">"測試中……"</string>
-    <string name="connection_test_available">"成功: %d 毫秒延遲"</string>
-    <string name="connection_test_error">"偵測出網際網路連線失敗: %s"</string>
+    <string name="connection_test_available">"成功： %d 毫秒延遲"</string>
+    <string name="connection_test_error">"偵測出網際網路連線失敗：%s"</string>
     <string name="connection_test_fail">"無法使用網際網路"</string>
-    <string name="connection_test_error_status_code">"錯誤碼: （#%d）"</string>
+    <string name="connection_test_error_status_code">"錯誤碼：(#%d)"</string>
     <string name="connection_connected">"已連線，輕觸以檢查連線能力"</string>
     <string name="connection_not_connected">"未連線"</string>
 
     <string-array name="share_method">
-        <item>QR 碼</item>
+        <item>QR Code</item>
         <item>匯出至剪貼簿</item>
-        <item>匯出完整配置至剪貼簿</item>
+        <item>匯出完整組態至剪貼簿</item>
     </string-array>
 
     <string-array name="routing_tag">
@@ -187,20 +187,20 @@
     </string-array>
 
     <string-array name="routing_mode">
-        <item>全球</item>
+        <item>全域</item>
         <item>略過區域網路</item>
         <item>略過中國大陸</item>
         <item>略過區域網路及中國大陸</item>
     </string-array>
-    <string name="title_pref_proxy_sharing_enabled">代理共享</string>
-    <string name="summary_pref_proxy_sharing_enabled">綁定代理入口ip到0.0.0.0</string>
-    <string name="toast_warning_pref_proxysharing">其他設備可以使用socks/http協定通過您的IP地址連接到代理\nHttp 代理: http://您的ip:10809\nSocks 代理: socks(4/5)://您的ip:10808\n僅在受信任的網路中啟用以避免未經授權的連接</string>
-    <string name="toast_warning_pref_proxysharing_short">代理共享已啟用，請確保處於受信網路</string>
-    <string name="toast_malformed_josn">配置格式錯誤</string>
+    <string name="title_pref_proxy_sharing_enabled">Proxy 共用</string>
+    <string name="summary_pref_proxy_sharing_enabled">綁定 Proxy 入口 IP 到 0.0.0.0</string>
+    <string name="toast_warning_pref_proxysharing">其他裝置可以使用 socks/http 協定通過您的 IP 位址連線到 Proxy \nHttp Proxy：http://您的ip:10809\nSocks Proxy：socks(4/5)://您的ip:10808\n僅在受信任的網路中啟用以避免未經授權的連線</string>
+    <string name="toast_warning_pref_proxysharing_short">Proxy 共用已啟用，請確保處於受信網路</string>
+    <string name="toast_malformed_josn">組態格式錯誤</string>
 
     <string-array name="mode_entries">
         <item>VPN</item>
-        <item>僅代理</item>
+        <item>僅 Proxy</item>
     </string-array>
 
 </resources>

V2rayNG/app/src/main/res/values/arrays.xml

@@ -8,14 +8,15 @@
         <item>zero</item>
     </string-array>
     <string-array name="ss_securitys" translatable="false">
-        <item>aes-256-cfb</item>
-        <item>aes-128-cfb</item>
-        <item>chacha20</item>
-        <item>chacha20-ietf</item>
         <item>aes-256-gcm</item>
         <item>aes-128-gcm</item>
         <item>chacha20-poly1305</item>
         <item>chacha20-ietf-poly1305</item>
+        <item>none</item>
+        <item>plain</item>
+        <item>2022-blake3-aes-128-gcm</item>
+        <item>2022-blake3-aes-256-gcm</item>
+        <item>2022-blake3-chacha20-poly1305</item>
     </string-array>
 
     <string-array name="networks" translatable="false">

V2rayNG/app/src/main/res/values/strings.xml

@@ -79,7 +79,7 @@
     <string name="title_advanced">Advanced Settings</string>
     <string name="title_vpn_settings">VPN Settings</string>
     <string name="title_pref_per_app_proxy">Per-app proxy</string>
-    <string name="summary_pref_per_app_proxy">Per-app proxy mode only support Android 5.0 Lollipop or higher</string>
+    <string name="summary_pref_per_app_proxy">General: Checked App is proxy, unchecked direct connection; \nbypass mode: checked app directly connected, unchecked proxy. \nThe option to automatically select the proxy application in the menu</string>
 
     <string name="title_pref_mux_enabled">Enable Mux</string>
     <string name="summary_pref_mux_enabled">Enable maybe speed up network and switch network maybe flash</string>

V2rayNG/app/src/main/res/values/styles.xml

@@ -11,6 +11,7 @@
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 
     <style name="AppTheme.NoActionBar.Translucent">

V2rayNG/build.gradle

@@ -3,11 +3,13 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url 'https://maven.google.com' }
+        maven { url 'https://jitpack.io' }
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,8 +20,10 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url 'https://maven.google.com' }
+        maven { url 'https://jitpack.io' }
+        jcenter()
     }
 }
 

V2rayNG/gradle.properties

@@ -13,10 +13,10 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Fri Jun 02 14:08:42 CST 2017
-kotlinVersion=1.5.10
-buildToolsVer=30.0.2
-compileSdkVer=30
-targetSdkVer=30
+kotlinVersion=1.6.10
+buildToolsVer=31.0.0
+compileSdkVer=31
+targetSdkVer=31
 kotlin.incremental=true
 android.useAndroidX=true
 android.enableJetifier=true

V2rayNG/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip