mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-04 14:13:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Disable the "set default channel" button if already on the default channel

Browse Source
This commit is contained in:
Kevin Hester
2021-03-24 14:28:11 +08:00
parent 8f32c39c5f
commit 10d6537972
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/geeksville/mesh/model/Channel.kt
View File

@@ -78,6 +78,10 @@ data class Channel(
return "#${name}-${suffix}"
}
override fun equals(o: Any?): Boolean = (o is Channel)
&& psk.toByteArray() contentEquals o.psk.toByteArray()
&& name == o.name
}
fun xorHash(b: ByteArray) = b.fold(0, { acc, x -> acc xor (x.toInt() and 0xff) })

4
app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
View File

@@ -85,7 +85,7 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
// Only let buttons work if we are connected to the radio
binding.shareButton.isEnabled = connected
binding.resetButton.isEnabled = connected
binding.resetButton.isEnabled = connected && Channel.defaultChannel != channel
binding.editableCheckbox.isChecked = false // start locked
if (channel != null) {
@@ -185,7 +185,7 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
.setNeutralButton(R.string.cancel) { _, _ ->
setGUIfromModel() // throw away any edits
}
.setPositiveButton(getString(R.string.accept)) { _, _ ->
.setPositiveButton(R.string.apply) { _, _ ->
debug("Switching back to default channel")
installSettings(Channel.defaultChannel.settings)
}