Skip to content

Commit d53703b

Browse files
fix: увеличение таймаута failover до 15с и кнопка 'Следующий профиль'
- В SmartConnectManager увеличен delay для failover c 8s до 15s. - В activity_main вынесена кнопка 'Следующий профиль' из GridLayout для лучшей видимости при активном VPN. - В strings.xml обновлена метка кнопки.
1 parent c5f8303 commit d53703b

3 files changed

Lines changed: 20 additions & 16 deletions

File tree

V2rayNG/app/src/main/java/com/kiktor/v2whitelist/handler/SmartConnectManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,9 @@ object SmartConnectManager {
266266
private fun startFailoverTimer(context: Context) {
267267
failoverJob?.cancel()
268268
failoverJob = CoroutineScope(Dispatchers.Main).launch {
269-
delay(8000)
269+
delay(15000)
270270
if (!V2RayServiceManager.isRunning()) {
271-
Log.w(AppConfig.TAG, "Connection failed within 8s, triggering failover")
271+
Log.w(AppConfig.TAG, "Connection failed within 15s, triggering failover")
272272
switchServer(context)
273273
}
274274
}

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,25 +130,29 @@
130130
app:trackThickness="4dp" />
131131
</FrameLayout>
132132

133+
<!-- Switch Server Button (Visible only when connected) -->
134+
<com.google.android.material.button.MaterialButton
135+
android:id="@+id/btn_switch_server"
136+
style="@style/Widget.Material3.Button.TonalButton"
137+
android:layout_width="match_parent"
138+
android:layout_height="wrap_content"
139+
android:layout_marginBottom="16dp"
140+
android:paddingTop="12dp"
141+
android:paddingBottom="12dp"
142+
android:text="@string/btn_label_switch"
143+
android:visibility="gone"
144+
app:cornerRadius="12dp"
145+
app:icon="@drawable/ic_check_update_24dp"
146+
app:iconGravity="textStart" />
147+
133148
<!-- Actions Grid -->
134149
<GridLayout
135150
android:layout_width="match_parent"
136151
android:layout_height="wrap_content"
137152
android:layout_marginBottom="24dp"
138153
android:alignmentMode="alignMargins"
139-
android:columnCount="3"
140-
android:rowCount="2">
141-
142-
<com.google.android.material.button.MaterialButton
143-
android:id="@+id/btn_switch_server"
144-
style="@style/Widget.Material3.Button.TextButton"
145-
android:layout_width="0dp"
146-
android:layout_height="wrap_content"
147-
android:layout_columnWeight="1"
148-
android:layout_margin="2dp"
149-
android:text="@string/btn_label_switch"
150-
android:textSize="11sp"
151-
app:icon="@drawable/ic_check_update_24dp" />
154+
android:columnCount="4"
155+
android:rowCount="1">
152156

153157
<com.google.android.material.button.MaterialButton
154158
android:id="@+id/btn_settings_quick"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@
444444
<string name="btn_label_start">Start</string>
445445
<string name="btn_label_stop">Stop</string>
446446
<string name="btn_label_cancel">Отмена</string>
447-
<string name="btn_label_switch">Сменить</string>
447+
<string name="btn_label_switch">Следующий профиль</string>
448448
<string name="btn_label_settings">Настройки</string>
449449
<string name="btn_label_logs">Логи</string>
450450
<string name="btn_label_update">Обновить</string>

0 commit comments

Comments
 (0)