From 2b63997b2218477fa1a835c45704d6a2616a9fac Mon Sep 17 00:00:00 2001 From: Kr328 <39107975+Kr328@users.noreply.github.com> Date: Wed, 8 Apr 2020 01:58:14 +0800 Subject: [PATCH] cleanup code --- .../main/java/com/github/kr328/clash/service/ClashService.kt | 5 ++--- .../main/java/com/github/kr328/clash/service/TunService.kt | 5 ++--- .../github/kr328/clash/service/clash/module/ReloadModule.kt | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/service/src/main/java/com/github/kr328/clash/service/ClashService.kt b/service/src/main/java/com/github/kr328/clash/service/ClashService.kt index 61debc5..bda494a 100644 --- a/service/src/main/java/com/github/kr328/clash/service/ClashService.kt +++ b/service/src/main/java/com/github/kr328/clash/service/ClashService.kt @@ -35,12 +35,11 @@ class ClashService : BaseService() { runtime.install(ReloadModule(service)) { onLoaded { - if ( it != null ) { + if (it != null) { reason = it.message stopSelf() - } - else { + } else { broadcastProfileLoaded() } } diff --git a/service/src/main/java/com/github/kr328/clash/service/TunService.kt b/service/src/main/java/com/github/kr328/clash/service/TunService.kt index a5915e1..673da09 100644 --- a/service/src/main/java/com/github/kr328/clash/service/TunService.kt +++ b/service/src/main/java/com/github/kr328/clash/service/TunService.kt @@ -48,14 +48,13 @@ class TunService : VpnService(), CoroutineScope by MainScope() { runtime.install(ReloadModule(service)) { onLoaded { - if ( it != null ) { + if (it != null) { reason = it.message stopSelf() TunModule.requestStop() - } - else { + } else { broadcastProfileLoaded() } } diff --git a/service/src/main/java/com/github/kr328/clash/service/clash/module/ReloadModule.kt b/service/src/main/java/com/github/kr328/clash/service/clash/module/ReloadModule.kt index 5eeaed9..1025ad8 100644 --- a/service/src/main/java/com/github/kr328/clash/service/clash/module/ReloadModule.kt +++ b/service/src/main/java/com/github/kr328/clash/service/clash/module/ReloadModule.kt @@ -9,7 +9,6 @@ import com.github.kr328.clash.service.data.ClashDatabase import com.github.kr328.clash.service.util.resolveBase import com.github.kr328.clash.service.util.resolveProfile import kotlinx.coroutines.sync.Mutex -import java.lang.NullPointerException class ReloadModule(private val context: Context) : Module() { override val receiveBroadcasts: Set