From 04e67d2f638a28035c6869894e5579b076b3ace5 Mon Sep 17 00:00:00 2001
From: Stas Shakirov <punksta@protonmail.com>
Date: Wed, 18 Aug 2021 22:31:25 +0200
Subject: [PATCH] fix some issues

---
 .../java/com/example/punksta/volumecontrol/BootReceiver.java   | 3 ++-
 .../java/com/example/punksta/volumecontrol/MainActivity.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/punksta/volumecontrol/BootReceiver.java b/app/src/main/java/com/example/punksta/volumecontrol/BootReceiver.java
index 0b79e90..e38565a 100644
--- a/app/src/main/java/com/example/punksta/volumecontrol/BootReceiver.java
+++ b/app/src/main/java/com/example/punksta/volumecontrol/BootReceiver.java
@@ -7,6 +7,7 @@
 
 import com.example.punksta.volumecontrol.data.Settings;
 import com.example.punksta.volumecontrol.model.SettingsStorage;
+import com.example.punksta.volumecontrol.util.DNDModeChecker;
 
 import java.util.Arrays;
 import java.util.List;
@@ -24,7 +25,7 @@ public void onReceive(Context context, Intent intent) {
         if (actionsToStartService.contains(intent.getAction())) {
             SettingsStorage settingsStorage = SoundApplication.getSettingsStorage(context);
             Settings settings = settingsStorage.settings();
-            if (settings.isNotificationWidgetEnabled) {
+            if (settings.isNotificationWidgetEnabled && DNDModeChecker.isDNDPermissionGranted(context)) {
                 Intent i = SoundService.getIntentForForeground(context, settings);
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     context.startForegroundService(i);
diff --git a/app/src/main/java/com/example/punksta/volumecontrol/MainActivity.java b/app/src/main/java/com/example/punksta/volumecontrol/MainActivity.java
index 62b22a6..8e40923 100644
--- a/app/src/main/java/com/example/punksta/volumecontrol/MainActivity.java
+++ b/app/src/main/java/com/example/punksta/volumecontrol/MainActivity.java
@@ -298,7 +298,7 @@ private void updateVibrateOnCalls() {
 
     private void stopSoundService() {
         Intent i = SoundService.getStopIntent(this);
-        startService(i);
+        stopService(i);
     }
 
     private void startSoundService() {