Skip to content

refactor(service): inject ProfileRepository via Hilt in vpn and tile services #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hidden-Node merged 1 commit into from
Jul 24, 2026
Merged

refactor(service): inject ProfileRepository via Hilt in vpn and tile services #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions android/app/src/main/java/com/masterdns/vpn/service/MasterDnsVpnService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ import com.google.gson.reflect.TypeToken
import com.masterdns.vpn.App
import com.masterdns.vpn.MainActivity
import com.masterdns.vpn.R
import com.masterdns.vpn.data.local.AppDatabase
import com.masterdns.vpn.data.repository.ProfileRepository
import com.masterdns.vpn.util.ConfigGenerator
import com.masterdns.vpn.util.GlobalSettingsStore
import com.masterdns.vpn.util.VpnManager
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.*
import java.io.File
import java.io.FileInputStream
Expand All @@ -28,8 +29,10 @@ import java.net.InetAddress
import java.net.InetSocketAddress
import java.net.ServerSocket
import java.net.Socket
import javax.inject.Inject
import kotlin.coroutines.coroutineContext

@AndroidEntryPoint
class MasterDnsVpnService : VpnService() {

companion object {
Expand Down Expand Up @@ -83,6 +86,9 @@ class MasterDnsVpnService : VpnService() {
@Volatile
private var activeLocalSocksPort: Int = DEFAULT_SOCKS_PORT

@Inject
lateinit var profileRepository: ProfileRepository

/**
* Close any ParcelFileDescriptor left from a previous session before we
* attempt establish() again. The fd must be closed AFTER the Go core
Expand Down Expand Up @@ -136,8 +142,7 @@ class MasterDnsVpnService : VpnService() {
acquireWakeLock()

// Load profile from DB
val db = AppDatabase.getInstance(this@MasterDnsVpnService)
val profile = db.profileDao().getProfileById(profileId)
val profile = profileRepository.getProfileById(profileId)
?: throw IllegalStateException("Profile not found")
val socksPort = profile.listenPort.takeIf { it in 1..65535 } ?: DEFAULT_SOCKS_PORT
activeLocalSocksPort = socksPort
Expand Down
12 changes: 8 additions & 4 deletions android/app/src/main/java/com/masterdns/vpn/service/VpnTileService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,25 @@ import android.service.quicksettings.TileService
import androidx.annotation.RequiresApi
import com.masterdns.vpn.MainActivity
import com.masterdns.vpn.R
import com.masterdns.vpn.data.local.AppDatabase
import com.masterdns.vpn.data.repository.ProfileRepository
import com.masterdns.vpn.util.VpnManager
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.cancel
import kotlinx.coroutines.launch
import javax.inject.Inject

@AndroidEntryPoint
@RequiresApi(Build.VERSION_CODES.N)
class VpnTileService : TileService() {

private val tileScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)

@Inject
lateinit var profileRepository: ProfileRepository

override fun onStartListening() {
super.onStartListening()
updateTile()
Expand Down Expand Up @@ -50,9 +56,7 @@ class VpnTileService : TileService() {
}

tileScope.launch(Dispatchers.IO) {
val selectedProfile = AppDatabase.getInstance(this@VpnTileService)
.profileDao()
.getSelectedProfile()
val selectedProfile = profileRepository.getSelectedProfile()

launch(Dispatchers.Main) {
if (selectedProfile != null) {
Expand Down
Loading