From 164dc7fe9ffd1c87a7b446b49a34eb874f16d63b Mon Sep 17 00:00:00 2001 From: Mygod Date: Thu, 24 Oct 2019 12:47:27 +0800 Subject: [PATCH] Bump to foreground service unconditionally on Q --- .../main/java/be/mygod/vpnhotspot/RepeaterService.kt | 10 ++++------ .../be/mygod/vpnhotspot/manage/RepeaterTileService.kt | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt index f86fed6f..5cac65a7 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt @@ -46,8 +46,6 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene */ private const val PLACEHOLDER_NETWORK_NAME = "DIRECT-00-VPNHotspot" - const val EXTRA_POSSIBLY_BACKGROUND = "possiblyBackground" - /** * This is only a "ServiceConnection" to system service and its impact on system is minimal. */ @@ -256,10 +254,10 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene if (status != Status.IDLE) return START_NOT_STICKY val channel = channel ?: return START_NOT_STICKY.also { stopSelf() } status = Status.STARTING - // show invisible foreground notification on television to avoid being killed - if (Build.VERSION.SDK_INT >= 26 && app.uiMode.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION || - // or bump self to foreground location service to use foreground location permission - Build.VERSION.SDK_INT >= 29 && intent?.getBooleanExtra(EXTRA_POSSIBLY_BACKGROUND, false) == true) { + // bump self to foreground location service to use foreground location permission later + if (Build.VERSION.SDK_INT >= 29 || + // or show invisible foreground notification on television to avoid being killed + Build.VERSION.SDK_INT >= 26 && app.uiMode.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION) { showNotification() } launch { diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterTileService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterTileService.kt index da6d2474..cea8fe5c 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterTileService.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterTileService.kt @@ -36,7 +36,7 @@ class RepeaterTileService : KillableTileService() { if (binder == null) tapPending = true else when (binder.service.status) { RepeaterService.Status.ACTIVE -> binder.shutdown() RepeaterService.Status.IDLE -> ContextCompat.startForegroundService(this, - Intent(this, RepeaterService::class.java).putExtra(RepeaterService.EXTRA_POSSIBLY_BACKGROUND, true)) + Intent(this, RepeaterService::class.java)) else -> { } } }