From 7ab2df9afea2009964276da1442ba93434d2a0af Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Tue, 14 Apr 2020 14:25:18 +0800
Subject: [PATCH] fix profile reload detect

---
 .../java/com/github/kr328/clash/service/ClashService.kt   | 2 +-
 .../com/github/kr328/clash/service/clash/ClashRuntime.kt  | 8 ++++----
 .../github/kr328/clash/service/data/DatabaseMigrations.kt | 1 -
 3 files changed, 5 insertions(+), 6 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 f95eecb..0cc119f 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
@@ -40,7 +40,7 @@ class ClashService : BaseService() {
 
                         stopSelf()
                     } else {
-                        broadcastProfileLoaded()
+                        service.broadcastProfileLoaded()
                     }
                 }
             }
diff --git a/service/src/main/java/com/github/kr328/clash/service/clash/ClashRuntime.kt b/service/src/main/java/com/github/kr328/clash/service/clash/ClashRuntime.kt
index dbed6b4..0f7444c 100644
--- a/service/src/main/java/com/github/kr328/clash/service/clash/ClashRuntime.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/clash/ClashRuntime.kt
@@ -58,16 +58,16 @@ class ClashRuntime(private val context: Context) {
             try {
                 Clash.start()
 
-                modules.forEach {
-                    it.onStart()
-                }
-
                 context.registerReceiver(receiver, IntentFilter().apply {
                     modules.flatMap { it.receiveBroadcasts }.distinct().forEach {
                         addAction(it)
                     }
                 }, Permissions.PERMISSION_RECEIVE_BROADCASTS, null)
 
+                modules.forEach {
+                    it.onStart()
+                }
+
                 while (isActive) {
                     tickerEnabled = modules.any { it.enableTicker }
 
diff --git a/service/src/main/java/com/github/kr328/clash/service/data/DatabaseMigrations.kt b/service/src/main/java/com/github/kr328/clash/service/data/DatabaseMigrations.kt
index 2f5f4af..b4d965a 100644
--- a/service/src/main/java/com/github/kr328/clash/service/data/DatabaseMigrations.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/data/DatabaseMigrations.kt
@@ -1,6 +1,5 @@
 package com.github.kr328.clash.service.data
 
-import android.app.NotificationManager
 import android.content.ContentValues
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase