From 26ed9065217cd39d31c2cd626003c0e4e03f62c0 Mon Sep 17 00:00:00 2001
From: jens <android-development@gmx.de>
Date: Sat, 11 Jun 2022 13:59:15 +0200
Subject: [PATCH] function cleanup

---
 .../java/com/jens/automation2/Actions.java    | 29 +++++++++++--------
 .../java/com/jens/automation2/Profile.java    |  4 +--
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/jens/automation2/Actions.java b/app/src/main/java/com/jens/automation2/Actions.java
index 6ed43ee..59040c1 100644
--- a/app/src/main/java/com/jens/automation2/Actions.java
+++ b/app/src/main/java/com/jens/automation2/Actions.java
@@ -781,6 +781,23 @@ public class Actions
 		return false;
 	}
 
+	public static void setDoNotDisturb(Context context, int desiredDndMode)
+	{
+		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+		{
+			/*
+				if (!notificationManager.isNotificationPolicyAccessGranted())
+				--> done externally
+			*/
+
+			Miscellaneous.logEvent("i", context.getResources().getString(R.string.soundSettings), "Changing DND to " + String.valueOf(desiredDndMode), 4);
+			NotificationManager mNotificationManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
+			mNotificationManager.setInterruptionFilter(desiredDndMode);
+		}
+		else
+			Miscellaneous.logEvent("w", context.getResources().getString(R.string.soundSettings), "Cannot change DND to " + String.valueOf(desiredDndMode) + ". This Android version is too and doesn\'t have that feature, yet.", 4);
+	}
+
 	@RequiresApi(api = Build.VERSION_CODES.M)
 	public static boolean isDoNotDisturbActive(Context context)
 	{
@@ -915,18 +932,6 @@ public class Actions
 		}
     }
 
-	public static void setDND(Context context, int desiredDndMode)
-	{
-		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-		{
-			Miscellaneous.logEvent("i", context.getResources().getString(R.string.soundSettings), "Changing DND to " + String.valueOf(desiredDndMode), 4);
-			NotificationManager mNotificationManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
-			mNotificationManager.setInterruptionFilter(desiredDndMode);
-		}
-		else
-			Miscellaneous.logEvent("w", context.getResources().getString(R.string.soundSettings), "Cannot change DND to " + String.valueOf(desiredDndMode) + ". This Android version is too and doesn\'t have that feature, yet.", 4);
-	}
-
 	public void useDownloadedWebpage(String result)
 	{
 //		Toast.makeText(context, "Result: " + result, Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/com/jens/automation2/Profile.java b/app/src/main/java/com/jens/automation2/Profile.java
index 5f40373..d1241e3 100644
--- a/app/src/main/java/com/jens/automation2/Profile.java
+++ b/app/src/main/java/com/jens/automation2/Profile.java
@@ -4,12 +4,10 @@ import android.app.NotificationManager;
 import android.content.ContentValues;
 import android.content.Context;
 import android.media.AudioManager;
-import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
-import android.provider.Settings;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -509,7 +507,7 @@ public class Profile implements Comparable<Profile>
 			    	Actions.setSound(context, soundMode);
 
 				if(changeDndMode)
-					Actions.setDND(context, dndMode);
+					Actions.setDoNotDisturb(context, dndMode);
 		
 			    if(changeVolumeMusicVideoGameMedia)
 			    	am.setStreamVolume(AudioManager.STREAM_MUSIC, volumeMusic, AudioManager.FLAG_PLAY_SOUND);