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

Partial #36: Don't make our service foreground if user hasn't selected radio

Browse source
This commit is contained in:
geeksville 2020-06-07 17:51:51 -07:00
parent f4ae325d02
commit 6a5cb0ddc7
1 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -340,9 +340,6 @@ class MeshService : Service(), Logging {
})
}
override fun onBind(intent: Intent?): IBinder? {
return binder
}
@RequiresApi(Build.VERSION_CODES.O)
private fun createNotificationChannel(): String {
@ -439,14 +436,19 @@ class MeshService : Service(), Logging {
* tell android not to kill us
*/
private fun startForeground() {
startForeground(notifyId, createNotification())
val wantForeground = RadioInterfaceService.getBondedDeviceAddress(this) != null
info("Requesting foreground service=$wantForeground")
if (wantForeground)
startForeground(notifyId, createNotification())
else
stopForeground(true)
}
override fun onCreate() {
super.onCreate()
info("Creating mesh service")
startForeground()
// Switch to the IO thread
serviceScope.handledLaunch {
@ -467,6 +469,23 @@ class MeshService : Service(), Logging {
}
}
/**
* If someone binds to us, this will be called after on create
*/
override fun onBind(intent: Intent?): IBinder? {
startForeground()
return binder
}
/**
* If someone starts us (or restarts us) this will be called after onCreate)
*/
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
startForeground()
return super.onStartCommand(intent, flags, startId)
}
override fun onDestroy() {
info("Destroying mesh service")
@ -1439,6 +1458,7 @@ class MeshService : Service(), Logging {
debug("Passing through device change to radio service: $deviceAddr")
discardNodeDB()
radio.service.setDeviceAddress(deviceAddr)
startForeground() // We might need to become foreground or background at this point
}
// Note: bound methods don't get properly exception caught/logged, so do that with a wrapper