meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix #1567: Allow using a different TCP port than default 4403 (#1861)

Browse source
This commit is contained in:
Slush 2025-05-19 13:30:23 +02:00 • committed by GitHub
parent a603dcb91e
commit e90aa6c5ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/com/geeksville/mesh/ui/Settings.kt
View file

@ -88,6 +88,7 @@ import com.geeksville.mesh.model.BTScanModel
import com.geeksville.mesh.model.BluetoothViewModel
import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.service.MeshService
import com.geeksville.mesh.repository.network.NetworkRepository
import kotlinx.coroutines.delay
fun String?.isIPAddress(): Boolean {
@ -145,6 +146,7 @@ fun SettingsScreen(
// State for manual IP address input
var manualIpAddress by remember { mutableStateOf("") }
var manualIpPort by remember { mutableStateOf(NetworkRepository.SERVICE_PORT.toString()) }
// State for the device scan dialog
var showScanDialog by remember { mutableStateOf(false) }
@ -306,7 +308,7 @@ fun SettingsScreen(
scanModel.onSelected(
BTScanModel.DeviceListEntry(
"",
"t$manualIpAddress",
"t$manualIpAddress:$manualIpPort",
true
)
)
@ -319,13 +321,13 @@ fun SettingsScreen(
verticalAlignment = Alignment.CenterVertically
) {
RadioButton(
selected = ("t$manualIpAddress" == selectedDevice),
selected = ("t$manualIpAddress:$manualIpPort" == selectedDevice),
onClick = {
if (manualIpAddress.isIPAddress()) {
scanModel.onSelected(
BTScanModel.DeviceListEntry(
"",
"t$manualIpAddress",
"t$manualIpAddress:$manualIpPort",
true
)
)
@ -340,9 +342,23 @@ fun SettingsScreen(
label = { Text(stringResource(R.string.ip_address)) },
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
modifier = Modifier
.weight(1f)
.weight(weight = 0.7f)
.padding(start = 16.dp)
)
OutlinedTextField(
value = manualIpPort,
onValueChange = {
// Only allow numeric input for port
if (it.all { char -> char.isDigit() }) {
manualIpPort = it
}
},
label = { Text(stringResource(R.string.ip_port)) },
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
modifier = Modifier
.weight(weight = 0.3f)
.padding(start = 8.dp)
)
}
}