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

refactor(di): Introduce @ProcessLifecycle qualifier for di (#3978)

Browse source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich 2025-12-12 08:23:35 -06:00 • committed by GitHub
parent 1bbb4aca62
commit d2b15c73b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 44 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@
package com.geeksville.mesh
import android.app.Activity
import android.content.Context
import androidx.appcompat.app.AppCompatActivity.BIND_ABOVE_CLIENT
import androidx.appcompat.app.AppCompatActivity.BIND_AUTO_CREATE
import androidx.lifecycle.DefaultLifecycleObserver
@ -28,6 +28,7 @@ import com.geeksville.mesh.android.ServiceClient
import com.geeksville.mesh.concurrent.handledLaunch
import com.geeksville.mesh.service.MeshService
import com.geeksville.mesh.service.startService
import dagger.hilt.android.qualifiers.ActivityContext
import dagger.hilt.android.scopes.ActivityScoped
import kotlinx.coroutines.Job
import org.meshtastic.core.service.IMeshService
@ -40,18 +41,12 @@ import javax.inject.Inject
class MeshServiceClient
@Inject
constructor(
/**
* Ideally, this would be broken up into Context and LifecycleOwner. However, ApplicationModule defines its own
* LifecycleOwner which overrides the default binding for @ActivityScoped. The solution to this is to add a
* qualifier to the LifecycleOwner provider in ApplicationModule.
*/
private val activity: Activity,
@ActivityContext private val context: Context,
private val serviceRepository: ServiceRepository,
) : ServiceClient<IMeshService>(IMeshService.Stub::asInterface),
DefaultLifecycleObserver {
// TODO Use the default binding for @ActivityScoped
private val lifecycleOwner: LifecycleOwner = activity as LifecycleOwner
private val lifecycleOwner: LifecycleOwner = context as LifecycleOwner
// TODO Inject this for ease of testing
private var serviceSetupJob: Job? = null
@ -106,11 +101,11 @@ constructor(
private fun bindMeshService() {
Timber.d("Binding to mesh service!")
try {
MeshService.startService(activity)
MeshService.startService(context)
} catch (ex: Exception) {
Timber.e("Failed to start service from activity - but ignoring because bind will work: ${ex.message}")
}
connect(activity, MeshService.createIntent(activity), BIND_AUTO_CREATE + BIND_ABOVE_CLIENT)
connect(context, MeshService.createIntent(context), BIND_AUTO_CREATE + BIND_ABOVE_CLIENT)
}
}