diff --git a/app/src/main/java/com/github/shadowsocks/plugin/gost/ConfigActivity.java b/app/src/main/java/com/github/shadowsocks/plugin/gost/ConfigActivity.java index 271d327..daac8e2 100644 --- a/app/src/main/java/com/github/shadowsocks/plugin/gost/ConfigActivity.java +++ b/app/src/main/java/com/github/shadowsocks/plugin/gost/ConfigActivity.java @@ -457,7 +457,7 @@ public void run() { } private final String[] fileNameList = { - "config.json", + "config.yaml", "cacert.pem", "clientcert.pem", "clientcertkey.pem", diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 889959b..7819495 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -13,14 +13,14 @@ 附加文件 请不要在命令行参数中加入双引号(\"),加了会让Gost无法启动。\n\"#SS_HOST\"与\"#SS_PORT\"将会被分别替换为Shadowsocks-Android中设置的\"服务器\"与\"远程端口\"。 Gost会在本地开一个Shadowsocks服务器,Shadowsocks-Android直接连的就是它。为了避免不必要的开销,一般而言,Shadowsocks-Android本身和Gost的\"-L\"参数都被设为\"none\"无加密模式(如果\"none\"不可用,则换用其他加密方法)——无论如何,两者必须相符才能正常工作。然后Gost会按照\"-F\"参数指定的加密方法来跟远程服务器建立真正的加密连接。 - 必须添加对应的命令行参数(例如: -C config.json)才能让下面的文件内容生效! + 必须添加对应的命令行参数(例如: -C config.yaml)才能让下面的文件内容生效! 删除 删除单个文件 你确定要删除这个文件吗?\n文件名: 加载 仍在读取之前的文件,请稍后重试 错误!文件过大(>1M字符) - /* 示例配置,不会被保存生效 */\n{\n\t\t\"Debug\": true,\n\t\t\"Retries\": 0,\n\t\t\"ServeNodes\": [\n\t\t\t\t\":8080\",\n\t\t\t\t\"ss://chacha20:12345678@:8338\"\n\t\t],\n\t\t\"ChainNodes\": [\n\t\t\t\t\"http://192.168.1.1:8080\",\n\t\t\t\t\"https://10.0.2.1:443\"\n\t\t],\n\t\t\"Routes\": [\n\t\t\t\t{\n\t\t\t\t\t\t\"Retries\": 1,\n\t\t\t\t\t\t\"ServeNodes\": [\n\t\t\t\t\t\t\t\t\"ws://:1443\"\n\t\t\t\t\t\t],\n\t\t\t\t\t\t\"ChainNodes\": [\n\t\t\t\t\t\t\t\t\"socks://:192.168.1.1:1080\"\n\t\t\t\t\t\t]\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\t\t\"Retries\": 3,\n\t\t\t\t\t\t\"ServeNodes\": [\n\t\t\t\t\t\t\t\t\"quic://:443\"\n\t\t\t\t\t\t]\n\t\t\t\t}\n\t\t]\n}\n + # 示例配置,不会被保存生效\nchains:\n- name: chain-0\n\thops:\n\t- name: hop-0\n\t\tnodes:\n\t\t- name: node-0\n\t\t\taddr: example.com:443\n\t\t\tconnector:\n\t\t\t\ttype: http\n\t\t\t\tmetadata:\n\t\t\t\t\tpath: /ws\n\t\t\tdialer:\n\t\t\t\ttype: wss\n\t\t\t\ttls:\n\t\t\t\t\tsecure: true\n\t\t\t\t\tserverName: example.com\n\t\t\t\tmetadata:\n\t\t\t\t\tpath: /ws\nlog:\n\tlevel: debug -----BEGIN CERTIFICATE-----\n(你自己的CA证书,Base64 PEM格式)\n-----END CERTIFICATE----- -----BEGIN CERTIFICATE-----\n(你自己的客户端证书,Base64 PEM格式)\n-----END CERTIFICATE----- -----BEGIN RSA PRIVATE KEY-----\n(你自己的客户端证书私钥,Base64 PEM格式)\n-----END RSA PRIVATE KEY----- diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8abdd33..b9e7c2a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,14 +18,14 @@ Add 2 arguments Attached files - You need to add corresponding command line arguments (like: -C config.json) to make the file content below actually take effect! + You need to add corresponding command line arguments (like: -C config.yaml) to make the file content below actually take effect! Delete Delete a file Are you sure to delete this file?\nFile name: Load Still reading the previous file, please retry later Error! File is too large (>1M characters) - /* sample config, won\'t be saved & applied */\n{\n\t\t\"Debug\": true,\n\t\t\"Retries\": 0,\n\t\t\"ServeNodes\": [\n\t\t\t\t\":8080\",\n\t\t\t\t\"ss://chacha20:12345678@:8338\"\n\t\t],\n\t\t\"ChainNodes\": [\n\t\t\t\t\"http://192.168.1.1:8080\",\n\t\t\t\t\"https://10.0.2.1:443\"\n\t\t],\n\t\t\"Routes\": [\n\t\t\t\t{\n\t\t\t\t\t\t\"Retries\": 1,\n\t\t\t\t\t\t\"ServeNodes\": [\n\t\t\t\t\t\t\t\t\"ws://:1443\"\n\t\t\t\t\t\t],\n\t\t\t\t\t\t\"ChainNodes\": [\n\t\t\t\t\t\t\t\t\"socks://:192.168.1.1:1080\"\n\t\t\t\t\t\t]\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\t\t\"Retries\": 3,\n\t\t\t\t\t\t\"ServeNodes\": [\n\t\t\t\t\t\t\t\t\"quic://:443\"\n\t\t\t\t\t\t]\n\t\t\t\t}\n\t\t]\n} + # sample config, won\'t be saved & applied\nchains:\n- name: chain-0\n\thops:\n\t- name: hop-0\n\t\tnodes:\n\t\t- name: node-0\n\t\t\taddr: example.com:443\n\t\t\tconnector:\n\t\t\t\ttype: http\n\t\t\t\tmetadata:\n\t\t\t\t\tpath: /ws\n\t\t\tdialer:\n\t\t\t\ttype: wss\n\t\t\t\ttls:\n\t\t\t\t\tsecure: true\n\t\t\t\t\tserverName: example.com\n\t\t\t\tmetadata:\n\t\t\t\t\tpath: /ws\nlog:\n\tlevel: debug -----BEGIN CERTIFICATE-----\n(Your own CA certificate in Base64 PEM format)\n-----END CERTIFICATE----- -----BEGIN CERTIFICATE-----\n(Your own client certificate in Base64 PEM format)\n-----END CERTIFICATE----- -----BEGIN RSA PRIVATE KEY-----\n(Your own client certificate key in Base64 PEM format)\n-----END RSA PRIVATE KEY-----