From bb976ba50fdce0625377d43876b29b9ad52e7f07 Mon Sep 17 00:00:00 2001
From: PeratX <1215714524@qq.com>
Date: Mon, 10 Apr 2017 15:47:09 +0800
Subject: [PATCH] Clear notification when service destroyed

---
 .../org/itxtech/daedalus/service/DaedalusVpnService.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java b/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
index 1d30e3f..fe68858 100644
--- a/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
+++ b/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
@@ -128,9 +128,6 @@ public class DaedalusVpnService extends VpnService implements Runnable {
                 case ACTION_DEACTIVATE:
                     stopThread();
 
-                    NotificationManager notificationManager = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
-                    notificationManager.cancel(NOTIFICATION_ACTIVATED);
-
                     notification = null;
                     return START_NOT_STICKY;
             }
@@ -156,6 +153,10 @@ public class DaedalusVpnService extends VpnService implements Runnable {
                 Os.close(mBlockFd);
                 this.mThread = null;
             }
+            if (notification != null) {
+                NotificationManager notificationManager = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
+                notificationManager.cancel(NOTIFICATION_ACTIVATED);
+            }
         } catch (Exception e) {
             Log.d(TAG, e.toString());
         }