Skip to content

Commit 3931a42

Browse files
DanielcoderXilanyu
DanielcoderX
and
ilanyu
authored
Pr 299 (#343)
Fixed @ilanyu PR #299 conflicts. --------- Co-authored-by: lanyu <[email protected]>
1 parent 68078c7 commit 3931a42

File tree

8 files changed

+82
-12
lines changed

8 files changed

+82
-12
lines changed

‎app/libs/tun2socks.go

+12-2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ type StartOptions struct {
4141
PsiphonEnabled bool
4242
Gool bool
4343
DNS string
44+
EndpointType int
4445
}
4546

4647
var global StartOptions
@@ -101,10 +102,19 @@ func Start(opt *StartOptions) {
101102
var scanOpts *wiresocks.ScanOptions
102103
if global.Endpoint == "" {
103104
scanOpts = &wiresocks.ScanOptions{
104-
V4: true,
105-
V6: true,
105+
V4: false,
106+
V6: false,
106107
MaxRTT: 1500 * time.Millisecond,
107108
}
109+
switch global.EndpointType {
110+
case 0:
111+
scanOpts.V4 = true
112+
scanOpts.V6 = true
113+
case 1:
114+
scanOpts.V4 = true
115+
case 2:
116+
scanOpts.V6 = true
117+
}
108118
}
109119

110120
var psiphonOpts *app.PsiphonOptions

‎app/src/main/java/org/bepass/oblivion/service/OblivionVpnService.java

+2
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,7 @@ private void configure() throws Exception {
578578
if (endpoint.equals("engage.cloudflareclient.com:2408")) {
579579
endpoint = "";
580580
}
581+
int endpointType = fileManager.getInt("USERSETTING_endpoint_type");
581582

582583
String license = fileManager.getString("USERSETTING_license", "").trim();
583584
boolean enablePsiphon = fileManager.getBoolean("USERSETTING_psiphon", false);
@@ -591,6 +592,7 @@ private void configure() throws Exception {
591592
so.setBindAddress(bindAddress);
592593
so.setLicense(license);
593594
so.setDNS("1.1.1.1");
595+
so.setEndpointType(endpointType);
594596

595597
if (enablePsiphon && !enableGool) {
596598
so.setPsiphonEnabled(true);

‎app/src/main/java/org/bepass/oblivion/ui/LogActivity.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,10 @@ protected int getStatusBarColor() {
4545
@Override
4646
protected void onCreate(Bundle savedInstanceState) {
4747
super.onCreate(savedInstanceState);
48-
setContentView(R.layout.activity_log);
4948

50-
setupScrollListener();
5149
binding.back.setOnClickListener(v -> getOnBackPressedDispatcher().onBackPressed());
52-
5350
binding.copytoclip.setOnClickListener(v -> copyLast100LinesToClipboard());
51+
setupScrollListener();
5452

5553
logUpdater = new Runnable() {
5654
@Override

‎app/src/main/java/org/bepass/oblivion/ui/SettingsActivity.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,12 @@ public void onNothingSelected(AdapterView parent) {
133133
binding.country.setEnabled(false);
134134
}
135135
};
136+
binding.txtDarkMode.setOnClickListener(new View.OnClickListener() {
137+
@Override
138+
public void onClick(View view) {
139+
binding.checkBoxDarkMode.setChecked(!binding.checkBoxDarkMode.isChecked());
140+
}
141+
});
136142
binding.checkBoxDarkMode.setChecked(ThemeHelper.getInstance().getCurrentTheme() == ThemeHelper.Theme.DARK);
137143
binding.checkBoxDarkMode.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
138144
@Override
@@ -198,4 +204,4 @@ public String getKey() {
198204
@Override
199205
public void onConnectionStateChange(ConnectionState state) {
200206
}
201-
}
207+
}

‎app/src/main/res/layout/activity_settings.xml

+41-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,47 @@
110110
android:layout_height="1dp"
111111
android:background="@android:color/darker_gray" />
112112
</LinearLayout>
113+
<LinearLayout
114+
android:id="@+id/endpoint_type_layout"
115+
android:layout_width="match_parent"
116+
android:paddingHorizontal="16dp"
117+
android:background="?selectableItemBackground"
118+
android:layout_height="80dp"
119+
android:gravity="center"
120+
android:orientation="vertical">
121+
<LinearLayout
122+
android:layout_width="match_parent"
123+
android:layout_height="wrap_content"
124+
android:gravity="end">
125+
126+
<Spinner
127+
android:id="@+id/endpoint_type"
128+
android:entries="@array/endpointType"
129+
android:layout_width="0dp"
130+
android:layout_height="wrap_content"
131+
android:layout_weight="1" />
113132

133+
<TextView
134+
android:layout_width="wrap_content"
135+
android:layout_height="wrap_content"
136+
android:fontFamily="@font/shabnam"
137+
android:minWidth="100dp"
138+
android:text="@string/endpointTypeText"
139+
android:textAlignment="viewEnd"
140+
android:textColor="@color/black"
141+
android:textSize="20sp" />
142+
143+
</LinearLayout>
144+
145+
<TextView
146+
android:layout_width="match_parent"
147+
android:layout_height="wrap_content"
148+
android:layout_marginTop="4dp"
149+
android:fontFamily="@font/shabnam"
150+
android:text="@string/endpointTypeTextDesc"
151+
android:textColor="#9A9A9A"
152+
android:textSize="16sp" />
153+
</LinearLayout>
114154
<LinearLayout
115155
android:id="@+id/endpoint_layout"
116156
android:layout_width="match_parent"
@@ -647,4 +687,4 @@
647687

648688

649689
</androidx.constraintlayout.widget.ConstraintLayout>
650-
</layout>
690+
</layout>

‎app/src/main/res/layout/endpoint_type_item_layout.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- spinner_item_layout.xml -->
2+
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="wrap_content"
5+
android:paddingLeft="5dp"
6+
android:textSize="18sp"
7+
android:fontFamily="@font/shabnammedium" />

‎app/src/main/res/values-zh/strings.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<string name="dialBtText">为了确保应用程序正常运行，请为此应用程序关闭电池优化。</string>
4545
<string name="goToSettings">前往设置</string>
4646
<string name="copytoclip">复制日志到剪贴板</string>
47-
<string name="turn_on_dark_mode">Turn on dark mode</string>
48-
<string name="turn_on_dark_mode_desc">turn on dark mode</string>
47+
<string name="endpointTypeText">端点类型</string>
48+
<string name="endpointTypeTextDesc">用于查找终点IP</string>
4949
<string-array name="countries">
5050
<item>奥地利</item>
5151
<item>比利时</item>
@@ -81,4 +81,4 @@
8181
<item>美国</item>
8282
</string-array>
8383

84-
</resources>
84+
</resources>

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

+9-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@
4444
<string name="dialBtText"> To ensure the app works properly, please disable battery optimization for this app. </string>
4545
<string name="goToSettings"> Go to Settings </string>
4646
<string name="copytoclip">Copy log to clipboard</string>
47-
<string name="turn_on_dark_mode">Turn on dark mode</string>
47+
<string name="endpointTypeText">Endpoint Type</string>
48+
<string name="endpointTypeTextDesc">Used to find the endpoint IP</string>
49+
<string name="turn_on_dark_mode">Turn on dark mode</string>
4850
<string name="turn_on_dark_mode_desc">turn on dark mode</string>
4951
<string-array name="countries">
5052
<item>Austria</item>
@@ -114,4 +116,9 @@
114116
<item>United Kingdom</item>
115117
<item>United States</item>
116118
</string-array>
117-
</resources>
119+
<string-array name="endpointType">
120+
<item>Auto</item>
121+
<item>IPv4</item>
122+
<item>IPv6</item>
123+
</string-array>
124+
</resources>

0 commit comments

Comments
 (0)