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

Merge pull request #47 from meshtastic/dev

Browse source 
Dev
This commit is contained in:
Kevin Hester 2020-06-14 09:41:46 -07:00 • committed by GitHub
commit 1b2dc0d455
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -17,8 +17,8 @@ android {
applicationId "com.geeksville.mesh"
minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
targetSdkVersion 29
versionCode 10771 // format is Mmmss (where M is 1+the numeric major number
versionName "0.7.71"
versionCode 10772 // format is Mmmss (where M is 1+the numeric major number
versionName "0.7.72"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {

4
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View file

@ -893,7 +893,7 @@ class MeshService : Service(), Logging {
val packet = toMeshPacket(p)
p.status = MessageStatus.ENROUTE
p.time = System.currentTimeMillis() // update time to the actual time we started sending
debug("SENDING TO RADIO: $packet")
// debug("SENDING TO RADIO: $packet")
sendToRadio(packet)
}
@ -1161,7 +1161,7 @@ class MeshService : Service(), Logging {
try {
val proto =
MeshProtos.FromRadio.parseFrom(bytes)
info("Received from radio service: ${proto.toOneLineString()}")
// info("Received from radio service: ${proto.toOneLineString()}")
when (proto.variantCase.number) {
MeshProtos.FromRadio.PACKET_FIELD_NUMBER -> handleReceivedMeshPacket(
proto.packet

4
app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
View file

@ -102,6 +102,7 @@ class RadioInterfaceService : Service(), Logging {
val isValid = when (c) {
'x' -> BluetoothInterface.addressValid(context, rest)
's' -> SerialInterface.addressValid(context, rest)
'n' -> true
else -> TODO("Unexpected interface type $c")
}
if (!isValid)
@ -236,7 +237,7 @@ class RadioInterfaceService : Service(), Logging {
@SuppressLint("NewApi")
private fun setBondedDeviceAddress(addressIn: String?) {
private fun setBondedDeviceAddress(address: String?) {
// Record that this use has configured a radio
GeeksvilleApplication.analytics.track(
"mesh_bond"
@ -248,7 +249,6 @@ class RadioInterfaceService : Service(), Logging {
}
// The device address "n" can be used to mean none
val address = if ("n" == addressIn) null else addressIn
debug("Setting bonded device to $address")

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

@ -22,7 +22,6 @@ import com.geeksville.mesh.R
import com.geeksville.mesh.model.Channel
import com.geeksville.mesh.model.ChannelOption
import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.model.toHumanRes
import com.geeksville.mesh.service.MeshService
import com.geeksville.util.Exceptions
import com.google.android.material.dialog.MaterialAlertDialogBuilder
@ -167,7 +166,8 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
newSettings.psk = ByteString.copyFrom(Channel.channelDefaultKey)
}
val selectedChannelOptionString = filled_exposed_dropdown.editableText.toString()
val selectedChannelOptionString =
filled_exposed_dropdown.editableText.toString()
newSettings.modemConfig = getModemConfig(selectedChannelOptionString)
// Try to change the radio, if it fails, tell the user why and throw away their redits
try {