rkp/v2rayNG
1
0 Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Add reality and remove legacy xtls settings

Browse Source 
No sharing support for Reality yet
This commit is contained in:
yuhan6665 committed 2023-02-20 21:25:33 -05:00
1 parent 237be79680
commit a2c262441e
7 files changed
+182 -58
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
-18
View File
@@ -98,24 +98,6 @@
</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_flow" />
<Spinner
android:id="@+id/sp_flow"
android:layout_width="match_parent"
android:layout_height="@dimen/edit_height"
android:entries="@array/flows" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
V2rayNG/app/src/main/res/layout/tls_layout.xml
+59
View File
@@ -104,5 +104,64 @@
android:layout_height="@dimen/edit_height"
android:entries="@array/allowinsecures" />
</LinearLayout>
<LinearLayout
android:id="@+id/l6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_horizontal_margin"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/server_lab_public_key" />
<EditText
android:id="@+id/et_public_key"
android:layout_width="match_parent"
android:layout_height="@dimen/edit_height"
android:inputType="text"
android:nextFocusDown="@+id/sp_stream_fingerprint" />
</LinearLayout>
<LinearLayout
android:id="@+id/l7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_horizontal_margin"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/server_lab_short_id" />
<EditText
android:id="@+id/et_short_id"
android:layout_width="match_parent"
android:layout_height="@dimen/edit_height"
android:inputType="text"
android:nextFocusDown="@+id/sp_stream_fingerprint" />
</LinearLayout>
<LinearLayout
android:id="@+id/l8"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_horizontal_margin"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/server_lab_spider_x" />
<EditText
android:id="@+id/et_spider_x"
android:layout_width="match_parent"
android:layout_height="@dimen/edit_height"
android:inputType="text"
android:nextFocusDown="@+id/sp_stream_fingerprint" />
</LinearLayout>
</LinearLayout>
V2rayNG/app/src/main/res/values/arrays.xml
+1 -7
View File
@@ -57,7 +57,7 @@
<string-array name="streamsecurityxs" translatable="false">
<item></item>
<item>tls</item>
<item>xtls</item>
<item>reality</item>
</string-array>
<string-array name="streamsecurity_utls" translatable="false">
@@ -116,12 +116,6 @@
<string-array name="flows" translatable="false">
<item></item>
<item>xtls-rprx-origin</item>
<item>xtls-rprx-origin-udp443</item>
<item>xtls-rprx-direct</item>
<item>xtls-rprx-direct-udp443</item>
<item>xtls-rprx-splice</item>
<item>xtls-rprx-splice-udp443</item>
<item>xtls-rprx-vision</item>
<item>xtls-rprx-vision-udp443</item>
</string-array>
V2rayNG/app/src/main/res/values/strings.xml
+3
View File
@@ -61,6 +61,9 @@
<string name="server_lab_security4">User(Optional)</string>
<string name="server_lab_encryption">encryption</string>
<string name="server_lab_flow">flow</string>
<string name="server_lab_public_key">public key</string>
<string name="server_lab_short_id">short Id</string>
<string name="server_lab_spider_x">spiderX</string>
<string name="toast_success">Success</string>
<string name="toast_failure">Failure</string>
<string name="toast_none_data">There is nothing</string>