Skip to content
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

Rely on connectionState to decide if to unbind the service #7470

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rely on connectionState to decide if to unbind the service #7470

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
7 changes: 3 additions & 4 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import net.mullvad.mullvadvpn.lib.theme.AppTheme
import net.mullvad.mullvadvpn.repository.SplashCompleteRepository
import net.mullvad.mullvadvpn.repository.UserPreferencesRepository
import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionState
import net.mullvad.mullvadvpn.viewmodel.MullvadAppViewModel
import org.koin.android.ext.android.inject
import org.koin.android.scope.AndroidScopeComponent
Expand Down Expand Up @@ -121,10 +122,8 @@ class MainActivity : ComponentActivity(), AndroidScopeComponent {

override fun onStop() {
super.onStop()
lifecycleScope.launch {
if (userPreferencesRepository.preferences().isPrivacyDisclosureAccepted) {
serviceConnectionManager.unbind()
}
if (serviceConnectionManager.connectionState.value == ServiceConnectionState.Bound) {
serviceConnectionManager.unbind()
}
}

Expand Down
Loading