@@ -35,7 +35,6 @@ import androidx.compose.ui.res.stringResource
35
35
import androidx.compose.ui.unit.dp
36
36
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
37
37
import androidx.lifecycle.compose.collectAsStateWithLifecycle
38
- import androidx.lifecycle.lifecycleScope
39
38
import androidx.navigation.compose.NavHost
40
39
import androidx.navigation.compose.composable
41
40
import androidx.navigation.compose.rememberNavController
@@ -70,7 +69,6 @@ import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
70
69
import com.zaneschepke.wireguardautotunnel.util.Constants
71
70
import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
72
71
import dagger.hilt.android.AndroidEntryPoint
73
- import kotlinx.coroutines.launch
74
72
import javax.inject.Inject
75
73
import kotlin.system.exitProcess
76
74
@@ -251,11 +249,9 @@ class MainActivity : AppCompatActivity() {
251
249
TunnelAutoTunnelScreen (config, appUiState.settings)
252
250
}
253
251
}
254
- BackHandler (enabled = true ) {
255
- lifecycleScope.launch {
256
- if (! navController.popBackStack()) {
257
- this @MainActivity.finish()
258
- }
252
+ BackHandler {
253
+ if (navController.previousBackStackEntry == null || ! navController.popBackStack()) {
254
+ this @MainActivity.finish()
259
255
}
260
256
}
261
257
}
0 commit comments