Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 056384fdab | |||
| 7c40d074f3 | |||
| c61595eb0d | |||
| 7192c970fa | |||
| cfa709c651 | |||
| 97c467af41 | |||
| 6039426bac | |||
| 862fb90de9 |
@@ -11,8 +11,8 @@ android {
|
|||||||
applicationId = "com.v2ray.ang"
|
applicationId = "com.v2ray.ang"
|
||||||
minSdk = 21
|
minSdk = 21
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 593
|
versionCode = 594
|
||||||
versionName = "1.9.2"
|
versionName = "1.9.3"
|
||||||
multiDexEnabled = true
|
multiDexEnabled = true
|
||||||
splits {
|
splits {
|
||||||
abi {
|
abi {
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ class AngApplication : MultiDexApplication() {
|
|||||||
// if (firstRun)
|
// if (firstRun)
|
||||||
// defaultSharedPreferences.edit().putInt(PREF_LAST_VERSION, BuildConfig.VERSION_CODE).apply()
|
// defaultSharedPreferences.edit().putInt(PREF_LAST_VERSION, BuildConfig.VERSION_CODE).apply()
|
||||||
|
|
||||||
//Logger.init().logLevel(if (BuildConfig.DEBUG) LogLevel.FULL else LogLevel.NONE)
|
|
||||||
MMKV.initialize(this)
|
MMKV.initialize(this)
|
||||||
|
|
||||||
Utils.setNightMode(application)
|
Utils.setNightMode(application)
|
||||||
|
|||||||
@@ -146,4 +146,6 @@ object AppConfig {
|
|||||||
const val VLESS = "vless://"
|
const val VLESS = "vless://"
|
||||||
const val TROJAN = "trojan://"
|
const val TROJAN = "trojan://"
|
||||||
const val WIREGUARD = "wireguard://"
|
const val WIREGUARD = "wireguard://"
|
||||||
|
const val TUIC = "tuic://"
|
||||||
|
const val HYSTERIA2 = "hysteria2://"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ enum class EConfigType(val value: Int, val protocolScheme: String) {
|
|||||||
VLESS(5, AppConfig.VLESS),
|
VLESS(5, AppConfig.VLESS),
|
||||||
TROJAN(6, AppConfig.TROJAN),
|
TROJAN(6, AppConfig.TROJAN),
|
||||||
WIREGUARD(7, AppConfig.WIREGUARD),
|
WIREGUARD(7, AppConfig.WIREGUARD),
|
||||||
|
// TUIC(8, AppConfig.TUIC),
|
||||||
|
HYSTERIA2(9, AppConfig.HYSTERIA2),
|
||||||
HTTP(10, AppConfig.HTTP);
|
HTTP(10, AppConfig.HTTP);
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ data class ServerConfig(
|
|||||||
companion object {
|
companion object {
|
||||||
fun create(configType: EConfigType): ServerConfig {
|
fun create(configType: EConfigType): ServerConfig {
|
||||||
when (configType) {
|
when (configType) {
|
||||||
EConfigType.VMESS, EConfigType.VLESS ->
|
EConfigType.VMESS,
|
||||||
|
EConfigType.VLESS ->
|
||||||
return ServerConfig(
|
return ServerConfig(
|
||||||
configType = configType,
|
configType = configType,
|
||||||
outboundBean = V2rayConfig.OutboundBean(
|
outboundBean = V2rayConfig.OutboundBean(
|
||||||
@@ -38,7 +39,8 @@ data class ServerConfig(
|
|||||||
EConfigType.SHADOWSOCKS,
|
EConfigType.SHADOWSOCKS,
|
||||||
EConfigType.SOCKS,
|
EConfigType.SOCKS,
|
||||||
EConfigType.HTTP,
|
EConfigType.HTTP,
|
||||||
EConfigType.TROJAN ->
|
EConfigType.TROJAN,
|
||||||
|
EConfigType.HYSTERIA2 ->
|
||||||
return ServerConfig(
|
return ServerConfig(
|
||||||
configType = configType,
|
configType = configType,
|
||||||
outboundBean = V2rayConfig.OutboundBean(
|
outboundBean = V2rayConfig.OutboundBean(
|
||||||
|
|||||||
@@ -147,8 +147,6 @@ data class V2rayConfig(
|
|||||||
val ivCheck: Boolean? = null,
|
val ivCheck: Boolean? = null,
|
||||||
var users: List<SocksUsersBean>? = null
|
var users: List<SocksUsersBean>? = null
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
|
||||||
data class SocksUsersBean(
|
data class SocksUsersBean(
|
||||||
var user: String = "",
|
var user: String = "",
|
||||||
var pass: String = "",
|
var pass: String = "",
|
||||||
@@ -177,6 +175,7 @@ data class V2rayConfig(
|
|||||||
var quicSettings: QuicSettingBean? = null,
|
var quicSettings: QuicSettingBean? = null,
|
||||||
var realitySettings: TlsSettingsBean? = null,
|
var realitySettings: TlsSettingsBean? = null,
|
||||||
var grpcSettings: GrpcSettingsBean? = null,
|
var grpcSettings: GrpcSettingsBean? = null,
|
||||||
|
var hy2steriaSettings: Hy2steriaSettingsBean? = null,
|
||||||
val dsSettings: Any? = null,
|
val dsSettings: Any? = null,
|
||||||
var sockopt: SockoptBean? = null
|
var sockopt: SockoptBean? = null
|
||||||
) {
|
) {
|
||||||
@@ -295,6 +294,18 @@ data class V2rayConfig(
|
|||||||
var health_check_timeout: Int? = null
|
var health_check_timeout: Int? = null
|
||||||
)
|
)
|
||||||
|
|
||||||
|
data class Hy2steriaSettingsBean(
|
||||||
|
var password: String? = null,
|
||||||
|
var use_udp_extension: Boolean? = true,
|
||||||
|
var congestion: Hy2CongestionBean? = null
|
||||||
|
) {
|
||||||
|
data class Hy2CongestionBean(
|
||||||
|
var type: String? = "bbr",
|
||||||
|
var up_mbps: Int? = null,
|
||||||
|
var down_mbps: Int? = null,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
fun populateTransportSettings(
|
fun populateTransportSettings(
|
||||||
transport: String, headerType: String?, host: String?, path: String?, seed: String?,
|
transport: String, headerType: String?, host: String?, path: String?, seed: String?,
|
||||||
quicSecurity: String?, key: String?, mode: String?, serviceName: String?,
|
quicSecurity: String?, key: String?, mode: String?, serviceName: String?,
|
||||||
@@ -427,6 +438,7 @@ data class V2rayConfig(
|
|||||||
|| protocol.equals(EConfigType.SOCKS.name, true)
|
|| protocol.equals(EConfigType.SOCKS.name, true)
|
||||||
|| protocol.equals(EConfigType.HTTP.name, true)
|
|| protocol.equals(EConfigType.HTTP.name, true)
|
||||||
|| protocol.equals(EConfigType.TROJAN.name, true)
|
|| protocol.equals(EConfigType.TROJAN.name, true)
|
||||||
|
|| protocol.equals(EConfigType.HYSTERIA2.name, true)
|
||||||
) {
|
) {
|
||||||
return settings?.servers?.get(0)?.address
|
return settings?.servers?.get(0)?.address
|
||||||
} else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
|
} else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
|
||||||
@@ -444,6 +456,7 @@ data class V2rayConfig(
|
|||||||
|| protocol.equals(EConfigType.SOCKS.name, true)
|
|| protocol.equals(EConfigType.SOCKS.name, true)
|
||||||
|| protocol.equals(EConfigType.HTTP.name, true)
|
|| protocol.equals(EConfigType.HTTP.name, true)
|
||||||
|| protocol.equals(EConfigType.TROJAN.name, true)
|
|| protocol.equals(EConfigType.TROJAN.name, true)
|
||||||
|
|| protocol.equals(EConfigType.HYSTERIA2.name, true)
|
||||||
) {
|
) {
|
||||||
return settings?.servers?.get(0)?.port
|
return settings?.servers?.get(0)?.port
|
||||||
} else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
|
} else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
|
||||||
@@ -465,10 +478,12 @@ data class V2rayConfig(
|
|||||||
return settings?.vnext?.get(0)?.users?.get(0)?.id
|
return settings?.vnext?.get(0)?.users?.get(0)?.id
|
||||||
} else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)
|
} else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)
|
||||||
|| protocol.equals(EConfigType.TROJAN.name, true)
|
|| protocol.equals(EConfigType.TROJAN.name, true)
|
||||||
|
|| protocol.equals(EConfigType.HYSTERIA2.name, true)
|
||||||
) {
|
) {
|
||||||
return settings?.servers?.get(0)?.password
|
return settings?.servers?.get(0)?.password
|
||||||
} else if (protocol.equals(EConfigType.SOCKS.name, true)
|
} else if (protocol.equals(EConfigType.SOCKS.name, true)
|
||||||
|| protocol.equals(EConfigType.HTTP.name, true)) {
|
|| protocol.equals(EConfigType.HTTP.name, true)
|
||||||
|
) {
|
||||||
return settings?.servers?.get(0)?.users?.get(0)?.pass
|
return settings?.servers?.get(0)?.users?.get(0)?.pass
|
||||||
} else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
|
} else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
|
||||||
return settings?.secretKey
|
return settings?.secretKey
|
||||||
@@ -497,8 +512,8 @@ data class V2rayConfig(
|
|||||||
val tcpSetting = streamSettings?.tcpSettings ?: return null
|
val tcpSetting = streamSettings?.tcpSettings ?: return null
|
||||||
listOf(
|
listOf(
|
||||||
tcpSetting.header.type,
|
tcpSetting.header.type,
|
||||||
tcpSetting.header.request?.headers?.Host?.joinToString().orEmpty(),
|
tcpSetting.header.request?.headers?.Host?.joinToString(",").orEmpty(),
|
||||||
tcpSetting.header.request?.path?.joinToString().orEmpty()
|
tcpSetting.header.request?.path?.joinToString(",").orEmpty()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -542,7 +557,7 @@ data class V2rayConfig(
|
|||||||
val h2Setting = streamSettings?.httpSettings ?: return null
|
val h2Setting = streamSettings?.httpSettings ?: return null
|
||||||
listOf(
|
listOf(
|
||||||
"",
|
"",
|
||||||
h2Setting.host.joinToString(),
|
h2Setting.host.joinToString(","),
|
||||||
h2Setting.path
|
h2Setting.path
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -597,6 +612,7 @@ data class V2rayConfig(
|
|||||||
) {
|
) {
|
||||||
|
|
||||||
data class RulesBean(
|
data class RulesBean(
|
||||||
|
var type: String = "field",
|
||||||
var ip: ArrayList<String>? = null,
|
var ip: ArrayList<String>? = null,
|
||||||
var domain: ArrayList<String>? = null,
|
var domain: ArrayList<String>? = null,
|
||||||
var outboundTag: String = "",
|
var outboundTag: String = "",
|
||||||
|
|||||||
@@ -106,13 +106,11 @@ object V2RayServiceManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onEmitStatus(l: Long, s: String?): Long {
|
override fun onEmitStatus(l: Long, s: String?): Long {
|
||||||
//Logger.d(s)
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun setup(s: String): Long {
|
override fun setup(s: String): Long {
|
||||||
val serviceControl = serviceControl?.get() ?: return -1
|
val serviceControl = serviceControl?.get() ?: return -1
|
||||||
//Logger.d(s)
|
|
||||||
return try {
|
return try {
|
||||||
serviceControl.startService()
|
serviceControl.startService()
|
||||||
lastQueryTime = System.currentTimeMillis()
|
lastQueryTime = System.currentTimeMillis()
|
||||||
@@ -197,7 +195,6 @@ object V2RayServiceManager {
|
|||||||
val serviceControl = serviceControl?.get() ?: return
|
val serviceControl = serviceControl?.get() ?: return
|
||||||
when (intent?.getIntExtra("key", 0)) {
|
when (intent?.getIntExtra("key", 0)) {
|
||||||
AppConfig.MSG_REGISTER_CLIENT -> {
|
AppConfig.MSG_REGISTER_CLIENT -> {
|
||||||
//Logger.e("ReceiveMessageHandler", intent?.getIntExtra("key", 0).toString())
|
|
||||||
if (v2rayPoint.isRunning) {
|
if (v2rayPoint.isRunning) {
|
||||||
MessageUtil.sendMsg2UI(serviceControl.getService(), AppConfig.MSG_STATE_RUNNING, "")
|
MessageUtil.sendMsg2UI(serviceControl.getService(), AppConfig.MSG_STATE_RUNNING, "")
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import android.os.StrictMode
|
|||||||
import android.util.Log
|
import android.util.Log
|
||||||
import androidx.annotation.RequiresApi
|
import androidx.annotation.RequiresApi
|
||||||
import com.v2ray.ang.AppConfig
|
import com.v2ray.ang.AppConfig
|
||||||
|
import com.v2ray.ang.BuildConfig
|
||||||
import com.v2ray.ang.R
|
import com.v2ray.ang.R
|
||||||
import com.v2ray.ang.util.MmkvManager.settingsStorage
|
import com.v2ray.ang.util.MmkvManager.settingsStorage
|
||||||
import com.v2ray.ang.util.MyContextWrapper
|
import com.v2ray.ang.util.MyContextWrapper
|
||||||
@@ -137,22 +138,25 @@ class V2RayVpnService : VpnService(), ServiceControl {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsStorage?.decodeBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
|
// if (settingsStorage?.decodeBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
|
||||||
builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
|
// builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
|
||||||
} else {
|
// } else {
|
||||||
Utils.getVpnDnsServers()
|
Utils.getVpnDnsServers()
|
||||||
.forEach {
|
.forEach {
|
||||||
if (Utils.isPureIpAddress(it)) {
|
if (Utils.isPureIpAddress(it)) {
|
||||||
builder.addDnsServer(it)
|
builder.addDnsServer(it)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// }
|
||||||
|
|
||||||
builder.setSession(V2RayServiceManager.currentConfig?.remarks.orEmpty())
|
builder.setSession(V2RayServiceManager.currentConfig?.remarks.orEmpty())
|
||||||
|
|
||||||
|
val selfPackageName = BuildConfig.APPLICATION_ID
|
||||||
if (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 apps = settingsStorage?.decodeStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
|
||||||
val bypassApps = settingsStorage?.decodeBool(AppConfig.PREF_BYPASS_APPS) ?: false
|
val bypassApps = settingsStorage?.decodeBool(AppConfig.PREF_BYPASS_APPS) ?: false
|
||||||
|
//process self package
|
||||||
|
if (bypassApps) apps?.add(selfPackageName) else apps?.remove(selfPackageName)
|
||||||
apps?.forEach {
|
apps?.forEach {
|
||||||
try {
|
try {
|
||||||
if (bypassApps)
|
if (bypassApps)
|
||||||
@@ -160,9 +164,10 @@ class V2RayVpnService : VpnService(), ServiceControl {
|
|||||||
else
|
else
|
||||||
builder.addAllowedApplication(it)
|
builder.addAllowedApplication(it)
|
||||||
} catch (e: PackageManager.NameNotFoundException) {
|
} catch (e: PackageManager.NameNotFoundException) {
|
||||||
//Logger.d(e)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
builder.addDisallowedApplication(selfPackageName)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close the old interface since the parameters have been changed.
|
// Close the old interface since the parameters have been changed.
|
||||||
|
|||||||
@@ -292,6 +292,11 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
|
|||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// R.id.import_manually_hysteria2 -> {
|
||||||
|
// importManually(EConfigType.HYSTERIA2.value)
|
||||||
|
// true
|
||||||
|
// }
|
||||||
|
|
||||||
R.id.import_config_custom_clipboard -> {
|
R.id.import_config_custom_clipboard -> {
|
||||||
importConfigCustomClipboard()
|
importConfigCustomClipboard()
|
||||||
true
|
true
|
||||||
|
|||||||
@@ -2,12 +2,10 @@ package com.v2ray.ang.ui
|
|||||||
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.text.TextUtils
|
import android.text.TextUtils
|
||||||
import android.util.Log
|
|
||||||
import android.view.Menu
|
import android.view.Menu
|
||||||
import android.view.MenuItem
|
import android.view.MenuItem
|
||||||
import androidx.appcompat.app.AlertDialog
|
import androidx.appcompat.app.AlertDialog
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.v2ray.ang.R
|
import com.v2ray.ang.R
|
||||||
import com.v2ray.ang.databinding.ActivityRoutingEditBinding
|
import com.v2ray.ang.databinding.ActivityRoutingEditBinding
|
||||||
import com.v2ray.ang.dto.RulesetItem
|
import com.v2ray.ang.dto.RulesetItem
|
||||||
@@ -40,10 +38,10 @@ class RoutingEditActivity : BaseActivity() {
|
|||||||
|
|
||||||
private fun bindingServer(rulesetItem: RulesetItem): Boolean {
|
private fun bindingServer(rulesetItem: RulesetItem): Boolean {
|
||||||
binding.etRemarks.text = Utils.getEditable(rulesetItem.remarks)
|
binding.etRemarks.text = Utils.getEditable(rulesetItem.remarks)
|
||||||
binding.etDomain.text = Utils.getEditable(rulesetItem.domain?.joinToString())
|
binding.etDomain.text = Utils.getEditable(rulesetItem.domain?.joinToString(","))
|
||||||
binding.etIp.text = Utils.getEditable(rulesetItem.ip?.joinToString())
|
binding.etIp.text = Utils.getEditable(rulesetItem.ip?.joinToString(","))
|
||||||
binding.etPort.text = Utils.getEditable(rulesetItem.port)
|
binding.etPort.text = Utils.getEditable(rulesetItem.port)
|
||||||
binding.etProtocol.text = Utils.getEditable(rulesetItem.protocol?.joinToString())
|
binding.etProtocol.text = Utils.getEditable(rulesetItem.protocol?.joinToString(","))
|
||||||
binding.etNetwork.text = Utils.getEditable(rulesetItem.network)
|
binding.etNetwork.text = Utils.getEditable(rulesetItem.network)
|
||||||
val outbound = Utils.arrayFind(outbound_tag, rulesetItem.outboundTag)
|
val outbound = Utils.arrayFind(outbound_tag, rulesetItem.outboundTag)
|
||||||
binding.spOutboundTag.setSelection(outbound)
|
binding.spOutboundTag.setSelection(outbound)
|
||||||
@@ -61,9 +59,9 @@ class RoutingEditActivity : BaseActivity() {
|
|||||||
val rulesetItem = SettingsManager.getRoutingRuleset(position) ?: RulesetItem()
|
val rulesetItem = SettingsManager.getRoutingRuleset(position) ?: RulesetItem()
|
||||||
|
|
||||||
rulesetItem.remarks = binding.etRemarks.text.toString()
|
rulesetItem.remarks = binding.etRemarks.text.toString()
|
||||||
binding.etDomain.text.toString().let { rulesetItem.domain = if (it.isEmpty()) null else it.split(',') }
|
binding.etDomain.text.toString().let { rulesetItem.domain = if (it.isEmpty()) null else it.split(",").map { itt -> itt.trim() }.filter { itt -> itt.isNotEmpty() } }
|
||||||
binding.etIp.text.toString().let { rulesetItem.ip = if (it.isEmpty()) null else it.split(',') }
|
binding.etIp.text.toString().let { rulesetItem.ip = if (it.isEmpty()) null else it.split(",").map { itt -> itt.trim() }.filter { itt -> itt.isNotEmpty() } }
|
||||||
binding.etProtocol.text.toString().let { rulesetItem.protocol = if (it.isEmpty()) null else it.split(',') }
|
binding.etProtocol.text.toString().let { rulesetItem.protocol = if (it.isEmpty()) null else it.split(",").map { itt -> itt.trim() }.filter { itt -> itt.isNotEmpty() } }
|
||||||
binding.etPort.text.toString().let { rulesetItem.port = it.ifEmpty { null } }
|
binding.etPort.text.toString().let { rulesetItem.port = it.ifEmpty { null } }
|
||||||
binding.etNetwork.text.toString().let { rulesetItem.network = it.ifEmpty { null } }
|
binding.etNetwork.text.toString().let { rulesetItem.network = it.ifEmpty { null } }
|
||||||
rulesetItem.outboundTag = outbound_tag[binding.spOutboundTag.selectedItemPosition]
|
rulesetItem.outboundTag = outbound_tag[binding.spOutboundTag.selectedItemPosition]
|
||||||
|
|||||||
@@ -134,6 +134,7 @@ class ServerActivity : BaseActivity() {
|
|||||||
EConfigType.VLESS -> setContentView(R.layout.activity_server_vless)
|
EConfigType.VLESS -> setContentView(R.layout.activity_server_vless)
|
||||||
EConfigType.TROJAN -> setContentView(R.layout.activity_server_trojan)
|
EConfigType.TROJAN -> setContentView(R.layout.activity_server_trojan)
|
||||||
EConfigType.WIREGUARD -> setContentView(R.layout.activity_server_wireguard)
|
EConfigType.WIREGUARD -> setContentView(R.layout.activity_server_wireguard)
|
||||||
|
EConfigType.HYSTERIA2 -> setContentView(R.layout.activity_server_hysteria2)
|
||||||
}
|
}
|
||||||
sp_network?.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
|
sp_network?.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
|
||||||
override fun onItemSelected(
|
override fun onItemSelected(
|
||||||
@@ -284,7 +285,7 @@ class ServerActivity : BaseActivity() {
|
|||||||
Utils.getEditable("${WIREGUARD_LOCAL_ADDRESS_V4},${WIREGUARD_LOCAL_ADDRESS_V6}")
|
Utils.getEditable("${WIREGUARD_LOCAL_ADDRESS_V4},${WIREGUARD_LOCAL_ADDRESS_V6}")
|
||||||
} else {
|
} else {
|
||||||
val list = outbound.settings?.address as List<*>
|
val list = outbound.settings?.address as List<*>
|
||||||
et_local_address?.text = Utils.getEditable(list.joinToString())
|
et_local_address?.text = Utils.getEditable(list.joinToString(","))
|
||||||
}
|
}
|
||||||
if (outbound.settings?.mtu == null) {
|
if (outbound.settings?.mtu == null) {
|
||||||
et_local_mtu?.text = Utils.getEditable(WIREGUARD_LOCAL_MTU)
|
et_local_mtu?.text = Utils.getEditable(WIREGUARD_LOCAL_MTU)
|
||||||
@@ -316,7 +317,7 @@ class ServerActivity : BaseActivity() {
|
|||||||
tlsSetting.alpn?.let {
|
tlsSetting.alpn?.let {
|
||||||
val alpnIndex = Utils.arrayFind(
|
val alpnIndex = Utils.arrayFind(
|
||||||
alpns,
|
alpns,
|
||||||
Utils.removeWhiteSpace(tlsSetting.alpn.joinToString()).orEmpty()
|
Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
|
||||||
)
|
)
|
||||||
sp_stream_alpn?.setSelection(alpnIndex)
|
sp_stream_alpn?.setSelection(alpnIndex)
|
||||||
}
|
}
|
||||||
@@ -411,7 +412,10 @@ class ServerActivity : BaseActivity() {
|
|||||||
&& config.configType != EConfigType.HTTP
|
&& config.configType != EConfigType.HTTP
|
||||||
&& TextUtils.isEmpty(et_id.text.toString())
|
&& TextUtils.isEmpty(et_id.text.toString())
|
||||||
) {
|
) {
|
||||||
if (config.configType == EConfigType.TROJAN || config.configType == EConfigType.SHADOWSOCKS) {
|
if (config.configType == EConfigType.TROJAN
|
||||||
|
|| config.configType == EConfigType.SHADOWSOCKS
|
||||||
|
|| config.configType == EConfigType.HYSTERIA2
|
||||||
|
) {
|
||||||
toast(R.string.server_lab_id3)
|
toast(R.string.server_lab_id3)
|
||||||
} else {
|
} else {
|
||||||
toast(R.string.server_lab_id)
|
toast(R.string.server_lab_id)
|
||||||
@@ -443,8 +447,10 @@ class ServerActivity : BaseActivity() {
|
|||||||
wireguard?.peers?.get(0)?.let { _ ->
|
wireguard?.peers?.get(0)?.let { _ ->
|
||||||
savePeer(wireguard, port)
|
savePeer(wireguard, port)
|
||||||
}
|
}
|
||||||
|
|
||||||
config.outboundBean?.streamSettings?.let {
|
config.outboundBean?.streamSettings?.let {
|
||||||
saveStreamSettings(it)
|
val sni = saveStreamSettings(it)
|
||||||
|
saveTls(it, sni)
|
||||||
}
|
}
|
||||||
if (config.subscriptionId.isEmpty() && !subscriptionId.isNullOrEmpty()) {
|
if (config.subscriptionId.isEmpty() && !subscriptionId.isNullOrEmpty()) {
|
||||||
config.subscriptionId = subscriptionId.orEmpty()
|
config.subscriptionId = subscriptionId.orEmpty()
|
||||||
@@ -493,7 +499,7 @@ class ServerActivity : BaseActivity() {
|
|||||||
socksUsersBean.pass = et_id.text.toString().trim()
|
socksUsersBean.pass = et_id.text.toString().trim()
|
||||||
server.users = listOf(socksUsersBean)
|
server.users = listOf(socksUsersBean)
|
||||||
}
|
}
|
||||||
} else if (config.configType == EConfigType.TROJAN) {
|
} else if (config.configType == EConfigType.TROJAN || config.configType == EConfigType.HYSTERIA2) {
|
||||||
server.password = et_id.text.toString().trim()
|
server.password = et_id.text.toString().trim()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -515,21 +521,13 @@ class ServerActivity : BaseActivity() {
|
|||||||
wireguard.mtu = Utils.parseInt(et_local_mtu?.text.toString())
|
wireguard.mtu = Utils.parseInt(et_local_mtu?.text.toString())
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun saveStreamSettings(streamSetting: V2rayConfig.OutboundBean.StreamSettingsBean) {
|
private fun saveStreamSettings(streamSetting: V2rayConfig.OutboundBean.StreamSettingsBean): String? {
|
||||||
val network = sp_network?.selectedItemPosition ?: return
|
val network = sp_network?.selectedItemPosition ?: return null
|
||||||
val type = sp_header_type?.selectedItemPosition ?: return
|
val type = sp_header_type?.selectedItemPosition ?: return null
|
||||||
val requestHost = et_request_host?.text?.toString()?.trim() ?: return
|
val requestHost = et_request_host?.text?.toString()?.trim() ?: return null
|
||||||
val path = et_path?.text?.toString()?.trim() ?: return
|
val path = et_path?.text?.toString()?.trim() ?: return null
|
||||||
val sniField = et_sni?.text?.toString()?.trim() ?: return
|
|
||||||
val allowInsecureField = sp_allow_insecure?.selectedItemPosition ?: return
|
|
||||||
val streamSecurity = sp_stream_security?.selectedItemPosition ?: return
|
|
||||||
val utlsIndex = sp_stream_fingerprint?.selectedItemPosition ?: return
|
|
||||||
val alpnIndex = sp_stream_alpn?.selectedItemPosition ?: return
|
|
||||||
val publicKey = et_public_key?.text?.toString()?.trim() ?: return
|
|
||||||
val shortId = et_short_id?.text?.toString()?.trim() ?: return
|
|
||||||
val spiderX = et_spider_x?.text?.toString()?.trim() ?: return
|
|
||||||
|
|
||||||
var sni = streamSetting.populateTransportSettings(
|
val sni = streamSetting.populateTransportSettings(
|
||||||
transport = networks[network],
|
transport = networks[network],
|
||||||
headerType = transportTypes(networks[network])[type],
|
headerType = transportTypes(networks[network])[type],
|
||||||
host = requestHost,
|
host = requestHost,
|
||||||
@@ -541,10 +539,21 @@ class ServerActivity : BaseActivity() {
|
|||||||
serviceName = path,
|
serviceName = path,
|
||||||
authority = requestHost,
|
authority = requestHost,
|
||||||
)
|
)
|
||||||
if (sniField.isNotBlank()) {
|
|
||||||
sni = sniField
|
return sni
|
||||||
}
|
}
|
||||||
val allowInsecure = if (allowinsecures[allowInsecureField].isBlank()) {
|
|
||||||
|
private fun saveTls(streamSetting: V2rayConfig.OutboundBean.StreamSettingsBean, sni: String?) {
|
||||||
|
val streamSecurity = sp_stream_security?.selectedItemPosition ?: return
|
||||||
|
val sniField = et_sni?.text?.toString()?.trim()
|
||||||
|
val allowInsecureField = sp_allow_insecure?.selectedItemPosition
|
||||||
|
val utlsIndex = sp_stream_fingerprint?.selectedItemPosition ?: 0
|
||||||
|
val alpnIndex = sp_stream_alpn?.selectedItemPosition ?: 0
|
||||||
|
val publicKey = et_public_key?.text?.toString()
|
||||||
|
val shortId = et_short_id?.text?.toString()
|
||||||
|
val spiderX = et_spider_x?.text?.toString()
|
||||||
|
|
||||||
|
val allowInsecure = if (allowInsecureField == null || allowinsecures[allowInsecureField].isBlank()) {
|
||||||
settingsStorage?.decodeBool(PREF_ALLOW_INSECURE) ?: false
|
settingsStorage?.decodeBool(PREF_ALLOW_INSECURE) ?: false
|
||||||
} else {
|
} else {
|
||||||
allowinsecures[allowInsecureField].toBoolean()
|
allowinsecures[allowInsecureField].toBoolean()
|
||||||
@@ -553,7 +562,7 @@ class ServerActivity : BaseActivity() {
|
|||||||
streamSetting.populateTlsSettings(
|
streamSetting.populateTlsSettings(
|
||||||
streamSecurity = streamSecuritys[streamSecurity],
|
streamSecurity = streamSecuritys[streamSecurity],
|
||||||
allowInsecure = allowInsecure,
|
allowInsecure = allowInsecure,
|
||||||
sni = sni,
|
sni = sniField ?: sni ?: "",
|
||||||
fingerprint = uTlsItems[utlsIndex],
|
fingerprint = uTlsItems[utlsIndex],
|
||||||
alpns = alpns[alpnIndex],
|
alpns = alpns[alpnIndex],
|
||||||
publicKey = publicKey,
|
publicKey = publicKey,
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import com.v2ray.ang.AppConfig
|
|||||||
import com.v2ray.ang.R
|
import com.v2ray.ang.R
|
||||||
import com.v2ray.ang.dto.*
|
import com.v2ray.ang.dto.*
|
||||||
import com.v2ray.ang.util.MmkvManager.settingsStorage
|
import com.v2ray.ang.util.MmkvManager.settingsStorage
|
||||||
|
import com.v2ray.ang.util.fmt.Hysteria2Fmt
|
||||||
import com.v2ray.ang.util.fmt.ShadowsocksFmt
|
import com.v2ray.ang.util.fmt.ShadowsocksFmt
|
||||||
import com.v2ray.ang.util.fmt.SocksFmt
|
import com.v2ray.ang.util.fmt.SocksFmt
|
||||||
import com.v2ray.ang.util.fmt.TrojanFmt
|
import com.v2ray.ang.util.fmt.TrojanFmt
|
||||||
@@ -50,6 +51,8 @@ object AngConfigManager {
|
|||||||
VlessFmt.parseVless(str)
|
VlessFmt.parseVless(str)
|
||||||
} else if (str.startsWith(EConfigType.WIREGUARD.protocolScheme)) {
|
} else if (str.startsWith(EConfigType.WIREGUARD.protocolScheme)) {
|
||||||
WireguardFmt.parseWireguard(str)
|
WireguardFmt.parseWireguard(str)
|
||||||
|
} else if (str.startsWith(EConfigType.HYSTERIA2.protocolScheme)) {
|
||||||
|
Hysteria2Fmt.parseHysteria2(str)
|
||||||
} else {
|
} else {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
@@ -92,6 +95,7 @@ object AngConfigManager {
|
|||||||
EConfigType.VLESS -> VlessFmt.toUri(config)
|
EConfigType.VLESS -> VlessFmt.toUri(config)
|
||||||
EConfigType.TROJAN -> TrojanFmt.toUri(config)
|
EConfigType.TROJAN -> TrojanFmt.toUri(config)
|
||||||
EConfigType.WIREGUARD -> WireguardFmt.toUri(config)
|
EConfigType.WIREGUARD -> WireguardFmt.toUri(config)
|
||||||
|
EConfigType.HYSTERIA2 -> Hysteria2Fmt.toUri(config)
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
e.printStackTrace()
|
e.printStackTrace()
|
||||||
|
|||||||
@@ -380,6 +380,7 @@ object V2rayConfigUtil {
|
|||||||
|| protocol.equals(EConfigType.HTTP.name, true)
|
|| protocol.equals(EConfigType.HTTP.name, true)
|
||||||
|| protocol.equals(EConfigType.TROJAN.name, true)
|
|| protocol.equals(EConfigType.TROJAN.name, true)
|
||||||
|| protocol.equals(EConfigType.WIREGUARD.name, true)
|
|| protocol.equals(EConfigType.WIREGUARD.name, true)
|
||||||
|
|| protocol.equals(EConfigType.HYSTERIA2.name, true)
|
||||||
) {
|
) {
|
||||||
muxEnabled = false
|
muxEnabled = false
|
||||||
} else if (protocol.equals(EConfigType.VLESS.name, true)
|
} else if (protocol.equals(EConfigType.VLESS.name, true)
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
package com.v2ray.ang.util.fmt
|
||||||
|
|
||||||
|
import android.text.TextUtils
|
||||||
|
import com.v2ray.ang.AppConfig
|
||||||
|
import com.v2ray.ang.dto.EConfigType
|
||||||
|
import com.v2ray.ang.dto.ServerConfig
|
||||||
|
import com.v2ray.ang.dto.V2rayConfig
|
||||||
|
import com.v2ray.ang.extension.idnHost
|
||||||
|
import com.v2ray.ang.util.MmkvManager.settingsStorage
|
||||||
|
import com.v2ray.ang.util.Utils
|
||||||
|
import java.net.URI
|
||||||
|
|
||||||
|
object Hysteria2Fmt {
|
||||||
|
|
||||||
|
fun parseHysteria2(str: String): ServerConfig {
|
||||||
|
var allowInsecure = settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false
|
||||||
|
val config = ServerConfig.create(EConfigType.HYSTERIA2)
|
||||||
|
|
||||||
|
val uri = URI(Utils.fixIllegalUrl(str))
|
||||||
|
config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
|
||||||
|
|
||||||
|
val queryParam = uri.rawQuery.split("&")
|
||||||
|
.associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
|
||||||
|
|
||||||
|
config.outboundBean?.streamSettings?.populateTlsSettings(
|
||||||
|
V2rayConfig.TLS,
|
||||||
|
if ((queryParam["allowInsecure"].orEmpty()) == "1") true else allowInsecure,
|
||||||
|
queryParam["sni"] ?: uri.idnHost,
|
||||||
|
null,
|
||||||
|
queryParam["alpn"],
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null
|
||||||
|
)
|
||||||
|
|
||||||
|
config.outboundBean?.settings?.servers?.get(0)?.let { server ->
|
||||||
|
server.address = uri.idnHost
|
||||||
|
server.port = uri.port
|
||||||
|
server.password = uri.userInfo
|
||||||
|
}
|
||||||
|
return config
|
||||||
|
}
|
||||||
|
|
||||||
|
fun toUri(config: ServerConfig): String {
|
||||||
|
val outbound = config.getProxyOutbound() ?: return ""
|
||||||
|
val streamSetting = outbound.streamSettings ?: V2rayConfig.OutboundBean.StreamSettingsBean()
|
||||||
|
|
||||||
|
val remark = "#" + Utils.urlEncode(config.remarks)
|
||||||
|
val dicQuery = HashMap<String, String>()
|
||||||
|
dicQuery["security"] = streamSetting.security.ifEmpty { "none" }
|
||||||
|
streamSetting.tlsSettings?.let { tlsSetting ->
|
||||||
|
dicQuery["insecure"] = if (tlsSetting.allowInsecure) "1" else "0"
|
||||||
|
if (!TextUtils.isEmpty(tlsSetting.serverName)) {
|
||||||
|
dicQuery["sni"] = tlsSetting.serverName
|
||||||
|
}
|
||||||
|
if (!tlsSetting.alpn.isNullOrEmpty() && tlsSetting.alpn.isNotEmpty()) {
|
||||||
|
dicQuery["alpn"] = Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val query = "?" + dicQuery.toList().joinToString(
|
||||||
|
separator = "&",
|
||||||
|
transform = { it.first + "=" + it.second })
|
||||||
|
|
||||||
|
val url = String.format(
|
||||||
|
"%s@%s:%s",
|
||||||
|
outbound.getPassword(),
|
||||||
|
Utils.getIpv6Address(outbound.getServerAddress()),
|
||||||
|
outbound.getServerPort()
|
||||||
|
)
|
||||||
|
return url + query + remark
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -92,7 +92,7 @@ object TrojanFmt {
|
|||||||
}
|
}
|
||||||
if (!tlsSetting.alpn.isNullOrEmpty() && tlsSetting.alpn.isNotEmpty()) {
|
if (!tlsSetting.alpn.isNullOrEmpty() && tlsSetting.alpn.isNotEmpty()) {
|
||||||
dicQuery["alpn"] =
|
dicQuery["alpn"] =
|
||||||
Utils.removeWhiteSpace(tlsSetting.alpn.joinToString()).orEmpty()
|
Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
|
||||||
}
|
}
|
||||||
if (!TextUtils.isEmpty(tlsSetting.fingerprint)) {
|
if (!TextUtils.isEmpty(tlsSetting.fingerprint)) {
|
||||||
dicQuery["fp"] = tlsSetting.fingerprint.orEmpty()
|
dicQuery["fp"] = tlsSetting.fingerprint.orEmpty()
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ object VlessFmt {
|
|||||||
}
|
}
|
||||||
if (!tlsSetting.alpn.isNullOrEmpty() && tlsSetting.alpn.isNotEmpty()) {
|
if (!tlsSetting.alpn.isNullOrEmpty() && tlsSetting.alpn.isNotEmpty()) {
|
||||||
dicQuery["alpn"] =
|
dicQuery["alpn"] =
|
||||||
Utils.removeWhiteSpace(tlsSetting.alpn.joinToString()).orEmpty()
|
Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
|
||||||
}
|
}
|
||||||
if (!TextUtils.isEmpty(tlsSetting.fingerprint)) {
|
if (!TextUtils.isEmpty(tlsSetting.fingerprint)) {
|
||||||
dicQuery["fp"] = tlsSetting.fingerprint.orEmpty()
|
dicQuery["fp"] = tlsSetting.fingerprint.orEmpty()
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ object VmessFmt {
|
|||||||
vmessQRCode.tls = streamSetting.security
|
vmessQRCode.tls = streamSetting.security
|
||||||
vmessQRCode.sni = streamSetting.tlsSettings?.serverName.orEmpty()
|
vmessQRCode.sni = streamSetting.tlsSettings?.serverName.orEmpty()
|
||||||
vmessQRCode.alpn =
|
vmessQRCode.alpn =
|
||||||
Utils.removeWhiteSpace(streamSetting.tlsSettings?.alpn?.joinToString()).orEmpty()
|
Utils.removeWhiteSpace(streamSetting.tlsSettings?.alpn?.joinToString(",")).orEmpty()
|
||||||
vmessQRCode.fp = streamSetting.tlsSettings?.fingerprint.orEmpty()
|
vmessQRCode.fp = streamSetting.tlsSettings?.fingerprint.orEmpty()
|
||||||
outbound.getTransportSettingDetails()?.let { transportDetails ->
|
outbound.getTransportSettingDetails()?.let { transportDetails ->
|
||||||
vmessQRCode.type = transportDetails[0]
|
vmessQRCode.type = transportDetails[0]
|
||||||
|
|||||||
@@ -81,12 +81,12 @@ object WireguardFmt {
|
|||||||
Utils.urlEncode(outbound.settings?.peers?.get(0)?.publicKey.toString())
|
Utils.urlEncode(outbound.settings?.peers?.get(0)?.publicKey.toString())
|
||||||
if (outbound.settings?.reserved != null) {
|
if (outbound.settings?.reserved != null) {
|
||||||
dicQuery["reserved"] = Utils.urlEncode(
|
dicQuery["reserved"] = Utils.urlEncode(
|
||||||
Utils.removeWhiteSpace(outbound.settings?.reserved?.joinToString())
|
Utils.removeWhiteSpace(outbound.settings?.reserved?.joinToString(","))
|
||||||
.toString()
|
.toString()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
dicQuery["address"] = Utils.urlEncode(
|
dicQuery["address"] = Utils.urlEncode(
|
||||||
Utils.removeWhiteSpace((outbound.settings?.address as List<*>).joinToString())
|
Utils.removeWhiteSpace((outbound.settings?.address as List<*>).joinToString(","))
|
||||||
.toString()
|
.toString()
|
||||||
)
|
)
|
||||||
if (outbound.settings?.mtu != null) {
|
if (outbound.settings?.mtu != null) {
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".ui.ServerActivity">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="@dimen/layout_margin_top_height">
|
||||||
|
|
||||||
|
<include layout="@layout/layout_address_port" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/server_lab_id3" />
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/et_id"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/edit_height"
|
||||||
|
android:inputType="text" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<include layout="@layout/layout_tls" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
|
android:layout_marginBottom="@dimen/layout_margin_top_height"
|
||||||
|
android:orientation="vertical" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
</ScrollView>
|
||||||
@@ -11,73 +11,7 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="@dimen/layout_margin_top_height">
|
android:padding="@dimen/layout_margin_top_height">
|
||||||
|
|
||||||
<LinearLayout
|
<include layout="@layout/layout_address_port" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/title_server"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_remarks" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_remarks"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_address3" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_address"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_port3" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_port"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="number" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -117,102 +51,15 @@
|
|||||||
android:entries="@array/ss_securitys" />
|
android:entries="@array/ss_securitys" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<include layout="@layout/layout_transport" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
<include layout="@layout/layout_tls" />
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_more_function"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_network" />
|
|
||||||
|
|
||||||
<Spinner
|
|
||||||
android:id="@+id/sp_network"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:entries="@array/networks" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/sp_header_type_title"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_head_type" />
|
|
||||||
|
|
||||||
<Spinner
|
|
||||||
android:id="@+id/sp_header_type"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/tv_request_host"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_request_host" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_request_host"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/tv_path"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_path" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_path"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<include layout="@layout/tls_layout" />
|
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginBottom="@dimen/layout_margin_top_height"
|
android:layout_marginBottom="@dimen/layout_margin_top_height"
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical" />
|
android:orientation="vertical" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@@ -11,73 +11,7 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="@dimen/layout_margin_top_height">
|
android:padding="@dimen/layout_margin_top_height">
|
||||||
|
|
||||||
<LinearLayout
|
<include layout="@layout/layout_address_port" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/title_server"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_remarks" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_remarks"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_address3" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_address"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_port3" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_port"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="number" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -118,12 +52,11 @@
|
|||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="@dimen/layout_margin_top_height"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
|
android:layout_marginBottom="@dimen/layout_margin_top_height"
|
||||||
android:orientation="vertical" />
|
android:orientation="vertical" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@@ -11,73 +11,7 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="@dimen/layout_margin_top_height">
|
android:padding="@dimen/layout_margin_top_height">
|
||||||
|
|
||||||
<LinearLayout
|
<include layout="@layout/layout_address_port" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/title_server"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_remarks" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_remarks"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_address3" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_address"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_port3" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_port"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="number" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -98,101 +32,15 @@
|
|||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<include layout="@layout/layout_transport" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
<include layout="@layout/layout_tls" />
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_more_function"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_network" />
|
|
||||||
|
|
||||||
<Spinner
|
|
||||||
android:id="@+id/sp_network"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:entries="@array/networks" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/sp_header_type_title"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_head_type" />
|
|
||||||
|
|
||||||
<Spinner
|
|
||||||
android:id="@+id/sp_header_type"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/tv_request_host"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_request_host" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_request_host"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/tv_path"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_path" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_path"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<include layout="@layout/tls_layout" />
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginBottom="@dimen/layout_margin_top_height"
|
android:layout_marginBottom="@dimen/layout_margin_top_height"
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical" />
|
android:orientation="vertical" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@@ -11,73 +11,7 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="@dimen/layout_margin_top_height">
|
android:padding="@dimen/layout_margin_top_height">
|
||||||
|
|
||||||
<LinearLayout
|
<include layout="@layout/layout_address_port" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/title_server"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_remarks" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_remarks"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_address" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_address"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_port" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_port"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="number" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -127,7 +61,6 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/server_lab_encryption" />
|
android:text="@string/server_lab_encryption" />
|
||||||
|
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
android:id="@+id/et_security"
|
android:id="@+id/et_security"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -137,101 +70,15 @@
|
|||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<include layout="@layout/layout_transport" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
<include layout="@layout/layout_tls" />
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_more_function"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_network" />
|
|
||||||
|
|
||||||
<Spinner
|
|
||||||
android:id="@+id/sp_network"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:entries="@array/networks" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/sp_header_type_title"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_head_type" />
|
|
||||||
|
|
||||||
<Spinner
|
|
||||||
android:id="@+id/sp_header_type"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/tv_request_host"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_request_host" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_request_host"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/tv_path"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_path" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_path"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<include layout="@layout/tls_layout" />
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginBottom="@dimen/layout_margin_top_height"
|
android:layout_marginBottom="@dimen/layout_margin_top_height"
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical" />
|
android:orientation="vertical" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@@ -11,73 +11,7 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="@dimen/layout_margin_top_height">
|
android:padding="@dimen/layout_margin_top_height">
|
||||||
|
|
||||||
<LinearLayout
|
<include layout="@layout/layout_address_port" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/title_server"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_remarks" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_remarks"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_address" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_address"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_port" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_port"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="number" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -136,101 +70,15 @@
|
|||||||
android:entries="@array/securitys" />
|
android:entries="@array/securitys" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<include layout="@layout/layout_transport" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
<include layout="@layout/layout_tls" />
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_more_function"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_network" />
|
|
||||||
|
|
||||||
<Spinner
|
|
||||||
android:id="@+id/sp_network"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:entries="@array/networks" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/sp_header_type_title"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_head_type" />
|
|
||||||
|
|
||||||
<Spinner
|
|
||||||
android:id="@+id/sp_header_type"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/tv_request_host"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_request_host" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_request_host"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/tv_path"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_path" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_path"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<include layout="@layout/tls_layout" />
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginBottom="@dimen/layout_margin_top_height"
|
android:layout_marginBottom="@dimen/layout_margin_top_height"
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical" />
|
android:orientation="vertical" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@@ -11,73 +11,7 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="@dimen/layout_margin_top_height">
|
android:padding="@dimen/layout_margin_top_height">
|
||||||
|
|
||||||
<LinearLayout
|
<include layout="@layout/layout_address_port" />
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/title_server"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_remarks" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_remarks"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_address3" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_address"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="text" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/server_lab_port3" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/et_port"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/edit_height"
|
|
||||||
android:inputType="number" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -194,8 +128,8 @@
|
|||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="@dimen/layout_margin_top_height"
|
|
||||||
android:layout_marginTop="@dimen/layout_margin_top_height"
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
|
android:layout_marginBottom="@dimen/layout_margin_top_height"
|
||||||
android:orientation="vertical" />
|
android:orientation="vertical" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/title_server"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/server_lab_remarks" />
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/et_remarks"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/edit_height"
|
||||||
|
android:inputType="text" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/server_lab_address3" />
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/et_address"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/edit_height"
|
||||||
|
android:inputType="text" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/server_lab_port3" />
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/et_port"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/edit_height"
|
||||||
|
android:inputType="number" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/server_lab_more_function"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/server_lab_network" />
|
||||||
|
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/sp_network"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/edit_height"
|
||||||
|
android:entries="@array/networks" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/sp_header_type_title"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/server_lab_head_type" />
|
||||||
|
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/sp_header_type"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/edit_height" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_request_host"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/server_lab_request_host" />
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/et_request_host"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/edit_height"
|
||||||
|
android:inputType="text" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/layout_margin_top_height"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_path"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/server_lab_path" />
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/et_path"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/edit_height"
|
||||||
|
android:inputType="text" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@@ -48,6 +48,10 @@
|
|||||||
android:id="@+id/import_manually_wireguard"
|
android:id="@+id/import_manually_wireguard"
|
||||||
android:title="@string/menu_item_import_config_manually_wireguard"
|
android:title="@string/menu_item_import_config_manually_wireguard"
|
||||||
app:showAsAction="never" />
|
app:showAsAction="never" />
|
||||||
|
<!-- <item-->
|
||||||
|
<!-- android:id="@+id/import_manually_hysteria2"-->
|
||||||
|
<!-- android:title="@string/menu_item_import_config_manually_hysteria2"-->
|
||||||
|
<!-- app:showAsAction="never" />-->
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:title="@string/menu_item_import_config_custom"
|
android:title="@string/menu_item_import_config_custom"
|
||||||
|
|||||||
@@ -29,12 +29,6 @@
|
|||||||
<copyright>Copyright 2010-2016 JetBrains s.r.o.</copyright>
|
<copyright>Copyright 2010-2016 JetBrains s.r.o.</copyright>
|
||||||
<license>Apache Software License 2.0</license>
|
<license>Apache Software License 2.0</license>
|
||||||
</notice>
|
</notice>
|
||||||
<notice>
|
|
||||||
<name>Logger</name>
|
|
||||||
<url>https://github.com/orhanobut/logger</url>
|
|
||||||
<copyright>Copyright 2015 Orhan Obut</copyright>
|
|
||||||
<license>Apache Software License 2.0</license>
|
|
||||||
</notice>
|
|
||||||
<notice>
|
<notice>
|
||||||
<name>LeakCanary</name>
|
<name>LeakCanary</name>
|
||||||
<url>https://github.com/square/leakcanary</url>
|
<url>https://github.com/square/leakcanary</url>
|
||||||
|
|||||||
@@ -32,6 +32,7 @@
|
|||||||
<string name="menu_item_import_config_manually_http">Type manually[HTTP]</string>
|
<string name="menu_item_import_config_manually_http">Type manually[HTTP]</string>
|
||||||
<string name="menu_item_import_config_manually_trojan">الكتابة يدويًا [Trojan]</string>
|
<string name="menu_item_import_config_manually_trojan">الكتابة يدويًا [Trojan]</string>
|
||||||
<string name="menu_item_import_config_manually_wireguard">الكتابة يدويًا [Wireguard]</string>
|
<string name="menu_item_import_config_manually_wireguard">الكتابة يدويًا [Wireguard]</string>
|
||||||
|
<string name="menu_item_import_config_manually_hysteria2">Type manually[Hysteria2]</string>
|
||||||
<string name="menu_item_import_config_custom">تكوين مخصص</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_clipboard">استيراد تكوين مخصص من الحافظة</string>
|
||||||
<string name="menu_item_import_config_custom_local">استيراد تكوين مخصص من الجهاز</string>
|
<string name="menu_item_import_config_custom_local">استيراد تكوين مخصص من الجهاز</string>
|
||||||
|
|||||||
@@ -32,6 +32,7 @@
|
|||||||
<string name="menu_item_import_config_manually_http">Type manually[HTTP]</string>
|
<string name="menu_item_import_config_manually_http">Type manually[HTTP]</string>
|
||||||
<string name="menu_item_import_config_manually_trojan">ম্যানুয়ালি টাইপ করুন [Trojan]</string>
|
<string name="menu_item_import_config_manually_trojan">ম্যানুয়ালি টাইপ করুন [Trojan]</string>
|
||||||
<string name="menu_item_import_config_manually_wireguard">ম্যানুয়ালি টাইপ করুন [Wireguard]</string>
|
<string name="menu_item_import_config_manually_wireguard">ম্যানুয়ালি টাইপ করুন [Wireguard]</string>
|
||||||
|
<string name="menu_item_import_config_manually_hysteria2">Type manually[Hysteria2]</string>
|
||||||
<string name="menu_item_import_config_custom">কাস্টম কনফিগারেশন</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_clipboard">ক্লিপবোর্ড থেকে কাস্টম কনফিগারেশন আমদানি করুন</string>
|
||||||
<string name="menu_item_import_config_custom_local">স্থানীয়ভাবে কাস্টম কনফিগারেশন আমদানি করুন</string>
|
<string name="menu_item_import_config_custom_local">স্থানীয়ভাবে কাস্টম কনফিগারেশন আমদানি করুন</string>
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
<string name="menu_item_import_config_manually_http">Type manually[HTTP]</string>
|
<string name="menu_item_import_config_manually_http">Type manually[HTTP]</string>
|
||||||
<string name="menu_item_import_config_manually_trojan">تایپ دستی[Trojan]</string>
|
<string name="menu_item_import_config_manually_trojan">تایپ دستی[Trojan]</string>
|
||||||
<string name="menu_item_import_config_manually_wireguard">[Wireguard]تایپ دستی</string>
|
<string name="menu_item_import_config_manually_wireguard">[Wireguard]تایپ دستی</string>
|
||||||
|
<string name="menu_item_import_config_manually_hysteria2">Type manually[Hysteria2]</string>
|
||||||
<string name="menu_item_import_config_custom">کانفیگ سفارشی</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_clipboard">کانفیگ سفارشی را از کلیپبورد وارد کنید</string>
|
||||||
<string name="menu_item_import_config_custom_local">کانفیگ سفارشی را به صورت محلی وارد کنید</string>
|
<string name="menu_item_import_config_custom_local">کانفیگ سفارشی را به صورت محلی وارد کنید</string>
|
||||||
|
|||||||
@@ -28,9 +28,10 @@
|
|||||||
<string name="menu_item_import_config_manually_vless">Ручной ввод VLESS</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_ss">Ручной ввод Shadowsocks</string>
|
||||||
<string name="menu_item_import_config_manually_socks">Ручной ввод Socks</string>
|
<string name="menu_item_import_config_manually_socks">Ручной ввод Socks</string>
|
||||||
<string name="menu_item_import_config_manually_http">Type manually[HTTP]</string>
|
<string name="menu_item_import_config_manually_http">Ручной ввод HTTP</string>
|
||||||
<string name="menu_item_import_config_manually_trojan">Ручной ввод Trojan</string>
|
<string name="menu_item_import_config_manually_trojan">Ручной ввод Trojan</string>
|
||||||
<string name="menu_item_import_config_manually_wireguard">Ручной ввод Wireguard</string>
|
<string name="menu_item_import_config_manually_wireguard">Ручной ввод WireGuard</string>
|
||||||
|
<string name="menu_item_import_config_manually_hysteria2">Type manually[Hysteria2]</string>
|
||||||
<string name="menu_item_import_config_custom">Другой профиль</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_clipboard">Импорт из буфера обмена</string>
|
||||||
<string name="menu_item_import_config_custom_local">Импорт из файла</string>
|
<string name="menu_item_import_config_custom_local">Импорт из файла</string>
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
<string name="menu_item_import_config_manually_http">Type manually[HTTP]</string>
|
<string name="menu_item_import_config_manually_http">Type manually[HTTP]</string>
|
||||||
<string name="menu_item_import_config_manually_trojan">Nhập thủ công [Trojan]</string>
|
<string name="menu_item_import_config_manually_trojan">Nhập thủ công [Trojan]</string>
|
||||||
<string name="menu_item_import_config_manually_wireguard">Nhập thủ công [WireGuard]</string>
|
<string name="menu_item_import_config_manually_wireguard">Nhập thủ công [WireGuard]</string>
|
||||||
|
<string name="menu_item_import_config_manually_hysteria2">Type manually[Hysteria2]</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">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ừ Clipboard</string>
|
<string name="menu_item_import_config_custom_clipboard">Nhập cấu hình tùy chỉnh từ Clipboard</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_local">Nhập cấu hình tùy chỉnh từ Tệp</string>
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
<string name="menu_item_import_config_manually_http">手动输入[HTTP]</string>
|
<string name="menu_item_import_config_manually_http">手动输入[HTTP]</string>
|
||||||
<string name="menu_item_import_config_manually_trojan">手动输入[Trojan]</string>
|
<string name="menu_item_import_config_manually_trojan">手动输入[Trojan]</string>
|
||||||
<string name="menu_item_import_config_manually_wireguard">手动输入[Wireguard]</string>
|
<string name="menu_item_import_config_manually_wireguard">手动输入[Wireguard]</string>
|
||||||
|
<string name="menu_item_import_config_manually_hysteria2">手动输入[Hysteria2]</string>
|
||||||
<string name="menu_item_import_config_custom">自定义配置</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_clipboard">从剪贴板导入自定义配置</string>
|
||||||
<string name="menu_item_import_config_custom_local">从本地导入自定义配置</string>
|
<string name="menu_item_import_config_custom_local">从本地导入自定义配置</string>
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
<string name="menu_item_import_config_manually_http">手動鍵入 [HTTP]</string>
|
<string name="menu_item_import_config_manually_http">手動鍵入 [HTTP]</string>
|
||||||
<string name="menu_item_import_config_manually_trojan">手動鍵入 [Trojan]</string>
|
<string name="menu_item_import_config_manually_trojan">手動鍵入 [Trojan]</string>
|
||||||
<string name="menu_item_import_config_manually_wireguard">手動鍵入 [Wireguard]</string>
|
<string name="menu_item_import_config_manually_wireguard">手動鍵入 [Wireguard]</string>
|
||||||
|
<string name="menu_item_import_config_manually_hysteria2">手動鍵入 [Hysteria2]</string>
|
||||||
<string name="menu_item_import_config_custom">自訂配置</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_clipboard">從剪貼簿匯入自訂配置</string>
|
||||||
<string name="menu_item_import_config_custom_local">從本地匯入自訂配置</string>
|
<string name="menu_item_import_config_custom_local">從本地匯入自訂配置</string>
|
||||||
|
|||||||
@@ -32,6 +32,7 @@
|
|||||||
<string name="menu_item_import_config_manually_http">Type manually[HTTP]</string>
|
<string name="menu_item_import_config_manually_http">Type manually[HTTP]</string>
|
||||||
<string name="menu_item_import_config_manually_trojan">Type manually[Trojan]</string>
|
<string name="menu_item_import_config_manually_trojan">Type manually[Trojan]</string>
|
||||||
<string name="menu_item_import_config_manually_wireguard">Type manually[Wireguard]</string>
|
<string name="menu_item_import_config_manually_wireguard">Type manually[Wireguard]</string>
|
||||||
|
<string name="menu_item_import_config_manually_hysteria2">Type manually[Hysteria2]</string>
|
||||||
<string name="menu_item_import_config_custom">Custom config</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_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_local">Import custom config from locally</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user