diff --git a/app/src/main/java/com/jens/automation2/Settings.java b/app/src/main/java/com/jens/automation2/Settings.java index 05c9299a..a3e1d5e4 100644 --- a/app/src/main/java/com/jens/automation2/Settings.java +++ b/app/src/main/java/com/jens/automation2/Settings.java @@ -263,6 +263,8 @@ public class Settings implements SharedPreferences startScreen = Integer.parseInt(prefs.getString("startScreen", String.valueOf(default_startScreen))); tabsPlacement = Integer.parseInt(prefs.getString("tabsPlacement", String.valueOf(default_tabsPlacement))); + musicCheckFrequency = Long.parseLong(prefs.getString("musicCheckFrequency", String.valueOf(default_musicCheckFrequency))); + executeRulesAndProfilesWithSingleClick = prefs.getBoolean("executeRulesAndProfilesWithSingleClick", default_executeRulesAndProfilesWithSingleClick); automaticUpdateCheck = prefs.getBoolean("automaticUpdateCheck", default_automaticUpdateCheck); displayNewsOnMainScreen = prefs.getBoolean("displayNewsOnMainScreen", default_displayNewsOnMainScreen); @@ -273,8 +275,6 @@ public class Settings implements SharedPreferences lastNewsPolltime = prefs.getLong("lastNewsPolltime", default_lastNewsPolltime); lastUpdateCheck = prefs.getLong("lastUpdateCheck", default_lastUpdateCheck); - - musicCheckFrequency = prefs.getLong("musicCheckFrequency", default_musicCheckFrequency); String whbdString = prefs.getString("whatHasBeenDone", ""); if(whbdString != null && whbdString.length() > 0) @@ -337,9 +337,6 @@ public class Settings implements SharedPreferences if(!prefs.contains("writeLogFile") || force) editor.putBoolean("writeLogFile", default_writeLogFile); -// if(!prefs.contains("useTextToSpeech") || force) -// editor.putBoolean("useTextToSpeech", default_useTextToSpeech); - if(!prefs.contains("useTextToSpeechOnNormal") || force) editor.putBoolean("useTextToSpeechOnNormal", default_useTextToSpeechOnNormal); @@ -549,6 +546,7 @@ public class Settings implements SharedPreferences editor.putBoolean("executeRulesAndProfilesWithSingleClick", executeRulesAndProfilesWithSingleClick); editor.putBoolean("automaticUpdateCheck", automaticUpdateCheck); editor.putBoolean("displayNewsOnMainScreen", displayNewsOnMainScreen); + editor.putString("musicCheckFrequency", String.valueOf(musicCheckFrequency)); editor.putBoolean("lockSoundChanges", lockSoundChanges); editor.putBoolean("noticeAndroid9MicrophoneShown", noticeAndroid9MicrophoneShown); @@ -556,8 +554,6 @@ public class Settings implements SharedPreferences editor.putLong("lastNewsPolltime", lastNewsPolltime); editor.putLong("lastUpdateCheck", lastUpdateCheck); - - editor.putLong("musicCheckFrequency", musicCheckFrequency); editor.putString("whatHasBeenDone", Miscellaneous.explode(";", whatHasBeenDone)); diff --git a/app/src/main/java/com/jens/automation2/receivers/MediaPlayerListener.java b/app/src/main/java/com/jens/automation2/receivers/MediaPlayerListener.java index 1f19e6ae..46df38ad 100644 --- a/app/src/main/java/com/jens/automation2/receivers/MediaPlayerListener.java +++ b/app/src/main/java/com/jens/automation2/receivers/MediaPlayerListener.java @@ -2,7 +2,6 @@ package com.jens.automation2.receivers; import android.content.Context; import android.media.AudioManager; -import android.media.MediaPlayer; import com.jens.automation2.AutomationService; import com.jens.automation2.Miscellaneous; @@ -11,7 +10,6 @@ import com.jens.automation2.Settings; import com.jens.automation2.Trigger; import java.util.ArrayList; -import java.util.Set; import java.util.Timer; import java.util.TimerTask; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 46bab318..478ff19b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -790,7 +790,7 @@ Select parameters music is playing music is not playing - Frequency to check if music is playing [milliseconds] - Milliseconds between checks Music playing detection + Check frequency [ms] + Milliseconds between checks \ No newline at end of file