Skip to content

Unify connection and speed tests in Diagnostics #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andre487 merged 1 commit into from
Oct 27, 2026
Merged

Unify connection and speed tests in Diagnostics #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions app/src/main/java/net/megaproxy487/AppNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ internal object AppRoute {
const val MTU = "mtu"
const val FAILOVER = "failover"
const val VISIBILITY = "visibility"
const val SPEED = "speed"
const val CONNECTION_TEST = "connection-test"
const val DIAGNOSTICS = "diagnostics"
const val DIAGNOSTIC_LOG = "diagnostic-log"
const val SSH_HOST_KEY = "ssh-host-key"

Expand All @@ -47,8 +46,7 @@ internal object AppRoute {
MTU,
FAILOVER,
VISIBILITY,
SPEED,
CONNECTION_TEST,
DIAGNOSTICS,
DIAGNOSTIC_LOG,
SSH_HOST_KEY,
)
Expand Down Expand Up @@ -113,8 +111,7 @@ internal fun MegaProxyNavHost(
readConnectionStats = readConnectionStats,
onOpenSettings = { navController.navigate(AppRoute.SETTINGS) },
onOpenVisibility = { navController.navigate(AppRoute.VISIBILITY) },
onOpenSpeed = { navController.navigate(AppRoute.SPEED) },
onOpenConnectionTest = { navController.navigate(AppRoute.CONNECTION_TEST) },
onOpenDiagnostics = { navController.navigate(AppRoute.DIAGNOSTICS) },
onEditProfile = { navController.navigate(AppRoute.profileEditor(it)) },
) }
}
Expand All @@ -140,8 +137,7 @@ internal fun MegaProxyNavHost(
composable(AppRoute.VISIBILITY) {
ScreenDestination(AppRoute.VISIBILITY) { VisibilityScreen(activity, back, runVisibilityNetworkChecks) }
}
composable(AppRoute.SPEED) { ScreenDestination(AppRoute.SPEED) { SpeedTestScreen(activity, back) } }
composable(AppRoute.CONNECTION_TEST) { ScreenDestination(AppRoute.CONNECTION_TEST) { ConnectionTestScreen(activity, autoStart = true, onBack = back) } }
composable(AppRoute.DIAGNOSTICS) { ScreenDestination(AppRoute.DIAGNOSTICS) { DiagnosticsScreen(activity, autoStart = true, onBack = back) } }
composable(AppRoute.DIAGNOSTIC_LOG) { ScreenDestination(AppRoute.DIAGNOSTIC_LOG) { DiagnosticLogScreen(activity, back) } }
composable(AppRoute.SSH_HOST_KEY) {
hostKeyPrompt?.let { prompt ->
Expand Down
55 changes: 39 additions & 16 deletions .../net/megaproxy487/ConnectionTestScreen.kt → ...ava/net/megaproxy487/DiagnosticsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,13 @@ import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context
import android.net.VpnService
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.enableEdgeToEdge
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.compose.setContent
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
Expand Down Expand Up @@ -52,7 +47,6 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.semantics.LiveRegionMode
import androidx.compose.ui.semantics.clearAndSetSemantics
import androidx.compose.ui.semantics.contentDescription
Expand All @@ -65,22 +59,41 @@ import net.megaproxy487.data.ConfigStore
import net.megaproxy487.vpn.ProxyVpnService
import net.megaproxy487.vpn.TestDiagnosticLog
import net.megaproxy487.vpn.TestState
import net.megaproxy487.vpn.SshHostKeyPromptState
import net.megaproxy487.vpn.hasOtherProvider
import net.megaproxy487.vpn.openAndroidVpnSettings
import net.megaproxy487.vpn.readAlwaysOnVpnStatus
import net.megaproxy487.ui.theme.MegaProxyTheme

@OptIn(ExperimentalMaterial3Api::class)
@Composable
internal fun ConnectionTestScreen(activity: Activity, autoStart: Boolean, onBack: () -> Unit) {
internal fun DiagnosticsScreen(activity: Activity, autoStart: Boolean, onBack: () -> Unit) {
val state by TestDiagnosticLog.state
val exitIp by TestDiagnosticLog.exitIp
val countryCode by TestDiagnosticLog.countryCode
val http3 by TestDiagnosticLog.http3
val http3Fallback by TestDiagnosticLog.http3Fallback
var showAlwaysOnConflict by remember { mutableStateOf(false) }
var speedRunning by remember { mutableStateOf(false) }
var exportMessage by remember { mutableStateOf<String?>(null) }
val scope = rememberCoroutineScope()
val exportDocument = rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) { uri ->
if (uri != null) {
val snapshot = TestDiagnosticLog.entries.joinToString("\n")
scope.launch {
try {
withContext(kotlinx.coroutines.Dispatchers.IO) {
activity.contentResolver.openOutputStream(uri, "wt")?.bufferedWriter()?.use {
it.write(snapshot)
} ?: throw UiException(R.string.error_open_export)
}
exportMessage = activity.uiText(R.string.diagnostic_log_exported)
} catch (cancelled: kotlinx.coroutines.CancellationException) {
throw cancelled
} catch (error: Exception) {
exportMessage = error.userMessage(activity, R.string.log_export_failed)
}
}
}
}
val permission = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {
if (VpnService.prepare(activity) == null) ProxyVpnService.test(activity)
else scope.launch {
Expand All @@ -94,7 +107,7 @@ internal fun ConnectionTestScreen(activity: Activity, autoStart: Boolean, onBack
}
}
val runTest = runTest@{
if (TestDiagnosticLog.state.value == TestState.RUNNING) return@runTest
if (TestDiagnosticLog.state.value == TestState.RUNNING || speedRunning) return@runTest
TestDiagnosticLog.begin()
scope.launch {
try {
Expand Down Expand Up @@ -135,7 +148,7 @@ internal fun ConnectionTestScreen(activity: Activity, autoStart: Boolean, onBack
Scaffold(
topBar = {
TopAppBar(
title = { ScreenTitle(stringResource(R.string.connection_test)) },
title = { ScreenTitle(stringResource(R.string.diagnostics)) },
navigationIcon = {
IconButton(onClick = onBack) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.back))
Expand Down Expand Up @@ -201,16 +214,26 @@ internal fun ConnectionTestScreen(activity: Activity, autoStart: Boolean, onBack
}
}
WrappingActions(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
Button(shape = RoundedCornerShape(12.dp), onClick = runTest, enabled = state != TestState.RUNNING) { Text(stringResource(R.string.run_again)) }
Button(shape = RoundedCornerShape(12.dp), onClick = runTest, enabled = state != TestState.RUNNING && !speedRunning) { Text(stringResource(R.string.run_again)) }
}
Text(stringResource(R.string.speed), style = MaterialTheme.typography.titleMedium)
if (state == TestState.SUCCEEDED) {
SpeedTestContent(activity, onRunningChanged = { speedRunning = it })
} else {
Text(stringResource(R.string.diagnostics_speed_locked), style = MaterialTheme.typography.bodySmall)
}
Text(activity.uiText(R.string.test_privacy_help), style = MaterialTheme.typography.bodySmall)
Text(stringResource(R.string.diagnostic_log), style = MaterialTheme.typography.titleMedium)
WrappingActions(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
Button(shape = RoundedCornerShape(12.dp), onClick = {
val clipboard = activity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
clipboard.setPrimaryClip(ClipData.newPlainText(activity.uiText(R.string.connection_test_clipboard_label), TestDiagnosticLog.entries.joinToString("\n")))
}, enabled = TestDiagnosticLog.entries.isNotEmpty()) { Text(stringResource(R.string.copy_log)) }
Button(shape = RoundedCornerShape(12.dp), onClick = {
exportDocument.launch("MegaProxy-diagnostics.log")
}, enabled = TestDiagnosticLog.entries.isNotEmpty()) { Text(stringResource(R.string.export_action)) }
}
Text(
activity.uiText(R.string.test_privacy_help),
style = MaterialTheme.typography.bodySmall,
)
exportMessage?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
Box(Modifier.fillMaxWidth().heightIn(min = 160.dp, max = logHeight)) {
SelectionContainer {
Text(
Expand Down
11 changes: 3 additions & 8 deletions app/src/main/java/net/megaproxy487/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,10 @@ private fun ProfileSelectorLabel(
internal fun MainScreen(
activity: Activity,
onOpenSettings: () -> Unit,
onOpenConnectionTest: () -> Unit,
onOpenDiagnostics: () -> Unit,
onEditProfile: (String) -> Unit,
readConnectionStats: () -> NativeConnectionStats? = ConnectionStatsReader::snapshot,
onOpenVisibility: () -> Unit = {},
onOpenSpeed: () -> Unit = {},
) {
val connection by VpnRuntimeState.connection
val runtimeAlwaysOn by VpnRuntimeState.alwaysOn
Expand Down Expand Up @@ -417,13 +416,9 @@ internal fun MainScreen(
}
DropdownMenu(actionsMenuExpanded, { actionsMenuExpanded = false }) {
DropdownMenuItem(
text = { Text(stringResource(R.string.test_connection)) },
text = { Text(stringResource(R.string.diagnostics)) },
enabled = connection != VpnConnectionState.CONNECTING,
onClick = { actionsMenuExpanded = false; onOpenConnectionTest() },
)
DropdownMenuItem(
text = { Text(stringResource(R.string.speed)) },
onClick = { actionsMenuExpanded = false; onOpenSpeed() },
onClick = { actionsMenuExpanded = false; onOpenDiagnostics() },
)
DropdownMenuItem(
text = { Text(stringResource(R.string.visibility)) },
Expand Down
Loading
Loading