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

message status updates are coded but not yet tested.

Browse source
This commit is contained in:
geeksville 2020-05-30 19:58:36 -07:00
parent b2d8b30d5b
commit 7506d712ff
9 changed files with 157 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/com/geeksville/mesh/MainActivity.kt
View file

@ -31,7 +31,6 @@ import com.geeksville.android.GeeksvilleApplication
import com.geeksville.android.Logging
import com.geeksville.android.ServiceClient
import com.geeksville.mesh.model.Channel
import com.geeksville.mesh.model.TextMessage
import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.service.*
import com.geeksville.mesh.ui.*
@ -398,7 +397,7 @@ class MainActivity : AppCompatActivity(), Logging,
else -> R.drawable.cloud_off
}
connectStatusImage.setImageDrawable(getDrawable(image))
connectStatusImage.setImageResource(image)
})
askToRate()
@ -623,6 +622,15 @@ class MainActivity : AppCompatActivity(), Logging,
errormsg("Unhandled dataType ${payload.dataType}")
}
}
MeshService.ACTION_MESSAGE_STATUS -> {
debug("received message status from service")
val id = intent.getIntExtra(EXTRA_PACKET_ID, 0)
val status = intent.getParcelableExtra<MessageStatus>(EXTRA_STATUS)
model.messagesState.updateStatus(id, status)
}
MeshService.ACTION_MESH_CONNECTED -> {
val connected =
MeshService.ConnectionState.valueOf(
@ -650,10 +658,7 @@ class MainActivity : AppCompatActivity(), Logging,
registerMeshReceiver()
// Init our messages table with the service's record of past text messages
model.messagesState.messages.value = service.oldMessages.map {
TextMessage(it)
}
model.messagesState.messages.value = service.oldMessages
val connectionState =
MeshService.ConnectionState.valueOf(service.connectionState())